* Set LIBOPT to something really existing (${ECHO} is a shell builtin

   now, and as such can't be used as a file dependency in make(1)).
 * Don't force anyone to have "." in his $PATH

4 files changed, 62 insertions, 10 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 529308640c6..1efd0ceed05 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2000/06/05 00:36:30 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2000/06/05 01:13:34 hubertf Exp $
 
 DISTNAME=	netpbm-9.3
 CATEGORIES=	graphics
@@ -23,11 +23,6 @@ MAKEFILE=	GNUmakefile
 CFLAGS=
 .endif
 # 'echo' doesn't suffice for unknown reasons
-.if ${OPSYS} == NetBSD
-MAKE_ENV+=	ECHO="/bin/echo"
-.else
-MAKE_ENV+=	ECHO="${ECHO}"
-.endif
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/shhopt/shhopt.h ${PREFIX}/include
diff --git a/graphics/netpbm/files/patch-sum b/graphics/netpbm/files/patch-sum
index 71dd16ce042..9fc7225b0e5 100644
--- a/graphics/netpbm/files/patch-sum
+++ b/graphics/netpbm/files/patch-sum
@@ -1,7 +1,8 @@
-$NetBSD: patch-sum,v 1.5 2000/06/05 00:36:31 wiz Exp $
+$NetBSD: patch-sum,v 1.6 2000/06/05 01:13:35 hubertf Exp $
 
 MD5 (patch-aa) = 107218ef620bf64ee6df627a6073abe6
-MD5 (patch-ab) = ede58d1ea5e707aeff4ec2ab51455733
+MD5 (patch-ab) = 680cc823889179a80874989811f798a0
 MD5 (patch-ac) = 39721b5f833ab984a5a49a8cb11f4a84
 MD5 (patch-ad) = 6800c568c8aefaecb72cc5eeb34f10dd
 MD5 (patch-ae) = 2dad77b8f2f4f3a694b77f9e7f914b07
+MD5 (patch-af) = 6530b564c630af7eedecf54224956f23
diff --git a/graphics/netpbm/patches/patch-ab b/graphics/netpbm/patches/patch-ab
index feecaaa5e01..eff6db2c9f4 100644
--- a/graphics/netpbm/patches/patch-ab
+++ b/graphics/netpbm/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.6 2000/06/05 00:36:31 wiz Exp $
+$NetBSD: patch-ab,v 1.7 2000/06/05 01:13:35 hubertf Exp $
 
 --- Makefile.common.orig	Thu Jun  1 19:38:14 2000
 +++ Makefile.common	Mon Jun  5 01:38:40 2000
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.6 2000/06/05 00:36:31 wiz Exp $
  	$(CC) -c $(CFLAGS) $(INCLUDE) -o $@ $<
  
 -LIBOPT = $(SRCDIR)/libopt
-+LIBOPT = $(ECHO)
++LIBOPT = /bin/echo		# XXX must exist, can't be ${ECHO} (shell builtin)
  
  # Rules for conventional single-object file executables
  $(PORTBINARIES): %: %.o $(NETPBMLIBS) $(LIBOPT)
diff --git a/graphics/netpbm/patches/patch-af b/graphics/netpbm/patches/patch-af
new file mode 100644
index 00000000000..e52e2a41fee
--- /dev/null
+++ b/graphics/netpbm/patches/patch-af
@@ -0,0 +1,56 @@
+$NetBSD: patch-af,v 1.5 2000/06/05 01:13:35 hubertf Exp $
+
+--- GNUmakefile.orig	Mon Jun  5 01:55:19 2000
++++ GNUmakefile	Mon Jun  5 01:55:47 2000
+@@ -79,21 +79,21 @@
+ 
+ .PHONY: install.bin
+ install.bin:
+-	mkinstalldirs $(INSTALLBINARIES)
++	./mkinstalldirs $(INSTALLBINARIES)
+ 	for i in $(SUBDIRS) ; do \
+ 	    ( echo install.bin.$$i ; cd $$i ; $(MAKE) install.bin ); \
+ 	done
+ 
+ .PHONY: install-merge
+ install.merge:
+-	mkinstalldirs $(INSTALLBINARIES)
++	./mkinstalldirs $(INSTALLBINARIES)
+ 	for i in $(SUBDIRS) ; do \
+ 	    ( echo install.merge.$$i ; cd $$i ; $(MAKE) install.merge ); \
+ 	done
+ 
+ .PHONY: install.lib
+ install.lib:
+-	mkinstalldirs $(INSTALLLIBS)
++	./mkinstalldirs $(INSTALLLIBS)
+ 	for i in $(SUBDIRS) ; do \
+ 	    ( echo install.lib.$$i ; cd $$i ; $(MAKE) install.lib ); \
+ 	done
+@@ -104,7 +104,7 @@
+ 
+ .PHONY: install.man
+ install.man:
+-	mkinstalldirs \
++	./mkinstalldirs \
+ 	    $(INSTALLMANUALS1) $(INSTALLMANUALS3) $(INSTALLMANUALS5)
+ 	for i in $(SUBDIRS) ; do \
+ 	    ( echo install.man.$$i ; cd $$i ; $(MAKE) install.man ); \
+@@ -115,7 +115,7 @@
+ 
+ .PHONY: install.hdr
+ install.hdr:
+-	mkinstalldirs $(INSTALLHDRS)
++	./mkinstalldirs $(INSTALLHDRS)
+ 	$(INSTALL) -c -m$(INSTALL_PERM_HDR) pbmplus.h $(INSTALLHDRS)
+ 	$(INSTALL) -c -m$(INSTALL_PERM_HDR) shhopt/shhopt.h $(INSTALLHDRS)
+ 	for i in $(SUBDIRS) ; do \
+@@ -128,7 +128,7 @@
+ 
+ .PHONY: install.staticlib
+ install.staticlib:
+-	mkinstalldirs $(INSTALLLIBS)
++	./mkinstalldirs $(INSTALLLIBS)
+ 	for i in $(SUBDIRS) ; do \
+ 	    (echo install.staticlib.$$i; cd $$i; $(MAKE) install.staticlib ); \
+ 	done