Fix build problems on older "a.out" system. Based on patches supplied by

Greg A. Woods in PR pkg/16030.

4 files changed, 43 insertions, 7 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 14114c7b21d..4965e39dd7f 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2002/03/15 11:04:29 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2002/05/14 18:03:17 tron Exp $
 
 DISTNAME=	netpbm-9.25
 CATEGORIES=	graphics
@@ -16,7 +16,7 @@ USE_PERL5=		yes
 REPLACE_PERL=		pnm/pnmquant ppm/ppmfade ppm/ppmrainbow ppm/ppmshadow
 
 INSTALL_TARGET=	install-dev install
-MAKE_ENV+=	CC="${CC}" INSTALL="${INSTALL}"
+MAKE_ENV+=	CC="${CC}" INSTALL="${INSTALL}" STRIPFLAG="${STRIPFLAG}"
 MAKEFILE=	GNUmakefile
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index e1f1d769d30..3313205c5c1 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2002/05/06 11:46:21 tron Exp $
+$NetBSD: distinfo,v 1.9 2002/05/14 18:03:18 tron Exp $
 
 SHA1 (netpbm-9.25.tgz) = 9c7f6a98348a5f3d6e908b514f33498b2a9c359a
 Size (netpbm-9.25.tgz) = 2052922 bytes
-SHA1 (patch-aa) = 7288a623ed96793271e27e73476918830f50b9e5
+SHA1 (patch-aa) = 1e3eb961f34dedb81ac1be823e25f0ae052905b6
 SHA1 (patch-ab) = b6932fd52dff9a6acd01e42136ff7a70561c7434
+SHA1 (patch-ac) = 42a6dbfe24447132c6dd654512607c0c9c4a5699
diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa
index 8a88d040f01..b0dbb607dfb 100644
--- a/graphics/netpbm/patches/patch-aa
+++ b/graphics/netpbm/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.18 2002/05/06 11:46:22 tron Exp $
+$NetBSD: patch-aa,v 1.19 2002/05/14 18:03:18 tron Exp $
 
 --- Makefile.config.in.orig	Thu Mar 14 16:25:54 2002
-+++ Makefile.config.in	Mon Apr 29 17:19:59 2002
++++ Makefile.config.in	Tue May 14 19:52:32 2002
 @@ -33,7 +33,7 @@
  #Tru64 (= Digital Unix):
  #CC = cc
@@ -20,6 +20,15 @@ $NetBSD: patch-aa,v 1.18 2002/05/06 11:46:22 tron Exp $
  #Solaris:
  #INSTALL = /usr/ucb/install
  #Tru64:
+@@ -64,7 +64,7 @@
+ 
+ # STRIPFLAG is the option you pass to the above install program to make it
+ # strip unnecessary information out of binaries.
+-STRIPFLAG = -s
++#STRIPFLAG = -s
+ # If you don't want to strip the binaries, just leave it null:
+ #STRIPFLAG = 
+ 
 @@ -137,10 +137,10 @@
  # the directory information in the executable at link time.
  
@@ -34,7 +43,7 @@ $NetBSD: patch-aa,v 1.18 2002/05/06 11:46:22 tron Exp $
  # Eunice users may want to use -noshare so that the executables can
  # run standalone:
  #LDFLAGS = -noshare
-@@ -156,9 +156,9 @@
+@@ -156,16 +156,16 @@
  
  ifeq ($(NEED_RUNTIME_PATH),Y)
  #If the linker is gcc (e.g. NetBSD):
@@ -46,6 +55,14 @@ $NetBSD: patch-aa,v 1.18 2002/05/06 11:46:22 tron Exp $
  endif
  
  # Linker options for created Netpbm shared libraries.
+ 
+ # Here, $(SONAME) resolves to the soname for the shared library being created.
+ # The following are gcc options.  This works on GNU libc systems.
+-LDSHLIB = -shared -Wl,-soname,$(SONAME)
++LDSHLIB = -nostdlib -shared -Wl,-Bshareable,-soname,$(SONAME)
+ # You need -nostart instead of -shared on BeOS.  Though the BeOS compiler is
+ # ostensibly gcc, it has the -nostart option, which is not mentioned in gcc
+ # documentation and doesn't exist in at least one non-BeOS installation.
 @@ -180,11 +180,15 @@
  #Tru64:
  #LDSHLIB = -shared -expect_unresolved "*"
diff --git a/graphics/netpbm/patches/patch-ac b/graphics/netpbm/patches/patch-ac
new file mode 100644
index 00000000000..98ef65c13c3
--- /dev/null
+++ b/graphics/netpbm/patches/patch-ac
@@ -0,0 +1,18 @@
+$NetBSD: patch-ac,v 1.11 2002/05/14 18:03:18 tron Exp $
+
+--- ppm/ppmtompeg/param.c-orig	Fri Aug 31 16:49:01 2001
++++ ppm/ppmtompeg/param.c	Sat Mar 23 19:20:02 2002
+@@ -11,13 +11,6 @@
+ 
+ /* COPYRIGHT INFORMATION IS AT THE END OF THIS FILE */
+ 
+-#define _XOPEN_SOURCE 1
+-    /* This makes sure popen() is in stdio.h.  In GNU libc 2.1.3, 
+-     _POSIX_C_SOURCE = 2 is sufficient, but on AIX 4.3, the higher level
+-     _XOPEN_SOURCE is required.  2000.09.09 
+-    */
+-
+-
+ /*==============*
+  * HEADER FILES *
+  *==============*/