- Set --mandir and --infodir in CONFIGURE_ARGS if the configure script

  supports them.  This is determined by running ``configure --help'' in
  do-configure target and set the shell variable _LATE_CONFIGURE_ARGS
  which is then passed to CONFIGURE_ARGS.
- Remove --mandir and --infodir in ports' Makefile where applicable
  Few ports use REINPLACE_CMD to achieve the same effect, remove them too.
- Correct some manual pages location from PREFIX/man to MANPREFIX/man
- Define INFO_PATH where necessary
- Document that .info files are installed in a subdirectory relative to
  PREFIX/INFO_PATH and slightly change add-plist-info to use INFO_PATH and
  subdirectory detection.

PR:		ports/111470
Approved by:	portmgr
Discussed with:	stas (Mk/*), gerald (info related stuffs)
Tested by:	pointyhat exp run

2 files changed, 18 insertions, 42 deletions

diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile
index 249af927ffeb..c858c33564fc 100644
--- a/editors/xemacs-devel/Makefile
+++ b/editors/xemacs-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xemacs-devel
 PORTVERSION=	${XEMACS_VER:S/-/./}
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES+=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS}
@@ -60,6 +60,22 @@ CONFIGURE_ARGS?=--enable-clash-detection \
 MAKE_ARGS=	prefix=${PREFIX}
 MAN1=		ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \
 		gnuserv.1 xemacs.1
+INFO=		xemacs-${XEMACS_VER}/beta \
+		xemacs-${XEMACS_VER}/cl \
+		xemacs-${XEMACS_VER}/custom \
+		xemacs-${XEMACS_VER}/emodules \
+		xemacs-${XEMACS_VER}/external-widget \
+		xemacs-${XEMACS_VER}/info \
+		xemacs-${XEMACS_VER}/internals \
+		xemacs-${XEMACS_VER}/lispref \
+		xemacs-${XEMACS_VER}/new-users-guide \
+		xemacs-${XEMACS_VER}/standards \
+		xemacs-${XEMACS_VER}/term \
+		xemacs-${XEMACS_VER}/termcap \
+		xemacs-${XEMACS_VER}/texinfo \
+		xemacs-${XEMACS_VER}/widget \
+		xemacs-${XEMACS_VER}/xemacs-faq \
+		xemacs-${XEMACS_VER}/xemacs
 ALL_TARGET=	all dist
 
 PLIST_SUB=	XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH}
diff --git a/editors/xemacs-devel/pkg-plist b/editors/xemacs-devel/pkg-plist
index 4bae4d0d6a60..03814df23921 100644
--- a/editors/xemacs-devel/pkg-plist
+++ b/editors/xemacs-devel/pkg-plist
@@ -9,6 +9,7 @@ bin/ootags
 bin/rcs-checkin
 bin/xemacs
 bin/xemacs-%%XEMACS_VER%%
+info/xemacs-%%XEMACS_VER%%/dir
 @exec mkdir -p %D/lib/xemacs/site-lisp ; chmod 755 %D/lib/xemacs/site-lisp
 lib/xemacs-%%XEMACS_VER%%/etc/COPYING
 lib/xemacs-%%XEMACS_VER%%/etc/ChangeLog
@@ -860,46 +861,6 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/sorted-doc
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/vcdiff
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/wakeup
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/yow
-lib/xemacs-%%XEMACS_VER%%/info/beta.info
-lib/xemacs-%%XEMACS_VER%%/info/cl.info
-lib/xemacs-%%XEMACS_VER%%/info/custom.info
-lib/xemacs-%%XEMACS_VER%%/info/dir
-lib/xemacs-%%XEMACS_VER%%/info/emodules.info
-lib/xemacs-%%XEMACS_VER%%/info/external-widget.info
-lib/xemacs-%%XEMACS_VER%%/info/info.info
-lib/xemacs-%%XEMACS_VER%%/info/internals.info
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-1
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-2
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-3
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-4
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-5
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-1
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-2
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-3
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-4
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-5
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-6
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-7
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-8
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-9
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-10
-lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info
-lib/xemacs-%%XEMACS_VER%%/info/standards.info
-lib/xemacs-%%XEMACS_VER%%/info/term.info
-lib/xemacs-%%XEMACS_VER%%/info/termcap.info
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-1
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-2
-lib/xemacs-%%XEMACS_VER%%/info/widget.info
-lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info
-lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-1
-lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-2
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-1
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-2
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-3
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-4
 lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog
 lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog.GTK
 lib/xemacs-%%XEMACS_VER%%/lisp/README
@@ -1457,7 +1418,6 @@ lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.elc
 @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/term
 @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/mule
 @dirrm lib/xemacs-%%XEMACS_VER%%/lisp
-@dirrm lib/xemacs-%%XEMACS_VER%%/info
 @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s
 @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m
 @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include