6 files changed, 18 insertions, 38 deletions
diff --git a/net/arpwatch/Makefile b/net/arpwatch/Makefile
index 549a8a05579..ab4f1746db9 100644
--- a/net/arpwatch/Makefile
+++ b/net/arpwatch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/11/03 10:59:40 grant Exp $
+# $NetBSD: Makefile,v 1.21 2004/12/10 23:32:34 minskim Exp $
 #
 
 DISTNAME=	arpwatch-2.1a11
@@ -14,6 +14,14 @@ GNU_CONFIGURE=	yes
 
 LIBS+=		${BUILDLINK_LDADD.libpcap}
 
+PLIST_SUBST+=	VARBASE=${VARBASE}
+
+SUBST_CLASSES+=		paths
+SUBST_MESSAGE.paths=	"Fixing hardcoded paths."
+SUBST_STAGE.paths=	post-patch
+SUBST_FILES.paths=	arpsnmp.8 arpwatch.8
+SUBST_SED.paths=	-e 's,/usr/operator/arpwatch,${VARBASE}/db/arpwatch,g'
+
 pre-patch:
 	f=arpwatch.h;							\
 	${MV} ${WRKSRC}/$$f ${WRKSRC}/$$f-prepatch;			\
@@ -22,8 +30,8 @@ pre-patch:
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/arpwatch.8 ${PREFIX}/man/man8
 	${INSTALL_MAN} ${WRKSRC}/arpsnmp.8 ${PREFIX}/man/man8
-	@${INSTALL_DATA_DIR} /var/db/arpwatch
-	${TOUCH} /var/db/arpwatch/arp.dat
+	@${INSTALL_DATA_DIR} ${VARBASE}/db/arpwatch
+	${TOUCH} ${VARBASE}/db/arpwatch/arp.dat
 	${INSTALL_DATA} ${WRKSRC}/ethercodes.dat ${PREFIX}/etc
 
 .include "../../net/libpcap/buildlink3.mk"
diff --git a/net/arpwatch/PLIST b/net/arpwatch/PLIST
index c9fde471c79..83f7409d834 100644
--- a/net/arpwatch/PLIST
+++ b/net/arpwatch/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/05 22:39:06 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/12/10 23:32:34 minskim Exp $
 sbin/arpwatch
 sbin/arpsnmp
 etc/ethercodes.dat
 man/man8/arpwatch.8
 man/man8/arpsnmp.8
-@exec ${MKDIR} /var/db/arpwatch
-@exec /usr/bin/touch /var/db/arpwatch/arp.dat
+@exec ${MKDIR} ${VARBASE}/db/arpwatch
+@exec /usr/bin/touch ${VARBASE}/db/arpwatch/arp.dat
diff --git a/net/arpwatch/distinfo b/net/arpwatch/distinfo
index a13077af21e..20505369561 100644
--- a/net/arpwatch/distinfo
+++ b/net/arpwatch/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.5 2002/10/10 13:13:06 wiz Exp $
+$NetBSD: distinfo,v 1.6 2004/12/10 23:32:34 minskim Exp $
 
 SHA1 (arpwatch-2.1a11.tar.gz) = d14f9218928885ea9b502461259513a815809be7
 Size (arpwatch-2.1a11.tar.gz) = 126550 bytes
-SHA1 (patch-aa) = fd74e2ff6fad7ea3f3355e4405e9e7135dd1ef49
-SHA1 (patch-ab) = c37e20d3e4a42e415a4bd49012b7b2a831254851
-SHA1 (patch-ac) = 3ac210f99f73fb0455779984ddb40471ee4c3920
+SHA1 (patch-aa) = f4cd576a1637086279ed76f440fe4fc670ae1b6c
 SHA1 (patch-ad) = 0292675b4b48656575ad4429c98e1187962a1bef
diff --git a/net/arpwatch/patches/patch-aa b/net/arpwatch/patches/patch-aa
index adb4340e5cc..703e0ef1433 100644
--- a/net/arpwatch/patches/patch-aa
+++ b/net/arpwatch/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2001/08/24 11:37:07 abs Exp $
+$NetBSD: patch-aa,v 1.5 2004/12/10 23:32:34 minskim Exp $
 
 --- Makefile.in.orig	Thu Jun 15 01:39:55 2000
 +++ Makefile.in
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.4 2001/08/24 11:37:07 abs Exp $
 +ETCDEST = $(prefix)/etc
  # Pathname of directory to install database file
 -ARPDIR = $(prefix)/arpwatch
-+ARPDIR = /var/db/arpwatch
++ARPDIR = ${VARBASE}/db/arpwatch
  
  # VPATH
  srcdir = @srcdir@
diff --git a/net/arpwatch/patches/patch-ab b/net/arpwatch/patches/patch-ab
deleted file mode 100644
index b1cc66e8daa..00000000000
--- a/net/arpwatch/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2001/08/24 11:37:08 abs Exp $
-
---- arpsnmp.8.orig	Sun Sep 17 21:34:48 2000
-+++ arpsnmp.8
-@@ -69,7 +69,7 @@
- .na
- .nh
- .nf
--/usr/operator/arpwatch - default directory
-+/var/db/arpwatch - default directory
- arp.dat - ethernet/ip address database
- ethercodes.dat - vendor ethernet block list
- .ad
diff --git a/net/arpwatch/patches/patch-ac b/net/arpwatch/patches/patch-ac
deleted file mode 100644
index 6591f7bcc9a..00000000000
--- a/net/arpwatch/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2002/08/05 17:54:04 wiz Exp $
-
---- arpwatch.8.orig	Sun Oct  8 21:31:28 2000
-+++ arpwatch.8
-@@ -152,7 +160,7 @@
- .na
- .nh
- .nf
--/usr/operator/arpwatch - default directory
-+/var/db/arpwatch - default directory
- arp.dat - ethernet/ip address database
- ethercodes.dat - vendor ethernet block list
- .ad