* List the info file entries directly in the PLIST.

* Honor PKGINFODIR and PKGMANDIR.

4 files changed, 19 insertions, 27 deletions

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