- 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)

14 files changed, 20 insertions, 20 deletions

diff --git a/databases/p5-postgresql-plperl/Makefile b/databases/p5-postgresql-plperl/Makefile
index f523742..443e884 100644
--- a/databases/p5-postgresql-plperl/Makefile
+++ b/databases/p5-postgresql-plperl/Makefile
@@ -21,7 +21,7 @@ DEFAULT_PGSQL_VER?=74
 
 # can't include <bsd.port.pre.mk> in a slave port
 # so set these instead:
-LOCALBASE?=	${DESTDIR}/usr/local
+LOCALBASE?=	/usr/local
 SED?=		/usr/bin/sed
 
 # Setting/finding PostgreSQL version we want.
diff --git a/databases/p5-sqlrelay/Makefile b/databases/p5-sqlrelay/Makefile
index 23e9cbb..787b37c 100644
--- a/databases/p5-sqlrelay/Makefile
+++ b/databases/p5-sqlrelay/Makefile
@@ -32,7 +32,7 @@ CONFIGURE_ARGS=	${SQLRELAY_CONFIGURE_ARGS} \
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		${SQLRELAY_CONFIGURE_ENV}
 
-MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		DBD::SQLRelay.3 SQLRelay::Connection.3 SQLRelay::Cursor.3
 
 .include "${.CURDIR}/../sqlrelay/Makefile.common"
diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index a326c57..06625a4 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -58,7 +58,7 @@ OPTIONS=	BZ2	 "bzip2 library support" on \
 		MCRYPT   "MCrypt library support" on \
 		MBSTRING "Multi-byte character-set string support" on
 
-PORT_DBDIR?=	${DESTDIR}/var/db/ports
+PORT_DBDIR?=	/var/db/ports
 LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
 OPTIONSFILE?=	${PORT_DBDIR}/${LATEST_LINK}/options
 
@@ -137,7 +137,7 @@ do-install: install-app install-conf
 install-app:
 	cd ${WRKSRC} ; \
 	for src in $$( ${FIND} . ! -name .cvsignore ) ; do \
-	    dst=${TARGETDIR}/${MYADMDIR}$${src#.} ; \
+	    dst=${PREFIX}/${MYADMDIR}$${src#.} ; \
 	    if ${TEST} -d $$src ; then \
 	        ${MKDIR} $$dst ; \
 	    else \
@@ -146,7 +146,7 @@ install-app:
 	done
 
 install-conf: install-app
-	cd ${TARGETDIR}/${MYADMDIR} ; \
+	cd ${PREFIX}/${MYADMDIR} ; \
 	${CHMOD} 0640 ${CFGFILE}.sample ; \
 	${CHGRP} ${MYADMGRP} ${CFGFILE}.sample ; \
 	if ${TEST} ! -f ${CFGFILE} ; then \
diff --git a/databases/phpmyadmin211/Makefile b/databases/phpmyadmin211/Makefile
index a326c57..06625a4 100644
--- a/databases/phpmyadmin211/Makefile
+++ b/databases/phpmyadmin211/Makefile
@@ -58,7 +58,7 @@ OPTIONS=	BZ2	 "bzip2 library support" on \
 		MCRYPT   "MCrypt library support" on \
 		MBSTRING "Multi-byte character-set string support" on
 
-PORT_DBDIR?=	${DESTDIR}/var/db/ports
+PORT_DBDIR?=	/var/db/ports
 LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
 OPTIONSFILE?=	${PORT_DBDIR}/${LATEST_LINK}/options
 
@@ -137,7 +137,7 @@ do-install: install-app install-conf
 install-app:
 	cd ${WRKSRC} ; \
 	for src in $$( ${FIND} . ! -name .cvsignore ) ; do \
-	    dst=${TARGETDIR}/${MYADMDIR}$${src#.} ; \
+	    dst=${PREFIX}/${MYADMDIR}$${src#.} ; \
 	    if ${TEST} -d $$src ; then \
 	        ${MKDIR} $$dst ; \
 	    else \
@@ -146,7 +146,7 @@ install-app:
 	done
 
 install-conf: install-app
-	cd ${TARGETDIR}/${MYADMDIR} ; \
+	cd ${PREFIX}/${MYADMDIR} ; \
 	${CHMOD} 0640 ${CFGFILE}.sample ; \
 	${CHGRP} ${MYADMGRP} ${CFGFILE}.sample ; \
 	if ${TEST} ! -f ${CFGFILE} ; then \
diff --git a/databases/phppgadmin/Makefile b/databases/phppgadmin/Makefile
index 97ee6c9..3baea33 100644
--- a/databases/phppgadmin/Makefile
+++ b/databases/phppgadmin/Makefile
@@ -41,8 +41,8 @@ do-install:
 	${MKDIR} ${PREFIX}/${PGADMDIR}
 	${RM} -f ${WRKSRC}/classes/database/Postgres81.php.orig
 	${CP} -Rp ${WRKSRC}/ ${PREFIX}/${PGADMDIR}/
-.if exists(${DESTDIR}${PREFIX}/${PGADMOLDDIR}/conf/config.inc.php)
-	${CP} -np ${DESTDIR}${PREFIX}/${PGADMOLDDIR}/conf/config.inc.php \
+.if exists(${PREFIX}/${PGADMOLDDIR}/conf/config.inc.php)
+	${CP} -np ${PREFIX}/${PGADMOLDDIR}/conf/config.inc.php \
 		${PREFIX}/${PGADMDIR}/conf/config.inc.php
 .endif
 	${CP} -np ${PREFIX}/${PGADMDIR}/conf/config.inc.php-dist \
diff --git a/databases/postgresql-contrib/Makefile b/databases/postgresql-contrib/Makefile
index 5332c8d..dad2ae0 100644
--- a/databases/postgresql-contrib/Makefile
+++ b/databases/postgresql-contrib/Makefile
@@ -20,7 +20,7 @@ DEFAULT_PGSQL_VER?=81
 
 # can't include <bsd.port.pre.mk> in a slave port
 # so set these instead:
-LOCALBASE?=	${DESTDIR}/usr/local
+LOCALBASE?=	/usr/local
 SED?=		/usr/bin/sed
 
 # Setting/finding PostgreSQL version we want.
diff --git a/databases/postgresql-docs/Makefile b/databases/postgresql-docs/Makefile
index a2ee5df..3d62ba6 100644
--- a/databases/postgresql-docs/Makefile
+++ b/databases/postgresql-docs/Makefile
@@ -18,7 +18,7 @@ DEFAULT_PGSQL_VER?=74
 
 # can't include <bsd.port.pre.mk> in a slave port
 # so set these instead:
-LOCALBASE?=	${DESTDIR}/usr/local
+LOCALBASE?=	/usr/local
 SED?=		/usr/bin/sed
 
 # Setting/finding PostgreSQL version we want.
diff --git a/databases/postgresql-plpython/Makefile b/databases/postgresql-plpython/Makefile
index 2521a1a..073f5e5 100644
--- a/databases/postgresql-plpython/Makefile
+++ b/databases/postgresql-plpython/Makefile
@@ -21,7 +21,7 @@ DEFAULT_PGSQL_VER?=74
 
 # can't include <bsd.port.pre.mk> in a slave port
 # so set these instead:
-LOCALBASE?=	${DESTDIR}/usr/local
+LOCALBASE?=	/usr/local
 SED?=		/usr/bin/sed
 
 # Setting/finding PostgreSQL version we want.
diff --git a/databases/postgresql-pltcl/Makefile b/databases/postgresql-pltcl/Makefile
index e2441f9..1584907 100644
--- a/databases/postgresql-pltcl/Makefile
+++ b/databases/postgresql-pltcl/Makefile
@@ -22,7 +22,7 @@ DEFAULT_PGSQL_VER?=74
 
 # can't include <bsd.port.pre.mk> in a slave port
 # so set these instead:
-LOCALBASE?=	${DESTDIR}/usr/local
+LOCALBASE?=	/usr/local
 SED?=		/usr/bin/sed
 
 # Setting/finding PostgreSQL version we want.
diff --git a/databases/py-bsddb3/Makefile b/databases/py-bsddb3/Makefile
index f1581ac..25a60ca 100644
--- a/databases/py-bsddb3/Makefile
+++ b/databases/py-bsddb3/Makefile
@@ -23,7 +23,7 @@ PYDISTUTILS_BUILDARGS=	--libs="-l${BDB_LIB_NAME}" --berkeley-db=${LOCALBASE}
 PYDISTUTILS_INSTALLARGS=-c -O1 --prefix=${PREFIX} --berkeley-db=${LOCALBASE}
 
 PORTDOCS=	*
-DOCSDIR=	${TARGETDIR}/share/doc/py-${PORTNAME}
+DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 
 post-patch:
 	${REINPLACE_CMD} 's,%%DBVERSION%%,${BDB_LIB_NAME},g' ${WRKSRC}/setup.py
diff --git a/databases/py-dbutils/Makefile b/databases/py-dbutils/Makefile
index 0c57f22..f1a398f 100644
--- a/databases/py-dbutils/Makefile
+++ b/databases/py-dbutils/Makefile
@@ -20,7 +20,7 @@ USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 PYDISTUTILS_PKGNAME=	DBUtils
 
-DOCSDIR=	${TARGETDIR}/share/doc/py-${PORTNAME}
+DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/databases/py-psycopg2/Makefile b/databases/py-psycopg2/Makefile
index e17ca85..3673d62 100644
--- a/databases/py-psycopg2/Makefile
+++ b/databases/py-psycopg2/Makefile
@@ -30,8 +30,8 @@ do-build:
 do-install:
 	@(cd ${WRKSRC}; ${PYTHON_CMD} setup.py install)
 
-DOCSDIR=	${TARGETDIR}/share/doc/py-psycopg2
-EXAMPLESDIR=	${TARGETDIR}/share/examples/py-psycopg2
+DOCSDIR=	${PREFIX}/share/doc/py-psycopg2
+EXAMPLESDIR=	${PREFIX}/share/examples/py-psycopg2
 
 EXAMPLES=	binary.py cursor.py dt.py lastrowid.py notify.py threads.py \
 		whereareyou.jpg copy_from.py dialtone.py encoding.py \
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 34065ee..36e83e7 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -73,7 +73,7 @@ MAN1=		bin_dec_hex.1 cdeftutorial.1 rpntutorial.1 rrd-beginners.1 \
 
 .if !defined(WITHOUT_PERL_MODULE)
 MAN3=		RRDp.3 RRDs.3
-MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 .endif
 
 post-extract:
diff --git a/databases/rrdtool10/Makefile b/databases/rrdtool10/Makefile
index 9b659fc..da30bc4 100644
--- a/databases/rrdtool10/Makefile
+++ b/databases/rrdtool10/Makefile
@@ -36,7 +36,7 @@ MAN1=		RRDp.1 RRDs.1 bin_dec_hex.1 rrdcgi.1 rrdcreate.1 rrddump.1 \
 		cdeftutorial.1 rpntutorial.1 rrdinfo.1 rrdxport.1 rrd-beginners.1 \
 		rrdfirst.1
 MAN3=		RRDp.3 RRDs.3
-MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 OPTIONS=	"ISO-8859-2 fonts support" off