- Remove the DESTDIR modifications from individual ports as we have a new,

  fully chrooted DESTDIR, which does not need such any more.

Sponsored by:	Google Summer of Code 2007
Approved by:	portmgr (pav)

9 files changed, 25 insertions, 25 deletions

diff --git a/net-mgmt/argus-clients/Makefile b/net-mgmt/argus-clients/Makefile
index eaf3b84572ce..89d0c775f3df 100644
--- a/net-mgmt/argus-clients/Makefile
+++ b/net-mgmt/argus-clients/Makefile
@@ -26,8 +26,8 @@ CONFIGURE_ARGS+= --with-sasl=${PREFIX}
 CFLAGS+=	-I${PREFIX}/include/sasl
 .endif
 
-DOCSDIR?=	${TARGETDIR}/share/doc/argus-2.0
-EXAMPLESDIR?=	${TARGETDIR}/share/examples/argus-2.0
+DOCSDIR?=	${PREFIX}/share/doc/argus-2.0
+EXAMPLESDIR?=	${PREFIX}/share/examples/argus-2.0
 
 MAN1=	ra.1 racount.1 ragator.1 rahosts.1 ramon.1 ranonymize.1 rapolicy.1 \
 	rasort.1 rastrip.1 raxml.1
@@ -37,20 +37,20 @@ do-install:
 .for i in ra racount ragator ragrep rahistogram rahosts \
 		ramon ranonymize rapath rapolicy rarpwatch raseq \
 		rasort rasrvstats rastrip ratop raxml
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/$i ${TARGETDIR}/bin/$i
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/$i ${PREFIX}/bin/$i
 .endfor
 .for i in argusbug ragraph
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/$i ${TARGETDIR}/bin/$i
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/$i ${PREFIX}/bin/$i
 .endfor
 .for i in argus_client.a argus_common.a argus_parse.a
-	${INSTALL_DATA} ${WRKSRC}/lib/$i ${TARGETDIR}/lib/$i
+	${INSTALL_DATA} ${WRKSRC}/lib/$i ${PREFIX}/lib/$i
 .endfor
-	${MKDIR} ${TARGETDIR}/argus/archive
-	${INSTALL_DATA} ${WRKSRC}/README ${TARGETDIR}/argus
-	${INSTALL_DATA} ${WRKSRC}/COPYING ${TARGETDIR}/argus
-	${MKDIR} ${TARGETDIR}/include
-	${INSTALL_DATA} ${WRKSRC}/include/cons_def.h ${TARGETDIR}/include
-	${INSTALL_DATA} ${WRKSRC}/include/cons_out.h ${TARGETDIR}/include
+	${MKDIR} ${PREFIX}/argus/archive
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/argus
+	${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/argus
+	${MKDIR} ${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/include/cons_def.h ${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/include/cons_out.h ${PREFIX}/include
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/support/README ${EXAMPLESDIR}
 .for i in Archive Config System Tools Xml
@@ -70,10 +70,10 @@ do-install:
 .endif
 .if !defined(NOMAN)
 .for i in ${MAN1}
-	${INSTALL_DATA} ${WRKSRC}/man/man1/$i ${TARGETDIR}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/man/man1/$i ${PREFIX}/man/man1
 .endfor
 .for i in ${MAN5}
-	${INSTALL_DATA} ${WRKSRC}/man/man5/$i ${TARGETDIR}/man/man5
+	${INSTALL_DATA} ${WRKSRC}/man/man5/$i ${PREFIX}/man/man5
 .endfor
 .endif
 
diff --git a/net-mgmt/argus/Makefile b/net-mgmt/argus/Makefile
index f71910be0aeb..adba7210193a 100644
--- a/net-mgmt/argus/Makefile
+++ b/net-mgmt/argus/Makefile
@@ -26,14 +26,14 @@ CONFIGURE_ARGS=	--exec-prefix=${PREFIX}
 CONFIGURE_ARGS+= --with-sasl=${PREFIX}
 .endif
 
-DOCSDIR?=       ${TARGETDIR}/share/doc/argus-2.0
+DOCSDIR?=       ${PREFIX}/share/doc/argus-2.0
 
 MAN5=		argus.5 argus.conf.5
 MAN8=		argus.8
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/argus_bpf ${TARGETDIR}/sbin/argus
-	${MKDIR} ${TARGETDIR}/argus/archive
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/argus_bpf ${PREFIX}/sbin/argus
+	${MKDIR} ${PREFIX}/argus/archive
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}/html/man
 .for i in  doc/html/man/*.html
@@ -42,10 +42,10 @@ do-install:
 .endif
 .if !defined(NOMAN)
 .for i in ${MAN5}
-	${INSTALL_DATA} ${WRKSRC}/man/man5/$i ${TARGETDIR}/man/man5
+	${INSTALL_DATA} ${WRKSRC}/man/man5/$i ${PREFIX}/man/man5
 .endfor
 .for i in ${MAN8}
-	${INSTALL_DATA} ${WRKSRC}/man/man8/$i ${TARGETDIR}/man/man8
+	${INSTALL_DATA} ${WRKSRC}/man/man8/$i ${PREFIX}/man/man8
 .endfor
 .endif
 
diff --git a/net-mgmt/flow-tools/Makefile b/net-mgmt/flow-tools/Makefile
index 89719fcd7a59..7b3b49618d02 100644
--- a/net-mgmt/flow-tools/Makefile
+++ b/net-mgmt/flow-tools/Makefile
@@ -35,7 +35,7 @@ SUB_LIST=	FLOW_CAPTURE_SPOOL="${FLOW_CAPTURE_SPOOL}" \
 		FLOW_CAPTURE_PIDDIR="${FLOW_CAPTURE_PIDDIR}"
 USE_RC_SUBR=	flow_capture flow_fanout
 
-VARDIR?=		${DESTDIR}/var
+VARDIR?=		/var
 FLOW_CAPTURE_SPOOL=	${VARDIR}/db/flows
 FLOW_CAPTURE_USER=	flowtools
 FLOW_CAPTURE_GROUP=	flowtools
diff --git a/net-mgmt/flowd/Makefile b/net-mgmt/flowd/Makefile
index 0ee415824a1f..a636d9880773 100644
--- a/net-mgmt/flowd/Makefile
+++ b/net-mgmt/flowd/Makefile
@@ -24,7 +24,7 @@ FLOWD_USER?=	_flowd
 .if defined(WITH_PERL)
 USE_PERL5=	yes
 PLIST_SUB+=	WITH_PERL=""
-#MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
+#MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 #MAN3=		Flowd.3
 .else
 PLIST_SUB+=	WITH_PERL="@comment "
diff --git a/net-mgmt/nedi/Makefile b/net-mgmt/nedi/Makefile
index 42990d355d3b..1fc8c7413099 100644
--- a/net-mgmt/nedi/Makefile
+++ b/net-mgmt/nedi/Makefile
@@ -29,7 +29,7 @@ NO_BUILD=	yes
 # after pre.mk. The solution is to set them by ourselves.
 OPTIONS=	GD "Use GD" OFF
 
-PORT_DBDIR?=	${DESTDIR}/var/db/ports
+PORT_DBDIR?=	/var/db/ports
 LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
 OPTIONSFILE?=	${PORT_DBDIR}/${LATEST_LINK}/options
 
diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile
index 1dedd9da65e9..663eb9417205 100644
--- a/net-mgmt/net-snmp-devel/Makefile
+++ b/net-mgmt/net-snmp-devel/Makefile
@@ -155,7 +155,7 @@ MAN3PERL=	NetSNMP::ASN.3 NetSNMP::OID.3 NetSNMP::agent.3 \
 		NetSNMP::agent::default_store.3 \
 		NetSNMP::default_store.3 \
 		NetSNMP::netsnmp_request_infoPtr.3 SNMP.3
-MAN3PERLPREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
+MAN3PERLPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 _MANPAGES+=	${MAN3PERL:S%^%${MAN3PERLPREFIX}/man/man3/%}
 .endif
 
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index 1dedd9da65e9..663eb9417205 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -155,7 +155,7 @@ MAN3PERL=	NetSNMP::ASN.3 NetSNMP::OID.3 NetSNMP::agent.3 \
 		NetSNMP::agent::default_store.3 \
 		NetSNMP::default_store.3 \
 		NetSNMP::netsnmp_request_infoPtr.3 SNMP.3
-MAN3PERLPREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
+MAN3PERLPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 _MANPAGES+=	${MAN3PERL:S%^%${MAN3PERLPREFIX}/man/man3/%}
 .endif
 
diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile
index 1dedd9da65e9..663eb9417205 100644
--- a/net-mgmt/net-snmp53/Makefile
+++ b/net-mgmt/net-snmp53/Makefile
@@ -155,7 +155,7 @@ MAN3PERL=	NetSNMP::ASN.3 NetSNMP::OID.3 NetSNMP::agent.3 \
 		NetSNMP::agent::default_store.3 \
 		NetSNMP::default_store.3 \
 		NetSNMP::netsnmp_request_infoPtr.3 SNMP.3
-MAN3PERLPREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
+MAN3PERLPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 _MANPAGES+=	${MAN3PERL:S%^%${MAN3PERLPREFIX}/man/man3/%}
 .endif
 
diff --git a/net-mgmt/nocol/Makefile b/net-mgmt/nocol/Makefile
index ecf2412eac32..7fada71630e5 100644
--- a/net-mgmt/nocol/Makefile
+++ b/net-mgmt/nocol/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.netplex-tech.com/software/downloads/nocol/
 MAINTAINER=	nivo+kw+ports.bfa274@is-root.com
 COMMENT=	Network/Service monitoring software
 
-MANPREFIX=	${TARGETDIR}/nocol/
+MANPREFIX=	${PREFIX}/nocol/
 MAN1=		netconsole.1
 MAN3=		nocol-prog.3 perlnocol.3
 MAN8=		etherload.8 eventselect.8 genmon.8 multiping.8 noclogd.8 \