>Number:         20809
>Category:       pkg
>Synopsis:       Patch: Enable missing png support in graphics/netpbm
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Mar 19 12:15:01 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Christopher Richards
>Release:        NetBSD 1.6.1_RC2
>Organization:
>Environment:
System: NetBSD zembla.Princeton.EDU 1.6.1_RC2 NetBSD 1.6.1_RC2 (ZEMBLA) #0: Thu Mar 6 05:20:48 EST 2003 richards@zembla.Princeton.EDU:/usr/src/sys/arch/i386/compile/ZEMBLA i386
Architecture: i386
Machine: i386

>Description:
	The netpbm package currently fails to build the pnmtopng/pngtopnm
	programs because of a missing dependency on libz.

>How-To-Repeat:

>Fix:
	Patch follows:

Index: graphics/netpbm/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/netpbm/Makefile,v
retrieving revision 1.67
diff -u -b -r1.67 Makefile
--- graphics/netpbm/Makefile	2003/03/18 12:11:55	1.67
+++ graphics/netpbm/Makefile	2003/03/19 20:13:49
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.67 2003/03/18 12:11:55 tron Exp $
 
 DISTNAME=	netpbm-10.11.6
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netpbm/}
 EXTRACT_SUFX=	.tgz
@@ -59,6 +60,7 @@
 	${GTAR} cf - * | ${GTAR} xpCf ${PREFIX} - &&	\
 	${RM} -fr ${STAGEDIR}
 
+.include "../../devel/zlib/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
 .include "../../graphics/tiff/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
Index: graphics/netpbm/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/netpbm/distinfo,v
retrieving revision 1.12
diff -u -b -r1.12 distinfo
--- graphics/netpbm/distinfo	2003/03/18 12:11:56	1.12
+++ graphics/netpbm/distinfo	2003/03/19 20:13:49
@@ -2,5 +2,5 @@
 
 SHA1 (netpbm-10.11.6.tgz) = acda105f98695998659e519255e3b366fbb6121b
 Size (netpbm-10.11.6.tgz) = 1910873 bytes
-SHA1 (patch-aa) = f1f305a3a5b3297ebc881e6135f3db064c59782e
+SHA1 (patch-aa) = f37a0da740cbec8cf5e998dd4c3448c65c21b526
 SHA1 (patch-ac) = cd8bb4318828a9872cce2793635c4bc51272d199
Index: graphics/netpbm/patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/netpbm/patches/patch-aa,v
retrieving revision 1.21
diff -u -b -r1.21 patch-aa
--- graphics/netpbm/patches/patch-aa	2003/03/18 12:11:57	1.21
+++ graphics/netpbm/patches/patch-aa	2003/03/19 20:13:49
@@ -91,6 +91,17 @@
  # OSF/Tru64:
  #PNGLIB = /usr/local1/DEC/lib/libpng$(PNGVER).so
  #PNGHDR_DIR = /usr/local1/DEC/include
+@@ -308,8 +312,8 @@
+ # NONE for the PNG library, it doesn't matter what you specify here --
+ # it won't get used.
+ 
+-ZLIB = NONE
+-ZHDR_DIR = 
++ZLIB = $(BUILDLINK_DIR)/lib/libz.so
++ZHDR_DIR = $(BUILDLINK_DIR)/include
+ #ZLIB = libz.so
+ 
+ # The JBIG lossless image compression library (aka JBIG-KIT):
 @@ -337,7 +341,7 @@
  # network functions is the option in ppmtompeg to run it on multiple
  # computers simultaneously.
>Release-Note:
>Audit-Trail:
>Unformatted: