List the info pages directly in the PLIST and ensure that we honor

PKGINFODIR.

10 files changed, 27 insertions, 20 deletions

diff --git a/math/cln/Makefile b/math/cln/Makefile
index 3cf27f7fbf2..ce99c98b42c 100644
--- a/math/cln/Makefile
+++ b/math/cln/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/03/12 16:33:32 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2006/03/31 23:56:28 jlam Exp $
 
 DISTNAME=	cln-1.1.9
 PKGREVISION=	2
@@ -17,7 +17,6 @@ USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 LIBTOOL_OVERRIDE+=	libtool
 PKGCONFIG_OVERRIDE=	cln.pc.in
-
-INFO_FILES=	cln.info
+INFO_FILES=		# PLIST
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/cln/PLIST b/math/cln/PLIST
index e0aeffa4856..6047271c8a4 100644
--- a/math/cln/PLIST
+++ b/math/cln/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/03/12 16:33:32 rillig Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/03/31 23:56:28 jlam Exp $
 bin/cln-config
 include/cln/GV.h
 include/cln/GV_complex.h
@@ -78,6 +78,7 @@ include/cln/univpoly_modint.h
 include/cln/univpoly_rational.h
 include/cln/univpoly_real.h
 include/cln/version.h
+info/cln.info
 lib/libcln.la
 lib/pkgconfig/cln.pc
 man/man1/cln-config.1
diff --git a/math/fftw/Makefile b/math/fftw/Makefile
index a6964abaa0f..486d1ce5069 100644
--- a/math/fftw/Makefile
+++ b/math/fftw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/02/05 23:10:01 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2006/03/31 23:56:28 jlam Exp $
 
 DISTNAME=	fftw-3.1
 PKGREVISION=	1
@@ -19,7 +19,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-shared
 
 PKGCONFIG_OVERRIDE+=	fftw.pc.in
-INFO_FILES=		fftw3.info
+INFO_FILES=		# PLIST
 
 TEST_TARGET=		check
 
diff --git a/math/fftw/PLIST b/math/fftw/PLIST
index 87af138f408..68fca0ce769 100644
--- a/math/fftw/PLIST
+++ b/math/fftw/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.8 2004/09/22 08:09:42 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/03/31 23:56:28 jlam Exp $
 bin/fftw-wisdom
 bin/fftw-wisdom-to-conf
 include/fftw3.f
 include/fftw3.h
+info/fftw3.info
 lib/libfftw3.la
 lib/pkgconfig/fftw3.pc
 man/man1/fftw-wisdom-to-conf.1
diff --git a/math/fftw2/PLIST b/math/fftw2/PLIST
index cd886533bc7..f60e95c4892 100644
--- a/math/fftw2/PLIST
+++ b/math/fftw2/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:42 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/03/31 23:56:28 jlam Exp $
 include/fftw.h
 include/rfftw.h
+info/fftw.info
 lib/libfftw.la
 lib/librfftw.la
diff --git a/math/gsl/Makefile b/math/gsl/Makefile
index ee90964c166..9601ebe6601 100644
--- a/math/gsl/Makefile
+++ b/math/gsl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/03/31 18:57:28 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2006/03/31 23:56:28 jlam Exp $
 
 DISTNAME=	gsl-1.7
 CATEGORIES=	math devel
@@ -10,7 +10,7 @@ COMMENT=	The GNU Scientific Library
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-INFO_FILES=		gsl-ref.info
+INFO_FILES=		# PLIST
 
 TEST_TARGET=		check
 
diff --git a/math/gsl/PLIST b/math/gsl/PLIST
index d86a86dace9..70e4c285905 100644
--- a/math/gsl/PLIST
+++ b/math/gsl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2005/09/30 12:31:28 wiz Exp $
+@comment $NetBSD: PLIST,v 1.13 2006/03/31 23:56:28 jlam Exp $
 bin/gsl-config
 bin/gsl-histogram
 bin/gsl-randist
@@ -215,6 +215,7 @@ include/gsl/gsl_vector_ushort.h
 include/gsl/gsl_version.h
 include/gsl/gsl_wavelet.h
 include/gsl/gsl_wavelet2d.h
+info/gsl-ref.info
 lib/libgsl.la
 lib/libgslcblas.la
 lib/pkgconfig/gsl.pc
diff --git a/math/mpfr/Makefile b/math/mpfr/Makefile
index 147e13d6153..d56851c7dcd 100644
--- a/math/mpfr/Makefile
+++ b/math/mpfr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/02 19:09:39 drochner Exp $
+# $NetBSD: Makefile,v 1.8 2006/03/31 23:56:28 jlam Exp $
 #
 
 DISTNAME=		mpfr-2.2.0
@@ -17,7 +17,7 @@ COMMENT=		GMP-based library for multiple-precision floating-point computations
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 TEST_TARGET=		check
-INFO_FILES=		mpfr.info
+INFO_FILES=		# PLIST
 
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/yorick/Makefile b/math/yorick/Makefile
index 560e8b2fe07..a77401d0662 100644
--- a/math/yorick/Makefile
+++ b/math/yorick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/05 16:27:27 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/03/31 23:56:28 jlam Exp $
 
 DISTNAME=	yorick-1.6.02
 PKGREVISION=	1
@@ -15,7 +15,7 @@ BUILD_DIRS=	${WRKSRC} ${WRKSRC}/doc
 INSTALL_DIRS=	${WRKSRC}
 
 USE_TOOLS+=	gmake makeinfo
-INFO_FILES=	yorick.info
+INFO_FILES=	# PLIST
 
 .include "../../mk/x11.buildlink3.mk"
 
@@ -26,11 +26,14 @@ post-patch:
 	done
 
 post-install:
-	for f in yorick gist; do \
-	cd ${PREFIX}/bin && ${LN} -sf ../lib/yorick/1.6/bin/$$f $$f; \
+	cd ${PREFIX}/bin; for f in yorick gist; do			\
+		${LN} -sf ../lib/yorick/1.6/bin/$$f $$f;		\
 	done
-	${INSTALL_DATA} ${WRKSRC}/doc/yorick.info* ${PREFIX}/info
-	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${PREFIX}/man/man1
+	cd ${WRKSRC}; for f in yorick.info yorick.info-[0-9]*; do	\
+		${TEST} ! -f "$$f" ||					\
+		${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};		\
+	done
+	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${PREFIX}/${PKGMANDIR}/man1
 	cd ${PREFIX}/share/doc && ${LN} -sf ../yorick/1.6/doc yorick
 	${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/emacs/*.el ${PREFIX}/share/emacs/site-lisp
diff --git a/math/yorick/PLIST b/math/yorick/PLIST
index 67739612817..f393554d3d3 100644
--- a/math/yorick/PLIST
+++ b/math/yorick/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.7 2005/05/31 18:02:31 drochner Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/03/31 23:56:28 jlam Exp $
 bin/gist
 bin/yorick
+info/yorick.info
 lib/yorick/1.6/Make.cfg
 lib/yorick/1.6/Makedll
 lib/yorick/1.6/Makeexe