Remove mk/find-prefix.mk usage from the net category.

The find-prefix infrastructure was required in a pkgviews world where
packages installed from pkgsrc could have different installation
prefixes, and this was a way for a dependency prefix to be determined.

Now that pkgviews has been removed there is no longer any need for the
overhead of this infrastructure.  Instead we use BUILDLINK_PREFIX.pkg
for dependencies pulled in via buildlink, or LOCALBASE/PREFIX where the
dependency is coming from pkgsrc.

Provides a reasonable performance win due to the reduction of `pkg_info
-qp` calls, some of which were redundant anyway as they were duplicating
the same information provided by BUILDLINK_PREFIX.pkg.

11 files changed, 33 insertions, 52 deletions

diff --git a/net/djbdns-run/INSTALL b/net/djbdns-run/INSTALL
index b64495fe28e..a36cfeaecd9 100644
--- a/net/djbdns-run/INSTALL
+++ b/net/djbdns-run/INSTALL
@@ -1,5 +1,3 @@
-UCSPI_TCP_PREFIX=@UCSPI_TCP_PREFIX@
-
 psmsg='#
 # This file was auto-generated by pkgsrc.'
 
@@ -13,7 +11,7 @@ POST-INSTALL)
 		${ECHO} "$psmsg" >> tcp
 		${CHMOD} 644 tcp
 	fi
-	${UCSPI_TCP_PREFIX}/bin/tcprules tcp.cdb tcp.tmp < tcp
+	${PREFIX}/bin/tcprules tcp.cdb tcp.tmp < tcp
 	${CHMOD} 644 tcp.cdb
 
 	cd ${PKG_SYSCONFDIR}/dnscache
diff --git a/net/djbdns-run/Makefile b/net/djbdns-run/Makefile
index f209af5a658..40023eff030 100644
--- a/net/djbdns-run/Makefile
+++ b/net/djbdns-run/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2014/12/07 04:33:30 schmonz Exp $
+# $NetBSD: Makefile,v 1.26 2015/11/25 12:52:11 jperkin Exp $
 #
 
 DISTNAME=		djbdns-run-20141207
@@ -50,14 +50,6 @@ MAKEVARS+=	PKG_SYSCONFDIR.djbdns-run
 .  endif
 .endif
 
-DJBDNS_TOOLS=		daemontools djbdns ucspi-tcp
-
-.for i in ${DJBDNS_TOOLS}
-DJBDNS_TOOL_VAR.${i}=	${i:S/-/_/g:tu}_PREFIX
-EVAL_PREFIX+=		${DJBDNS_TOOL_VAR.${i}}=${i}
-FILES_SUBST+=		${DJBDNS_TOOL_VAR.${i}}=${${DJBDNS_TOOL_VAR.${i}}:Q}
-.endfor
-
 do-install:
 	${INSTALL_DATA} ${FILESDIR}/README.pkgsrc ${DESTDIR}${PREFIX}/share/doc/djbdns-run
 
diff --git a/net/djbdns-run/files/axfrdns.sh b/net/djbdns-run/files/axfrdns.sh
index 71186e9dc5c..fb868cb67e7 100644
--- a/net/djbdns-run/files/axfrdns.sh
+++ b/net/djbdns-run/files/axfrdns.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: axfrdns.sh,v 1.6 2014/12/07 04:33:31 schmonz Exp $
+# $NetBSD: axfrdns.sh,v 1.7 2015/11/25 12:52:12 jperkin Exp $
 #
 # @PKGNAME@ script to control axfrdns (DNS zone-transfer and TCP service)
 #
@@ -19,7 +19,7 @@ name="axfrdns"
 : ${axfrdns_pretcpserver:=""}
 : ${axfrdns_log:="YES"}
 : ${axfrdns_logcmd:="logger -t nb${name} -p daemon.info"}
-: ${axfrdns_nologcmd:="@DAEMONTOOLS_PREFIX@/bin/multilog -*"}
+: ${axfrdns_nologcmd:="@PREFIX@/bin/multilog -*"}
 
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
@@ -27,7 +27,7 @@ fi
 
 rcvar=${name}
 required_files="@PKG_SYSCONFDIR@/axfrdns/tcp.cdb"
-command="@UCSPI_TCP_PREFIX@/bin/tcpserver"
+command="@PREFIX@/bin/tcpserver"
 procname=${name}
 start_precmd="axfrdns_precmd"
 extra_commands="reload cdb"
@@ -38,7 +38,7 @@ axfrdns_precmd()
 	if [ -f /etc/rc.subr ]; then
 		checkyesno axfrdns_log || axfrdns_logcmd=${axfrdns_nologcmd}
 	fi
-	command="@SETENV@ - ${axfrdns_postenv} ROOT=@PKG_SYSCONFDIR@/tinydns IP=${tinydns_ip} @DAEMONTOOLS_PREFIX@/bin/envuidgid axfrdns @DAEMONTOOLS_PREFIX@/bin/softlimit -d ${axfrdns_datalimit} ${axfrdns_pretcpserver} @UCSPI_TCP_PREFIX@/bin/argv0 @UCSPI_TCP_PREFIX@/bin/tcpserver ${name} ${axfrdns_tcpflags} -x @PKG_SYSCONFDIR@/axfrdns/tcp.cdb -- ${tinydns_ip} ${axfrdns_tcpport} @DJBDNS_PREFIX@/bin/axfrdns </dev/null 2>&1 | @DAEMONTOOLS_PREFIX@/bin/setuidgid dnslog ${axfrdns_logcmd}"
+	command="@SETENV@ - ${axfrdns_postenv} ROOT=@PKG_SYSCONFDIR@/tinydns IP=${tinydns_ip} @PREFIX@/bin/envuidgid axfrdns @PREFIX@/bin/softlimit -d ${axfrdns_datalimit} ${axfrdns_pretcpserver} @PREFIX@/bin/argv0 @PREFIX@/bin/tcpserver ${name} ${axfrdns_tcpflags} -x @PKG_SYSCONFDIR@/axfrdns/tcp.cdb -- ${tinydns_ip} ${axfrdns_tcpport} @PREFIX@/bin/axfrdns </dev/null 2>&1 | @PREFIX@/bin/setuidgid dnslog ${axfrdns_logcmd}"
 	command_args="&"
 	rc_flags=""
 }
@@ -47,7 +47,7 @@ axfrdns_cdb()
 {
 	@ECHO@ "Reloading @PKG_SYSCONFDIR@/axfrdns/tcp."
 	cd @PKG_SYSCONFDIR@/axfrdns
-	@UCSPI_TCP_PREFIX@/bin/tcprules tcp.cdb tcp.tmp < tcp
+	@PREFIX@/bin/tcprules tcp.cdb tcp.tmp < tcp
 }
 
 if [ -f /etc/rc.subr ]; then
diff --git a/net/djbdns-run/files/dnscache.sh b/net/djbdns-run/files/dnscache.sh
index 43cad3ad89a..d6fc63f60aa 100644
--- a/net/djbdns-run/files/dnscache.sh
+++ b/net/djbdns-run/files/dnscache.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: dnscache.sh,v 1.7 2014/12/07 04:33:31 schmonz Exp $
+# $NetBSD: dnscache.sh,v 1.8 2015/11/25 12:52:12 jperkin Exp $
 #
 # @PKGNAME@ script to control dnscache (caching DNS resolver)
 #
@@ -19,7 +19,7 @@ name="dnscache"
 : ${dnscache_datalimit:="3000000"}
 : ${dnscache_log:="YES"}
 : ${dnscache_logcmd:="logger -t nb${name} -p daemon.info"}
-: ${dnscache_nologcmd:="@DAEMONTOOLS_PREFIX@/bin/multilog -*"}
+: ${dnscache_nologcmd:="@PREFIX@/bin/multilog -*"}
 
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
@@ -28,7 +28,7 @@ fi
 rcvar=${name}
 required_dirs="@PKG_SYSCONFDIR@/dnscache/ip @PKG_SYSCONFDIR@/dnscache/servers"
 required_files="@PKG_SYSCONFDIR@/dnscache/servers/@"
-command="@DJBDNS_PREFIX@/bin/${name}"
+command="@PREFIX@/bin/${name}"
 start_precmd="dnscache_precmd"
 
 dnscache_precmd()
@@ -36,7 +36,7 @@ dnscache_precmd()
 	if [ -f /etc/rc.subr ]; then
 		checkyesno dnscache_log || dnscache_logcmd=${dnscache_nologcmd}
 	fi
-	command="@SETENV@ - ${dnscache_postenv} ROOT=@PKG_SYSCONFDIR@/dnscache IP=${dnscache_ip} IPSEND=${dnscache_ipsend} CACHESIZE=${dnscache_size} @DAEMONTOOLS_PREFIX@/bin/envuidgid dnscache @DAEMONTOOLS_PREFIX@/bin/softlimit -o250 -d ${dnscache_datalimit} @DJBDNS_PREFIX@/bin/dnscache </dev/urandom 2>&1 | @DAEMONTOOLS_PREFIX@/bin/setuidgid dnslog ${dnscache_logcmd}"
+	command="@SETENV@ - ${dnscache_postenv} ROOT=@PKG_SYSCONFDIR@/dnscache IP=${dnscache_ip} IPSEND=${dnscache_ipsend} CACHESIZE=${dnscache_size} @PREFIX@/bin/envuidgid dnscache @PREFIX@/bin/softlimit -o250 -d ${dnscache_datalimit} @PREFIX@/bin/dnscache </dev/urandom 2>&1 | @PREFIX@/bin/setuidgid dnslog ${dnscache_logcmd}"
 	command_args="&"
 	rc_flags=""
 }
diff --git a/net/djbdns-run/files/rbldns.sh b/net/djbdns-run/files/rbldns.sh
index b2dfeeb56fb..a19d87b1781 100644
--- a/net/djbdns-run/files/rbldns.sh
+++ b/net/djbdns-run/files/rbldns.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: rbldns.sh,v 1.4 2014/12/07 04:33:31 schmonz Exp $
+# $NetBSD: rbldns.sh,v 1.5 2015/11/25 12:52:12 jperkin Exp $
 #
 # @PKGNAME@ script to control rbldns (local RBL service)
 #
@@ -18,7 +18,7 @@ name="rbldns"
 : ${rbldns_datalimit:="250000"}
 : ${rbldns_log:="YES"}
 : ${rbldns_logcmd:="logger -t nb${name} -p daemon.info"}
-: ${rbldns_nologcmd:="@DAEMONTOOLS_PREFIX@/bin/multilog -*"}
+: ${rbldns_nologcmd:="@PREFIX@/bin/multilog -*"}
 
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
@@ -26,7 +26,7 @@ fi
 
 rcvar=${name}
 required_files="@PKG_SYSCONFDIR@/rbldns/data.cdb"
-command="@DJBDNS_PREFIX@/bin/${name}"
+command="@PREFIX@/bin/${name}"
 start_precmd="rbldns_precmd"
 extra_commands="reload cdb"
 reload_cmd="rbldns_cdb"; cdb_cmd=${reload_cmd}
@@ -36,7 +36,7 @@ rbldns_precmd()
 	if [ -f /etc/rc.subr ]; then
 		checkyesno rbldns_log || rbldns_logcmd=${rbldns_nologcmd}
 	fi
-	command="@SETENV@ - ${rbldns_postenv} ROOT=@PKG_SYSCONFDIR@/rbldns IP=${rbldns_ip} BASE=${rbldns_base} @DAEMONTOOLS_PREFIX@/bin/envuidgid rbldns @DAEMONTOOLS_PREFIX@/bin/softlimit -d ${rbldns_datalimit} @DJBDNS_PREFIX@/bin/rbldns 2>&1 | @DAEMONTOOLS_PREFIX@/bin/setuidgid dnslog ${rbldns_logcmd}"
+	command="@SETENV@ - ${rbldns_postenv} ROOT=@PKG_SYSCONFDIR@/rbldns IP=${rbldns_ip} BASE=${rbldns_base} @PREFIX@/bin/envuidgid rbldns @PREFIX@/bin/softlimit -d ${rbldns_datalimit} @PREFIX@/bin/rbldns 2>&1 | @PREFIX@/bin/setuidgid dnslog ${rbldns_logcmd}"
 	command_args="&"
 	rc_flags=""
 }
@@ -45,7 +45,7 @@ rbldns_cdb()
 {
 	@ECHO@ "Reloading @PKG_SYSCONFDIR@/rbldns/data."
 	cd @PKG_SYSCONFDIR@/rbldns
-	@DJBDNS_PREFIX@/bin/rbldns-data
+	@PREFIX@/bin/rbldns-data
 }
 
 if [ -f /etc/rc.subr ]; then
diff --git a/net/djbdns-run/files/tinydns.sh b/net/djbdns-run/files/tinydns.sh
index b02f3dbd2f5..e2df8586a78 100644
--- a/net/djbdns-run/files/tinydns.sh
+++ b/net/djbdns-run/files/tinydns.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: tinydns.sh,v 1.6 2014/12/07 04:33:31 schmonz Exp $
+# $NetBSD: tinydns.sh,v 1.7 2015/11/25 12:52:12 jperkin Exp $
 #
 # @PKGNAME@ script to control tinydns (authoritative DNS service)
 #
@@ -17,7 +17,7 @@ name="tinydns"
 : ${tinydns_datalimit:="300000"}
 : ${tinydns_log:="YES"}
 : ${tinydns_logcmd:="logger -t nb${name} -p daemon.info"}
-: ${tinydns_nologcmd:="@DAEMONTOOLS_PREFIX@/bin/multilog -*"}
+: ${tinydns_nologcmd:="@PREFIX@/bin/multilog -*"}
 
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
@@ -25,7 +25,7 @@ fi
 
 rcvar=${name}
 required_files="@PKG_SYSCONFDIR@/tinydns/data.cdb"
-command="@DJBDNS_PREFIX@/bin/${name}"
+command="@PREFIX@/bin/${name}"
 start_precmd="tinydns_precmd"
 extra_commands="reload cdb"
 reload_cmd="tinydns_cdb"; cdb_cmd=${reload_cmd}
@@ -35,7 +35,7 @@ tinydns_precmd()
 	if [ -f /etc/rc.subr ]; then
 		checkyesno tinydns_log || tinydns_logcmd=${tinydns_nologcmd}
 	fi
-	command="@SETENV@ - ${tinydns_postenv} ROOT=@PKG_SYSCONFDIR@/tinydns IP=${tinydns_ip} @DAEMONTOOLS_PREFIX@/bin/envuidgid tinydns @DAEMONTOOLS_PREFIX@/bin/softlimit -d ${tinydns_datalimit} @DJBDNS_PREFIX@/bin/tinydns </dev/null 2>&1 | @DAEMONTOOLS_PREFIX@/bin/setuidgid dnslog ${tinydns_logcmd}"
+	command="@SETENV@ - ${tinydns_postenv} ROOT=@PKG_SYSCONFDIR@/tinydns IP=${tinydns_ip} @PREFIX@/bin/envuidgid tinydns @PREFIX@/bin/softlimit -d ${tinydns_datalimit} @PREFIX@/bin/tinydns </dev/null 2>&1 | @PREFIX@/bin/setuidgid dnslog ${tinydns_logcmd}"
 	command_args="&"
 	rc_flags=""
 }
@@ -44,7 +44,7 @@ tinydns_cdb()
 {
 	@ECHO@ "Reloading @PKG_SYSCONFDIR@/tinydns/data."
 	cd @PKG_SYSCONFDIR@/tinydns
-	@DJBDNS_PREFIX@/bin/tinydns-data
+	@PREFIX@/bin/tinydns-data
 }
 
 if [ -f /etc/rc.subr ]; then
diff --git a/net/publicfile-run/Makefile b/net/publicfile-run/Makefile
index bdb3d5b3d35..b2682246297 100644
--- a/net/publicfile-run/Makefile
+++ b/net/publicfile-run/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/01/27 23:01:31 schmonz Exp $
+# $NetBSD: Makefile,v 1.2 2015/11/25 12:52:12 jperkin Exp $
 
 DISTNAME=		publicfile-run-20150109
 CATEGORIES=		net
@@ -26,20 +26,13 @@ RCD_SCRIPTS=		pubfile pubftpd pubhttpd
 
 MESSAGE_SUBST+=		VARBASE=${VARBASE:Q}
 
-EVAL_PREFIX+=		DAEMONTOOLS_PREFIX=daemontools
-EVAL_PREFIX+=		PUBLICFILE_PREFIX=publicfile
-EVAL_PREFIX+=		UCSPI_TCP_PREFIX=ucspi-tcp
-
 FILES_SUBST+=		PKGNAME=${PKGNAME:Q}
-FILES_SUBST+=		DAEMONTOOLS_PREFIX=${DAEMONTOOLS_PREFIX:Q}
-FILES_SUBST+=		PUBLICFILE_PREFIX=${PUBLICFILE_PREFIX:Q}
-FILES_SUBST+=		UCSPI_TCP_PREFIX=${UCSPI_TCP_PREFIX:Q}
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Substituting paths.
 SUBST_STAGE.paths=	post-patch
 SUBST_FILES.paths=	libexec-pubftpd
-SUBST_VARS.paths=	UCSPI_TCP_PREFIX
+SUBST_VARS.paths=	PREFIX
 
 BUILD_DEFS+=		VARBASE
 
diff --git a/net/publicfile-run/files/libexec-pubftpd.sh b/net/publicfile-run/files/libexec-pubftpd.sh
index 8680ad4e1d8..20832b113dc 100644
--- a/net/publicfile-run/files/libexec-pubftpd.sh
+++ b/net/publicfile-run/files/libexec-pubftpd.sh
@@ -11,6 +11,6 @@
 # constructed command.
 #
 
-exec @UCSPI_TCP_PREFIX@/bin/argv0 @UCSPI_TCP_PREFIX@/bin/tcpserver pubftpd \
+exec @PREFIX@/bin/argv0 @PREFIX@/bin/tcpserver pubftpd \
 -B'220 Features: a p .

 ' "$@"
diff --git a/net/publicfile-run/files/pubftpd.sh b/net/publicfile-run/files/pubftpd.sh
index 252b13917b0..9d0f228f857 100644
--- a/net/publicfile-run/files/pubftpd.sh
+++ b/net/publicfile-run/files/pubftpd.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: pubftpd.sh,v 1.1 2015/01/27 23:01:31 schmonz Exp $
+# $NetBSD: pubftpd.sh,v 1.2 2015/11/25 12:52:12 jperkin Exp $
 #
 # @PKGNAME@ script to control publicfile ftpd (FTP server)
 #
@@ -22,7 +22,7 @@ name="pubftpd"
 : ${pubftpd_port:="21"}
 : ${pubftpd_log:="YES"}
 : ${pubftpd_logcmd:="logger -t nb${name} -p ftp.info"}
-: ${pubftpd_nologcmd:="@DAEMONTOOLS_PREFIX@/bin/multilog -*"}
+: ${pubftpd_nologcmd:="@PREFIX@/bin/multilog -*"}
 
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
@@ -39,7 +39,7 @@ pubftpd_precmd()
 	if [ -f /etc/rc.subr ]; then
 		checkyesno pubftpd_log || pubftpd_logcmd=${pubftpd_nologcmd}
 	fi
- 	command="@SETENV@ - ${pubftpd_postenv} @DAEMONTOOLS_PREFIX@/bin/envuidgid pubftp @DAEMONTOOLS_PREFIX@/bin/softlimit -o20 -d${pubftpd_datalimit} @PREFIX@/libexec/pubftpd -vDRH -l${pubftpd_localname} -b${pubftpd_backlog} -c${pubftpd_conlimit} ${pubftpd_host} ${pubftpd_port} @PUBLICFILE_PREFIX@/publicfile/bin/ftpd ${pubftpd_root} 2>&1 | @DAEMONTOOLS_PREFIX@/bin/setuidgid publog ${pubftpd_logcmd}"
+ 	command="@SETENV@ - ${pubftpd_postenv} @PREFIX@/bin/envuidgid pubftp @PREFIX@/bin/softlimit -o20 -d${pubftpd_datalimit} @PREFIX@/libexec/pubftpd -vDRH -l${pubftpd_localname} -b${pubftpd_backlog} -c${pubftpd_conlimit} ${pubftpd_host} ${pubftpd_port} @PREFIX@/publicfile/bin/ftpd ${pubftpd_root} 2>&1 | @PREFIX@/bin/setuidgid publog ${pubftpd_logcmd}"
 	command_args="&"
 	rc_flags=""
 }
diff --git a/net/publicfile-run/files/pubhttpd.sh b/net/publicfile-run/files/pubhttpd.sh
index 769a4764000..e84db08ea9d 100644
--- a/net/publicfile-run/files/pubhttpd.sh
+++ b/net/publicfile-run/files/pubhttpd.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: pubhttpd.sh,v 1.1 2015/01/27 23:01:31 schmonz Exp $
+# $NetBSD: pubhttpd.sh,v 1.2 2015/11/25 12:52:12 jperkin Exp $
 #
 # @PKGNAME@ script to control publicfile httpd (HTTP server)
 #
@@ -22,7 +22,7 @@ name="pubhttpd"
 : ${pubhttpd_port:="80"}
 : ${pubhttpd_log:="YES"}
 : ${pubhttpd_logcmd:="logger -t nb${name} -p ftp.info"}
-: ${pubhttpd_nologcmd:="@DAEMONTOOLS_PREFIX@/bin/multilog -*"}
+: ${pubhttpd_nologcmd:="@PREFIX@/bin/multilog -*"}
 
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
@@ -30,7 +30,7 @@ fi
 
 rcvar=${name}
 required_dirs="${pubhttpd_root}"
-command="@UCSPI_TCP_PREFIX@/bin/tcpserver"
+command="@PREFIX@/bin/tcpserver"
 procname=${name}
 start_precmd="pubhttpd_precmd"
 
@@ -42,7 +42,7 @@ pubhttpd_precmd()
 	if [ -f /etc/rc.subr ]; then
 		checkyesno pubhttpd_log || pubhttpd_logcmd=${pubhttpd_nologcmd}
 	fi
- 	command="@SETENV@ - ${pubhttpd_postenv} @DAEMONTOOLS_PREFIX@/bin/envuidgid pubhttp @DAEMONTOOLS_PREFIX@/bin/softlimit -o20 -d${pubhttpd_datalimit} @UCSPI_TCP_PREFIX@/bin/argv0 @UCSPI_TCP_PREFIX@/bin/tcpserver ${name} -vDRH -l${pubhttpd_localname} -b${pubhttpd_backlog} -c${pubhttpd_conlimit} ${pubhttpd_host} ${pubhttpd_port} @PUBLICFILE_PREFIX@/publicfile/bin/httpd ${pubhttpd_root} 2>&1 | @DAEMONTOOLS_PREFIX@/bin/setuidgid publog ${pubhttpd_logcmd}"
+ 	command="@SETENV@ - ${pubhttpd_postenv} @PREFIX@/bin/envuidgid pubhttp @PREFIX@/bin/softlimit -o20 -d${pubhttpd_datalimit} @PREFIX@/bin/argv0 @PREFIX@/bin/tcpserver ${name} -vDRH -l${pubhttpd_localname} -b${pubhttpd_backlog} -c${pubhttpd_conlimit} ${pubhttpd_host} ${pubhttpd_port} @PREFIX@/publicfile/bin/httpd ${pubhttpd_root} 2>&1 | @PREFIX@/bin/setuidgid publog ${pubhttpd_logcmd}"
 	command_args="&"
 	rc_flags=""
 }
diff --git a/net/xymon/Makefile b/net/xymon/Makefile
index af664316eb6..a9c6c5f2c59 100644
--- a/net/xymon/Makefile
+++ b/net/xymon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2015/04/25 14:23:48 tnn Exp $
+# $NetBSD: Makefile,v 1.43 2015/11/25 12:52:12 jperkin Exp $
 #
 
 DISTNAME=		xymon-4.3.17
@@ -90,15 +90,13 @@ MESSAGE_SUBST+=		DESTDIR=${DESTDIR}
 MESSAGE_SUBST+=		EXAMPLEDIR=${EXAMPLEDIR}
 MESSAGE_SUBST+=		SECCGIDIR=${SECCGIDIR}
 
-EVAL_PREFIX+=		PREFIX.fping=fping
-
 CONFIGURE_ARGS+=	"--server"
 CONFIGURE_ARGS+=	"--rrdinclude" "${BUILDLINK_PREFIX.rrdtool}/include"
 CONFIGURE_ARGS+=	"--rrdlib" "${BUILDLINK_PREFIX.rrdtool}/lib"
 CONFIGURE_ARGS+=	"--pngconfig" "${BUILDLINK_PREFIX.png}/bin/libpng-config"
 CONFIGURE_ARGS+=	"--pcreinclude" "${BUILDLINK_PREFIX.pcre}/include"
 CONFIGURE_ARGS+=	"--pcrelib" "${BUILDLINK_PREFIX.pcre}/lib"
-CONFIGURE_ARGS+=	"--fping" "${PREFIX.fping}/sbin/fping"
+CONFIGURE_ARGS+=	"--fping" "${LOCALBASE}/sbin/fping"
 
 CONFIGURE_ENV+=		USEXYMONPING=n
 CONFIGURE_ENV+=		XYMONHOSTNAME=${XYMONSERVERNAME:Q}