8 files changed, 52 insertions, 8 deletions

diff --git a/net-mgmt/arpwatch-devel/Makefile b/net-mgmt/arpwatch-devel/Makefile
index 5fae6c47cf8f..157cddbed58c 100644
--- a/net-mgmt/arpwatch-devel/Makefile
+++ b/net-mgmt/arpwatch-devel/Makefile
@@ -15,6 +15,7 @@ DISTNAME=	arpwatch-2.1a10
 
 MAINTAINER=	brian@Awfulhak.org
 
+GNU_CONFIGURE=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--quiet
 INSTALL_TARGET=	install install-man
diff --git a/net-mgmt/arpwatch-devel/files/arpwatch.sh b/net-mgmt/arpwatch-devel/files/arpwatch.sh
index f0c8a797cb54..1f4ad205b3fe 100644
--- a/net-mgmt/arpwatch-devel/files/arpwatch.sh
+++ b/net-mgmt/arpwatch-devel/files/arpwatch.sh
@@ -1,9 +1,19 @@
 #!/bin/sh
 
+prog=$(realpath $0) || exit 1
+dir=${prog%/*}
+PREFIX=${dir%/etc/rc.d}
+
+if [ ."$dir" = ."$prog" -o ."$PREFIX" = ."$dir" ]
+then
+	echo "$0: Cannot determine the PREFIX" >&2
+	exit 1
+fi
+
 case $1 in
 start)
-	if [ -x /usr/local/sbin/arpwatch -a -d /usr/local/arpwatch ]; then
-		/usr/local/sbin/arpwatch && echo -n ' arpwatch'
+	if [ -x "$PREFIX"/sbin/arpwatch -a -d "$PREFIX"/arpwatch ]; then
+		"$PREFIX"/sbin/arpwatch && echo -n ' arpwatch'
 	fi
 	;;
 stop)
diff --git a/net-mgmt/arpwatch/Makefile b/net-mgmt/arpwatch/Makefile
index 5fae6c47cf8f..157cddbed58c 100644
--- a/net-mgmt/arpwatch/Makefile
+++ b/net-mgmt/arpwatch/Makefile
@@ -15,6 +15,7 @@ DISTNAME=	arpwatch-2.1a10
 
 MAINTAINER=	brian@Awfulhak.org
 
+GNU_CONFIGURE=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--quiet
 INSTALL_TARGET=	install install-man
diff --git a/net-mgmt/arpwatch/files/arpwatch.sh b/net-mgmt/arpwatch/files/arpwatch.sh
index f0c8a797cb54..1f4ad205b3fe 100644
--- a/net-mgmt/arpwatch/files/arpwatch.sh
+++ b/net-mgmt/arpwatch/files/arpwatch.sh
@@ -1,9 +1,19 @@
 #!/bin/sh
 
+prog=$(realpath $0) || exit 1
+dir=${prog%/*}
+PREFIX=${dir%/etc/rc.d}
+
+if [ ."$dir" = ."$prog" -o ."$PREFIX" = ."$dir" ]
+then
+	echo "$0: Cannot determine the PREFIX" >&2
+	exit 1
+fi
+
 case $1 in
 start)
-	if [ -x /usr/local/sbin/arpwatch -a -d /usr/local/arpwatch ]; then
-		/usr/local/sbin/arpwatch && echo -n ' arpwatch'
+	if [ -x "$PREFIX"/sbin/arpwatch -a -d "$PREFIX"/arpwatch ]; then
+		"$PREFIX"/sbin/arpwatch && echo -n ' arpwatch'
 	fi
 	;;
 stop)
diff --git a/net/arpwatch-devel/Makefile b/net/arpwatch-devel/Makefile
index 5fae6c47cf8f..157cddbed58c 100644
--- a/net/arpwatch-devel/Makefile
+++ b/net/arpwatch-devel/Makefile
@@ -15,6 +15,7 @@ DISTNAME=	arpwatch-2.1a10
 
 MAINTAINER=	brian@Awfulhak.org
 
+GNU_CONFIGURE=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--quiet
 INSTALL_TARGET=	install install-man
diff --git a/net/arpwatch-devel/files/arpwatch.sh b/net/arpwatch-devel/files/arpwatch.sh
index f0c8a797cb54..1f4ad205b3fe 100644
--- a/net/arpwatch-devel/files/arpwatch.sh
+++ b/net/arpwatch-devel/files/arpwatch.sh
@@ -1,9 +1,19 @@
 #!/bin/sh
 
+prog=$(realpath $0) || exit 1
+dir=${prog%/*}
+PREFIX=${dir%/etc/rc.d}
+
+if [ ."$dir" = ."$prog" -o ."$PREFIX" = ."$dir" ]
+then
+	echo "$0: Cannot determine the PREFIX" >&2
+	exit 1
+fi
+
 case $1 in
 start)
-	if [ -x /usr/local/sbin/arpwatch -a -d /usr/local/arpwatch ]; then
-		/usr/local/sbin/arpwatch && echo -n ' arpwatch'
+	if [ -x "$PREFIX"/sbin/arpwatch -a -d "$PREFIX"/arpwatch ]; then
+		"$PREFIX"/sbin/arpwatch && echo -n ' arpwatch'
 	fi
 	;;
 stop)
diff --git a/net/arpwatch/Makefile b/net/arpwatch/Makefile
index 5fae6c47cf8f..157cddbed58c 100644
--- a/net/arpwatch/Makefile
+++ b/net/arpwatch/Makefile
@@ -15,6 +15,7 @@ DISTNAME=	arpwatch-2.1a10
 
 MAINTAINER=	brian@Awfulhak.org
 
+GNU_CONFIGURE=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--quiet
 INSTALL_TARGET=	install install-man
diff --git a/net/arpwatch/files/arpwatch.sh b/net/arpwatch/files/arpwatch.sh
index f0c8a797cb54..1f4ad205b3fe 100644
--- a/net/arpwatch/files/arpwatch.sh
+++ b/net/arpwatch/files/arpwatch.sh
@@ -1,9 +1,19 @@
 #!/bin/sh
 
+prog=$(realpath $0) || exit 1
+dir=${prog%/*}
+PREFIX=${dir%/etc/rc.d}
+
+if [ ."$dir" = ."$prog" -o ."$PREFIX" = ."$dir" ]
+then
+	echo "$0: Cannot determine the PREFIX" >&2
+	exit 1
+fi
+
 case $1 in
 start)
-	if [ -x /usr/local/sbin/arpwatch -a -d /usr/local/arpwatch ]; then
-		/usr/local/sbin/arpwatch && echo -n ' arpwatch'
+	if [ -x "$PREFIX"/sbin/arpwatch -a -d "$PREFIX"/arpwatch ]; then
+		"$PREFIX"/sbin/arpwatch && echo -n ' arpwatch'
 	fi
 	;;
 stop)