--NDin8bjvE/0mNLFQ
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Fri, Apr 11, 2003 at 04:08:31PM -0600, Dominic Jones wrote:
> 	I just updated pkgsrc today, and now netbpm won't `make install'.
> I've attached a transcript of what happens, but in brief it appears that
> patchaa has a bug (line 119). I'm running NetBSD 1.5.2 on i386.
> 

Hi,

Can you try the attached patch (it removes the last hunk essentially)?

best wishes,
Chris

--NDin8bjvE/0mNLFQ
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=pppp

? work.tubbs
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/netpbm/distinfo,v
retrieving revision 1.13
diff -u -u -r1.13 distinfo
--- distinfo	2003/03/21 08:30:48	1.13
+++ distinfo	2003/04/11 22:21:59
@@ -2,5 +2,5 @@
 
 SHA1 (netpbm-10.11.6.tgz) = acda105f98695998659e519255e3b366fbb6121b
 Size (netpbm-10.11.6.tgz) = 1910873 bytes
-SHA1 (patch-aa) = f37a0da740cbec8cf5e998dd4c3448c65c21b526
+SHA1 (patch-aa) = fe7387e17607fed00c7a598abaafac5f2c1d8c91
 SHA1 (patch-ac) = cd8bb4318828a9872cce2793635c4bc51272d199
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/netpbm/patches/patch-aa,v
retrieving revision 1.22
diff -u -u -r1.22 patch-aa
--- patches/patch-aa	2003/03/21 08:30:49	1.22
+++ patches/patch-aa	2003/04/11 22:21:59
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.22 2003/03/21 08:30:49 tron Exp $
+$NetBSD$
 
---- Makefile.config.in.orig	2002-10-15 19:17:21.000000000 +0200
-+++ Makefile.config.in	2003-03-18 10:44:40.000000000 +0100
-@@ -33,7 +33,7 @@
+--- Makefile.config.in.orig	2002-10-15 18:17:21.000000000 +0100
++++ Makefile.config.in
+@@ -33,7 +33,7 @@ BUILD_FIASCO = Y
  #CC = gcc
  # Note that 'cc' is usually an alias for whatever is the main compiler
  # on a system, e.g. the GNU Compiler on Linux.
@@ -11,7 +11,7 @@
  
  # The linker.
  LD = $(CC)
-@@ -52,7 +52,7 @@
+@@ -52,7 +52,7 @@ LD_FOR_BUILD = $(LD)
  
  # MAKE is set automatically by Make to what was used to invoke Make.
  
@@ -20,7 +20,7 @@
  #Solaris:
  #INSTALL = /usr/ucb/install
  #Tru64:
-@@ -64,7 +64,7 @@
+@@ -64,7 +64,7 @@ INSTALL = $(SRCDIR)/buildtools/install.s
  
  # STRIPFLAG is the option you pass to the above install program to make it
  # strip unnecessary information out of binaries.
@@ -29,7 +29,7 @@
  # If you don't want to strip the binaries, just leave it null:
  #STRIPFLAG = 
  
-@@ -131,7 +131,7 @@
+@@ -131,7 +131,7 @@ NEED_RUNTIME_PATH = N
  # Solaris, SunOS, NetBSD:
  #NEED_RUNTIME_PATH = Y
  
@@ -38,7 +38,7 @@
  # Eunice users may want to use -noshare so that the executables can
  # run standalone:
  #LDFLAGS = -noshare
-@@ -171,6 +171,10 @@
+@@ -171,6 +171,10 @@ LDSHLIB = -shared -Wl,-soname,$(SONAME)
  #AIX:
  #LDSHLIB = ???
  
@@ -49,7 +49,7 @@
  # On older systems, you have to make shared libraries out of position
  # independent code, so you need -fpic or fPIC here.  (The rule is: if
  # -fpic works, use it.  If it bombs, go to fPIC).  On newer systems,
-@@ -188,7 +192,7 @@
+@@ -188,7 +192,7 @@ LDSHLIB = -shared -Wl,-soname,$(SONAME)
  CFLAGS_SHLIB = 
  # Solaris or SunOS with gcc, and NetBSD:
  #CFLAGS_SHLIB = -fpic
@@ -58,7 +58,7 @@
  # Sun compiler:
  #CFLAGS_SHLIB = -Kpic
  #CFLAGS_SHLIB = -KPIC
-@@ -244,8 +248,8 @@
+@@ -244,8 +248,8 @@ TIFFHDR_DIR =
  #TIFFLIB = libtiff.so
  #TIFFHDR_DIR = /usr/include/libtiff
  #NetBSD:
@@ -69,7 +69,7 @@
  # OSF, Tru64:
  #TIFFLIB = /usr/local1/DEC/lib/libtiff.so
  #TIFFHDR_DIR = /usr/local1/DEC/include
-@@ -273,8 +277,8 @@
+@@ -273,8 +277,8 @@ JPEGHDR_DIR =
  #JPEGLIB = libjpeg.so
  #JPEGHDR_DIR = /usr/include/jpeg
  # Netbsd:
@@ -80,7 +80,7 @@
  # OSF, Tru64:
  #JPEGLIB = /usr/local1/DEC/libjpeg.so
  #JPEGHDR_DIR = /usr/local1/DEC/include
-@@ -297,8 +301,8 @@
+@@ -297,8 +301,8 @@ PNGVER = 
  #PNGLIB = libpng$(PNGVER).so
  #PNGHDR_DIR = /usr/include/libpng$(PNGVER)
  # NetBSD:
@@ -91,7 +91,7 @@
  # OSF/Tru64:
  #PNGLIB = /usr/local1/DEC/lib/libpng$(PNGVER).so
  #PNGHDR_DIR = /usr/local1/DEC/include
-@@ -308,8 +312,8 @@
+@@ -308,8 +312,8 @@ PNGVER = 
  # NONE for the PNG library, it doesn't matter what you specify here --
  # it won't get used.
  
@@ -102,7 +102,7 @@
  #ZLIB = libz.so
  
  # The JBIG lossless image compression library (aka JBIG-KIT):
-@@ -337,7 +341,7 @@
+@@ -337,7 +341,7 @@ LINUXSVGAHDR_DIR = 
  # network functions is the option in ppmtompeg to run it on multiple
  # computers simultaneously.
  
@@ -111,10 +111,3 @@
  # Solaris, SunOS:
  #NETWORKLD = -lsocket -lnsl
  # SCO:
-@@ -450,4 +454,4 @@
- #NETPBM_DOCURL = file:/usr/doc/netpbm/
- 
- # This is where everything goes when you do 'make package':
--PKGDIR = /tmp/netpbm
-\ No newline at end of file
-+PKGDIR = /tmp/netpbm

--NDin8bjvE/0mNLFQ--