- 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

484 files changed, 360 insertions, 792 deletions

diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index c91fe8f767f2..5f9db8a0453a 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -116,8 +116,7 @@ gnomeprefix_CONFIGURE_ARGS=--localstatedir=${DESTDIR}${GNOME_LOCALSTATEDIR} \
 			   --with-html-dir=${DESTDIR}${GNOME_HTML_DIR} \
 			   --with-help-dir=${TARGETDIR}/share/gnome/help \
 			   --disable-gtk-doc \
-			   --with-gconf-source=${GCONF_CONFIG_SOURCE} \
-			   --mandir=${PREFIX}/man
+			   --with-gconf-source=${GCONF_CONFIG_SOURCE}
 gnomeprefix_USE_GNOME_IMPL=gnomehier
 .if !defined(WITHOUT_HACK)
 gnomeprefix_PREFIX=${LOCALBASE}
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 647c161e8805..1024a448178f 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -659,7 +659,8 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 # Set the following to specify all .info files your port installs.
 #
 # INFO			- A list of .info files (omitting the trailing ".info");
-#				  only one entry per document!
+#				  only one entry per document! These files are listed in
+#				  the path relative to ${INFO_PATH}.
 # INFO_PATH		- Path, where all .info files will be installed by your
 #				  port, relative to ${PREFIX}
 #				  Default: "share/info" if ${PREFIX} is equal to /usr
@@ -889,7 +890,8 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 #				  Default: ${ARCH}-portbld-freebsd${OSREL}
 # CONFIGURE_ARGS
 #				- Pass these args to configure if ${HAS_CONFIGURE} is set.
-#				  Default: "--prefix=${PREFIX} ${CONFIGURE_TARGET}" if
+#				  Default: "--prefix=${PREFIX} --infodir=${PREFIX}/${INFO_PATH}
+#				  --mandir=${MANPREFIX}/man ${CONFIGURE_TARGET}" if
 #				  GNU_CONFIGURE is set, "CC=${CC} CCFLAGS=${CFLAGS}
 #				  PREFIX=${PREFIX} INSTALLPRIVLIB=${PREFIX}/lib
 #				  INSTALLARCHLIB=${PREFIX}/lib" if PERL_CONFIGURE is set,
@@ -2977,9 +2979,18 @@ CONFIGURE_FAIL_MESSAGE?=	"Please report the problem to ${MAINTAINER} [maintainer
 .if !defined(CONFIGURE_MAX_CMD_LEN)
 CONFIGURE_MAX_CMD_LEN!=	${SYSCTL} -n kern.argmax
 .endif
-CONFIGURE_ARGS+=	--prefix=${PREFIX} ${CONFIGURE_TARGET}
+CONFIGURE_ARGS+=	--prefix=${PREFIX} $${_LATE_CONFIGURE_ARGS} ${CONFIGURE_TARGET}
 CONFIGURE_ENV+=		lt_cv_sys_max_cmd_len=${CONFIGURE_MAX_CMD_LEN}
 HAS_CONFIGURE=		yes
+
+SET_LATE_CONFIGURE_ARGS= \
+     _LATE_CONFIGURE_ARGS="" ; \
+	if [ ! -z "`./${CONFIGURE_SCRIPT} --help 2>&1 | ${GREP} -- '--mandir'`" ]; then \
+	    _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --mandir=${MANPREFIX}/man" ; \
+	fi ; \
+	if [ ! -z "`./${CONFIGURE_SCRIPT} --help 2>&1 | ${GREP} -- '--infodir'`" ]; then \
+	    _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR}" ; \
+	fi ;
 .endif
 
 # Passed to most of script invocations
@@ -3109,6 +3120,20 @@ INFO_PATH?=	share/info
 INFO_PATH?=	info
 .endif
 
+.if defined(INFO)
+. for D in ${INFO:H}
+RD:=	${D}
+.  if ${RD} != "."
+.   if !defined(INFO_SUBDIR)
+INFO_SUBDIR:=	${RD}
+.   elif ${INFO_SUBDIR} != ${RD}
+BROKEN=		only one subdirectory in INFO is allowed
+.   endif
+.  endif
+.undef RD
+. endfor
+.endif
+
 DOCSDIR_REL?=	${DOCSDIR:S,^${TARGETDIR}/,,}
 EXAMPLESDIR_REL?=	${EXAMPLESDIR:S,^${TARGETDIR}/,,}
 DATADIR_REL?=	${DATADIR:S,^${TARGETDIR}/,,}
@@ -3723,6 +3748,7 @@ do-configure:
 .endif
 .if defined(HAS_CONFIGURE)
 	@(cd ${CONFIGURE_WRKSRC} && \
+	    ${SET_LATE_CONFIGURE_ARGS} \
 		if ! ${SETENV} CC="${CC}" CXX="${CXX}" \
 	    CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 	    INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \
@@ -5859,14 +5885,14 @@ add-plist-info:
 	@${LS} ${TARGETDIR}/${INFO_PATH}/$i.info* | ${SED} -e s:${TARGETDIR}/::g >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec install-info --quiet %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
 		>> ${TMPPLIST}
-	@if [ "`${DIRNAME} $i`" != "." ]; then \
-		${ECHO_CMD} "@unexec ${RMDIR} %D/info/`${DIRNAME} $i` 2> /dev/null || true" >> ${TMPPLIST}; \
-	fi
 .endfor
+.if defined(INFO_SUBDIR)
+	@${ECHO_CMD} "@unexec ${RMDIR} %D/${INFO_PATH}/${INFO_SUBDIR} 2> /dev/null || true" >> ${TMPPLIST}
+.endif
 .if (${PREFIX} != "/usr")
 	@${ECHO_CMD} "@unexec if [ -f %D/${INFO_PATH}/dir ]; then if sed -e '1,/Menu:/d' %D/${INFO_PATH}/dir | grep -q '^[*] '; then true; else rm %D/${INFO_PATH}/dir; fi; fi" >> ${TMPPLIST}
 .if (${PREFIX} != ${LOCALBASE_REL} && ${PREFIX} != ${X11BASE_REL} && ${PREFIX} != ${LINUXBASE_REL})
-	@${ECHO_CMD} "@unexec rmdir %D/info 2> /dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/${INFO_PATH} 2>/dev/null || true" >> ${TMPPLIST}
 .endif
 .endif
 .endif
diff --git a/Mk/bsd.xorg.mk b/Mk/bsd.xorg.mk
index 59ffc2bdb2db..eda8cb0c063d 100644
--- a/Mk/bsd.xorg.mk
+++ b/Mk/bsd.xorg.mk
@@ -42,8 +42,6 @@ DIST_SUBDIR=	xorg/${XORG_CAT}
 MASTER_SITES?=	${MASTER_SITE_XORG}
 MASTER_SITE_SUBDIR?=	individual/${XORG_CAT}
 
-CONFIGURE_ARGS+=	--mandir="${PREFIX}/man/"
-
 . if ${XORG_CAT} == "app"
 USE_GNOME+=	pkgconfig
 . endif
diff --git a/archivers/dpkg/Makefile b/archivers/dpkg/Makefile
index 0b324badde91..b254469203fd 100644
--- a/archivers/dpkg/Makefile
+++ b/archivers/dpkg/Makefile
@@ -30,9 +30,8 @@ PLIST_SUB+=	DPKGDIR=${DPKGDIR:C,^/,,}
 SUB_FILES=	pkg-install pkg-deinstall
 SUB_LIST+=	DPKGDIR=${DPKGDIR}
 
-CONFIGURE_ARGS+=--with-admindir=${DPKGDIR} --mandir=${PREFIX}/man \
-		--libdir=${PREFIX}/libexec --program-transform-name="" \
-		--infodir=${PREFIX}/info --with-libintl-prefix=${LOCALBASE}
+CONFIGURE_ARGS+=--with-admindir=${DPKGDIR} --libdir=${PREFIX}/libexec \
+		--program-transform-name="" --with-libintl-prefix=${LOCALBASE}
 
 MANLANG=	"" de fr hu ja pl ru sv
 
diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index 7490a23859b9..95a621cb5591 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -21,8 +21,7 @@ INFO=		tar
 USE_BZIP2=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--program-prefix=g \
-		--infodir=${PREFIX}/${INFO_PATH}
+CONFIGURE_ARGS=	--program-prefix=g
 CONFIGURE_ENV=	CPPFLAGS='-I${LOCALBASE}/include' \
 		LDFLAGS='-L${LOCALBASE}/lib ${LDSTATIC}' \
 		DEFAULT_ARCHIVE=/dev/sa0 \
diff --git a/archivers/gzip/Makefile b/archivers/gzip/Makefile
index f4c82486bd4c..e01bf6300c33 100644
--- a/archivers/gzip/Makefile
+++ b/archivers/gzip/Makefile
@@ -17,8 +17,6 @@ COMMENT=	A compression utility designed to be a replacement for compress
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS+=	--infodir=${LOCALBASE}/info \
-			--mandir=${MANPREFIX}/man
 
 MAN1=	gunzip.1 gzexe.1 gzip.1 zcat.1 zcmp.1 zdiff.1 zforce.1 \
 	zgrep.1 zless.1 zmore.1 znew.1
diff --git a/archivers/libarchive/Makefile b/archivers/libarchive/Makefile
index ebf37353f5f1..d1ad2917b356 100644
--- a/archivers/libarchive/Makefile
+++ b/archivers/libarchive/Makefile
@@ -15,7 +15,6 @@ COMMENT=	Library to create and read several streaming archive formats
 
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man
 
 PLIST_FILES=	bin/bsdtar \
 		include/archive.h \
diff --git a/astro/starplot/Makefile b/astro/starplot/Makefile
index 454b2e16c714..a4f4025fd3bb 100644
--- a/astro/starplot/Makefile
+++ b/astro/starplot/Makefile
@@ -20,7 +20,6 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
 MAKE_ENV=	DOCSDIR="${DOCSDIR}" EXAMPLESDIR="${EXAMPLESDIR}"
 
 MAN1=		starconvert.1 starpkg.1 starplot.1
diff --git a/astro/tclgeomap/Makefile b/astro/tclgeomap/Makefile
index 229f5218eb8b..a3db6278e3e0 100644
--- a/astro/tclgeomap/Makefile
+++ b/astro/tclgeomap/Makefile
@@ -15,8 +15,7 @@ COMMENT=	Read, manipulate and display geo data
 
 USE_TCL=	82+
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} --with-tclinclude=${TCL_INCLUDEDIR} \
-		--mandir=${MANPREFIX}/man
+CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} --with-tclinclude=${TCL_INCLUDEDIR}
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 TKPKG=		${PORTNAME}
 PLIST_SUB=	INC=include/${TKPKG} LIB=lib/${TKPKG}
diff --git a/astro/tkgeomap/Makefile b/astro/tkgeomap/Makefile
index e9d7da6411cd..34b6a13d0b15 100644
--- a/astro/tkgeomap/Makefile
+++ b/astro/tkgeomap/Makefile
@@ -18,7 +18,6 @@ LIB_DEPENDS=	tclgeomap.0:${PORTSDIR}/astro/tclgeomap
 CONFIGURE_ARGS=	--with-tclgeomap-include=${LOCALBASE}/include/tclgeomap --with-x \
 		--with-tcl=${TCL_LIBDIR} --with-tclinclude=${TCL_INCLUDEDIR} \
 		--with-tk=${TK_LIBDIR} --with-tkinclude=${TK_INCLUDEDIR} \
-		--mandir=${MANPREFIX}/man \
 		--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
 CONFIGURE_ENV=	TCLGEOMAP_LIB=${LOCALBASE}/lib/tclgeomap
 USE_TK=		82+
diff --git a/audio/audacity-devel/Makefile b/audio/audacity-devel/Makefile
index 35ef2dc983e8..92b56a3db69e 100644
--- a/audio/audacity-devel/Makefile
+++ b/audio/audacity-devel/Makefile
@@ -31,8 +31,6 @@ USE_GCC=	4.1
 USE_WX=		2.6
 WX_COMPS=	wx
 
-CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
-
 MAN1=		audacity.1
 MANCOMPRESSED=	yes
 
diff --git a/audio/checkmate/Makefile b/audio/checkmate/Makefile
index 5627880e4844..f4b6721b22f2 100644
--- a/audio/checkmate/Makefile
+++ b/audio/checkmate/Makefile
@@ -17,7 +17,6 @@ COMMENT=	A command-line utility for checking mp3 files for errors
 
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		mpck.1
diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile
index 11dfcf67e21a..3bbfb5aeccb8 100644
--- a/audio/cmus/Makefile
+++ b/audio/cmus/Makefile
@@ -20,7 +20,7 @@ USE_GCC=	3.2+
 USE_GMAKE=	yes
 USE_ICONV=	yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=prefix=${TARGETDIR} mandir=${TARGETDIR}/man
+CONFIGURE_ARGS+=prefix=${TARGETDIR} mandir=${MANPREFIX}/man
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/audio/darkice/Makefile b/audio/darkice/Makefile
index 6849e6763d70..e08508fb3c06 100644
--- a/audio/darkice/Makefile
+++ b/audio/darkice/Makefile
@@ -24,8 +24,7 @@ OPTIONS=	VORBIS "Ogg Vorbis support" on \
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
-CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man \
-		--without-alsa
+CONFIGURE_ARGS=	--without-alsa
 
 MAN1=		darkice.1
 MAN5=		darkice.cfg.5
diff --git a/audio/ecasound/Makefile b/audio/ecasound/Makefile
index d9f53abf3583..0065e811b11c 100644
--- a/audio/ecasound/Makefile
+++ b/audio/ecasound/Makefile
@@ -19,8 +19,7 @@ USE_GMAKE=	yes
 USE_GCC=	3.4+
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man \
-		--disable-pyecasound \
+CONFIGURE_ARGS=	--disable-pyecasound \
 		--disable-rubyecasound \
 		--with-largefile \
 		--enable-sys-readline
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index eb530963f7fa..14d9ce459850 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -25,7 +25,6 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=  yes
 CONFIGURE_ENV=	JW=false
 USE_GETOPT_LONG=yes
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man
 
 CONFLICTS=	py*-ro-[0-9]*
 
diff --git a/audio/gnupod/Makefile b/audio/gnupod/Makefile
index d6e002b33d53..44a26e1e272f 100644
--- a/audio/gnupod/Makefile
+++ b/audio/gnupod/Makefile
@@ -36,7 +36,7 @@ NO_BUILD=	yes
 
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--infodir=${PREFIX}/info \
-		--mandir=${PREFIX}/man
+		--mandir=${MANPREFIX}/man
 CONFIGURE_ENV=	ac_cv_path_PERL=${PERL}
 
 OPTIONS=	FLAC "Enable FLAC support" off
diff --git a/audio/gtick/Makefile b/audio/gtick/Makefile
index 8252f7130287..e2e5b863bbc2 100644
--- a/audio/gtick/Makefile
+++ b/audio/gtick/Makefile
@@ -20,7 +20,6 @@ USE_GNOME=	gtk20
 USE_GETTEXT=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS+=	--mandir=${MAN1PREFIX}/man
 
 MAN1=		gtick.1
 
diff --git a/audio/jack/Makefile b/audio/jack/Makefile
index 423feef33f4c..7d353ed21cf9 100644
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@@ -24,7 +24,6 @@ LATEST_LINK=	jack
 CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}" LDFLAGS="-L${LOCALBASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
 		CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man/
 GNU_CONFIGURE=	yes
 USE_GETOPT_LONG=yes
 USE_LDCONFIG=	yes
diff --git a/audio/libadplug/Makefile b/audio/libadplug/Makefile
index f85a3ffc705f..0bb443d132eb 100644
--- a/audio/libadplug/Makefile
+++ b/audio/libadplug/Makefile
@@ -30,7 +30,6 @@ CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${CPPFLAGS}" \
 		CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" \
 		CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man --infodir=${PREFIX}/info
 
 INFO=		libadplug
 MAN1=		adplugdb.1
diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index ea6d1903b841..a0145823ec07 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -39,7 +39,6 @@ LIB_DEPENDS+=	FLAC.7:${PORTSDIR}/audio/flac
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|@mandir@|${PREFIX}/man|' ${WRKSRC}/man/Makefile.in
 	@${REINPLACE_CMD} -e '/^SUBDIRS =/s/ doc / /g' ${WRKSRC}/Makefile.in
 
 post-install:
diff --git a/audio/moc/Makefile b/audio/moc/Makefile
index 4eb3dc97115a..91ff20f7414f 100644
--- a/audio/moc/Makefile
+++ b/audio/moc/Makefile
@@ -18,7 +18,6 @@ USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		mocp.1
diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index 317fd2828ea3..9e06080f9628 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -20,8 +20,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 WANT_GNOME=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS=	--with-cxxflags="${CXXFLAGS}" \
-		--infodir="${PREFIX}/info" --mandir="${PREFIX}/man"
+CONFIGURE_ARGS=	--with-cxxflags="${CXXFLAGS}"
 
 MAN1=		mp3blaster.1 nmixer.1 splay.1
 
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index c9af8069ef9f..c4070952d98b 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -35,8 +35,7 @@ OPTIONS=	FLAC "Support for FLAC Audio" on \
 
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--disable-pulse \
-		--disable-shout \
-		--mandir=${MANPREFIX}/man
+		--disable-shout
 
 .include <bsd.port.pre.mk>
 
diff --git a/audio/py-eyed3/Makefile b/audio/py-eyed3/Makefile
index 82ce888ca893..1fcbb30f8547 100644
--- a/audio/py-eyed3/Makefile
+++ b/audio/py-eyed3/Makefile
@@ -22,7 +22,6 @@ CONFIGURE_ENV=	PYTHON="${PYTHON_CMD}"
 MAKE_ENV=	SETUP_ARGS_BUILD="${PYDISTUTILS_BUILDARGS}" \
 		SETUP_ARGS_INSTALL="${PYDISTUTILS_INSTALLARGS}"
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
-MANDIR=		${PREFIX}/man
 
 MAN1=		eyeD3.1
 MANCOMPRESSED=	yes
@@ -34,7 +33,6 @@ post-patch:
 	${REINPLACE_CMD} -e 's,\(setup.py build\),\1 $${SETUP_ARGS_BUILD},g' \
 		-e 's,\(setup.py install\),\1 $${SETUP_ARGS_INSTALL} ,g' \
 		-e 's,^docdir:=.*,docdir:=${DOCSDIR},g' \
-		-e 's,^mandir:=.*,mandir:=${MANDIR},g' \
 		${WRKSRC}/Makefile.in
 .if defined(NOPORTDOCS)
 	${REINPLACE_CMD} -e 's,.*docdir.*,#,g' \
diff --git a/audio/shntool/Makefile b/audio/shntool/Makefile
index ffcdd9b7549d..807a805110f8 100644
--- a/audio/shntool/Makefile
+++ b/audio/shntool/Makefile
@@ -14,7 +14,6 @@ MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Multi-purpose .wav processing utility
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
 SHN_ALIASES=	tool len fix hash pad join split cat cmp cue conv info strip gen trim
 PLIST_FILES=	${SHN_ALIASES:S|^|bin/shn|}
 MAN1=		shntool.1
diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index 607105f6951d..b5aacadfbdb4 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -25,8 +25,7 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_XML2PO=""
-CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man \
-		--disable-oss-sound \
+CONFIGURE_ARGS=	--disable-oss-sound \
 		--enable-docbook-stylesheet=${STYLESHEET}
 MAKE_ARGS=	skipmanual=yes
 
diff --git a/audio/speex/Makefile b/audio/speex/Makefile
index 0e068bf5f25b..766a0af18db7 100644
--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@@ -23,7 +23,7 @@ USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-ogg-dir=${LOCALBASE} --mandir=${PREFIX}/man
+CONFIGURE_ARGS=	--with-ogg-dir=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/audio/twolame/Makefile b/audio/twolame/Makefile
index f146cb8a4ca1..f27686eda32d 100644
--- a/audio/twolame/Makefile
+++ b/audio/twolame/Makefile
@@ -21,7 +21,6 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man
 
 MAN1=		twolame.1
 
diff --git a/audio/wavbreaker/Makefile b/audio/wavbreaker/Makefile
index f95a6556eb37..9a5ce38ee230 100644
--- a/audio/wavbreaker/Makefile
+++ b/audio/wavbreaker/Makefile
@@ -18,8 +18,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man \
-		--disable-alsa
+CONFIGURE_ARGS=	--disable-alsa
 INSTALLS_ICONS=	yes
 
 MAN1=		wavbreaker.1 wavinfo.1 wavmerge.1
diff --git a/audio/xanalyser/Makefile b/audio/xanalyser/Makefile
index f1b8b0394a2d..fd7bc70c4d8b 100644
--- a/audio/xanalyser/Makefile
+++ b/audio/xanalyser/Makefile
@@ -27,7 +27,6 @@ MAN1=		xanalyser.1
 PLIST_FILES=	bin/xanalyser \
 		lib/X11/app-defaults/XAnalyser
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' \
diff --git a/benchmarks/postal/Makefile b/benchmarks/postal/Makefile
index 05c0f6580e65..5eeca5048504 100644
--- a/benchmarks/postal/Makefile
+++ b/benchmarks/postal/Makefile
@@ -28,7 +28,7 @@ MAN8=	bhm.8 postal.8 rabid.8
 
 CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
-CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man --disable-gnutls
+CONFIGURE_ARGS=	--disable-gnutls
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 .include <bsd.port.post.mk>
diff --git a/cad/alliance/Makefile b/cad/alliance/Makefile
index 14e8a967f9bd..3199886f0523 100644
--- a/cad/alliance/Makefile
+++ b/cad/alliance/Makefile
@@ -28,7 +28,7 @@ USE_XLIB=	yes
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV+=	ALLIANCE_TOP=${ALLIANCE_TOP}
-CONFIGURE_ARGS+=--mandir=${PREFIX}/man \
+CONFIGURE_ARGS+=--mandir=${MANPREFIX}/man \
 		--x-libraries=${X11BASE}/lib \
 		--x-includes=${X11BASE}/include \
 		--prefix=${ALLIANCE_TOP} ${CONFIGURE_TARGET}
diff --git a/cad/freehdl/Makefile b/cad/freehdl/Makefile
index 12627c2294c5..227699c34645 100644
--- a/cad/freehdl/Makefile
+++ b/cad/freehdl/Makefile
@@ -22,7 +22,7 @@ USE_XLIB=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--x-libraries=${X11BASE}/lib \
 		--prefix=${PREFIX} \
-		--mandir=${PREFIX}/man \
+		--mandir=${MANPREFIX}/man \
 		--infodir=${PREFIX}/info
 
 MAN1=		freehdl-config.1 \
diff --git a/cad/geda-gattrib/Makefile b/cad/geda-gattrib/Makefile
index ffd9b9c0f98b..567799e420ca 100644
--- a/cad/geda-gattrib/Makefile
+++ b/cad/geda-gattrib/Makefile
@@ -25,7 +25,7 @@ DOCSDIR=	${PREFIX}/share/doc/geda
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20
-CONFIGURE_ARGS=	--with-docdir=${DOCSDIR} --mandir=${PREFIX}/man
+CONFIGURE_ARGS=	--with-docdir=${DOCSDIR}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/cad/geda-gschem/Makefile b/cad/geda-gschem/Makefile
index 17e8cf1d1ddf..40750a679525 100644
--- a/cad/geda-gschem/Makefile
+++ b/cad/geda-gschem/Makefile
@@ -25,8 +25,7 @@ DATADIR=	${PREFIX}/share/geda
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20
-CONFIGURE_ARGS=	--enable-gdgeda --with-docdir=${DOCSDIR} \
-		--mandir=${PREFIX}/man --infodir=${PREFIX}/info
+CONFIGURE_ARGS=	--enable-gdgeda --with-docdir=${DOCSDIR}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/cad/geda-netlist/Makefile b/cad/geda-netlist/Makefile
index 1ea7b28ed954..454e6ebf3327 100644
--- a/cad/geda-netlist/Makefile
+++ b/cad/geda-netlist/Makefile
@@ -25,7 +25,7 @@ DOCSDIR=	${PREFIX}/share/doc/geda
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20
-CONFIGURE_ARGS=	--with-docdir=${DOCSDIR} --mandir=${PREFIX}/man
+CONFIGURE_ARGS=	--with-docdir=${DOCSDIR}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/cad/geda-symcheck/Makefile b/cad/geda-symcheck/Makefile
index f44e05f0a67e..e7657809e305 100644
--- a/cad/geda-symcheck/Makefile
+++ b/cad/geda-symcheck/Makefile
@@ -25,7 +25,7 @@ DATADIR=	${PREFIX}/share/geda
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20
-CONFIGURE_ARGS=	--with-docdir=${DOCSDIR} --mandir=${PREFIX}/man
+CONFIGURE_ARGS=	--with-docdir=${DOCSDIR}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/cad/geda-utils/Makefile b/cad/geda-utils/Makefile
index 13afd98ab33d..c7242842c729 100644
--- a/cad/geda-utils/Makefile
+++ b/cad/geda-utils/Makefile
@@ -26,7 +26,7 @@ DATADIR=	${PREFIX}/share/geda
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
-CONFIGURE_ARGS=	--with-docdir=${DOCSDIR} --mandir=${PREFIX}/man
+CONFIGURE_ARGS=	--with-docdir=${DOCSDIR}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/cad/gerbv/Makefile b/cad/gerbv/Makefile
index 3302d4f5ff95..3f8d5b34fd03 100644
--- a/cad/gerbv/Makefile
+++ b/cad/gerbv/Makefile
@@ -20,7 +20,6 @@ USE_GNOME=	gnometarget gtk20
 USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
 
 MAN1=		gerbv.1
 
diff --git a/cad/gnucap/Makefile b/cad/gnucap/Makefile
index c3a6ef9586cd..41f8ed2cc095 100644
--- a/cad/gnucap/Makefile
+++ b/cad/gnucap/Makefile
@@ -18,8 +18,7 @@ COMMENT=	The Gnu Circuit Analysis Package
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--docdir=${PREFIX}/share/doc/${PORTNAME} \
-			--mandir=${PREFIX}/man
+CONFIGURE_ARGS+=	--docdir=${PREFIX}/share/doc/${PORTNAME}
 
 OPTIONS=	READLINE "Enable commandline features via readline" on
 
diff --git a/cad/qucs/Makefile b/cad/qucs/Makefile
index a095a4e04edf..06a766a634f7 100644
--- a/cad/qucs/Makefile
+++ b/cad/qucs/Makefile
@@ -17,7 +17,6 @@ USE_QT_VER=	3
 USE_GNOME=	gnometarget
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
 
 MAN1=		ps2sp.1 qucs.1 qucsator.1 qucsattenuator.1 qucsconv.1 \
 		qucsdigi.1 qucsedit.1 qucsfilter.1 qucshelp.1 qucslib.1 \
diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile
index 21f5b19f8886..c277e927fd55 100644
--- a/comms/efax-gtk/Makefile
+++ b/comms/efax-gtk/Makefile
@@ -22,7 +22,6 @@ RUN_DEPENDS=		ggv:${PORTSDIR}/print/ggv
 USE_GHOSTSCRIPT_RUN=	yes
 USE_GNOME=		gtk20
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS=		--mandir=${X11BASE}/man
 MAN1=			efax.1 efix.1 efax-gtk.1
 
 post-install:
diff --git a/comms/gpredict/Makefile b/comms/gpredict/Makefile
index 5740fe95508a..31edc5d644e3 100644
--- a/comms/gpredict/Makefile
+++ b/comms/gpredict/Makefile
@@ -18,7 +18,6 @@ LIB_DEPENDS=	hamlib:${PORTSDIR}/comms/hamlib:install
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man
 
 MAN1=		gpredict.1
 
diff --git a/comms/grig/Makefile b/comms/grig/Makefile
index 5de869a7cc53..3f4cae434ad4 100644
--- a/comms/grig/Makefile
+++ b/comms/grig/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS=	hamlib:${PORTSDIR}/comms/hamlib
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man
 
 MAN1=		grig.1
 
diff --git a/comms/hf/Makefile b/comms/hf/Makefile
index 30523d455783..38359de4b43e 100644
--- a/comms/hf/Makefile
+++ b/comms/hf/Makefile
@@ -21,7 +21,7 @@ USE_GNOME=	gtk12
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--prefix=${PREFIX} --sysconfdir=${PREFIX} --mandir=${PREFIX}/man
+CONFIGURE_ARGS=	--prefix=${PREFIX} --sysconfdir=${PREFIX}
 
 ONLY_FOR_ARCHS=	i386
 
diff --git a/comms/linrad/Makefile b/comms/linrad/Makefile
index b4156de10b09..64c7c2effb78 100644
--- a/comms/linrad/Makefile
+++ b/comms/linrad/Makefile
@@ -24,7 +24,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-0${PORTVERSION}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--prefix=${PREFIX} --sysconfdir=${PREFIX} --mandir=${PREFIX}/man
+CONFIGURE_ARGS=	--prefix=${PREFIX} --sysconfdir=${PREFIX}
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 ALL_TARGET=	xlinrad
diff --git a/comms/qfaxreader/Makefile b/comms/qfaxreader/Makefile
index dbd0c5f7843f..4a49432bfc63 100644
--- a/comms/qfaxreader/Makefile
+++ b/comms/qfaxreader/Makefile
@@ -24,7 +24,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_QT_VER=	3
 CONFIGURE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS}
-CONFIGURE_ARGS=	--with-docdir=${DOCSDIR} --mandir=${MANPREFIX}/man
+CONFIGURE_ARGS=	--with-docdir=${DOCSDIR}
 
 MAN1=		qfaxreader.1
 MANCOMPRESSED=	yes
diff --git a/comms/tilp2/Makefile b/comms/tilp2/Makefile
index 96f6f493ed86..000181503773 100644
--- a/comms/tilp2/Makefile
+++ b/comms/tilp2/Makefile
@@ -34,7 +34,6 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB=	NLS="@comment "
 .endif
 
-CONFIGURE_ARGS+=	--mandir=${TARGETDIR}/man
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -export-dynamic"
 
diff --git a/comms/xdx/Makefile b/comms/xdx/Makefile
index 708d2087d44e..882671bd148d 100644
--- a/comms/xdx/Makefile
+++ b/comms/xdx/Makefile
@@ -17,7 +17,6 @@ COMMENT=	Amateur Radio DX cluster monitor
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man
 
 MAN1=		xdx.1
 
diff --git a/comms/xlog/Makefile b/comms/xlog/Makefile
index ef79329078ca..11207f4e9e36 100644
--- a/comms/xlog/Makefile
+++ b/comms/xlog/Makefile
@@ -17,8 +17,7 @@ COMMENT=	Amateur Radio logging application
 USE_GETTEXT=	yes
 USE_GNOME=	libgnomeprint gnomelibs gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-mime-update \
-		--mandir=${PREFIX}/man
+CONFIGURE_ARGS=	--with-mime-update
 
 LIB_DEPENDS+=	hamlib:${PORTSDIR}/comms/hamlib
 
diff --git a/converters/tnef/Makefile b/converters/tnef/Makefile
index 066dc39fcca0..214ae236dbca 100644
--- a/converters/tnef/Makefile
+++ b/converters/tnef/Makefile
@@ -16,7 +16,6 @@ COMMENT=	Unpack data in MS Outlook TNEF format
 
 GNU_CONFIGURE=		yes
 USE_GETOPT_LONG=	yes
-CONFIGURE_ARGS=		--mandir=${MANPREFIX}/man
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		tnef.1
diff --git a/databases/postgis/Makefile b/databases/postgis/Makefile
index 1d68fd98777b..0e6b7fee351b 100644
--- a/databases/postgis/Makefile
+++ b/databases/postgis/Makefile
@@ -31,7 +31,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/postgis \
 		--bindir=${PREFIX}/bin \
 		--libdir=${PREFIX}/lib \
-		--mandir=${PREFIX}/man \
 		--with-proj
 
 .include <bsd.port.pre.mk>
diff --git a/databases/xapian-core/Makefile b/databases/xapian-core/Makefile
index 93831ed7caef..fa0fa77d4f63 100644
--- a/databases/xapian-core/Makefile
+++ b/databases/xapian-core/Makefile
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR=	miwi
 MAINTAINER=	jean-francois.dockes@wanadoo.fr
 COMMENT=	A probabilistic text search database engine
 
-CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/databases/xapian-core10/Makefile b/databases/xapian-core10/Makefile
index 93831ed7caef..fa0fa77d4f63 100644
--- a/databases/xapian-core10/Makefile
+++ b/databases/xapian-core10/Makefile
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR=	miwi
 MAINTAINER=	jean-francois.dockes@wanadoo.fr
 COMMENT=	A probabilistic text search database engine
 
-CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/deskutils/doodle/Makefile b/deskutils/doodle/Makefile
index 82eeebba0f61..6944b4f53426 100644
--- a/deskutils/doodle/Makefile
+++ b/deskutils/doodle/Makefile
@@ -22,7 +22,6 @@ USE_GETTEXT=	yes
 USE_FAM=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		doodle.1 doodled.1
diff --git a/deskutils/gdesklets/Makefile b/deskutils/gdesklets/Makefile
index c88a696d1624..f15efdcdbc5f 100644
--- a/deskutils/gdesklets/Makefile
+++ b/deskutils/gdesklets/Makefile
@@ -43,7 +43,6 @@ RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/_bsddb.so:${PORTSDIR}/databases/py-bsddb
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man/
 
 post-install:
 	@${MKDIR} ${PREFIX}/share/gnome/gdesklets/Displays
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 1a6a6ac68250..b934e0e2e860 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -39,8 +39,4 @@ MAN1=		gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1 \
 GCONF_SCHEMAS=	gnome-dictionary.schemas gnome-screenshot.schemas \
 		gnome-search-tool.schemas logview.schemas baobab.schemas
 
-post-patch:
-	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} -n 10 \
-		${REINPLACE_CMD} -e 's|@mandir@|${PREFIX}/man|'
-
 .include <bsd.port.mk>
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