>Number:         32151
>Category:       pkg
>Synopsis:       update net/arpwatch to 2.1a13
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Nov 23 15:58:00 +0000 2005
>Originator:     Geert Hendrickx
>Release:        NetBSD 3.0_RC3
>Organization:
>Environment:
System: NetBSD lori.mine.nu 3.0_RC3 NetBSD 3.0_RC3 (LORI) #0: Wed Nov 23 15:07:48 CET 2005 geert@lori.mine.nu:/cvs/obj/sys/arch/i386/compile/LORI i386
Architecture: i386
Machine: i386
>Description:
- Update net/arpwatch to version 2.1a13 as requested by wiz in pkgsrc/doc/TODO.
- Move the ethercodes.dat file to share/arpwatch/ (from etc/) as it's probably
  not meant to be modified by the user.  
- Use ${VARBASE:Q} instead of ${VARBASE} as suggested by pkglint.  
- Use OWN_DIRS to note the admin about the stale db directory after
  deinstallation.
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/net/arpwatch/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile	11 Apr 2005 21:46:44 -0000	1.24
+++ Makefile	23 Nov 2005 15:55:38 -0000
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.24 2005/04/11 21:46:44 tv Exp $
 #
 
-DISTNAME=	arpwatch-2.1a11
-PKGREVISION=	2
+DISTNAME=	arpwatch-2.1a13
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.ee.lbl.gov/
 
@@ -14,8 +13,8 @@
 CFLAGS.Darwin+=	-DBIND_8_COMPAT
 LIBS+=		${BUILDLINK_LDADD.libpcap}
 
-MAKE_ENV+=	VARBASE=${VARBASE}
-PLIST_SUBST+=	VARBASE=${VARBASE}
+MAKE_ENV+=	VARBASE=${VARBASE:Q}
+PLIST_SUBST+=	VARBASE=${VARBASE:Q}
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	"Fixing hardcoded paths."
@@ -23,6 +22,9 @@
 SUBST_FILES.paths=	arpsnmp.8 arpwatch.8
 SUBST_SED.paths=	-e 's,/usr/operator/arpwatch,${VARBASE}/db/arpwatch,g'
 
+USE_PKGINSTALL=	yes
+OWN_DIRS=	${VARBASE:Q}/db/arpwatch
+
 pre-patch:
 	f=arpwatch.h;							\
 	${MV} ${WRKSRC}/$$f ${WRKSRC}/$$f-prepatch;			\
@@ -33,7 +35,8 @@
 	${INSTALL_MAN} ${WRKSRC}/arpsnmp.8 ${PREFIX}/man/man8
 	@${INSTALL_DATA_DIR} ${VARBASE}/db/arpwatch
 	${TOUCH} ${VARBASE}/db/arpwatch/arp.dat
-	${INSTALL_DATA} ${WRKSRC}/ethercodes.dat ${PREFIX}/etc
+	${INSTALL_DATA_DIR} ${PREFIX}/share/arpwatch
+	${INSTALL_DATA} ${WRKSRC}/ethercodes.dat ${PREFIX}/share/arpwatch
 
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/net/arpwatch/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- PLIST	10 Dec 2004 23:32:34 -0000	1.3
+++ PLIST	23 Nov 2005 15:55:38 -0000
@@ -1,8 +1,9 @@
 @comment $NetBSD: PLIST,v 1.3 2004/12/10 23:32:34 minskim Exp $
 sbin/arpwatch
 sbin/arpsnmp
-etc/ethercodes.dat
+share/arpwatch/ethercodes.dat
 man/man8/arpwatch.8
 man/man8/arpsnmp.8
 @exec ${MKDIR} ${VARBASE}/db/arpwatch
 @exec /usr/bin/touch ${VARBASE}/db/arpwatch/arp.dat
+@dirrm share/arpwatch
Index: distinfo
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/net/arpwatch/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo	24 Feb 2005 12:13:42 -0000	1.7
+++ distinfo	23 Nov 2005 15:55:38 -0000
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.7 2005/02/24 12:13:42 agc Exp $
 
-SHA1 (arpwatch-2.1a11.tar.gz) = d14f9218928885ea9b502461259513a815809be7
-RMD160 (arpwatch-2.1a11.tar.gz) = e5932b488fbbe34926525e2795f31d2e8b3974dc
-Size (arpwatch-2.1a11.tar.gz) = 126550 bytes
-SHA1 (patch-aa) = f4cd576a1637086279ed76f440fe4fc670ae1b6c
+SHA1 (arpwatch-2.1a13.tar.gz) = 03d98e239405529f97b742f04d2a9b837b5da43a
+RMD160 (arpwatch-2.1a13.tar.gz) = 80b89d36d9c20e9d0ac272ba7b66494d2888a557
+Size (arpwatch-2.1a13.tar.gz) = 152779 bytes
+SHA1 (patch-aa) = 01d72e1342cdcf2c566a2c761743d4b71af5985c
 SHA1 (patch-ad) = 0292675b4b48656575ad4429c98e1187962a1bef
Index: patches/patch-aa
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/net/arpwatch/patches/patch-aa,v
retrieving revision 1.5
diff -u -r1.5 patch-aa
--- patches/patch-aa	10 Dec 2004 23:32:34 -0000	1.5
+++ patches/patch-aa	23 Nov 2005 15:55:38 -0000
@@ -1,30 +1,30 @@
-$NetBSD: patch-aa,v 1.5 2004/12/10 23:32:34 minskim Exp $
+$NetBSD$
 
---- Makefile.in.orig	Thu Jun 15 01:39:55 2000
+--- Makefile.in.orig	2000-06-15 02:39:55.000000000 +0200
 +++ Makefile.in
-@@ -30,8 +30,10 @@
+@@ -30,8 +30,10 @@ exec_prefix = @exec_prefix@
  BINDEST = @sbindir@
  # Pathname of directory to install the man page
  MANDEST = @mandir@
 +# Pathname of directory to install ethernet vendor codes
-+ETCDEST = $(prefix)/etc
++SHAREDEST = $(prefix)/share/arpwatch
  # Pathname of directory to install database file
 -ARPDIR = $(prefix)/arpwatch
 +ARPDIR = ${VARBASE}/db/arpwatch
  
  # VPATH
  srcdir = @srcdir@
-@@ -45,7 +47,8 @@
+@@ -45,7 +47,8 @@ CC = @CC@
  PROG = arpwatch
  CCOPT = @V_CCOPT@
  INCLS = -I. @V_INCLS@
 -DEFS = -DDEBUG @DEFS@ -DARPDIR=\"$(ARPDIR)\" -DPATH_SENDMAIL=\"$(SENDMAIL)\"
 +DEFS = -DDEBUG @DEFS@ -DARPDIR=\"$(ARPDIR)\" -DPATH_SENDMAIL=\"$(SENDMAIL)\" \
-+       -DETHERCODES=\"$(ETCDEST)/ethercodes.dat\"
++       -DETHERCODES=\"$(SHAREDEST)/ethercodes.dat\"
  
  # Standard CFLAGS
  CFLAGS = $(CCOPT) $(DEFS) $(INCLS)
-@@ -110,8 +113,8 @@
+@@ -110,8 +113,8 @@ zap: zap.o intoa.o
  	$(CC) $(CFLAGS) -o $@ zap.o intoa.o -lutil
  
  install: force