* List the info file entries directly in the PLIST.

* Honor PKGINFODIR and PKGMANDIR.

15 files changed, 51 insertions, 47 deletions

diff --git a/graphics/barcode/Makefile b/graphics/barcode/Makefile
index feefc3c428d..ae3c23ed796 100644
--- a/graphics/barcode/Makefile
+++ b/graphics/barcode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:19 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2006/04/04 14:45:44 jlam Exp $
 #
 
 DISTNAME=	barcode-0.98
@@ -11,8 +11,11 @@ COMMENT=	Create bar codes as EPS (program and library)
 
 GNU_CONFIGURE=	YES
 MAKE_ENV+=	AWK=${AWK:Q}
+INFO_FILES=	# PLIST
 
-INFO_FILES=	barcode.info
+INSTALL_MAKE_FLAGS=	INFODIR=${PREFIX:Q}/${PKGINFODIR:Q}		\
+			MAN1DIR=${PREFIX:Q}/${PKGMANDIR:Q}/man1		\
+			MAN3DIR=${PREFIX:Q}/${PKGMANDIR:Q}/man3
 
 # man/man1/barcode.1
 CONFLICTS+=	xscreensaver-[0-9]*
diff --git a/graphics/barcode/PLIST b/graphics/barcode/PLIST
index d4bf7d8c589..21a5b737303 100644
--- a/graphics/barcode/PLIST
+++ b/graphics/barcode/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2004/02/17 16:43:14 seb Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/04/04 14:45:44 jlam Exp $
 bin/barcode
 include/barcode.h
+info/barcode.info
 lib/libbarcode.a
 man/man1/barcode.1
 man/man3/barcode.3
diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index 5721b47868b..7a1020d0b1e 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/03/04 21:29:47 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2006/04/04 14:45:44 jlam Exp $
 
 DISTNAME=		geomview-1.8.1
 PKGREVISION=		6
@@ -16,8 +16,7 @@ CONFIGURE_ARGS+=	--without-xforms
 CONFIGURE_ARGS+=	--with-opengl=${BUILDLINK_PREFIX.Mesa}
 CONFIGURE_ARGS+=	--with-motif=${MOTIFBASE:Q}
 CPPFLAGS+=		-Dunix -Dalloca=__builtin_alloca
-
-INFO_FILES=		geomview
+INFO_FILES=		# PLIST
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/graphics/geomview/PLIST b/graphics/geomview/PLIST
index 99778d23edc..cb9b72cb724 100644
--- a/graphics/geomview/PLIST
+++ b/graphics/geomview/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/02/17 16:55:40 seb Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/04/04 14:45:44 jlam Exp $
 bin/.geomview-animate
 bin/.geomview-drawbdy
 bin/anytooff
@@ -18,6 +18,7 @@ bin/polymerge
 bin/togeomview
 bin/ucdtooff
 bin/vrml2oogl
+info/geomview
 man/man1/anytooff.1
 man/man1/anytoucd.1
 man/man1/bdy.1
diff --git a/graphics/gnuplot-nox11/PLIST b/graphics/gnuplot-nox11/PLIST
index 6184def8c69..0b9242ca228 100644
--- a/graphics/gnuplot-nox11/PLIST
+++ b/graphics/gnuplot-nox11/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2004/06/25 17:09:27 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/04/04 14:45:45 jlam Exp $
 bin/gnuplot
+info/gnuplot.info
 man/man1/gnuplot.1
 share/gnuplot/4.0/gnuplot.gih
 @dirrm share/gnuplot/4.0
diff --git a/graphics/gnuplot/Makefile.common b/graphics/gnuplot/Makefile.common
index 4d0892327b2..e10ad11ad1d 100644
--- a/graphics/gnuplot/Makefile.common
+++ b/graphics/gnuplot/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2006/03/05 16:27:25 jlam Exp $
+# $NetBSD: Makefile.common,v 1.8 2006/04/04 14:45:44 jlam Exp $
 #
 
 DISTNAME=		gnuplot-4.0.0
@@ -18,7 +18,7 @@ GNU_CONFIGURE=		YES
 USE_GNU_READLINE=	YES
 
 USE_TOOLS+=		makeinfo
-INFO_FILES=		gnuplot.info
+INFO_FILES=		# PLIST
 
 CONFIGURE_ARGS+=	--with-pdf
 CONFIGURE_ARGS+=	--enable-history-file
diff --git a/graphics/gnuplot/PLIST b/graphics/gnuplot/PLIST
index 3889a5649ff..fa201e67b4b 100644
--- a/graphics/gnuplot/PLIST
+++ b/graphics/gnuplot/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.7 2004/06/25 17:08:13 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/04/04 14:45:44 jlam Exp $
 bin/gnuplot
+info/gnuplot.info
 libexec/gnuplot/4.0/gnuplot_x11
 man/man1/gnuplot.1
 share/gnuplot/4.0/gnuplot.gih
diff --git a/graphics/gri/Makefile b/graphics/gri/Makefile
index a4bd3f672f7..8543173f9ff 100644
--- a/graphics/gri/Makefile
+++ b/graphics/gri/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/03/05 16:27:25 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2006/04/04 14:45:45 jlam Exp $
 
 DISTNAME=		gri-2.12.5
 PKGREVISION=	3
@@ -15,7 +15,8 @@ BUILD_DEPENDS+=		ImageMagick-[0-9]*:../../graphics/ImageMagick
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake gs:run makeinfo perl
 REPLACE_PERL+=		gri_merge gri_unpage
-INFO_FILES=		gri.info
+INFO_FILES=		# PLIST
+INSTALL_MAKE_FLAGS=	INFO_DIR=${PREFIX:Q}/${PKGINFODIR:Q}
 
 .include "../../devel/netcdf/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
diff --git a/graphics/gri/PLIST b/graphics/gri/PLIST
index dd275911b73..060ef764ddd 100644
--- a/graphics/gri/PLIST
+++ b/graphics/gri/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.6 2004/02/17 23:58:52 seb Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/04/04 14:45:45 jlam Exp $
 bin/gri
 bin/${PKGNAME}
 bin/gri_merge
 bin/gri_unpage
+info/gri.info
 share/doc/html/gri/AboutGriMode.html
 share/doc/html/gri/Acknowledgments.html
 share/doc/html/gri/AdjustingCharacterPosition.html
diff --git a/graphics/hp2xx/Makefile b/graphics/hp2xx/Makefile
index 2934c597145..4e91945fd05 100644
--- a/graphics/hp2xx/Makefile
+++ b/graphics/hp2xx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/03/05 16:27:26 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2006/04/04 14:45:45 jlam Exp $
 #
 
 DISTNAME=	hp2xx-3.4.4
@@ -12,13 +12,20 @@ COMMENT=	HPGL converter and previewer
 
 BUILD_DIRS=	sources
 USE_TOOLS+=	makeinfo
-INFO_FILES=	hp2xx.info
+MAKE_FLAGS=	prefix=${PREFIX:Q}					\
+		mandir=${PREFIX:Q}/${PKGMANDIR:Q}			\
+		infodir=${PREFIX:Q}/${PKGINFODIR:Q}
+MAKE_ENV+=	XLDFLAGS=${LDFLAGS:Q} XCPPFLAGS=${CPPFLAGS:Q}
+INFO_FILES=	# PLIST
 
-post-extract:
-	${CP} ${WRKSRC}/makes/generic.mak ${WRKSRC}/sources/Makefile
+INSTALLATION_DIRS=	bin ${PKGINFODIR} ${PKGMANDIR}/man1
 
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../print/pdflib/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
+
+post-extract:
+	${CP} ${WRKSRC}/makes/generic.mak ${WRKSRC}/sources/Makefile
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/hp2xx/PLIST b/graphics/hp2xx/PLIST
index eb73e9e58b8..41f84292bd2 100644
--- a/graphics/hp2xx/PLIST
+++ b/graphics/hp2xx/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/02/18 00:06:57 seb Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/04/04 14:45:45 jlam Exp $
 bin/hp2xx
+info/hp2xx.info
 man/man1/hp2xx.1
diff --git a/graphics/hp2xx/distinfo b/graphics/hp2xx/distinfo
index 2aacce0d066..8a333eaf0c1 100644
--- a/graphics/hp2xx/distinfo
+++ b/graphics/hp2xx/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2005/11/03 22:09:28 rillig Exp $
+$NetBSD: distinfo,v 1.8 2006/04/04 14:45:45 jlam Exp $
 
 SHA1 (hp2xx-3.4.4.tar.gz) = a168cbce5e0cea3859b404b9cbad372bd246af91
 RMD160 (hp2xx-3.4.4.tar.gz) = 61befd1a3a3aaa717826fec632dacc01e017edb8
 Size (hp2xx-3.4.4.tar.gz) = 610330 bytes
-SHA1 (patch-ab) = cd71203243efacaad0e4696e48ed859282725bb9
+SHA1 (patch-ab) = 8c3f510708d4861b1e564eb7c51686cc15003f89
 SHA1 (patch-ad) = 82c123c227c7566e73137cda38f6807830e6cc5c
 SHA1 (patch-ae) = 30c3647e73c2e1fa2c417cc584809ec93c9efcf4
diff --git a/graphics/hp2xx/patches/patch-ab b/graphics/hp2xx/patches/patch-ab
index 45e586d358d..fcacb2759bf 100644
--- a/graphics/hp2xx/patches/patch-ab
+++ b/graphics/hp2xx/patches/patch-ab
@@ -1,23 +1,7 @@
-$NetBSD: patch-ab,v 1.8 2005/11/03 22:09:28 rillig Exp $
+$NetBSD: patch-ab,v 1.9 2006/04/04 14:45:45 jlam Exp $
 
---- sources/Makefile.orig	Sat Nov 27 23:52:19 2004
+--- sources/Makefile.orig	2006-04-01 00:34:38.000000000 -0500
 +++ sources/Makefile
-@@ -28,13 +28,13 @@ SHELL    = /bin/sh
- 
- CHMOD    = chmod
- CP       = cp
--MKINFO   = makeinfo
-+MKINFO   = $(MAKEINFO)
- RMCMD    = rm -f
- STRIP    = strip
- 
- # Installation sites (GNU conventions):
- #
--prefix   = /usr/local
-+prefix   = ${PREFIX}
- bindir   = $(prefix)/bin
- includedir = $(prefix)/include
- mandir   = $(prefix)/man
 @@ -44,12 +44,12 @@ infodir  = $(prefix)/info
  # CC and CFLAGS set for gcc, but any ANSI-C compiler should work.
  # For non-gcc compilers, simply set CFLAGS = -O (to start with)
@@ -30,8 +14,8 @@ $NetBSD: patch-ab,v 1.8 2005/11/03 22:09:28 rillig Exp $
 -LFLAGS   =                # only sometimes needed; see below for examples
 -CPPFLAGS = -I.            # only sometimes needed; see below for examples
 -BINDCMD  =                # only needed for EMX and DJGPP DOS extenders
-+LFLAGS   =  -Wl,-R${X11BASE}/lib -L${X11BASE}/lib  -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
-+CPPFLAGS = -I. -I${X11BASE}/include  -I${LOCALBASE}/include
++LFLAGS   =  ${XLDFLAGS}
++CPPFLAGS = -I. ${XCPPFLAGS}
 +BINDCMD  = echo
  
  
diff --git a/graphics/xzgv/Makefile b/graphics/xzgv/Makefile
index b5ded2303ac..f62ef7ee1f7 100644
--- a/graphics/xzgv/Makefile
+++ b/graphics/xzgv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/03/19 15:33:24 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2006/04/04 14:45:45 jlam Exp $
 
 DISTNAME=	xzgv-0.8
 PKGNAME=	xzgv-0.8.0.1
@@ -16,14 +16,17 @@ COMMENT=	Image viewer
 
 USE_X11BASE=		yes
 USE_TOOLS+=		gmake makeinfo
-INFO_FILES=		xzgv
-INSTALLATION_DIRS=	bin info man/man1
+INFO_FILES=		# PLIST
+INSTALLATION_DIRS=	bin ${PKGINFODIR} ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/xzgv ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/xzgv.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/xzgv.1 ${PREFIX}/${PKGMANDIR}/man1
 	@(cd ${WRKSRC}/doc && ${MAKEINFO} xzgv.texi)
-	${INSTALL_DATA} ${WRKSRC}/doc/xzgv ${PREFIX}/info
+	cd ${WRKSRC}/doc; for f in xzgv xzgv-[0-9]*; do			\
+		${TEST} ! -f "$$f" ||					\
+		${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};		\
+	done
 
 .include "../../graphics/imlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xzgv/PLIST b/graphics/xzgv/PLIST
index cbee0a54e13..8d5bfec36fb 100644
--- a/graphics/xzgv/PLIST
+++ b/graphics/xzgv/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/02/18 00:35:58 seb Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/04/04 14:45:45 jlam Exp $
 bin/xzgv
+info/xzgv
 man/man1/xzgv.1