- 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

21 files changed, 9 insertions, 29 deletions

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' \