diff options
Diffstat (limited to 'graphics/hp2xx')
| -rw-r--r-- | graphics/hp2xx/Makefile | 3 | ||||
| -rw-r--r-- | graphics/hp2xx/PLIST | 6 | ||||
| -rw-r--r-- | graphics/hp2xx/distinfo | 4 | ||||
| -rw-r--r-- | graphics/hp2xx/patches/patch-ab | 32 |
4 files changed, 31 insertions, 14 deletions
diff --git a/graphics/hp2xx/Makefile b/graphics/hp2xx/Makefile index 12bb96c75b1..8fb8f6dde19 100644 --- a/graphics/hp2xx/Makefile +++ b/graphics/hp2xx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/09/27 23:18:12 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2002/02/18 15:14:20 seb Exp $ # DISTNAME= hp2xx-3.4.0 @@ -20,4 +20,5 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/sources post-extract: ${CP} ${WRKSRC}/../makes/generic.mak ${WRKSRC}/Makefile +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/hp2xx/PLIST b/graphics/hp2xx/PLIST index 9a05b74b840..4423e144fea 100644 --- a/graphics/hp2xx/PLIST +++ b/graphics/hp2xx/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:51:29 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:20 seb Exp $ bin/hp2xx man/man1/hp2xx.1 -@unexec install-info --delete %D/info/hp2xx.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/hp2xx.info %D/info/dir info/hp2xx.info -@exec install-info %D/info/hp2xx.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/hp2xx.info %D/info/dir diff --git a/graphics/hp2xx/distinfo b/graphics/hp2xx/distinfo index 6330c60f07d..f16c4f7c6c0 100644 --- a/graphics/hp2xx/distinfo +++ b/graphics/hp2xx/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.3 2001/04/23 19:25:46 dmcmahill Exp $ +$NetBSD: distinfo,v 1.4 2002/02/18 15:14:20 seb Exp $ SHA1 (hp2xx-3.4.0.tar.gz) = b8b80ae2f558017046d1b0f43e3c4d7de565065c Size (hp2xx-3.4.0.tar.gz) = 301139 bytes SHA1 (patch-aa) = 80c8e2505556d493ffc6a741ac13bfd0abfe165b -SHA1 (patch-ab) = 574ab1554935f51f2f9dd217552c65a523e76980 +SHA1 (patch-ab) = 6bf8fa3b72cf24803060dabb41e26b103a62545a SHA1 (patch-ac) = 41901116cab61281160e892edb998d73fb2c9bcc SHA1 (patch-ad) = 2ef9c938ef802f139998cafd9cfa4d9f3be29c8d SHA1 (patch-ae) = ae68f08e8ad907f043a344f3172ba4f104223f6d diff --git a/graphics/hp2xx/patches/patch-ab b/graphics/hp2xx/patches/patch-ab index 93d065e2bbf..4db7686c0cb 100644 --- a/graphics/hp2xx/patches/patch-ab +++ b/graphics/hp2xx/patches/patch-ab @@ -1,15 +1,25 @@ -$NetBSD: patch-ab,v 1.5 2000/08/31 12:37:02 dmcmahill Exp $ +$NetBSD: patch-ab,v 1.6 2002/02/18 15:14:21 seb Exp $ ---- Makefile.orig Thu Aug 31 08:09:46 2000 -+++ Makefile Thu Aug 31 08:10:24 2000 -@@ -35,5 +35,5 @@ +--- Makefile.orig Fri Feb 15 14:23:08 2002 ++++ Makefile +@@ -28,13 +28,13 @@ + + 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 -@@ -45,10 +45,10 @@ + mandir = $(prefix)/man +@@ -44,12 +44,12 @@ + # CC and CFLAGS set for gcc, but any ANSI-C compiler should work. # For non-gcc compilers, simply set CFLAGS = -O (to start with) # -CC = gcc @@ -25,14 +35,18 @@ $NetBSD: patch-ab,v 1.5 2000/08/31 12:37:02 dmcmahill Exp $ +BINDCMD = echo # only needed for EMX and DJGPP DOS extenders -@@ -63,5 +63,5 @@ + +@@ -62,7 +62,7 @@ + # DEFINES = -DUNIX -DHAS_UNIX_X11 PREVIEWER = to_x11 -ALL_LIBS = -lX11 -lm # Maybe -lX instead of -lX11 is needed? +ALL_LIBS = -lX11 -lm -lz -lpng -ltiff -ljpeg # # Generic UNIX, no previewer -@@ -183,12 +183,12 @@ + # +@@ -182,14 +182,14 @@ + EX_DEFS = # # PNG support (requires -lpng and -lz on the ALL_LIBS line) -#EX_SRC = png.c to_png.c @@ -51,7 +65,9 @@ $NetBSD: patch-ab,v 1.5 2000/08/31 12:37:02 dmcmahill Exp $ +EX_DEFS+= -DTIF # # Include extras: -@@ -304,14 +304,10 @@ + # EX_SRC = to_pic.c to_pac.c +@@ -305,15 +305,11 @@ + install: install-bin install-info install-man install-bin: $(PROGRAM) - -$(STRIP) $(PROGRAM) |