Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/graphics/netpbm/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/graphics/netpbm/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- pkgsrc/graphics/netpbm/Makefile	2000/06/01 11:23:30	1.40
+++ pkgsrc/graphics/netpbm/Makefile	2000/06/05 00:36:30	1.41
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2000/06/01 11:23:30 rh Exp $
+# $NetBSD: Makefile,v 1.41 2000/06/05 00:36:30 wiz Exp $
 
-DISTNAME=	netpbm-9.2
+DISTNAME=	netpbm-9.3
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.sourceforge.net/netpbm/
 EXTRACT_SUFX=	.tgz
@@ -12,10 +12,9 @@ DEPENDS+=	tiff>=3.5.4:../../graphics/tif
 DEPENDS+=	png>=1.0.6:../../graphics/png
 
 USE_GMAKE=	yes
-USE_PKGLIBTOOL=	yes
+USE_LIBTOOL=	yes
 
-INSTALL_TARGET=	install.dev install
-MAKE_ENV+=	ECHO="${ECHO}"
+INSTALL_TARGET=	install-dev install
 MAKEFILE=	GNUmakefile
 
 .include "../../mk/bsd.prefs.mk"
@@ -23,6 +22,12 @@ MAKEFILE=	GNUmakefile
 .if ${OPSYS} == NetBSD && ${MACHINE_ARCH} == arm32
 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