- 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

55 files changed, 38 insertions, 82 deletions

diff --git a/devel/arm-elf-binutils/Makefile b/devel/arm-elf-binutils/Makefile
index 362fa03758b1..3afd728bc205 100644
--- a/devel/arm-elf-binutils/Makefile
+++ b/devel/arm-elf-binutils/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--target=${PKGNAMEPREFIX:S/-$//}
-CONFIGURE_ARGS=	--infodir=${PREFIX}/${PKGNAMEPREFIX:S/-$//}/info
+INFO_PATH=	${PKGNAMEPREFIX:S/-$//}/info
 MAN1=		${PKGNAMEPREFIX}addr2line.1 ${PKGNAMEPREFIX}as.1 \
 		${PKGNAMEPREFIX}ar.1 ${PKGNAMEPREFIX}c++filt.1 \
 		${PKGNAMEPREFIX}dlltool.1 ${PKGNAMEPREFIX}ld.1 \
diff --git a/devel/autoconf261/Makefile b/devel/autoconf261/Makefile
index e19e1161fcef..4185285da65c 100644
--- a/devel/autoconf261/Makefile
+++ b/devel/autoconf261/Makefile
@@ -30,8 +30,7 @@ INFO=		autoconf${BUILD_VERSION} standards${BUILD_VERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CONFIG_SHELL=${SH}
 CONFIGURE_ENV+=	M4=${LOCALBASE}/bin/gm4
-CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION} --without-lispdir \
-		--infodir=${PREFIX}/info --mandir=${PREFIX}/man
+CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION} --without-lispdir
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 GENERIC_TOOLS=	config.guess config.sub	elisp-comp install-sh mdate-sh missing
diff --git a/devel/autoconf262/Makefile b/devel/autoconf262/Makefile
index e19e1161fcef..4185285da65c 100644
--- a/devel/autoconf262/Makefile
+++ b/devel/autoconf262/Makefile
@@ -30,8 +30,7 @@ INFO=		autoconf${BUILD_VERSION} standards${BUILD_VERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CONFIG_SHELL=${SH}
 CONFIGURE_ENV+=	M4=${LOCALBASE}/bin/gm4
-CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION} --without-lispdir \
-		--infodir=${PREFIX}/info --mandir=${PREFIX}/man
+CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION} --without-lispdir
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 GENERIC_TOOLS=	config.guess config.sub	elisp-comp install-sh mdate-sh missing
diff --git a/devel/autoconf267/Makefile b/devel/autoconf267/Makefile
index e19e1161fcef..4185285da65c 100644
--- a/devel/autoconf267/Makefile
+++ b/devel/autoconf267/Makefile
@@ -30,8 +30,7 @@ INFO=		autoconf${BUILD_VERSION} standards${BUILD_VERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CONFIG_SHELL=${SH}
 CONFIGURE_ENV+=	M4=${LOCALBASE}/bin/gm4
-CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION} --without-lispdir \
-		--infodir=${PREFIX}/info --mandir=${PREFIX}/man
+CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION} --without-lispdir
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 GENERIC_TOOLS=	config.guess config.sub	elisp-comp install-sh mdate-sh missing
diff --git a/devel/autoconf268/Makefile b/devel/autoconf268/Makefile
index e19e1161fcef..4185285da65c 100644
--- a/devel/autoconf268/Makefile
+++ b/devel/autoconf268/Makefile
@@ -30,8 +30,7 @@ INFO=		autoconf${BUILD_VERSION} standards${BUILD_VERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CONFIG_SHELL=${SH}
 CONFIGURE_ENV+=	M4=${LOCALBASE}/bin/gm4
-CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION} --without-lispdir \
-		--infodir=${PREFIX}/info --mandir=${PREFIX}/man
+CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION} --without-lispdir
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 GENERIC_TOOLS=	config.guess config.sub	elisp-comp install-sh mdate-sh missing
diff --git a/devel/autodist/Makefile b/devel/autodist/Makefile
index fdf87fe57bd3..7aad89391aeb 100644
--- a/devel/autodist/Makefile
+++ b/devel/autodist/Makefile
@@ -17,7 +17,6 @@ COMMENT=	Distribution creation system
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--infodir=${PREFIX}/${INFO_PATH} --mandir=${MANPREFIX}/man
 USE_GMAKE=	yes
 
 MAN1=		autodist.1
diff --git a/devel/autogen/Makefile b/devel/autogen/Makefile
index 6a1a8f347b8d..3bd52905661d 100644
--- a/devel/autogen/Makefile
+++ b/devel/autogen/Makefile
@@ -23,8 +23,7 @@ USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnometarget libxml2
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-libguile=yes --with-libxml2=yes --datadir=${PREFIX}/share \
-		--infodir=${PREFIX}/info --mandir=${PREFIX}/man
+CONFIGURE_ARGS=	--with-libguile=yes --with-libxml2=yes --datadir=${PREFIX}/share
 USE_LDCONFIG=	yes
 
 MAN1=	autogen.1 autoopts-config.1 columns.1 getdefs.1 xml2ag.1
diff --git a/devel/automake110/Makefile b/devel/automake110/Makefile
index 6b06cd222ca9..281a5d2d3c58 100644
--- a/devel/automake110/Makefile
+++ b/devel/automake110/Makefile
@@ -25,8 +25,7 @@ LATEST_LINK=	automake${BUILD_VERSION}
 USE_BZIP2=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION} \
-		--infodir=${PREFIX}/info --mandir=${PREFIX}/man
+CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION}
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INFO=		automake${BUILD_VERSION}
 
diff --git a/devel/automake19/Makefile b/devel/automake19/Makefile
index 87241d34df47..1bf11a36f33d 100644
--- a/devel/automake19/Makefile
+++ b/devel/automake19/Makefile
@@ -26,8 +26,7 @@ USE_BZIP2=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	AUTOCONF=autoconf259 AUTOHEADER=autoheader259 MAKEINFO=makeinfo
-CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION} \
-		--infodir=${PREFIX}/info
+CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION}
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INFO=		automake${BUILD_VERSION}
 
diff --git a/devel/cook/Makefile b/devel/cook/Makefile
index 168d405301e9..2a444f8262be 100644
--- a/devel/cook/Makefile
+++ b/devel/cook/Makefile
@@ -17,7 +17,6 @@ MAINTAINER=	jasone@FreeBSD.org
 COMMENT=	Like make(1), but more powerful and clean
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib \
 		YACC=yacc
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/devel/cppi/Makefile b/devel/cppi/Makefile
index 8b1a500e8c71..5f44308b5b0c 100644
--- a/devel/cppi/Makefile
+++ b/devel/cppi/Makefile
@@ -17,7 +17,6 @@ COMMENT=	A tool to indent the C preprocessor directives
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
 
 PLIST_FILES=	bin/cppi
diff --git a/devel/cxref/Makefile b/devel/cxref/Makefile
index 90dbe455e19a..a5b0f673b900 100644
--- a/devel/cxref/Makefile
+++ b/devel/cxref/Makefile
@@ -20,7 +20,7 @@ COMMENT=	C program cross-referencing & documentation tool
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-cxref-cpp --mandir="${PREFIX}/man"
+CONFIGURE_ARGS=	--without-cxref-cpp
 ALL_TARGET=	programs
 
 MAN1=		cxref.1 cxref-query.1
diff --git a/devel/darcs/Makefile b/devel/darcs/Makefile
index 956504ca32bd..fa08a090a39a 100644
--- a/devel/darcs/Makefile
+++ b/devel/darcs/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 
 OPTIONS=	SERVER "install server" off
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${PREFIX}/lib/ ${PTHREAD_LIBS}" \
 		CFLAGS=""
diff --git a/devel/djgpp-binutils/Makefile b/devel/djgpp-binutils/Makefile
index 7ff8257b64e7..56fab454977c 100644
--- a/devel/djgpp-binutils/Makefile
+++ b/devel/djgpp-binutils/Makefile
@@ -31,8 +31,8 @@ SRCDIR=		${WRKDIR}/binutils-${BINUTILVERSION}.${PATCHVERSION}
 WRKSRC=		${WRKDIR}/build
 CONFIGURE_ARGS=	--target=${TARGET} \
 		--with-gcc --with-gnu-ld --with-gnu-as \
-		--disable-nls --disable-shared \
-		--infodir=${PREFIX}/${TARGET}/info
+		--disable-nls --disable-shared
+INFO_PATH=	${TARGET}/info
 
 MAN1=	${TARGET}-addr2line.1 ${TARGET}-ar.1    \
 	${TARGET}-as.1 ${TARGET}-dlltool.1      \
diff --git a/devel/djgpp-gcc/Makefile b/devel/djgpp-gcc/Makefile
index dbd0b9ba8e19..e58bc2b93211 100644
--- a/devel/djgpp-gcc/Makefile
+++ b/devel/djgpp-gcc/Makefile
@@ -56,7 +56,6 @@ CONFIGURE_ARGS=	--target=${TARGET} \
 		--with-gcc --with-gnu-ld --with-gnu-as \
 		--disable-nls --disable-shared \
 		--with-gxx-include-dir=${PREFIX}/${TARGET}/include/c++/ \
-		--infodir=${PREFIX}/${TARGET}/info \
 		--includedir=${PREFIX}/${TARGET}/include \
 		--datadir=${PREFIX}/${TARGET}/share
 .if defined(WITH_FORTRAN)
@@ -64,6 +63,7 @@ CONFIGURE_ARGS+=--enable-languages=c,c++,fortran,objc,obj-c++
 .else
 CONFIGURE_ARGS+=--enable-languages=c,c++,objc,obj-c++
 .endif
+INFO_PATH=	${TARGET}/info
 
 MAKE_ENV=	PATH=${PREFIX}/bin:${PATH}
 LIBTOOLFILES=	configure gcc/configure
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index 6989d6652824..c14e74ea7d64 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -32,8 +32,7 @@ USE_GNOME=	gnomehier gnomehack orbit2 gtk20 libxml2 linc ltverhack \
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
-		--disable-gtk-doc \
-		--mandir=${PREFIX}/man
+		--disable-gtk-doc
 #		--enable-gconf-source=${PREFIX}/etc/gconf/schemas \
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/geany/Makefile b/devel/geany/Makefile
index 7aa44f9a21af..6744e8f8139f 100644
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@@ -20,7 +20,6 @@ INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS+=--mandir="${MANPREFIX}/man"
 
 OPTIONS=	VTE	"Enable Virtual Terminal Emulation support"	on \
 		NLS	"Enable Native Language support"		on
diff --git a/devel/gengetopt/Makefile b/devel/gengetopt/Makefile
index 9d4ad0c7ee4d..83104453277e 100644
--- a/devel/gengetopt/Makefile
+++ b/devel/gengetopt/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	laszlof@FreeBSD.org
 COMMENT=	A tool for generating a C function which parses command line arguments
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--infodir=${PREFIX}/info --mandir=${PREFIX}/man
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index dbffeb1dc56b..3da44d8b511e 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -28,8 +28,7 @@ CONFIGURE_ENV=	ACLOCAL="${TRUE}" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		EMACS="no"
-CONFIGURE_ARGS=	--disable-csharp --disable-threads --disable-openmp \
-		--mandir=${PREFIX}/man --infodir=${PREFIX}/info
+CONFIGURE_ARGS=	--disable-csharp --disable-threads --disable-openmp
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	VERSION=${PORTVERSION}
diff --git a/devel/gnu-autoconf/Makefile b/devel/gnu-autoconf/Makefile
index fd92153f16f9..f36a585778b6 100644
--- a/devel/gnu-autoconf/Makefile
+++ b/devel/gnu-autoconf/Makefile
@@ -31,8 +31,7 @@ NO_MTREE=	yes
 INFO=		autoconf standards
 CONFIGURE_ENV+=	CONFIG_SHELL=${SH}
 CONFIGURE_ENV+=	M4=${LOCALBASE}/bin/gm4
-CONFIGURE_ARGS=	--infodir=${PREFIX}/info --mandir=${PREFIX}/man \
-		--without-lispdir
+CONFIGURE_ARGS=	--without-lispdir
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		autoconf.1 autoheader.1 autom4te.1 autoreconf.1 autoscan.1 \
diff --git a/devel/gnu-automake/Makefile b/devel/gnu-automake/Makefile
index 40853d6bffde..f3ee383e59e8 100644
--- a/devel/gnu-automake/Makefile
+++ b/devel/gnu-automake/Makefile
@@ -30,7 +30,6 @@ CONFIGURE_ENV=	AUTOCONF=${LOCALBASE}/gnu-autotools/bin/autoconf \
 		AUTOHEADER=${LOCALBASE}/gnu-autotools/bin/autoheader \
 		MAKEINFO="${MAKEINFO} --no-split"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--infodir=${PREFIX}/info --mandir=${PREFIX}/man
 
 PLIST_SUB=	VERSION=1.10
 
diff --git a/devel/gperf/Makefile b/devel/gperf/Makefile
index 2af7ca04b2c9..ed490471744b 100644
--- a/devel/gperf/Makefile
+++ b/devel/gperf/Makefile
@@ -17,8 +17,6 @@ COMMENT=	Generates perfect hash functions for sets of keywords
 GNU_CONFIGURE=	yes
 MAN1=		gperf.1
 INFO=		gperf
-CONFIGURE_ARGS+=	--mandir=${PREFIX}/man \
-			--infodir=${PREFIX}/${INFO_PATH} \
-			--docdir=${DOCSDIR}
+CONFIGURE_ARGS+=	--docdir=${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index d9cc98a6018a..a1b3fa0c9d49 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -27,8 +27,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lgnuregex"
 CONFIGURE_ARGS=	--disable-debug \
-		--enable-compile-warnings=no \
-		--mandir=${PREFIX}/man
+		--enable-compile-warnings=no
 
 MAN1=		gtranslator.1 pozilla.sh.1
 
diff --git a/devel/guile-lib/Makefile b/devel/guile-lib/Makefile
index 986443252ba1..886490012c85 100644
--- a/devel/guile-lib/Makefile
+++ b/devel/guile-lib/Makefile
@@ -18,7 +18,6 @@ BUILD_DEPENDS=	guile:${PORTSDIR}/lang/guile
 RUN_DEPENDS=	guile:${PORTSDIR}/lang/guile
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--infodir=${PREFIX}/info
 USE_GMAKE=	yes
 
 INFO=	guile-library
diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile
index 956504ca32bd..fa08a090a39a 100644
--- a/devel/hs-darcs/Makefile
+++ b/devel/hs-darcs/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 
 OPTIONS=	SERVER "install server" off
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${PREFIX}/lib/ ${PTHREAD_LIBS}" \
 		CFLAGS=""
diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index 6c8afea465f5..634653844522 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -31,8 +31,7 @@ USE_AUTOTOOLS=  libtool:15
 
 USE_LDCONFIG=	yes
 
-CONFIGURE_ARGS+=--mandir=${MANPREFIX}/man \
-		--with-db-include-dir=${BDB_INCLUDE_DIR} \
+CONFIGURE_ARGS+=--with-db-include-dir=${BDB_INCLUDE_DIR} \
 		--with-db-lib-dir=${BDB_LIB_DIR} --with-db-name=${BDB_LIB_NAME} \
 		--with-apr-config=${LOCALBASE}/bin/apr-1-config \
 		--with-apu-config=${LOCALBASE}/bin/apu-1-config \
diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile
index 6c8afea465f5..634653844522 100644
--- a/devel/kdesdk4/Makefile
+++ b/devel/kdesdk4/Makefile
@@ -31,8 +31,7 @@ USE_AUTOTOOLS=  libtool:15
 
 USE_LDCONFIG=	yes
 
-CONFIGURE_ARGS+=--mandir=${MANPREFIX}/man \
-		--with-db-include-dir=${BDB_INCLUDE_DIR} \
+CONFIGURE_ARGS+=--with-db-include-dir=${BDB_INCLUDE_DIR} \
 		--with-db-lib-dir=${BDB_LIB_DIR} --with-db-name=${BDB_LIB_NAME} \
 		--with-apr-config=${LOCALBASE}/bin/apr-1-config \
 		--with-apu-config=${LOCALBASE}/bin/apu-1-config \
diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile
index a80cd6de8e8d..a5cd2c296fd6 100644
--- a/devel/libIDL/Makefile
+++ b/devel/libIDL/Makefile
@@ -22,8 +22,7 @@ USE_BISON=	yes
 USE_GNOME=	gnomehack glib20
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
-		--infodir=${PREFIX}/info
+CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index fda80eee4ad7..d312ac404f1b 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -31,8 +31,7 @@ GNU_CONFIGURE=	yes
 USE_PERL5=	yes
 USE_GNOME=	gnomehack intlhack libxml2 orbit2 referencehack
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
-		--disable-gtk-doc \
-		--mandir=${PREFIX}/man
+		--disable-gtk-doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 MAKE_ENV=	gnomelocaledir=${PREFIX}/share/locale
diff --git a/devel/libccid/Makefile b/devel/libccid/Makefile
index 7be111caf779..313431955cfe 100644
--- a/devel/libccid/Makefile
+++ b/devel/libccid/Makefile
@@ -19,7 +19,7 @@ GNU_CONFIGURE=	yes
 USE_PERL5_BUILD=yes
 CONFIGURE_ARGS=	--enable-usbdropdir=${LOCALBASE}/lib/pcsc/drivers \
 		--enable-ccidtwindir=${LOCALBASE}/lib/pcsc/drivers/serial \
-		--enable-udev --mandir=${PREFIX}/man
+		--enable-udev
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" \
 		LIBUSB_CFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/libevent/Makefile b/devel/libevent/Makefile
index e54eddc1d7f5..eb05758dd686 100644
--- a/devel/libevent/Makefile
+++ b/devel/libevent/Makefile
@@ -13,7 +13,6 @@ MASTER_SITES=	http://monkey.org/~provos/
 MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	Provides an API to execute callback functions on certain events
 
-CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index fd5cd87dbc52..6d13526f41e3 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -25,8 +25,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack glib20 ltverhack intlhack
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ARGS=	--infodir=${PREFIX}/info \
-		--disable-gtk-doc \
+CONFIGURE_ARGS=	--disable-gtk-doc \
 		--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/libruin/Makefile b/devel/libruin/Makefile
index 95e1e4802e2e..43d4165cb5f6 100644
--- a/devel/libruin/Makefile
+++ b/devel/libruin/Makefile
@@ -19,8 +19,6 @@ BUILD_DEPENDS=	${LOCALBASE}/share/guile/site/config/load.scm:${PORTSDIR}/devel/g
 RUN_DEPENDS=	${LOCALBASE}/share/guile/site/config/load.scm:${PORTSDIR}/devel/guile-lib
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--infodir=${PREFIX}/info \
-		--mandir=${PREFIX}/man
 USE_LDCONFIG=	yes
 
 MAN3=	ruin.3
diff --git a/devel/libslang2/Makefile b/devel/libslang2/Makefile
index 45f02dfe98fa..933cbc988dca 100644
--- a/devel/libslang2/Makefile
+++ b/devel/libslang2/Makefile
@@ -30,7 +30,6 @@ INSTALL_TARGET=	install install-static
 MAN1=		slsh.1
 DOCSDIR=	${PREFIX}/share/doc/slang
 DATADIR=	${PREFIX}/share/slsh
-CONFIGURE_ARGS=	--mandir=${MAN1PREFIX}/man
 
 OPTIONS=	PCRE	"Include pcre support" on \
 		PNG	"Include png support"  on \
diff --git a/devel/libstatgrab/Makefile b/devel/libstatgrab/Makefile
index 9b43c49aed5e..597f0d793249 100644
--- a/devel/libstatgrab/Makefile
+++ b/devel/libstatgrab/Makefile
@@ -32,7 +32,7 @@ MAN3=		sg_get_cpu_percents.3 sg_get_cpu_stats.3 \
 		sg_get_process_stats.3 sg_get_swap_stats.3 \
 		sg_get_user_stats.3 statgrab.3
 
-CONFIGURE_ARGS+=	--disable-examples --mandir=${PREFIX}/man
+CONFIGURE_ARGS+=	--disable-examples
 
 .ifdef(WITHOUT_STATGRAB)
 CONFIGURE_ARGS+=	--disable-statgrab
diff --git a/devel/libtool15/Makefile b/devel/libtool15/Makefile
index ab5d4c94be0a..91ed7c37d172 100644
--- a/devel/libtool15/Makefile
+++ b/devel/libtool15/Makefile
@@ -18,7 +18,6 @@ COMMENT?=	Generic shared library support script
 
 GNU_CONFIGURE=	 yes
 CONFIGURE_ARGS?= --disable-ltdl-install
-CONFIGURE_ARGS+= --infodir=${PREFIX}/info
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INFO?=		libtool
diff --git a/devel/libzvbi/Makefile b/devel/libzvbi/Makefile
index 64f5652e16fd..1ea6d9090dd5 100644
--- a/devel/libzvbi/Makefile
+++ b/devel/libzvbi/Makefile
@@ -30,6 +30,5 @@ CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/li
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|mandir = .*|mandir = ${MANPREFIX}/man|g' ${WRKSRC}/contrib/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index fb8dafb37e18..a7ffe5860a19 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -16,8 +16,7 @@ COMMENT=	GNU m4
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--infodir=${PREFIX}/info --mandir=${PREFIX}/man \
-		--program-prefix=g
+CONFIGURE_ARGS=	--program-prefix=g
 
 .if defined(WITH_CHANGEWORD)
 CONFIGURE_ARGS+=	--enable-changeword
diff --git a/devel/mcpp/Makefile b/devel/mcpp/Makefile
index c363f9672a5e..c8e59eb133ae 100644
--- a/devel/mcpp/Makefile
+++ b/devel/mcpp/Makefile
@@ -17,7 +17,6 @@ COMMENT=	Alternative C/C++ preprocessor
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
 MAN1=		mcpp.1
 
 PLIST_FILES=	bin/mcpp    \
diff --git a/devel/mingw32-binutils/Makefile b/devel/mingw32-binutils/Makefile
index d21855e855e9..3558b9152b09 100644
--- a/devel/mingw32-binutils/Makefile
+++ b/devel/mingw32-binutils/Makefile
@@ -40,8 +40,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} \
 		--with-gcc --with-gnu-ld --with-gnu-as \
 		--disable-nls --disable-win32-registry \
-		--disable-shared \
-		--infodir=${PREFIX}/${PKGNAMEPREFIX:S/-$//}/info
+		--disable-shared
+INFO_PATH=	${PKGNAMEPREFIX:S/-$//}/info
 
 MAN1=	${PKGNAMEPREFIX}addr2line.1 ${PKGNAMEPREFIX}ar.1    \
 	${PKGNAMEPREFIX}as.1 ${PKGNAMEPREFIX}dlltool.1      \
diff --git a/devel/mingw32-gcc/Makefile b/devel/mingw32-gcc/Makefile
index cc23fc10798e..db0892457de2 100644
--- a/devel/mingw32-gcc/Makefile
+++ b/devel/mingw32-gcc/Makefile
@@ -66,9 +66,9 @@ CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} \
 		--enable-interpreter --enable-hash-synchronization \
 		--without-newlib \
 		--with-gxx-include-dir=${PREFIX}/${PKGNAMEPREFIX:S/-$//}/include/c++/${GCCVERSION} \
-		--infodir=${PREFIX}/${PKGNAMEPREFIX:S/-$//}/info \
 		--includedir=${PREFIX}/${PKGNAMEPREFIX:S/-$//}/include \
 		--datadir=${PREFIX}/${PKGNAMEPREFIX:S/-$//}/share
+INFO_PATH=	${PKGNAMEPREFIX:S/-$//}/info
 MAKE_ENV=	PATH=${PREFIX}/bin:${PATH}
 LIBTOOLFILES=	configure gcc/configure
 MAN1=		${PKGNAMEPREFIX}gcc.1 ${PKGNAMEPREFIX}g++.1 ${PKGNAMEPREFIX}g77.1 \
diff --git a/devel/mm/Makefile b/devel/mm/Makefile
index 0235367a2aff..da819f9ea151 100644
--- a/devel/mm/Makefile
+++ b/devel/mm/Makefile
@@ -17,7 +17,6 @@ COMMENT=	Shared memory allocation library for pre-forked process models
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
 
 MAN1=		mm-config.1
 MAN3=		mm.3
diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile
index ed0693ab660b..6fb8ff66866b 100644
--- a/devel/monotone/Makefile
+++ b/devel/monotone/Makefile
@@ -21,7 +21,6 @@ USE_ICONV=	yes
 USE_GMAKE=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--infodir=${PREFIX}/${INFO_PATH} --mandir=${PREFIX}/man
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		MAKEINFO="makeinfo --no-split"
diff --git a/devel/msp430-binutils/Makefile b/devel/msp430-binutils/Makefile
index e652d882ca81..1b6007e35964 100644
--- a/devel/msp430-binutils/Makefile
+++ b/devel/msp430-binutils/Makefile
@@ -22,7 +22,8 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} \
 		--with-gcc --with-gnu-ld --with-gnu-as \
-		--disable-nls --infodir=${PREFIX}/${PKGNAMEPREFIX:S/-$//}/info
+		--disable-nls
+INFO_PATH=	${PKGNAMEPREFIX:S/-$//}/info
 MAN1=		${PKGNAMEPREFIX}ar.1 ${PKGNAMEPREFIX}nm.1 \
 		${PKGNAMEPREFIX}objdump.1 ${PKGNAMEPREFIX}ranlib.1 \
 		${PKGNAMEPREFIX}size.1 ${PKGNAMEPREFIX}strings.1 \
diff --git a/devel/msp430-gcc/Makefile b/devel/msp430-gcc/Makefile
index c1858454ae48..70a7dd964419 100644
--- a/devel/msp430-gcc/Makefile
+++ b/devel/msp430-gcc/Makefile
@@ -35,8 +35,8 @@ USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} \
 		--with-gcc --with-gnu-ld --with-gnu-as \
-		--enable-languages=c --disable-nls \
-		--infodir=${PREFIX}/${PKGNAMEPREFIX:S/-$//}/info
+		--enable-languages=c --disable-nls
+INFO_PATH=	${PKGNAMEPREFIX:S/-$//}/info
 MAKE_ENV=	PATH=${PREFIX}/bin:${PATH}
 MAN1=		${PKGNAMEPREFIX}gcc.1 ${PKGNAMEPREFIX}cpp.1 ${PKGNAMEPREFIX}gcov.1
 
diff --git a/devel/msp430-gcc3/Makefile b/devel/msp430-gcc3/Makefile
index c1858454ae48..70a7dd964419 100644
--- a/devel/msp430-gcc3/Makefile
+++ b/devel/msp430-gcc3/Makefile
@@ -35,8 +35,8 @@ USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} \
 		--with-gcc --with-gnu-ld --with-gnu-as \
-		--enable-languages=c --disable-nls \
-		--infodir=${PREFIX}/${PKGNAMEPREFIX:S/-$//}/info
+		--enable-languages=c --disable-nls
+INFO_PATH=	${PKGNAMEPREFIX:S/-$//}/info
 MAKE_ENV=	PATH=${PREFIX}/bin:${PATH}
 MAN1=		${PKGNAMEPREFIX}gcc.1 ${PKGNAMEPREFIX}cpp.1 ${PKGNAMEPREFIX}gcov.1
 
diff --git a/devel/ossp-cfg/Makefile b/devel/ossp-cfg/Makefile
index d42e7958d3fd..96a7f737cf44 100644
--- a/devel/ossp-cfg/Makefile
+++ b/devel/ossp-cfg/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	ex.10:${PORTSDIR}/devel/ossp-ex
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--with-ex=${LOCALBASE} --mandir=${MANPREFIX}/man
+CONFIGURE_ARGS=	--with-ex=${LOCALBASE}
 USE_LDCONFIG=	yes
 
 MAN3=		cfg.3
diff --git a/devel/ossp-l2/Makefile b/devel/ossp-l2/Makefile
index 48991d900564..930662564640 100644
--- a/devel/ossp-l2/Makefile
+++ b/devel/ossp-l2/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	A C library for a flexible and sophisticated Unix logging facility
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_LDCONFIG=	yes
 
diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile
index 862a4c61b933..868fe9e424d1 100644
--- a/devel/pcre/Makefile
+++ b/devel/pcre/Makefile
@@ -19,8 +19,7 @@ COMMENT=	Perl Compatible Regular Expressions library
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man --enable-utf8 \
-		--enable-unicode-properties
+CONFIGURE_ARGS=	--enable-utf8 --enable-unicode-properties
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .if !defined(NOPORTDOCS)
diff --git a/devel/pcsc-lite/Makefile b/devel/pcsc-lite/Makefile
index 651fb92d8846..5a8c5b40c254 100644
--- a/devel/pcsc-lite/Makefile
+++ b/devel/pcsc-lite/Makefile
@@ -30,8 +30,7 @@ CONFIGURE_ARGS+=--enable-debug \
 		--enable-confdir=${PREFIX}/etc/ \
 		--enable-usbdropdir=${PREFIX}/lib/pcsc/drivers/ \
 		--enable-muscledropdir=${PREFIX}/lib/pcsc/services/ \
-		--enable-threadsafe \
-		--mandir=${PREFIX}/man
+		--enable-threadsafe
 USE_GETOPT_LONG=yes
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile
index 55d116d28698..65bcb1ce2fef 100644
--- a/devel/pkg-config/Makefile
+++ b/devel/pkg-config/Makefile
@@ -31,7 +31,6 @@ PC_PATH:=	${PC_PATH}:${LOCALBASE}/lib/pkgconfig
 .endif
 
 CONFIGURE_ARGS=	--disable-threads \
-		--with-pc-path="${PC_PATH}" \
-		--mandir=${MANPREFIX}/man
+		--with-pc-path="${PC_PATH}"
 
 .include <bsd.port.post.mk>
diff --git a/devel/rlwrap/Makefile b/devel/rlwrap/Makefile
index 3a5898e76e98..56c7672d5985 100644
--- a/devel/rlwrap/Makefile
+++ b/devel/rlwrap/Makefile
@@ -18,7 +18,6 @@ USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV+=	ptyttylib_cv_ptys=BSD LDFLAGS=-lutil
-CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man
 
 MAN1=	rlwrap.1
 
diff --git a/devel/shtool/Makefile b/devel/shtool/Makefile
index 2f0c7f988de2..d50ea81358a6 100644
--- a/devel/shtool/Makefile
+++ b/devel/shtool/Makefile
@@ -18,7 +18,6 @@ COMMENT=	The GNU Portable Shell Tool
 USE_PERL5_BUILD=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
 
 MAN1=		shtool-arx.1 shtool-echo.1 shtool-fixperm.1 shtool-install.1 \
 		shtool-mdate.1 shtool-mkdir.1 shtool-mkln.1 shtool-mkshadow.1 \
diff --git a/devel/yasm/Makefile b/devel/yasm/Makefile
index 12f24cadea7a..755106ade487 100644
--- a/devel/yasm/Makefile
+++ b/devel/yasm/Makefile
@@ -18,7 +18,6 @@ USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/zziplib/Makefile b/devel/zziplib/Makefile
index 681e25a4d0bd..4d82c32306f2 100644
--- a/devel/zziplib/Makefile
+++ b/devel/zziplib/Makefile
@@ -18,7 +18,6 @@ USE_BZIP2=	yes
 USE_GNOME=	gnomehack pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man
 USE_PYTHON_BUILD=	yes
 USE_LDCONFIG=	yes