Bump PKGREVISION.

- it doesn't really need gmake, fix the issue with Makefile instead
- add dependency on mpg123 which is the default tool used for playing
  MPEG audio streams
- style nits

4 files changed, 33 insertions, 21 deletions

diff --git a/net/driftnet/DESCR b/net/driftnet/DESCR
index 076142fd344..b282f30f26b 100644
--- a/net/driftnet/DESCR
+++ b/net/driftnet/DESCR
@@ -1,5 +1,5 @@
 Driftnet watches network traffic, and picks out and displays JPEG and GIF
-images for display. It is an horrific invasion of privacy and shouldn't be used
-by anyone anywhere. It can also extract MPEG audio data from the network and
-play it. If you live in a house with thick walls, this may be a useful way to
-find out about your neighbours' musical taste.
+images for display.  It is an horrific invasion of privacy and shouldn't be
+used by anyone anywhere.  It can also extract MPEG audio data from the network
+and play it.  If you live in a house with thick walls, this may be a useful
+way to find out about your neighbours' musical taste.
diff --git a/net/driftnet/Makefile b/net/driftnet/Makefile
index 3d3cec8a160..85036fc9538 100644
--- a/net/driftnet/Makefile
+++ b/net/driftnet/Makefile
@@ -1,24 +1,28 @@
-# $NetBSD: Makefile,v 1.4 2003/05/02 11:56:00 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/04 22:21:05 salo Exp $
 #
 
 DISTNAME=	driftnet-0.1.6
-PKGREVISION=	1
-CATEGORIES=	graphics net
+PKGREVISION=	2
+CATEGORIES=	net graphics
 MASTER_SITES=	http://www.ex-parrot.com/~chris/driftnet/
 
 MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://www.ex-parrot.com/~chris/driftnet/
 COMMENT=	Real-time image sniffer
 
+DEPENDS=	mpg123:../../audio/mpg123
+
+USE_BUILDLINK2=	YES
+
 ALL_TARGET=	default
-USE_GMAKE=	yes
-USE_BUILDLINK2=	yes
+MAKE_ENV+=	CAT="${CAT}" TRUE="${TRUE}"
 
 do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/driftnet ${PREFIX}/bin
-		${INSTALL_MAN} ${WRKSRC}/driftnet.1 ${PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/driftnet ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/driftnet.1 ${PREFIX}/man/man1
 
 .include "../../graphics/libungif/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/driftnet/distinfo b/net/driftnet/distinfo
index 0f62884d8c2..b4149275286 100644
--- a/net/driftnet/distinfo
+++ b/net/driftnet/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/01/09 08:29:42 hubertf Exp $
+$NetBSD: distinfo,v 1.2 2003/05/04 22:21:05 salo Exp $
 
 SHA1 (driftnet-0.1.6.tar.gz) = 279cb3a596f354e7e9c6ac3cc456b3d11dced2ff
 Size (driftnet-0.1.6.tar.gz) = 36989 bytes
-SHA1 (patch-aa) = ce900193d73c72c41da4ce2ec4c0873aaada41cb
+SHA1 (patch-aa) = 6ced6f1653b5bed9ba8e8826058e118f10f6b67e
diff --git a/net/driftnet/patches/patch-aa b/net/driftnet/patches/patch-aa
index d4cef6c7db2..4736b1ef9a3 100644
--- a/net/driftnet/patches/patch-aa
+++ b/net/driftnet/patches/patch-aa
@@ -1,13 +1,21 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/01/09 08:29:42 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2003/05/04 22:21:05 salo Exp $
 
---- Makefile.orig	Thu Jan  9 09:06:38 2003
-+++ Makefile
-@@ -51,7 +51,7 @@
- 
- # added 20020604 edobbs
+--- Makefile.orig	2002-07-09 21:26:41.000000000 +0200
++++ Makefile	2003-05-04 23:52:15.000000000 +0200
+@@ -53,6 +53,7 @@
  # On BSD systems, may need to use /usr/local/include
--#CFLAGS += -I/usr/local/include
-+CFLAGS += -I${LOCALBASE}/include
+ #CFLAGS += -I/usr/local/include
  
++CFLAGS += `${CAT} endianness 2>/dev/null || ${TRUE}`
  
  #
+ # No user-serviceable parts below this point.
+@@ -87,7 +88,7 @@
+ 	$(CC) $(CFLAGS) -o endian endian.c
+ 
+ %.o:    %.c Makefile endianness
+-	$(CC) $(CFLAGS) `cat endianness` -c -o $@ $<
++	$(CC) $(CFLAGS) -c -o $@ $<
+ 
+ clean:  nodepend
+ 	rm -f *~ *.bak *.o core $(BINS) TAGS driftnet.1 endian endianness