- 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

9 files changed, 4 insertions, 14 deletions

diff --git a/math/R/Makefile b/math/R/Makefile
index 93fbe9595ce9..487ce8f63ff7 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -56,7 +56,6 @@ USE_PERL5=	yes
 
 CONFIGURE_ENV=	INSTALL_DATA="${INSTALL} ${COPY} ${_SHROWNGRP} -m 644" F77="${F77}" FC="${FC}"
 CONFIGURE_ARGS=	--enable-R-shlib --with-system-bzlib --with-system-zlib \
-		--mandir=${MANPREFIX}/man \
 		rdocdir=${DOCSDIR}
 
 .include <bsd.port.pre.mk>
diff --git a/math/cln/Makefile b/math/cln/Makefile
index 27fbb18d85a9..c0fa76c5775f 100644
--- a/math/cln/Makefile
+++ b/math/cln/Makefile
@@ -25,8 +25,7 @@ USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS=	--infodir=${PREFIX}/info --mandir=${MANPREFIX}/man \
-		--with-gmp
+CONFIGURE_ARGS=	--with-gmp
 MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile
index 0807e1396d33..cbd4ab3caaad 100644
--- a/math/fftw3/Makefile
+++ b/math/fftw3/Makefile
@@ -95,10 +95,6 @@ PLIST_SUB+=	DEF="@comment "
 PLIST_SUB+=	FFTW3_SUFX="${FFTW3_SUFX}"
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|@infodir@|${PREFIX}/info|; \
-		s|@mandir@|${PREFIX}/man|' \
-		${WRKSRC}/doc/Makefile.in \
-		${WRKSRC}/tools/Makefile.in
 	@${REINPLACE_CMD} -e \
 		's|/etc/fftw|${PREFIX}/etc/fftw|' \
 		${WRKSRC}/Makefile.in \
diff --git a/math/fityk/Makefile b/math/fityk/Makefile
index e0c434a3c310..8f8d8e500613 100644
--- a/math/fityk/Makefile
+++ b/math/fityk/Makefile
@@ -26,7 +26,6 @@ WX_CONF_ARGS=	absolute
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
 USE_LDCONFIG=	yes
 
 MAN1=		fityk.1
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index a494485ca7e5..d8aa47468924 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -31,8 +31,7 @@ USE_PYTHON=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-guile --with-bonobo \
-		--mandir=${PREFIX}/man
+CONFIGURE_ARGS=	--without-guile --with-bonobo
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}" \
 		python_prog=${PYTHON_VERSION}
diff --git a/math/gri/Makefile b/math/gri/Makefile
index 2c5790c671d9..53a359c836bc 100644
--- a/math/gri/Makefile
+++ b/math/gri/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick	\
 .endif
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-FreeBSD --infodir=${PREFIX}/info
+CONFIGURE_ARGS=	--enable-FreeBSD
 USE_GMAKE=	yes
 REINPLACE_ARGS=	-Ei.bak
 MAKE_ENV+=	MAKEINFOFLAGS=--no-split
diff --git a/math/mpfr/Makefile b/math/mpfr/Makefile
index dda848098c5c..a5300df95a13 100644
--- a/math/mpfr/Makefile
+++ b/math/mpfr/Makefile
@@ -19,7 +19,6 @@ LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gmp=${LOCALBASE} \
-		--infodir=${PREFIX}/info \
 		--enable-shared
 USE_LDCONFIG=	yes
 
diff --git a/math/numdiff/Makefile b/math/numdiff/Makefile
index 4f67588bff29..70d7bdfb7003 100644
--- a/math/numdiff/Makefile
+++ b/math/numdiff/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Compare putatively similar files, ignoring small numeric differences
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--prefix=${PREFIX} --exec-prefix=${PREFIX} --infodir=${PREFIX}/info LIBS=-lm
+CONFIGURE_ARGS+=	--prefix=${PREFIX} --exec-prefix=${PREFIX} --infodir=${PREFIX}/${INFO_PATH} LIBS=-lm
 WRKSRC=	${WRKDIR}/${PORTNAME}
 
 INFO=	numdiff
diff --git a/math/tvmet/Makefile b/math/tvmet/Makefile
index da183fe9fe2c..0955a95f36c8 100644
--- a/math/tvmet/Makefile
+++ b/math/tvmet/Makefile
@@ -18,7 +18,6 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
 MAKE_ARGS=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
 
 MAN1=		tvmet-config.1