- 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

15 files changed, 11 insertions, 22 deletions

diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index ddcc84371ce2..b992de8fc002 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -24,9 +24,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--enable-dict-dir=${DATADIR}	\
 			--enable-docdir=${DOCSDIR}	\
-			--enable-static			\
-			--mandir=${MANPREFIX}/man	\
-			--infodir=${PREFIX}/${INFO_PATH}
+			--enable-static	
 PTHREAD_CFLAGS=		# Disable threading
 PTHREAD_LIBS=		# libaspell may be used by unthreaded apps.
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"	\
diff --git a/textproc/dict/Makefile b/textproc/dict/Makefile
index 4d246c909d88..f31a3875ade9 100644
--- a/textproc/dict/Makefile
+++ b/textproc/dict/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Dictionary Server Protocol (RFC2229) client
 USE_BISON=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-local-zlib --with-cflags="${CFLAGS}" \
-		--with-etcdir=${PREFIX}/etc --mandir="${PREFIX}/man"
+		--with-etcdir=${PREFIX}/etc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 USE_GMAKE=	yes
diff --git a/textproc/dictfmt/Makefile b/textproc/dictfmt/Makefile
index 68f59247ac24..95291f9faa2b 100644
--- a/textproc/dictfmt/Makefile
+++ b/textproc/dictfmt/Makefile
@@ -20,7 +20,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS=	--with-cflags="${CFLAGS}" --mandir="${MANPREFIX}/man"
+CONFIGURE_ARGS=	--with-cflags="${CFLAGS}"
 ALL_TARGET=	dictfmt
 INSTALL_TARGET=	install.dictfmt
 USE_AUTOTOOLS=	libtool:15
diff --git a/textproc/ffe/Makefile b/textproc/ffe/Makefile
index e23bb84d1360..40aeb54f1dbb 100644
--- a/textproc/ffe/Makefile
+++ b/textproc/ffe/Makefile
@@ -14,7 +14,6 @@ MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Flat file extractor
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--mandir=${MAN1PREFIX}/man
 PLIST_FILES=	bin/${PORTNAME}
 MAN1=		${PORTNAME}.1
 PORTDOCS=	${PORTNAME}.html
diff --git a/textproc/filepp/Makefile b/textproc/filepp/Makefile
index 7615bc303337..af8947fd4ee3 100644
--- a/textproc/filepp/Makefile
+++ b/textproc/filepp/Makefile
@@ -16,8 +16,7 @@ COMMENT=	A generic file preprocessor
 
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
-			--mandir=${PREFIX}/man
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 NO_BUILD=	yes
 
 MAN1=	filepp.1
diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile
index 21b9c73f84ec..e48edd9b40de 100644
--- a/textproc/intltool/Makefile
+++ b/textproc/intltool/Makefile
@@ -25,7 +25,7 @@ USE_ICONV=	yes
 USE_PERL5=	yes
 USE_GNOME=	gnometarget
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--libdir="${PREFIX}/libdata" --mandir="${PREFIX}/man"
+CONFIGURE_ARGS=	--libdir="${PREFIX}/libdata"
 
 MAN8=		intltool-extract.8 intltool-merge.8 intltool-prepare.8 \
 		intltool-update.8 intltoolize.8
diff --git a/textproc/kdiff3/Makefile b/textproc/kdiff3/Makefile
index 3b75755e95a5..162de253c3b6 100644
--- a/textproc/kdiff3/Makefile
+++ b/textproc/kdiff3/Makefile
@@ -21,7 +21,6 @@ INSTALLS_ICONS=	yes
 USE_LDCONFIG=	${PREFIX}/lib/kde3
 
 CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
-CONFIGURE_ARGS=	--mandir="${MANPREFIX}/man"
 
 MAN1=	kdiff3.1
 
diff --git a/textproc/libextractor/Makefile b/textproc/libextractor/Makefile
index 14269f14d7cd..4b615ec1af45 100644
--- a/textproc/libextractor/Makefile
+++ b/textproc/libextractor/Makefile
@@ -25,7 +25,7 @@ USE_AUTOTOOLS=	libltdl:15
 USE_DOS2UNIX=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/libextractor
-CONFIGURE_ARGS=	--disable-ltdl-install --mandir=${PREFIX}/man --enable-exiv2
+CONFIGURE_ARGS=	--disable-ltdl-install --enable-exiv2
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/textproc/raptor/Makefile b/textproc/raptor/Makefile
index eae26890d0cd..dfd54a2c7e37 100644
--- a/textproc/raptor/Makefile
+++ b/textproc/raptor/Makefile
@@ -24,8 +24,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xml2-config=${LOCALBASE}/bin/xml2-config \
 		--with-curl-config=${LOCALBASE}/bin/curl-config \
 		--with-pkg-config=${LOCALBASE}/bin/pkg-config \
-		--with-xml-parser=libxml --with-www=curl \
-		--mandir=${PREFIX}/man
+		--with-xml-parser=libxml --with-www=curl
 
 USE_LDCONFIG=	yes
 
diff --git a/textproc/raptor2/Makefile b/textproc/raptor2/Makefile
index eae26890d0cd..dfd54a2c7e37 100644
--- a/textproc/raptor2/Makefile
+++ b/textproc/raptor2/Makefile
@@ -24,8 +24,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xml2-config=${LOCALBASE}/bin/xml2-config \
 		--with-curl-config=${LOCALBASE}/bin/curl-config \
 		--with-pkg-config=${LOCALBASE}/bin/pkg-config \
-		--with-xml-parser=libxml --with-www=curl \
-		--mandir=${PREFIX}/man
+		--with-xml-parser=libxml --with-www=curl
 
 USE_LDCONFIG=	yes
 
diff --git a/textproc/rasqal/Makefile b/textproc/rasqal/Makefile
index 3d7a73a3d882..899655fc1e94 100644
--- a/textproc/rasqal/Makefile
+++ b/textproc/rasqal/Makefile
@@ -31,8 +31,7 @@ LDFLAGS=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-raptor=system \
 		--with-rasqal=internal \
-		--with-threestore=no \
-		--mandir=${PREFIX}/man
+		--with-threestore=no
 
 USE_LDCONFIG=	yes
 
diff --git a/textproc/redland/Makefile b/textproc/redland/Makefile
index 3d7a73a3d882..899655fc1e94 100644
--- a/textproc/redland/Makefile
+++ b/textproc/redland/Makefile
@@ -31,8 +31,7 @@ LDFLAGS=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-raptor=system \
 		--with-rasqal=internal \
-		--with-threestore=no \
-		--mandir=${PREFIX}/man
+		--with-threestore=no
 
 USE_LDCONFIG=	yes
 
diff --git a/textproc/rl/Makefile b/textproc/rl/Makefile
index adef25dd1c96..150ecc9ae96c 100644
--- a/textproc/rl/Makefile
+++ b/textproc/rl/Makefile
@@ -14,7 +14,6 @@ MAINTAINER=	pav@FreeBSD.org
 COMMENT=	Randomizes lines from a specified input file
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man
 
 MAN1=		rl.1
 PLIST_FILES=	bin/rl
diff --git a/textproc/rotix/Makefile b/textproc/rotix/Makefile
index d35a44f19a57..71d079f20c7f 100644
--- a/textproc/rotix/Makefile
+++ b/textproc/rotix/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A program to generate rotational obfuscations
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX} --mandir=${PREFIX}/man --i18n=1
+CONFIGURE_ARGS=	--prefix=${PREFIX} --i18n=1
 CONFIGURE_ENV=	EXPR_COMPAT=1
 
 MAN1=		rotix.1
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index 12c2855b00f6..36cf5050c23c 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -25,7 +25,6 @@ USE_AUTOTOOLS=	libtool:15
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--mandir=${PREFIX}/man
 
 .if !defined(WITHOUT_X11)
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft