Fix inappropriate uses of ${LOCALBASE} or ${X11PREFIX} instead of

${PREFIX}.

7 files changed, 14 insertions, 14 deletions

diff --git a/net/chrony/Makefile b/net/chrony/Makefile
index 845b0af6610..cc78ae8c350 100644
--- a/net/chrony/Makefile
+++ b/net/chrony/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:23 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/06/17 04:49:47 jlam Exp $
 
 DISTNAME=	chrony-1.20
 PKGREVISION=	1
@@ -14,7 +14,7 @@ USE_TOOLS+=		gmake
 HAS_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 
-EGDIR=			${LOCALBASE}/share/examples/chrony
+EGDIR=			${PREFIX}/share/examples/chrony
 EGFILES=		chrony.conf.example chrony.keys.example
 RCD_SCRIPTS=		chronyd
 
diff --git a/net/firewalk/Makefile b/net/firewalk/Makefile
index 615358e12cd..b7a52f08f54 100644
--- a/net/firewalk/Makefile
+++ b/net/firewalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:46 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/06/17 04:49:47 jlam Exp $
 
 DISTNAME=	firewalk-5.0
 CATEGORIES=	net security
@@ -15,7 +15,7 @@ CONFIGURE_ENV+=	CFLAGS=-I${LOCALBASE}/include
 
 BUILDLINK_DEPENDS.libnet+=	libnet-1.1.*
 
-MAKE_ENV+=	FIREWALK_LOC=${LOCALBASE}
+MAKE_ENV+=	FIREWALK_LOC=${PREFIX}
 
 .include "../../devel/libnet11/buildlink3.mk"
 .include "../../net/libdnet/buildlink3.mk"
diff --git a/net/fping/Makefile b/net/fping/Makefile
index 01af658f19f..15da99e2a85 100644
--- a/net/fping/Makefile
+++ b/net/fping/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/03/24 21:12:58 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/06/17 04:49:47 jlam Exp $
 
 DISTNAME=	fping-2.4b2_to
 PKGNAME=	fping-2.4b2
@@ -13,6 +13,6 @@ COMMENT=	Quickly ping many hosts w/o flooding the network
 GNU_CONFIGURE=	YES
 
 post-install:
-	${CHMOD} 4555 ${LOCALBASE}/sbin/fping
+	${CHMOD} 4555 ${PREFIX}/sbin/fping
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/fping6/Makefile b/net/fping6/Makefile
index cd50f645492..9a8ee8191cd 100644
--- a/net/fping6/Makefile
+++ b/net/fping6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/07/17 22:51:10 grant Exp $
+# $NetBSD: Makefile,v 1.3 2005/06/17 04:49:47 jlam Exp $
 
 DISTNAME=	fping-2.4b2_to-ipv6
 PKGNAME=	fping6-2.4b2
@@ -15,6 +15,6 @@ post-patch:
 	@${MV} ${WRKSRC}/fping.8 ${WRKSRC}/fping6.8
 
 post-install:
-	${CHMOD} 4555 ${LOCALBASE}/sbin/fping6
+	${CHMOD} 4555 ${PREFIX}/sbin/fping6
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index ff3d9877720..3ba7dddcca8 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/05/22 20:08:25 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2005/06/17 04:49:47 jlam Exp $
 
 DISTNAME=	ntop-3.1
 PKGREVISION=	3
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/share/ntop
 CONFIGURE_ARGS+=	--with-gd-root=${BUILDLINK_PREFIX.gd}
 CONFIGURE_ARGS+=	--with-gdbm-root=${BUILDLINK_PREFIX.gdbm}
 CONFIGURE_ARGS+=	--with-gdchart-root=${BUILDLINK_PREFIX.gdchart}
-CONFIGURE_ARGS+=	--with-localedir=${LOCALBASE}/${PKGLOCALEDIR}
+CONFIGURE_ARGS+=	--with-localedir=${PREFIX}/${PKGLOCALEDIR}
 CONFIGURE_ARGS+=	--with-libpng-root=${BUILDLINK_PREFIX.png}
 CONFIGURE_ARGS+=	--with-ossl-root=${BUILDLINK_PREFIX.openssl}
 CONFIGURE_ARGS+=	--with-pcap-root=${BUILDLINK_PREFIX.libpcap}
diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
index bbb2bc27f8c..5ad75e68ea3 100644
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/06/12 05:26:47 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/06/17 04:49:47 jlam Exp $
 #
 
 DISTNAME=		tightvnc-1.2.9
@@ -36,7 +36,7 @@ post-install:
 	    ${PREFIX}/bin/vncpasswd
 	${INSTALL_MAN} ${WRKSRC}/vncpasswd/vncpasswd.man \
 	    ${PREFIX}/man/man1/vncpasswd.1
-	${SED} -e 's|/usr/local/vnc/classes|${X11PREFIX}/share/vnc/classes|g' \
+	${SED} -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g' \
 		-e 's|/usr/bin/perl|${PERL5}|g' \
 		< ${WRKSRC}/vncserver \
 		> ${WRKSRC}/vncserver.local
diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index a3b8bc13544..a54a474da7d 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/04/18 13:23:13 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2005/06/17 04:49:47 jlam Exp $
 
 DISTNAME=		vnc-3.3.3r2
 PKGNAME=		vnc-3.3.3.2
@@ -42,7 +42,7 @@ post-install:
 .endif
 	${INSTALL_PROGRAM} ${WRKSRC}/vncconnect/vncconnect ${PREFIX}/bin/vncconnect
 	${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd ${PREFIX}/bin/vncpasswd
-	${SED} -e 's|/usr/local/vnc/classes|${X11PREFIX}/share/vnc/classes|g' \
+	${SED} -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g' \
 		-e 's|/usr/bin/perl|${PERL5}|g' \
 		< ${WRKSRC}/vncserver \
 		> ${WRKSRC}/vncserver.local