Add support for DESTDIR part I.

This commit should largele be a NOOP as it only adds support
for DESTDIR undefined. This does allow us to start testing
ports with DESTDIR set, but this is as of yet not supported.

Although this has been extensively tested on pointyhat, this
is a very intrusive change and some cases may have been
overlooked. Please contact Gabor and me if you find any.

PR:             100555
Submitted by:   gabor
Sponsored by:   Google Summer of Code 2006

87 files changed, 537 insertions, 250 deletions

diff --git a/Mk/bsd.emacs.mk b/Mk/bsd.emacs.mk
index 50fd78040662..daf615496247 100644
--- a/Mk/bsd.emacs.mk
+++ b/Mk/bsd.emacs.mk
@@ -1,5 +1,5 @@
 #
-#	$FreeBSD: /tmp/pcvs/ports/Mk/bsd.emacs.mk,v 1.57 2006-05-16 17:11:20 anray Exp $
+#	$FreeBSD: /tmp/pcvs/ports/Mk/bsd.emacs.mk,v 1.58 2006-08-04 12:34:41 erwin Exp $
 #
 #	bsd.emacs.mk - 19990829 Shigeyuki Fukushima.
 #
@@ -236,8 +236,8 @@ check-makevars::
 
 # find where emacsen is installed
 # look for it in PREEFIX first and fall back to LOCALBASE then
-.if exists(${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER})
-EMACS_BASE?=			${PREFIX}
+.if exists(${TARGETDIR}/bin/${EMACS_NAME}-${EMACS_VER})
+EMACS_BASE?=			${DESTDIR}${PREFIX}
 .else
 EMACS_BASE?=			${LOCALBASE}
 .endif
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index 107656e57e9d..91f95bd0359b 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -106,13 +106,13 @@ gnomehier_RUN_DEPENDS=	${gnomehier_DETECT}:${PORTSDIR}/misc/gnomehier
 GNOME_HTML_DIR?=	${PREFIX}/share/doc
 GCONF_CONFIG_OPTIONS?=	merged
 GCONF_CONFIG_DIRECTORY?=etc/gconf/gconf.xml.defaults
-GCONF_CONFIG_SOURCE?=xml:${GCONF_CONFIG_OPTIONS}:${PREFIX}/${GCONF_CONFIG_DIRECTORY}
+GCONF_CONFIG_SOURCE?=xml:${GCONF_CONFIG_OPTIONS}:${TARGETDIR}/${GCONF_CONFIG_DIRECTORY}
 GNOME_LOCALSTATEDIR?=	${PREFIX}/share/gnome
 gnomeprefix_CONFIGURE_ENV=GTKDOC="false"
-gnomeprefix_CONFIGURE_ARGS=--localstatedir=${GNOME_LOCALSTATEDIR} \
-			   --datadir=${PREFIX}/share/gnome \
-			   --with-html-dir=${GNOME_HTML_DIR} \
-			   --with-help-dir=${PREFIX}/share/gnome/help \
+gnomeprefix_CONFIGURE_ARGS=--localstatedir=${DESTDIR}${GNOME_LOCALSTATEDIR} \
+			   --datadir=${TARGETDIR}/share/gnome \
+			   --with-html-dir=${DESTDIR}${GNOME_HTML_DIR} \
+			   --with-help-dir=${TARGETDIR}/share/gnome/help \
 			   --disable-gtk-doc \
 			   --with-gconf-source=${GCONF_CONFIG_SOURCE}
 gnomeprefix_USE_GNOME_IMPL=gnomehier
@@ -725,10 +725,10 @@ post-install: gnome-post-install
 
 gnome-pre-su-install:
 .if defined(_USE_GNOME) && ${_USE_GNOME:Mgnomeprefix}!="" && !defined(NO_MTREE)
-	@${MTREE_CMD} ${MTREE_ARGS:S/${MTREE_FILE}/${GNOME_MTREE_FILE}/} ${PREFIX}/ >/dev/null
+	@${MTREE_CMD} ${MTREE_ARGS:S/${MTREE_FILE}/${GNOME_MTREE_FILE}/} ${TARGETDIR}/ >/dev/null
 .endif
 .if defined(GCONF_SCHEMAS)
-	@${MKDIR} ${PREFIX}/etc/gconf/gconf.xml.defaults/
+	@${MKDIR} ${DESTDIR}${PREFIX}/etc/gconf/gconf.xml.defaults/
 .else
 	@${DO_NADA}
 .endif
diff --git a/Mk/bsd.mail.mk b/Mk/bsd.mail.mk
index 052fb071b204..7877aaa0fb17 100644
--- a/Mk/bsd.mail.mk
+++ b/Mk/bsd.mail.mk
@@ -51,9 +51,9 @@ IGNORE=	Invalid QMAIL_SLAVEPORT value. Only one can be set, valid values are: ${
 .endif
 
 .if defined(QMAIL_SLAVEPORT)
-QMAIL_DEPENDS=	${QMAIL_PREFIX}/bin/qmail-send:${PORTSDIR}/mail/qmail-${QMAIL_SLAVEPORT:L}
+QMAIL_DEPENDS=	${DESTDIR}${QMAIL_PREFIX}/bin/qmail-send:${PORTSDIR}/mail/qmail-${QMAIL_SLAVEPORT:L}
 .else
-QMAIL_DEPENDS=	${QMAIL_PREFIX}/bin/qmail-send:${PORTSDIR}/mail/qmail
+QMAIL_DEPENDS=	${DESTDIR}${QMAIL_PREFIX}/bin/qmail-send:${PORTSDIR}/mail/qmail
 .endif
 
 .if defined(USE_QMAIL) || defined(USE_QMAIL_RUN)
diff --git a/Mk/bsd.openssl.mk b/Mk/bsd.openssl.mk
index d187e02643eb..38edd01fde97 100644
--- a/Mk/bsd.openssl.mk
+++ b/Mk/bsd.openssl.mk
@@ -2,7 +2,7 @@
 # Date created:		31 May 2002
 # Whom:			dinoex
 #
-# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.openssl.mk,v 1.30 2006-05-25 15:17:34 dinoex Exp $
+# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.openssl.mk,v 1.31 2006-08-04 12:34:41 erwin Exp $
 #
 # Use of 'USE_OPENSSL=yes' includes this Makefile after bsd.ports.pre.mk
 #
@@ -59,10 +59,10 @@ WITH_OPENSSL_BASE=yes
 .endif
 
 .if defined(WITH_OPENSSL_BASE)
-OPENSSLBASE=		/usr
-OPENSSLDIR=		/etc/ssl
+OPENSSLBASE=		${DESTDIR}/usr
+OPENSSLDIR=		${DESTDIR}/etc/ssl
 
-.if !exists(/usr/lib/libcrypto.so)
+.if !exists(${DESTDIR}/usr/lib/libcrypto.so)
 check-depends::
 	@${ECHO_CMD} "Dependency error: this port requires the OpenSSL library, which is part of"
 	@${ECHO_CMD} "the FreeBSD crypto distribution but not installed on your"
@@ -98,7 +98,7 @@ OPENSSL_CFLAGS+=	-DNO_IDEA
 .endif
 MAKE_ARGS+=		OPENSSL_CFLAGS="${OPENSSL_CFLAGS}"
 .endif
-OPENSSLRPATH=		/usr/lib:${LOCALBASE}/lib
+OPENSSLRPATH=		${DESTDIR}/usr/lib:${LOCALBASE}/lib
 
 .else
 
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index e6ec92f930f3..6d5c32908bc8 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -472,7 +472,7 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 #				  If this is set to a list of files, these files will be
 #				  automatically added to ${SUB_FILES}, some %%VAR%%'s will
 #				  automatically be expanded, they will be installed in
-#				  ${PREFIX}/etc/rc.d and added to the packing list.
+#				  ${TARGETDIR}/etc/rc.d and added to the packing list.
 # USE_RCORDER	- List of rc.d startup scripts to be called early in the boot
 #				  process. This acts exactly like USE_RC_SUBR except that
 #				  scripts are installed in /etc/rc.d.
@@ -492,15 +492,48 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 # Various directory definitions and variables to control them.
 # You rarely need to redefine any of these except WRKSRC and NO_WRKSUBDIR.
 #
+# TARGETDIR		- The fully qualified path, where everything is installed.
+#				  See the other variables below.
+#				  Default: ${DESTDIR}${PREFIX}
+#
+# DESTDIR		- The path to the environment we are installing to.  Define
+#				  this if you want to install packages into a jail
+#				  or into an another FreeBSD environment mounted
+#				  elsewhere than /.  ${PREFIX} is relative to
+#				  ${DESTDIR}.  E.g. setting DESTDIR=/bla PREFIX=/opt will
+#				  result packages installed under /bla/opt and registered
+#				  under /bla/var/db/pkg.
+#				  Default: not set (means /)
+#
 # X11BASE		- Where X11 ports install things.
+#				  Default: ${DESTDIR}/usr/X11R6
+# X11BASE_REL		- Same as X11BASE, but relative to DESTDIR
 #				  Default: /usr/X11R6
 # LOCALBASE		- Where non-X11 ports install things.
+#				  Default: ${DESTDIR}/usr/local
+# LOCALBASE_REL		- Same as LOCALBASE, but relative to DESTDIR
 #				  Default: /usr/local
 # LINUXBASE		- Where Linux ports install things.
+#				  Default: ${DESTDIR}/compat/linux
+# LINUXBASE_REL		- Same as LINUXBASE, but relative to DESTDIR
 #				  Default: /compat/linux
 # PREFIX		- Where *this* port installs its files.
-#				  Default: ${X11BASE} if USE_X_PREFIX is set, ${LINUXBASE} if
-#				  USE_LINUX_PREFIX is set, otherwise ${LOCALBASE}
+#				  Default: ${X11BASE_REL} if USE_X_PREFIX is set,
+#				  ${LINUXBASE_REL} if  USE_LINUX_PREFIX is set,
+#				  otherwise ${LOCALBASE_REL}
+#
+# IGNORE_PATH_CHECKS	- There are some sanity checks against PREFIX and DESTDIR.
+#				  You can diasble these checks with defining
+#				  this variable, but this is not recommended!
+#				  Only do this if you really know what you are
+#				  doing.  These sanity checks are the following:
+#				    - DESTDIR can't be /.  Just leave it undefined
+#				      if you want to install to /.
+#				    - DESTDIR has to be an absolute path.
+#				    - DESTDIR can't have a trailing slash.
+#				    - PREFIX has to be an absolute path.
+#				    - PREFIX can't have a trailing slash.
+#
 # MASTERDIR		- Where the port finds patches, package files, etc.  Define
 #				  this is you have two or more ports that share most of the
 #				  files.
@@ -567,7 +600,7 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 #				  installs its own manpage links so they will show up
 #				  correctly in ${PLIST}.)
 # MANPREFIX		- The directory prefix for ${MAN<sect>} and ${MLINKS}.
-#				  Default: ${PREFIX}
+#				  Default: ${TARGETDIR}
 # MAN<sect>PREFIX
 #				- If manual pages of some sections install in different
 #				  locations than others, use these.
@@ -854,7 +887,7 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 #				  rest of PLIST, so ${PLIST_SUB} substitutions also
 #				  apply here.  It is recommended that you use
 #				  %%PREFIX%% for ${PREFIX}, %%LOCALBASE%% for
-#				  ${LOCALBASE} and %%X11BASE%% for ${X11BASE}.
+#				  ${LOCALBASE_REL} and %%X11BASE%% for ${X11BASE_REL}.
 #				  Default: %%PREFIX%%/lib
 # USE_LDCONFIG  - If set to "yes", it replaces the old variable INSTALLS_SHLIB.
 # 				  Otherwise, it can be set to a list of directories to be added to
@@ -868,14 +901,14 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 # 				  Note: that should only be used on 64-bit architectures.
 #
 # DOCSDIR		- Name of the directory to install the packages docs in.
-#				  Default: ${PREFIX}/share/doc/${PORTNAME}
+#				  Default: ${TARGETDIR}/share/doc/${PORTNAME}
 # EXAMPLESDIR	- Name of the directory to install the packages examples in.
-#				  Default: ${PREFIX}/share/examples/${PORTNAME}
+#				  Default: ${TARGETDIR}/share/examples/${PORTNAME}
 # DATADIR		- Name of the directory to install the packages shared data in.
-#				  Default: ${PREFIX}/share/${PORTNAME}
+#				  Default: ${TARGETDIR}/share/${PORTNAME}
 #
 # DESKTOPDIR	- Name of the directory to install ${DESKTOP_ENTRIES} in.
-#				  Default: ${PREFIX}/share/applications
+#				  Default: ${TARGETDIR}/share/applications
 # DESKTOP_ENTRIES
 #				- List of desktop entry files to generate and install in
 #				  ${DESKTOPDIR}. The format is
@@ -944,9 +977,9 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 #				  it attempts to apply them.
 # PKG_DBDIR		- Where package installation is recorded; this directory
 #				  must not contain anything else.
-#				  Default: /var/db/pkg
+#				  Default: ${DESTDIR}/var/db/pkg
 # PORT_DBDIR	- Where port configuration options are recorded.
-#				  Default: /var/db/ports
+#				  Default: ${DESTDIR}/var/db/ports
 # NO_PKG_REGISTER
 #				- Don't register a port installation as a package.
 # FORCE_PKG_REGISTER
@@ -1022,6 +1055,7 @@ CAT?=		/bin/cat
 CHGRP?=		/usr/bin/chgrp
 CHMOD?=		/bin/chmod
 CHOWN?=		/usr/sbin/chown
+CHROOT?=	/usr/sbin/chroot
 COMM?=		/usr/bin/comm
 CP?=		/bin/cp
 CPIO?=		/usr/bin/cpio
@@ -1106,8 +1140,14 @@ OSREL!=	${UNAME} -r | ${SED} -e 's/[-(].*//'
 
 # Get __FreeBSD_version
 .if !defined(OSVERSION)
+.if exists(${DESTDIR}/usr/include/sys/param.h)
+OSVERSION!=	${AWK} '/^\#define __FreeBSD_version/ {print $$3}' < ${DESTDIR}/usr/include/sys/param.h
+.elif exists(${DESTDIR}/usr/src/sys/sys/param.h)
+OSVERSION!=	${AWK} '/^\#define __FreeBSD_version/ {print $$3}' < ${DESTDIR}/usr/src/sys/sys/param.h
+.else
 OSVERSION!=	${SYSCTL} -n kern.osreldate
 .endif
+.endif
 
 # Get the object format.
 .if !defined(PORTOBJFORMAT)
@@ -1177,7 +1217,7 @@ USE_SUBMAKE=	yes
 .endif
 
 # where 'make config' records user configuration options
-PORT_DBDIR?=	/var/db/ports
+PORT_DBDIR?=	${DESTDIR}/var/db/ports
 
 LDCONFIG_DIR=	libdata/ldconfig
 LDCONFIG32_DIR=	libdata/ldconfig32
@@ -1264,9 +1304,15 @@ DISTNAME?=	${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSI
 # tree we are and thus can't go relative.  They can, of course, be overridden
 # by individual Makefiles or local system make configuration.
 PORTSDIR?=		/usr/ports
-LOCALBASE?=		${DESTDIR}/usr/local
-X11BASE?=		${DESTDIR}/usr/X11R6
-LINUXBASE?=		${DESTDIR}/compat/linux
+LOCALBASE?=		/usr/local
+X11BASE?=		/usr/X11R6
+LINUXBASE?=		/compat/linux
+LOCALBASE_REL:=		${LOCALBASE}
+X11BASE_REL:=		${X11BASE}
+LINUXBASE_REL:=		${LINUXBASE}
+LOCALBASE:=		${DESTDIR}${LOCALBASE_REL}
+X11BASE:=		${DESTDIR}${X11BASE_REL}
+LINUXBASE:=		${DESTDIR}${LINUXBASE_REL}
 DISTDIR?=		${PORTSDIR}/distfiles
 _DISTDIR?=		${DISTDIR}/${DIST_SUBDIR}
 INDEXDIR?=		${PORTSDIR}
@@ -1276,6 +1322,8 @@ INDEXFILE?=		INDEX-${OSVERSION:C/([0-9]).*/\1/}
 INDEXFILE?=		INDEX
 .endif
 
+TARGETDIR:=		${DESTDIR}${PREFIX}
+
 .if defined(USE_LINUX_RPM)
 .include "${PORTSDIR}/Mk/bsd.linux-rpm.mk"
 .endif
@@ -1311,22 +1359,32 @@ USE_X_PREFIX=	yes
 USE_XLIB=		yes
 .endif
 .if defined(USE_X_PREFIX)
-PREFIX?=		${X11BASE}
+PREFIX?=		${X11BASE_REL}
 .elif defined(USE_LINUX_PREFIX)
-PREFIX?=		${LINUXBASE}
+PREFIX?=		${LINUXBASE_REL}
 NO_MTREE=		yes
 .else
-PREFIX?=		${LOCALBASE}
+PREFIX?=		${LOCALBASE_REL}
 .endif
 
 .if defined(USE_LINUX_PREFIX)
-LDCONFIG_CMD?=			${LINUXBASE}/sbin/ldconfig -r ${LINUXBASE}
+.if !defined(DESTDIR)
+LDCONFIG_CMD?=			${LINUXBASE_REL}/sbin/ldconfig -r ${LINUXBASE_REL}
+.else
+LDCONFIG_CMD?=			${CHROOT} ${DESTDIR} ${LINUXBASE_REL}/sbin/ldconfig -r ${LINUXBASE_REL}
+.endif
 LDCONFIG_PLIST_EXEC_CMD?=	${LDCONFIG_CMD}
 LDCONFIG_PLIST_UNEXEC_CMD?=	${LDCONFIG_CMD}
 .else
-LDCONFIG_CMD?=				${LDCONFIG} -m ${LDCONFIG_RUNLIST}
+.if !defined(DESTDIR)
+LDCONFIG_CMD?=			${LDCONFIG} -m ${LDCONFIG_RUNLIST}
 LDCONFIG_PLIST_EXEC_CMD?=	${LDCONFIG} -m ${LDCONFIG_PLIST}
 LDCONFIG_PLIST_UNEXEC_CMD?=	${LDCONFIG} -R
+.else
+LDCONFIG_CMD?=			${CHROOT} ${DESTDIR} ${LDCONFIG} -m ${LDCONFIG_RUNLIST}
+LDCONFIG_PLIST_EXEC_CMD?=	${CHROOT} ${DESTDIR} ${LDCONFIG} -m ${LDCONFIG_PLIST}
+LDCONFIG_PLIST_UNEXEC_CMD?=	${CHROOT} ${DESTDIR} ${LDCONFIG} -R
+.endif
 .endif
 
 PKGCOMPATDIR?=		${LOCALBASE}/lib/compat/pkg
@@ -1381,8 +1439,8 @@ SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VER}
 SITE_PERL?=	${LOCALBASE}/${SITE_PERL_REL}
 
 .if ${PERL_LEVEL} < 500600
-PERL5=		/usr/bin/perl${PERL_VERSION}
-PERL=		/usr/bin/perl
+PERL5=		${DESTDIR}/usr/bin/perl${PERL_VERSION}
+PERL=		${DESTDIR}/usr/bin/perl
 .else
 PERL5=		${LOCALBASE}/bin/perl${PERL_VERSION}
 PERL=		${LOCALBASE}/bin/perl
@@ -1452,6 +1510,38 @@ PERL=		${LOCALBASE}/bin/perl
 .include "${PORTSDIR}/Mk/bsd.sdl.mk"
 .endif
 
+# These do some path checks if DESTDIR is set correctly.
+# You can force skipping these test by defining IGNORE_PATH_CHECKS
+.if !defined(IGNORE_PATH_CHECKS)
+.if (${PREFIX:C,(^.).*,\1,} != "/")
+.BEGIN:
+	@${ECHO_MSG} "PREFIX must be defined as an absolute path so that when 'make'"
+	@${ECHO_MSG} "is invoked in the work area PREFIX points to the right place."
+	@${FALSE}
+.endif
+.if defined(DESTDIR)
+.if (${DESTDIR:C,(^.).*,\1,} != "/")
+.if ${DESTDIR} == "/"
+.BEGIN:
+	@${ECHO_MSG} "You can't set DESTDIR to /. Please re-run make with"
+	@${ECHO_MSG} "DESTDIR unset."
+	@${FALSE}
+.else
+.BEGIN:
+	@${ECHO_MSG} "DESTDIR must be defined as an absolute path so that when 'make'"
+	@${ECHO_MSG} "is invoked in the work area DESTDIR points to the right place."
+	@${FALSE}
+.endif
+.endif
+.if (${DESTDIR:C,^.*(/)$$,\1,} == "/")
+.BEGIN:
+	@${ECHO_MSG} "DESTDIR can't have a trailing slash. Please remove the trailing"
+	@${ECHO_MSG} "slash and re-run 'make'"
+	@${FALSE}
+.endif
+.endif
+.endif
+
 .if ${OSVERSION} >= 502123
 X_WINDOW_SYSTEM ?= xorg
 .elif (${OSVERSION} >= 450005 && !defined(XFREE86_VERSION)) || \
@@ -1496,8 +1586,9 @@ CONFIGURE_WRKSRC?=	${WRKSRC}
 BUILD_WRKSRC?=	${WRKSRC}
 INSTALL_WRKSRC?=${WRKSRC}
 
-PLIST_SUB+=	OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
-SUB_LIST+=	PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}	\
+PLIST_SUB+=	OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE_REL} X11BASE=${X11BASE_REL} \
+		DESTDIR=${DESTDIR} TARGETDIR=${TARGETDIR}
+SUB_LIST+=	PREFIX=${PREFIX} LOCALBASE=${LOCALBASE_REL} X11BASE=${X11BASE_REL}	\
 			DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR}
 
 PLIST_REINPLACE+=	dirrmtry
@@ -1838,10 +1929,10 @@ ALL_TARGET?=
 PL_BUILD?=		Build
 CONFIGURE_ARGS+= \
 	create_packlist=0 \
-	install_path=lib="${PREFIX}/${SITE_PERL_REL}" \
-	install_path=arch="${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}" \
-	install_path=script="${PREFIX}/bin" \
-	install_path=bin="${PREFIX}/bin" \
+	install_path=lib="${TARGETDIR}/${SITE_PERL_REL}" \
+	install_path=arch="${TARGETDIR}/${SITE_PERL_REL}/${PERL_ARCH}" \
+	install_path=script="${TARGETDIR}/bin" \
+	install_path=bin="${TARGETDIR}/bin" \
 	install_path=libdoc="${MAN3PREFIX}/man/man3" \
 	install_path=bindoc="${MAN1PREFIX}/man/man1"
 .elif defined(PERL_CONFIGURE)
@@ -1995,8 +2086,8 @@ MD5?=			md5
 .endif
 .if exists(/sbin/sha256)
 SHA256?=		/sbin/sha256
-.elif exists(${LOCALBASE}/sbin/sha256)
-SHA256?=		${LOCALBASE}/sbin/sha256
+.elif exists(${LOCALBASE_REL}/sbin/sha256)
+SHA256?=		${LOCALBASE_REL}/sbin/sha256
 .else
 SHA256?=		NO
 .endif
@@ -2007,7 +2098,10 @@ MD5_FILE?=		${MASTERDIR}/distinfo
 
 MAKE_FLAGS?=	-f
 MAKEFILE?=		Makefile
-MAKE_ENV+=		PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" MANPREFIX="${MANPREFIX}"
+MAKE_ENV+=		TARGETDIR=${TARGETDIR} DESTDIR=${DESTDIR} PREFIX=${PREFIX} \
+			LOCALBASE=${LOCALBASE_REL} X11BASE=${X11BASE_REL} \
+			MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" CFLAGS="${CFLAGS}" \
+			CXXFLAGS="${CXXFLAGS}" MANPREFIX="${MANPREFIX}"
 
 .if ${OSVERSION} < 500016
 PTHREAD_CFLAGS?=	-D_THREAD_SAFE
@@ -2101,7 +2195,7 @@ EXTRACT_CMD?=			${GZIP_CMD}
 
 # Figure out where the local mtree file is
 .if !defined(MTREE_FILE) && !defined(NO_MTREE)
-.if ${PREFIX} == ${X11BASE} || defined(USE_X_PREFIX)
+.if ${PREFIX} == ${X11BASE_REL} || defined(USE_X_PREFIX)
 # User may have specified non-standard PREFIX for installing a port that
 # uses X
 .if ${X_WINDOW_SYSTEM:L} == xfree86-3
@@ -2177,23 +2271,38 @@ PKGORIGIN?=		${PKGCATEGORY}/${PORTDIRNAME}
 .if ${OSVERSION} < 491101 && ${PKGORIGIN} != "sysutils/pkg_install"
 EXTRACT_DEPENDS+=	${LOCALBASE}/sbin/pkg_info:${PORTSDIR}/sysutils/pkg_install
 .endif
-PKG_CMD?=		${LOCALBASE}/sbin/pkg_create
-PKG_ADD?=		${LOCALBASE}/sbin/pkg_add
-PKG_DELETE?=	${LOCALBASE}/sbin/pkg_delete
-PKG_INFO?=		${LOCALBASE}/sbin/pkg_info
-PKG_VERSION?=		${LOCALBASE}/sbin/pkg_version
+.if !defined(DESTDIR)
+PKG_CMD?=		${LOCALBASE_REL}/sbin/pkg_create
+PKG_ADD?=		${LOCALBASE_REL}/sbin/pkg_add
+PKG_DELETE?=	${LOCALBASE_REL}/sbin/pkg_delete
+PKG_INFO?=		${LOCALBASE_REL}/sbin/pkg_info
+PKG_VERSION?=		${LOCALBASE_REL}/sbin/pkg_version
 .else
+PKG_CMD?=		${LOCALBASE_REL}/sbin/pkg_create
+PKG_ADD?=		${CHROOT} ${DESTDIR} ${LOCALBASE_REL}/sbin/pkg_add
+PKG_DELETE?=		${CHROOT} ${DESTDIR} ${LOCALBASE_REL}/sbin/pkg_delete
+PKG_INFO?=		${CHROOT} ${DESTDIR} ${LOCALBASE_REL}/sbin/pkg_info
+.endif
+.else
+.if !defined(DESTDIR)
 PKG_CMD?=		/usr/sbin/pkg_create
 PKG_ADD?=		/usr/sbin/pkg_add
 PKG_DELETE?=	/usr/sbin/pkg_delete
 PKG_INFO?=		/usr/sbin/pkg_info
 PKG_VERSION?=		/usr/sbin/pkg_version
+.else
+PKG_CMD?=		/usr/sbin/pkg_create
+PKG_ADD?=		${CHROOT} ${DESTDIR} /usr/sbin/pkg_add
+PKG_DELETE?=		${CHROOT} ${DESTDIR} /usr/sbin/pkg_delete
+PKG_INFO?=		${CHROOT} ${DESTDIR} /usr/sbin/pkg_info
+PKG_VERSION?=		${CHROOT} ${DESTDIR} /usr/sbin/pkg_version
+.endif
 .endif
 
 # Does the pkg_create tool support conflict checking?
 # XXX Slow?
 .if !defined(PKGINSTALLVER)
-PKGINSTALLVER!= ${PKG_INFO} -P 2>/dev/null | ${SED} -e 's/.*: //'
+PKGINSTALLVER!= ${CHROOT} ${DESTDIR} ${PKG_INFO} -P 2>/dev/null | ${SED} -e 's/.*: //'
 .endif
 .if ${PKGINSTALLVER} < 20030417
 DISABLE_CONFLICTS=	YES
@@ -2220,7 +2329,7 @@ PKG_SUFX?=		.tgz
 .endif
 .endif
 # where pkg_add records its dirty deeds.
-PKG_DBDIR?=		/var/db/pkg
+PKG_DBDIR?=		${DESTDIR}/var/db/pkg
 
 MOTIFLIB?=	-L${X11BASE}/lib -lXm -lXp
 
@@ -2714,10 +2823,10 @@ LATEST_LINK?=		${PKGBASE}
 PKGLATESTFILE=		${PKGLATESTREPOSITORY}/${LATEST_LINK}${PKG_SUFX}
 
 .if defined(PERL_CONFIGURE)
-CONFIGURE_ARGS+=	CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}" \
-			INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib"
+CONFIGURE_ARGS+=	CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${TARGETDIR}" \
+			INSTALLPRIVLIB="${TARGETDIR}/lib" INSTALLARCHLIB="${TARGETDIR}/lib"
 CONFIGURE_SCRIPT?=	Makefile.PL
-MAN3PREFIX?=		${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX?=		${TARGETDIR}/lib/perl5/${PERL_VERSION}
 .undef HAS_CONFIGURE
 .endif
 
@@ -2743,16 +2852,17 @@ SCRIPTS_ENV+=	CURDIR=${MASTERDIR} DISTDIR=${DISTDIR} \
 		  WRKDIR=${WRKDIR} WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} \
 		  SCRIPTDIR=${SCRIPTDIR} FILESDIR=${FILESDIR} \
 		  PORTSDIR=${PORTSDIR} DEPENDS="${DEPENDS}" \
-		  PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
+		  PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \
+		  DESTDIR=${DESTDIR} TARGETDIR=${DESTDIR}
 
 .if defined(BATCH)
 SCRIPTS_ENV+=	BATCH=yes
 .endif
 
 .if ${PREFIX} == /usr
-MANPREFIX?=	/usr/share
+MANPREFIX?=	${DESTDIR}/usr/share
 .else
-MANPREFIX?=	${PREFIX}
+MANPREFIX?=	${TARGETDIR}
 .endif
 
 .for sect in 1 2 3 4 5 6 7 8 9
@@ -2830,9 +2940,9 @@ _TMLINKS=
 .if defined(_MANPAGES)
 
 .if defined(NOMANCOMPRESS)
-__MANPAGES:=	${_MANPAGES:S%^${PREFIX}/%%}
+__MANPAGES:=	${_MANPAGES:S%^${TARGETDIR}/%%}
 .else
-__MANPAGES:=	${_MANPAGES:S%^${PREFIX}/%%:S%$%.gz%}
+__MANPAGES:=	${_MANPAGES:S%^${TARGETDIR}/%%:S%$%.gz%}
 .endif
 
 .if ${MANCOMPRESSED} == "yes"
@@ -2847,16 +2957,16 @@ INFO_PATH?=	share/info
 INFO_PATH?=	info
 .endif
 
-DOCSDIR?=	${PREFIX}/share/doc/${PORTNAME}
-EXAMPLESDIR?=	${PREFIX}/share/examples/${PORTNAME}
-DATADIR?=	${PREFIX}/share/${PORTNAME}
+DOCSDIR?=	${TARGETDIR}/share/doc/${PORTNAME}
+EXAMPLESDIR?=	${TARGETDIR}/share/examples/${PORTNAME}
+DATADIR?=	${TARGETDIR}/share/${PORTNAME}
 
-PLIST_SUB+=	DOCSDIR="${DOCSDIR:S,^${PREFIX}/,,}" \
-		EXAMPLESDIR="${EXAMPLESDIR:S,^${PREFIX}/,,}" \
-		DATADIR="${DATADIR:S,^${PREFIX}/,,}"
+PLIST_SUB+=	DOCSDIR="${DOCSDIR:S,^${TARGETDIR}/,,}" \
+		EXAMPLESDIR="${EXAMPLESDIR:S,^${TARGETDIR}/,,}" \
+		DATADIR="${DATADIR:S,^${TARGETDIR}/,,}"
 
-DESKTOPDIR?=		${PREFIX}/share/applications
-_DESKTOPDIR_REL=	${DESKTOPDIR:S,^${PREFIX}/,,}/
+DESKTOPDIR?=		${TARGETDIR}/share/applications
+_DESKTOPDIR_REL=	${DESKTOPDIR:S,^${TARGETDIR}/,,}/
 
 .if ${_DESKTOPDIR_REL} == ${DESKTOPDIR}/
 # DESKTOPDIR is not beneath PREFIX
@@ -3016,7 +3126,7 @@ all:
 	@cd ${.CURDIR} && ${SETENV} CURDIR=${.CURDIR} DISTNAME=${DISTNAME} \
 	  DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} WRKSRC=${WRKSRC} \
 	  PATCHDIR=${PATCHDIR} SCRIPTDIR=${SCRIPTDIR} \
-	  FILESDIR=${FILESDIR} PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} \
+	  FILESDIR=${FILESDIR} PORTSDIR=${PORTSDIR} DESTDIR=${DESTDIR} PREFIX=${PREFIX} \
 	  DEPENDS="${DEPENDS}" BUILD_DEPENDS="${BUILD_DEPENDS}" \
 	  RUN_DEPENDS="${RUN_DEPENDS}" X11BASE=${X11BASE} \
 	  CONFLICTS="${CONFLICTS}" \
@@ -3500,7 +3610,11 @@ check-conflicts:
 	done; \
 	if [ -n "$${conflicts_with}" ]; then \
 		${ECHO_MSG}; \
-		${ECHO_MSG} "===>  ${PKGNAME} conflicts with installed package(s): "; \
+		if [ -z "${DESTDIR}" ] ; then \
+			${ECHO_MSG} "===>  ${PKGNAME} conflicts with installed package(s): "; \
+		else \
+			${ECHO_MSG} "===>  ${PKGNAME} conflicts with installed package(s) in ${DESTDIR}: "; \
+		fi; \
 		for entry in $${conflicts_with}; do \
 			${ECHO_MSG} "      $${entry}"; \
 		done; \
@@ -3628,9 +3742,13 @@ delete-package-list: delete-package-links-list
 .if !target(check-already-installed)
 check-already-installed:
 .if !defined(NO_PKG_REGISTER) && !defined(FORCE_PKG_REGISTER)
+.if !defined(DESTDIR)
 		@${ECHO_MSG} "===>  Checking if ${PKGORIGIN} already installed"
-		@${MKDIR} ${PKG_DBDIR}
-		@already_installed=`${PKG_INFO} -q -O ${PKGORIGIN}`; \
+.else
+		@${ECHO_MSG} "===>  Checking if ${PKGORIGIN} already installed in ${DESTDIR}"
+.endif
+		@${MKDIR} ${PKG_DBDIR}; \
+		already_installed=`${PKG_INFO} -q -O ${PKGORIGIN}`; \
 		if [ -n "$${already_installed}" ]; then \
 				for p in $${already_installed}; do \
 						prfx=`${PKG_INFO} -q -p $${p} 2> /dev/null | ${SED} -ne '1s|^@cwd ||p'`; \
@@ -3642,12 +3760,20 @@ check-already-installed:
 								fi; \
 						fi; \
 				done; \
-		fi; \
-		if [ -d ${PKG_DBDIR}/${PKGNAME} -o -n "$${found_package}" ]; then \
+		fi
+		@if [ -d ${PKG_DBDIR}/${PKGNAME} -o -n "$${found_package}" ]; then \
 				if [ -d ${PKG_DBDIR}/${PKGNAME} ]; then \
+					if [ -z "${DESTDIR}" ] ; then \
 						${ECHO_CMD} "===>   ${PKGNAME} is already installed"; \
+					else \
+						${ECHO_MSG} "===>   ${PKGNAME} is already installed in ${DESTDIR}"; \
+					fi; \
 				else \
+					if [ -z "${DESTDIR}" ] ; then \
 						${ECHO_CMD} "===>   An older version of ${PKGORIGIN} is already installed ($${found_package})"; \
+					else \
+						${ECHO_MSG} "===>   An older version of ${PKGORIGIN} is already installed in ${DESTDIR} ($${found_package})"; \
+					fi; \
 				fi; \
 				${ECHO_CMD} "      You may wish to \`\`make deinstall'' and install this port again"; \
 				${ECHO_CMD} "      by \`\`make reinstall'' to upgrade it properly."; \
@@ -3672,12 +3798,12 @@ check-umask:
 
 .if !target(install-mtree)
 install-mtree:
-	@${MKDIR} ${PREFIX}
+	@${MKDIR} ${TARGETDIR}
 	@if [ `${ID} -u` != 0 ]; then \
-		if [ -w ${PREFIX}/ ]; then \
+		if [ -w ${TARGETDIR}/ ]; then \
 			${ECHO_MSG} "Warning: not superuser, you may get some errors during installation."; \
 		else \
-			${ECHO_MSG} "Error: ${PREFIX}/ not writable."; \
+			${ECHO_MSG} "Error: ${TARGETDIR}/ not writable."; \
 			${FALSE}; \
 		fi; \
 	fi
@@ -3688,9 +3814,9 @@ install-mtree:
 			${ECHO_CMD} "Copy it from a suitable location (e.g., /usr/src/etc/mtree) and try again."; \
 			exit 1; \
 		else \
-			${MTREE_CMD} ${MTREE_ARGS} ${PREFIX}/ >/dev/null; \
+			${MTREE_CMD} ${MTREE_ARGS} ${TARGETDIR}/ >/dev/null; \
 			if [ ${MTREE_FILE} = "/etc/mtree/BSD.local.dist" ]; then \
-				cd ${PREFIX}/share/nls; \
+				cd ${TARGETDIR}/share/nls; \
 				${LN} -shf C POSIX; \
 				${LN} -shf C en_US.US-ASCII; \
 			fi; \
@@ -3707,11 +3833,21 @@ install-ldconfig-file:
 .if defined(USE_LDCONFIG) || defined(USE_LDCONFIG32) || defined(INSTALLS_SHLIB)
 .if defined(USE_LDCONFIG)
 .if !defined(INSTALL_AS_USER)
+.if !defined(DESTDIR)
 	@${ECHO_MSG} "===>   Running ldconfig"
 	${LDCONFIG} -m ${USE_LDCONFIG}
 .else
+	@${ECHO_MSG} "===>   Running ldconfig in ${DESTDIR}"
+	${CHROOT} ${DESTDIR} ${LDCONFIG} -m ${USE_LDCONFIG}
+.endif
+.else
+.if !defined(DESTDIR)
 	@${ECHO_MSG} "===>   Running ldconfig (errors are ignored)"
 	-${LDCONFIG} -m ${USE_LDCONFIG}
+.else
+	@${ECHO_MSG} "===>   Running ldconfig in ${DESTDIR} (errors are ignored)"
+	${CHROOT} ${DESTDIR} -${LDCONFIG} -m ${USE_LDCONFIG}
+.endif
 .endif
 .if ${USE_LDCONFIG:L} != "${PREFIX}/lib"
 	@${ECHO_MSG} "===>   Installing ldconfig configuration file"
@@ -3728,11 +3864,21 @@ install-ldconfig-file:
 .endif
 .if defined(USE_LDCONFIG32)
 .if !defined(INSTALL_AS_USER)
+.if !defined(DESTDIR)
 	@${ECHO_MSG} "===>   Running ldconfig"
 	${LDCONFIG} -32 -m ${USE_LDCONFIG32}
 .else
+	@${ECHO_MSG} "===>   Running ldconfig in ${DESTDIR}"
+	${CHROOT} ${DESTDIR} ${LDCONFIG} -32 -m ${USE_LDCONFIG32}
+.endif
+.else
+.if !defined(DESTDIR)
 	@${ECHO_MSG} "===>   Running ldconfig (errors are ignored)"
 	-${LDCONFIG} -32 -m ${USE_LDCONFIG32}
+.else
+	@${ECHO_MSG} "===>   Running ldconfig in ${DESTDIR} (errors are ignored)"
+	${CHROOT} ${DESTDIR} -${LDCONFIG} -32 -m ${USE_LDCONFIG32}
+.endif
 .endif
 	@${ECHO_MSG} "===>   Installing 32-bit ldconfig configuration file"
 .if defined(NO_LDCONFIG_MTREE)
@@ -3748,10 +3894,18 @@ install-ldconfig-file:
 # This can be removed once, all ports have been converted to USE_LDCONFIG.
 .if defined(INSTALLS_SHLIB)
 .if !defined(INSTALL_AS_USER)
+.if !defined(DESTDIR)
 	@${ECHO_MSG} "===>   Running ldconfig"
+.else
+	@${ECHO_MSG} "===>   Running ldconfig in ${DESTDIR}"
+.endif
 	${LDCONFIG_CMD}
 .else
+.if !defined(DESTDIR)
 	@${ECHO_MSG} "===>   Running ldconfig (errors are ignored)"
+.else
+	@${ECHO_MSG} "===>   Running ldconfig in ${DESTDIR} (errors are ignored)"
+.endif
 	-${LDCONFIG_CMD}
 .endif
 .endif
@@ -3786,7 +3940,7 @@ security-check:
 	| ${XARGS} -0 -J % ${FIND} % -prune ! -type l -type f -print0 2> /dev/null \
 	| ${XARGS} -0 -n 1 ${OBJDUMP} -R 2> /dev/null > ${WRKDIR}/.PLIST.objdump; \
 	if \
-		! ${AWK} -v audit="$${PORTS_AUDIT}" -f ${PORTSDIR}/Tools/scripts/security-check.awk \
+		! ${AWK} -v audit="$${PORTS_AUDIT}" -v destdir="${DESTDIR}" -f ${PORTSDIR}/Tools/scripts/security-check.awk \
 		  ${WRKDIR}/.PLIST.flattened ${WRKDIR}/.PLIST.objdump ${WRKDIR}/.PLIST.setuid ${WRKDIR}/.PLIST.writable; \
 	then \
 		www_site=$$(cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} www-site); \
@@ -3853,30 +4007,57 @@ security-check:
 	${GREP} '^etc/rc.d/' ${TMPPLIST} > ${WRKDIR}/.PLIST.startup; \
 	if [ -s ${WRKDIR}/.PLIST.setuid -o -s ${WRKDIR}/.PLIST.network -o -s ${WRKDIR}/.PLIST.writable ]; then \
 		if [ -n "$$PORTS_AUDIT" ]; then \
-			${ECHO_MSG} "===>  SECURITY REPORT (PARANOID MODE): "; \
+			if [ -z "${DESTDIR}" ] ; then \
+				${ECHO_MSG} "===>  SECURITY REPORT (PARANOID MODE): "; \
+			else \
+				${ECHO_MSG} "===>  SECURITY REPORT FOR ${DESTDIR} (PARANOID MODE): "; \
+			fi; \
 		else \
-			${ECHO_MSG} "===>  SECURITY REPORT: "; \
+			if [ -z "${DESTDIR}" ] ; then \
+				${ECHO_MSG} "===>  SECURITY REPORT: "; \
+			else \
+				${ECHO_MSG} "===>  SECURITY REPORT FOR ${DESTDIR}: "; \
+			fi; \
 		fi; \
 		if [ -s ${WRKDIR}/.PLIST.setuid ] ; then \
-			${ECHO_MSG} "      This port has installed the following binaries which execute with"; \
-			${ECHO_MSG} "      increased privileges."; \
+			if [ -z "${DESTDIR}" ] ; then \
+				${ECHO_MSG} "      This port has installed the following binaries,"; \
+			else \
+				${ECHO_MSG} "      This port has installed the following binaries into ${DESTDIR},"; \
+			fi; \
+			${ECHO_MSG} "      which execute with increased privileges."; \
 			${CAT} ${WRKDIR}/.PLIST.setuid; \
 			${ECHO_MSG}; \
 		fi; \
 		if [ -s ${WRKDIR}/.PLIST.network ] ; then \
-			${ECHO_MSG} "      This port has installed the following files which may act as network"; \
-			${ECHO_MSG} "      servers and may therefore pose a remote security risk to the system."; \
+			if [ -z "${DESTDIR}" ] ; then \
+				${ECHO_MSG} "      This port has installed the following files, which may act as network"; \
+				${ECHO_MSG} "      servers and may therefore pose a remote security risk to the system."; \
+			else \
+				${ECHO_MSG} "      This port has installed the following files into ${DESTDIR}, which may"; \
+				${ECHO_MSG} "      act as network servers and may therefore pose a remote security risk to"; \
+				${ECHO_MSG} "      the system."; \
+			fi; \
 			${CAT} ${WRKDIR}/.PLIST.network; \
 			${ECHO_MSG}; \
 			if [ -s ${WRKDIR}/.PLIST.startup ] ; then \
-				${ECHO_MSG} "      This port has installed the following startup scripts which may cause"; \
-				${ECHO_MSG} "      these network services to be started at boot time."; \
+				if [ -z "${DESTDIR}" ] ; then \
+					${ECHO_MSG} "      This port has installed the following startup scripts,"; \
+				else \
+					${ECHO_MSG} "      This port has installed the following startup scripts into ${DESTDIR},"; \
+				fi; \
+				${ECHO_MSG} "      which may cause these network services to be started at boot time."; \
 				${SED} s,^,${PREFIX}/, < ${WRKDIR}/.PLIST.startup; \
 				${ECHO_MSG}; \
 			fi; \
 		fi; \
 		if [ -s ${WRKDIR}/.PLIST.writable ] ; then \
-			${ECHO_MSG} "      This port has installed the following world-writable files/directories."; \
+			if [ -z "${DESTDIR}" ] ; then \
+				${ECHO_MSG} "      This port has installed the following world-writable files/directories."; \
+			else \
+				${ECHO_MSG} "      This port has installed the following world-writable files/directories"; \
+				${ECHO_MSG} "      into ${DESTDIR}."; \
+			fi; \
 			${CAT} ${WRKDIR}/.PLIST.writable; \
 			${ECHO_MSG}; \
 		fi; \
@@ -4018,7 +4199,11 @@ configure-message:
 build-message:
 	@${ECHO_MSG} "===>  Building for ${PKGNAME}"
 install-message:
+.if !defined(DESTDIR)
 	@${ECHO_MSG} "===>  Installing for ${PKGNAME}"
+.else
+	@${ECHO_MSG} "===>  Installing for ${PKGNAME} into ${DESTDIR}"
+.endif
 package-message:
 	@${ECHO_MSG} "===>  Building package for ${PKGNAME}"
 
@@ -4100,14 +4285,22 @@ deinstall:
 		${SU_CMD} "${MAKE} ${__softMAKEFLAGS} ${.TARGET}"
 	@${ECHO_MSG} "===>  Returning to user credentials"
 .else
+.if !defined(DESTDIR)
 	@${ECHO_MSG} "===>  Deinstalling for ${PKGORIGIN}"
+.else
+	@${ECHO_MSG} "===>  Deinstalling for ${PKGORIGIN} from ${DESTDIR}"
+.endif
 	@found_names=`${PKG_INFO} -q -O ${PKGORIGIN}`; \
 	for p in $${found_names}; do \
 			check_name=`${ECHO_CMD} $${p} | ${SED} -e 's/-[^-]*$$//'`; \
 			if [ "$${check_name}" = "${PKGBASE}" ]; then \
 					prfx=`${PKG_INFO} -q -p $${p} 2> /dev/null | ${SED} -ne '1s|^@cwd ||p'`; \
 					if [ "x${PREFIX}" = "x$${prfx}" ]; then \
-							${ECHO_MSG} "===>   Deinstalling $${p}"; \
+							if [ -z "${DESTDIR}" ] ; then \
+									${ECHO_MSG} "===>   Deinstalling $${p}"; \
+							else \
+									${ECHO_MSG} "===>   Deinstalling $${p} from ${DESTDIR}"; \
+							fi; \
 							${PKG_DELETE} -f $${p}; \
 					else \
 							${ECHO_MSG} "===>   $${p} has a different PREFIX: $${prfx}, skipping"; \
@@ -4115,7 +4308,11 @@ deinstall:
 			fi; \
 	done; \
 	if [ -z "$${found_names}" ]; then \
-			${ECHO_MSG} "===>   ${PKGBASE} not installed, skipping"; \
+			if [ -z "${DESTDIR}" ] ; then \
+					${ECHO_MSG} "===>   ${PKGBASE} not installed, skipping"; \
+			else \
+					${ECHO_MSG} "===>   ${PKGBASE} not installed in ${DESTDIR}, skipping"; \
+			fi; \
 	fi
 	@${RM} -f ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
 .endif
@@ -4133,17 +4330,29 @@ deinstall-all:
 		${SU_CMD} "${MAKE} ${__softMAKEFLAGS} ${.TARGET}"
 	@${ECHO_MSG} "===>  Returning to user credentials"
 .else
+.if !defined(DESTDIR)
 	@${ECHO_MSG} "===>  Deinstalling for ${PKGORIGIN}"
+.else
+	@${ECHO_MSG} "===>  Deinstalling for ${PKGORIGIN} from ${DESTDIR}"
+.endif
 	@deinstall_names=`${PKG_INFO} -q -O ${PKGORIGIN}`; \
 	if [ -n "$${deinstall_names}" ]; then \
 		for d in $${deinstall_names}; do \
-			${ECHO_MSG} "===>   Deinstalling $${d}"; \
+			if [ -z "${DESTDIR}" ] ; then \
+				${ECHO_MSG} "===>   Deinstalling $${d}"; \
+			else \
+				${ECHO_MSG} "===>   Deinstalling $${d} from ${DESTDIR}"; \
+			fi; \
 			${PKG_DELETE} -f $${d}; \
 		done; \
 	else \
-		${ECHO_MSG} "===>   ${PKGORIGIN} not installed, skipping"; \
-	fi
-	@${RM} -f ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
+		if [ -z "${DESTDIR}" ] ; then \
+			${ECHO_MSG} "===>   ${PKGORIGIN} not installed, skipping"; \
+		else \
+			${ECHO_MSG} "===>   ${PKGORIGIN} not installed in ${DESTDIR}, skipping"; \
+		fi; \
+	fi; \
+	${RM} -f ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
 .endif
 .endif
 
@@ -4534,16 +4743,24 @@ _INSTALL_DEPENDS=	\
 		if [ X${USE_PACKAGE_DEPENDS} != "X" ]; then \
 			subpkgfile=`(cd $$dir; ${MAKE} $$depends_args -V PKGFILE)`; \
 			if [ -r "$${subpkgfile}" -a "$$target" = "${DEPENDS_TARGET}" ]; then \
-				${ECHO_MSG} "===>   Installing existing package $${subpkgfile}"; \
-				${PKG_ADD} $${subpkgfile}; \
+				if [ -z "${DESTDIR}" ] ; then \
+					${ECHO_MSG} "===>   Installing existing package $${subpkgfile}"; \
+					${PKG_ADD} $${subpkgfile}; \
+				else \
+					${ECHO_MSG} "===>   Installing existing package $${subpkgfile} into ${DESTDIR}"; \
+					${PKG_ADD} -C ${DESTDIR} $${subpkgfile}; \
+				fi; \
 			else \
 			  (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \
 			fi; \
 		else \
 			(cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \
-		fi ; \
-		${ECHO_MSG} "===>   Returning to build of ${PKGNAME}"; \
-
+		fi; \
+		if [ -z "${DESTDIR}" ] ; then \
+			${ECHO_MSG} "===>   Returning to build of ${PKGNAME}"; \
+		else \
+			${ECHO_MSG} "===>   Returning to build of ${PKGNAME} for ${DESTDIR}"; \
+		fi;
 
 .for deptype in EXTRACT PATCH FETCH BUILD RUN
 ${deptype:L}-depends:
@@ -4565,7 +4782,11 @@ ${deptype:L}-depends:
 					${ECHO_MSG} "Error: ${NONEXISTENT} exists.  Please remove it, and restart the build."; \
 					${FALSE}; \
 				else \
-					${ECHO_MSG} "===>   ${PKGNAME} depends on file: $$prog - found"; \
+					if [ -z "${DESTDIR}" ] ; then \
+						${ECHO_MSG} "===>   ${PKGNAME} depends on file: $$prog - found"; \
+					else \
+						${ECHO_MSG} "===>   ${PKGNAME} depends on file in ${DESTDIR}: $$prog - found"; \
+					fi; \
 					if [ ${_DEPEND_ALWAYS} = 1 ]; then \
 						${ECHO_MSG} "       (but building it anyway)"; \
 						notfound=1; \
@@ -4574,7 +4795,11 @@ ${deptype:L}-depends:
 					fi; \
 				fi; \
 			else \
-				${ECHO_MSG} "===>   ${PKGNAME} depends on file: $$prog - not found"; \
+				if [ -z "${DESTDIR}" ] ; then \
+					${ECHO_MSG} "===>   ${PKGNAME} depends on file: $$prog - not found"; \
+				else \
+					${ECHO_MSG} "===>   ${PKGNAME} depends on file in ${DESTDIR}: $$prog - not found"; \
+				fi; \
 				notfound=1; \
 			fi; \
 		else \
@@ -4584,7 +4809,11 @@ ${deptype:L}-depends:
 			esac; \
 			if [ "$$pkg" != "" ]; then \
 				if ${PKG_INFO} "$$prog" > /dev/null 2>&1 ; then \
-					${ECHO_MSG} "===>   ${PKGNAME} depends on package: $$prog - found"; \
+					if [ -z "${DESTDIR}" ] ; then \
+						${ECHO_MSG} "===>   ${PKGNAME} depends on package: $$prog - found"; \
+					else \
+						${ECHO_MSG} "===>   ${PKGNAME} depends on package in ${DESTDIR}: $$prog - found"; \
+					fi; \
 					if [ ${_DEPEND_ALWAYS} = 1 ]; then \
 						${ECHO_MSG} "       (but building it anyway)"; \
 						notfound=1; \
@@ -4592,7 +4821,11 @@ ${deptype:L}-depends:
 						notfound=0; \
 					fi; \
 				else \
-					${ECHO_MSG} "===>   ${PKGNAME} depends on package: $$prog - not found"; \
+					if [ -z "${DESTDIR}" ] ; then \
+						${ECHO_MSG} "===>   ${PKGNAME} depends on package: $$prog - not found"; \
+					else \
+						${ECHO_MSG} "===>   ${PKGNAME} depends on package in ${DESTDIR}: $$prog - not found"; \
+					fi; \
 					notfound=1; \
 				fi; \
 				if [ $$notfound != 0 ]; then \
@@ -4606,7 +4839,11 @@ ${deptype:L}-depends:
 					fi; \
 				fi; \
 			elif ${WHICH} "$$prog" > /dev/null 2>&1 ; then \
-				${ECHO_MSG} "===>   ${PKGNAME} depends on executable: $$prog - found"; \
+				if [ -z "${PREFIX}" ] ; then \
+					${ECHO_MSG} "===>   ${PKGNAME} depends on executable: $$prog - found"; \
+				else \
+					${ECHO_MSG} "===>   ${PKGNAME} depends on executable in ${DESTDIR}: $$prog - found"; \
+				fi; \
 				if [ ${_DEPEND_ALWAYS} = 1 ]; then \
 					${ECHO_MSG} "       (but building it anyway)"; \
 					notfound=1; \
@@ -4614,7 +4851,11 @@ ${deptype:L}-depends:
 					notfound=0; \
 				fi; \
 			else \
-				${ECHO_MSG} "===>   ${PKGNAME} depends on executable: $$prog - not found"; \
+				if [ -z "${DESTDIR}" ] ; then \
+					${ECHO_MSG} "===>   ${PKGNAME} depends on executable: $$prog - not found"; \
+				else \
+					${ECHO_MSG} "===>   ${PKGNAME} depends on executable in ${DESTDIR}: $$prog - not found"; \
+				fi; \
 				notfound=1; \
 			fi; \
 		fi; \
@@ -4650,18 +4891,34 @@ lib-depends:
 		else \
 			dir=$${dir%%:*}; \
 		fi; \
-		${ECHO_MSG} -n "===>   ${PKGNAME} depends on shared library: $$lib"; \
-		if ${LDCONFIG} -r | ${GREP} -vwF -e "${PKGCOMPATDIR}" | ${GREP} -qwE -e "-l$$pattern"; then \
-			${ECHO_MSG} " - found"; \
-			if [ ${_DEPEND_ALWAYS} = 1 ]; then \
-				${ECHO_MSG} "       (but building it anyway)"; \
-				notfound=1; \
+		if [ -z "${DESTDIR}" ] ; then \
+			${ECHO_MSG} -n "===>   ${PKGNAME} depends on shared library: $$lib"; \
+			if ${LDCONFIG} -r | ${GREP} -vwF -e "${PKGCOMPATDIR}" | ${GREP} -qwE -e "-l$$pattern"; then \
+				${ECHO_MSG} " - found"; \
+				if [ ${_DEPEND_ALWAYS} = 1 ]; then \
+					${ECHO_MSG} "       (but building it anyway)"; \
+					notfound=1; \
+				else \
+					notfound=0; \
+				fi; \
 			else \
-				notfound=0; \
+				${ECHO_MSG} " - not found"; \
+				notfound=1; \
 			fi; \
 		else \
-			${ECHO_MSG} " - not found"; \
-			notfound=1; \
+			${ECHO_MSG} -n "===>   ${PKGNAME} depends on shared library in ${DESTDIR}: $$lib"; \
+			if ${CHROOT} ${DESTDIR} ${LDCONFIG} -r | ${GREP} -vwF -e "${PKGCOMPATDIR}" | ${GREP} -qwE -e "-l$$pattern"; then \
+				${ECHO_MSG} " - found"; \
+				if [ ${_DEPEND_ALWAYS} = 1 ]; then \
+					${ECHO_MSG} "       (but building it anyway)"; \
+					notfound=1; \
+				else \
+					notfound=0; \
+				fi; \
+			else \
+				${ECHO_MSG} " - not found"; \
+				notfound=1; \
+			fi; \
 		fi; \
 		if [ $$notfound != 0 ]; then \
 			${ECHO_MSG} "===>    Verifying $$target for $$lib in $$dir"; \
@@ -4697,7 +4954,11 @@ misc-depends:
 			(cd $$dir; ${MAKE} $$target $$depends_args) ; \
 		fi \
 	done
-	@${ECHO_MSG} "===>   Returning to build of ${PKGNAME}"
+	@if [ -z "${DESTDIR}" ] ; then \
+		${ECHO_MSG} "===>   Returning to build of ${PKGNAME}"; \
+	else \
+		${ECHO_MSG} "===>   Returning to build of ${PKGNAME} for ${DESTDIR}"; \
+	fi
 .endif
 .else
 	@${DO_NADA}
@@ -5196,14 +5457,14 @@ add-plist-docs:
 	@if ${ECHO_CMD} "${x}"| ${AWK} '$$1 ~ /(\*|\||\[|\]|\?|\{|\}|\$$)/ { exit 1};'; then \
 		if [ ! -e ${DOCSDIR}/${x} ]; then \
 		${ECHO_CMD} ${DOCSDIR}/${x} | \
-			${SED} -e 's,^${PREFIX}/,,' >> ${TMPPLIST}; \
+			${SED} -e 's,^${TARGETDIR}/,,' >> ${TMPPLIST}; \
 	fi;fi
 .endfor
 	@${FIND} -P ${PORTDOCS:S/^/${DOCSDIR}\//} ! -type d 2>/dev/null | \
-		${SED} -ne 's,^${PREFIX}/,,p' >> ${TMPPLIST}
+		${SED} -ne 's,^${TARGETDIR}/,,p' >> ${TMPPLIST}
 	@${FIND} -P -d ${PORTDOCS:S/^/${DOCSDIR}\//} -type d 2>/dev/null | \
-		${SED} -ne 's,^${PREFIX}/,@dirrm ,p' >> ${TMPPLIST}
-	@${ECHO_CMD} "@dirrm ${DOCSDIR:S,^${PREFIX}/,,}" >> ${TMPPLIST}
+		${SED} -ne 's,^${TARGETDIR}/,@dirrm ,p' >> ${TMPPLIST}
+	@${ECHO_CMD} "@dirrm ${DOCSDIR:S,^${TARGETDIR}/,,}" >> ${TMPPLIST}
 .else
 	@${DO_NADA}
 .endif
@@ -5214,10 +5475,10 @@ add-plist-info:
 # Process GNU INFO files at package install/deinstall time
 .if defined(INFO)
 .for i in ${INFO}
-	install-info --quiet ${PREFIX}/${INFO_PATH}/$i.info ${PREFIX}/${INFO_PATH}/dir
+	install-info --quiet ${TARGETDIR}/${INFO_PATH}/$i.info ${TARGETDIR}/${INFO_PATH}/dir
 	@${ECHO_CMD} "@unexec install-info --quiet --delete %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
 		>> ${TMPPLIST}
-	@${LS} ${PREFIX}/${INFO_PATH}/$i.info* | ${SED} -e s:${PREFIX}/::g >> ${TMPPLIST}
+	@${LS} ${TARGETDIR}/${INFO_PATH}/$i.info* | ${SED} -e s:${TARGETDIR}/::g >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec install-info --quiet %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
 		>> ${TMPPLIST}
 	@if [ "`${DIRNAME} $i`" != "." ]; then \
@@ -5226,7 +5487,7 @@ add-plist-info:
 .endfor
 .if (${PREFIX} != "/usr")
 	@${ECHO_CMD} "@unexec if [ -f %D/${INFO_PATH}/dir ]; then if sed -e '1,/Menu:/d' %D/${INFO_PATH}/dir | grep -q '^[*] '; then true; else rm %D/${INFO_PATH}/dir; fi; fi" >> ${TMPPLIST}
-.if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${X11BASE} && ${PREFIX} != ${LINUXBASE})
+.if (${PREFIX} != ${LOCALBASE_REL} && ${PREFIX} != ${X11BASE_REL} && ${PREFIX} != ${LINUXBASE_REL})
 	@${ECHO_CMD} "@unexec rmdir %D/info 2> /dev/null || true" >> ${TMPPLIST}
 .endif
 .endif
@@ -5237,7 +5498,7 @@ add-plist-info:
 # deinstall-time
 .if !target(add-plist-post)
 add-plist-post:
-.if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${X11BASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr")
+.if (${PREFIX} != ${LOCALBASE_REL} && ${PREFIX} != ${X11BASE_REL} && ${PREFIX} != ${LINUXBASE_REL} && ${PREFIX} != "/usr")
 	@${ECHO_CMD} "@unexec rmdir %D 2> /dev/null || true" >> ${TMPPLIST}
 .else
 	@${DO_NADA}
@@ -5261,12 +5522,12 @@ install-rc-script:
 	@${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
 .if (${OSVERSION} >= 700007 || ( ${OSVERSION} < 700000 && ${OSVERSION} >= 600101 ))
 	@for i in ${USE_RC_SUBR}; do \
-		${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${PREFIX}/etc/rc.d/$${i%.sh}; \
+		${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${TARGETDIR}/etc/rc.d/$${i%.sh}; \
 		${ECHO_CMD} "etc/rc.d/$${i%.sh}" >> ${TMPPLIST}; \
 	done
 .else
 	@for i in ${USE_RC_SUBR}; do \
-		${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${PREFIX}/etc/rc.d/$${i%.sh}.sh; \
+		${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${TARGETDIR}/etc/rc.d/$${i%.sh}.sh; \
 		${ECHO_CMD} "etc/rc.d/$${i%.sh}.sh" >> ${TMPPLIST}; \
 	done
 .endif
@@ -5320,9 +5581,13 @@ fake-pkg:
 	fi
 	@${RM} -rf ${PKG_DBDIR}/${PKGNAME}
 .endif
-	@if [ ! -d ${PKG_DBDIR}/${PKGNAME} ]; then \
-		${ECHO_MSG} "===>   Registering installation for ${PKGNAME}"; \
-		${MKDIR} ${PKG_DBDIR}/${PKGNAME}; \
+.if !exists(${PKG_DBDIR}/${PKGNAME})
+.if !defined(DESTDIR)
+		@${ECHO_MSG} "===>   Registering installation for ${PKGNAME}"
+.else
+		@${ECHO_MSG} "===>   Registering installation for ${PKGNAME} in ${DESTDIR}"
+.endif
+		@${MKDIR} ${PKG_DBDIR}/${PKGNAME}; \
 		${PKG_CMD} ${PKG_ARGS} -O ${PKGFILE} > ${PKG_DBDIR}/${PKGNAME}/+CONTENTS; \
 		${CP} ${DESCR} ${PKG_DBDIR}/${PKGNAME}/+DESC; \
 		${ECHO_CMD} ${COMMENT:Q} > ${PKG_DBDIR}/${PKGNAME}/+COMMENT; \
@@ -5345,8 +5610,8 @@ fake-pkg:
 					${ECHO_CMD} ${PKGNAME} >> ${PKG_DBDIR}/$$dep/+REQUIRED_BY; \
 				fi; \
 			fi; \
-		done; \
-	fi
+		done
+.endif
 .if !defined(NO_MTREE)
 	@if [ -f ${MTREE_FILE} ]; then \
 		${CP} ${MTREE_FILE} ${PKG_DBDIR}/${PKGNAME}/+MTREE_DIRS; \
@@ -5629,7 +5894,7 @@ check-desktop-entries:
 .if defined(DESKTOP_ENTRIES)
 	@set ${DESKTOP_ENTRIES} XXX; \
 	if [ `${EXPR} \( $$# - 1 \) % 6` -ne 0 ]; then \
-		${ECHO_CMD} "${PKGNAME}: Makefile error: the DESKTOP_ENTRIES list must contain one or more groups of 6 elements"; \
+		${ECHO_MSG} "${PKGNAME}: Makefile error: the DESKTOP_ENTRIES list must contain one or more groups of 6 elements"; \
 		exit 1; \
 	fi; \
 	num=1; \
diff --git a/Mk/bsd.port.subdir.mk b/Mk/bsd.port.subdir.mk
index 82ba7d542b74..0ee1bce07b0b 100644
--- a/Mk/bsd.port.subdir.mk
+++ b/Mk/bsd.port.subdir.mk
@@ -48,10 +48,10 @@ STRIP?=	-s
 
 .if !defined(NOPRECIOUSMAKEVARS)
 .if !defined(ARCH)
-ARCH!=	/usr/bin/uname -p
+ARCH!=	${DESTDIR}/usr/bin/uname -p
 .endif
 .if !defined(OSREL)
-OSREL!=	/usr/bin/uname -r | sed -e 's/[-(].*//'
+OSREL!=	${DESTDIR}/usr/bin/uname -r | sed -e 's/[-(].*//'
 .endif
 .if !defined(OSVERSION)
 .if exists(/sbin/sysctl)
@@ -61,23 +61,23 @@ OSVERSION!= /usr/sbin/sysctl -n kern.osreldate
 .endif
 .endif
 .if !defined(PORTOBJFORMAT)
-PORTOBJFORMAT!= test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
+PORTOBJFORMAT!= test -x ${DESTDIR}/usr/bin/objformat && ${DESTDIR}/usr/bin/objformat || echo aout
 .endif
 .endif
 
-ID?=	/usr/bin/id
+ID?=	${DESTDIR}/usr/bin/id
 UID!=	${ID} -u
-LOCALBASE?=	${DESTDIR}/usr/local
+LOCALBASE?=	${DESTDIR}${LOCALBASE_REL}
 .if exists(${LOCALBASE}/sbin/pkg_info)
 PKG_INFO?=	${LOCALBASE}/sbin/pkg_info
 .else
-PKG_INFO?=	/usr/sbin/pkg_info
+PKG_INFO?=	${DESTDIR}/usr/sbin/pkg_info
 .endif
-SED?=		/usr/bin/sed
+SED?=		${DESTDIR}/usr/bin/sed
 PKGINSTALLVER!=	${PKG_INFO} -P 2>/dev/null | ${SED} -e 's/.*: //'
 
 .if !defined(OPSYS)
-OPSYS!=	/usr/bin/uname -s
+OPSYS!=	${DESTDIR}/usr/bin/uname -s
 .endif
 
 ECHO_MSG?=	echo
diff --git a/Mk/bsd.python.mk b/Mk/bsd.python.mk
index 21987b97fc5f..2112b1484f25 100644
--- a/Mk/bsd.python.mk
+++ b/Mk/bsd.python.mk
@@ -404,7 +404,7 @@ check-makevars::
 	@${ECHO} "Legal values are:	2.7 (default), 2.8, 2.9, 3.2"
 	@${FALSE}
 .endif
-ZOPEBASEDIR?=			${PREFIX}/${SZOPEBASEDIR}
+ZOPEBASEDIR?=			${TARGETDIR}/${SZOPEBASEDIR}
 ZOPEPRODUCTDIR?=		Products
 .endif
 
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index b0b7a8addc8d..ea8e147db544 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -113,7 +113,7 @@ RUBY_DEFAULT_VER?=	1.8
 RUBY_VER?=		${RUBY_DEFAULT_VER}
 
 .if defined(RUBY)
-.if !exists(${RUBY})
+.if !exists(${DESTDIR}${RUBY})
 IGNORE=	cannot install: you set the variable RUBY to "${RUBY}", but it does not seem to exist.  Please specify an already installed ruby executable.
 .endif
 
@@ -122,7 +122,7 @@ _RUBY_TEST!=		${RUBY} -e 'begin; require "rbconfig"; rescue LoadError; puts "err
 IGNORE=	cannot install: you set the variable RUBY to "${RUBY}", but it failed to include rbconfig.  Please specify a properly installed ruby executable.
 .endif
 
-_RUBY_CONFIG=		${RUBY} -r rbconfig -e 'C = Config::CONFIG' -e
+_RUBY_CONFIG=		${DESTDIR}${RUBY} -r rbconfig -e 'C = Config::CONFIG' -e
 
 RUBY_VERSION!=		${_RUBY_CONFIG} 'puts VERSION'
 RUBY_SUFFIX?=		# empty
diff --git a/Mk/bsd.scons.mk b/Mk/bsd.scons.mk
index f596b5ad78d2..78a4ba37f523 100644
--- a/Mk/bsd.scons.mk
+++ b/Mk/bsd.scons.mk
@@ -57,7 +57,7 @@ CPPPATH?=	${LOCALBASE}/include ${X11BASE}/include
 SCONS_ENV?=	CCFLAGS="${CCFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 		LINKFLAGS="${LINKFLAGS}" PKGCONFIGDIR="${PKGCONFIGDIR}"  \
 		CPPPATH="${CPPPATH}" LIBPATH="${LIBPATH}" PREFIX="${PREFIX}" \
-		CC="${CC}" CXX="${CXX}"
+		DESTDIR="${DESTDIR}" CC="${CC}" CXX="${CXX}"
 SCONS_ARGS?=
 SCONS_BUILDENV?=
 SCONS_TARGET?=
diff --git a/Tools/scripts/security-check.awk b/Tools/scripts/security-check.awk
index 48746cdb6384..7d6ff1b8b735 100644
--- a/Tools/scripts/security-check.awk
+++ b/Tools/scripts/security-check.awk
@@ -34,10 +34,18 @@ FILENAME ~ /\.writable$/ { writable_files[$0] = 1; }
 function print_header() {
 	if (header_printed)
 		return;
-	if (audit != "")
-		print "===> SECURITY REPORT (PARANOID MODE): ";
-	else
-		print "===> SECURITY REPORT: ";
+	if (audit != "") {
+		if (destdir == "")
+			print "===> SECURITY REPORT (PARANOID MODE): ";
+		else
+			print "===> SECURITY REPORT FOR", destdir, "(PARANOID MODE): ";
+		}
+	else {
+		if (destdir == "")
+			print "===> SECURITY REPORT: ";
+		else
+			print "===> SECURITY REPORT FOR", destdir, ": ";
+		}
 	header_printed = 1;
 }
 function note_for_the_stupid(file) { return (file in stupid_binaries) ? (" (USES POSSIBLY INSECURE FUNCTIONS:" stupid_binaries[file] ")") : ""; }
@@ -46,8 +54,14 @@ END {
 	for (file in setuid_binaries) {
 		if (!note_printed) {
 			print_header();
-			print "      This port has installed the following binaries which execute with";
-			print "      increased privileges.";
+			if (destdir == "") {
+				print "      This port has installed the following binaries, which execute with";
+				print "      increased privileges.";
+				}
+			else {
+				print "      This port has installed the following binaries into", destdir, ", which";
+				print "      execute with increased privileges.";
+				}
 			note_printed = 1;
 		}
 		print file note_for_the_stupid(file);
@@ -58,8 +72,15 @@ END {
 	for (file in network_binaries) {
 		if (!note_printed) {
 			print_header();
-			print "      This port has installed the following files which may act as network";
-			print "      servers and may therefore pose a remote security risk to the system.";
+			if (destdir == "") {
+				print "      This port has installed the following files, which may act as network";
+				print "      servers and may therefore pose a remote security risk to the system.";
+				}
+			else {
+				print "      This port has installed the following files into", destdir, ", which may";
+				print "      act as network servers and may therefore pose a remote security risk to";
+				print "      the system.";
+				}
 			note_printed = 1;
 		}
 		print file note_for_the_stupid(file);
@@ -70,8 +91,14 @@ END {
 		for (file in startup_scripts) {
 			if (!note_printed) {
 				print_header();
-				print "      This port has installed the following startup scripts which may cause";
+			if (destdir == "") {
+				print "      This port has installed the following startup scripts, which may cause";
 				print "      these network services to be started at boot time.";
+				}
+			else {
+				print "      This port has installed the following startup scripts into", destdir, ", which";
+				print "      may cause these network services to be started at boot time.";
+				}
 				note_printed = 1;
 			}
 			print file;
@@ -83,7 +110,10 @@ END {
 	for (file in writable_files) {
 		if (!note_printed) {
 			print_header();
-			print "      This port has installed the following world-writable files/directories.";
+			if (destdir == "")
+				print "      This port has installed the following world-writable files/directories.";
+			else
+				print "      This port has installed the following world-writable files/directories into", destdir, ".";
 			note_printed = 1;
 		}
 		print file;
diff --git a/databases/p5-DBD-Oracle/Makefile b/databases/p5-DBD-Oracle/Makefile
index 98a42500b973..e4dba4674508 100644
--- a/databases/p5-DBD-Oracle/Makefile
+++ b/databases/p5-DBD-Oracle/Makefile
@@ -24,7 +24,6 @@ PERL_CONFIGURE=	yes
 CONFIGURE_ENV=	ORACLE_HOME="${ORACLE_HOME}"
 
 MAN1=		ora_explain.1
-MAN1PREFIX=	${PREFIX}
 MAN3=		DBD::Oracle.3 DBD::Oraperl.3
 
 post-install:
diff --git a/databases/p5-sqlrelay/Makefile b/databases/p5-sqlrelay/Makefile
index 8be84ccab7a8..c1ba508fff5a 100644
--- a/databases/p5-sqlrelay/Makefile
+++ b/databases/p5-sqlrelay/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS=	${SQLRELAY_CONFIGURE_ARGS} \
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		${SQLRELAY_CONFIGURE_ENV}
 
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
 MAN3=		DBD::SQLRelay.3 SQLRelay::Connection.3 SQLRelay::Cursor.3
 
 .include "${.CURDIR}/../sqlrelay/Makefile.common"
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 1a812652c004..291d0017422d 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -36,7 +36,7 @@ MAN1=		bin_dec_hex.1 cdeftutorial.1 rpntutorial.1 rrd-beginners.1 \
 		rrdthreads.1 rrdtool.1 rrdtune.1 rrdtutorial.1 rrdupdate.1 \
 		rrdxport.1
 MAN3=		RRDp.3 RRDs.3
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
 
 post-extract:
 .if defined(NOPORTDOCS)
diff --git a/databases/rrdtool10/Makefile b/databases/rrdtool10/Makefile
index da30bc4b63a3..9b659fce79de 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=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
 
 OPTIONS=	"ISO-8859-2 fonts support" off
 
diff --git a/devel/p5-Devel-DProf/Makefile b/devel/p5-Devel-DProf/Makefile
index 3b7485bc7931..42cb201cf9a2 100644
--- a/devel/p5-Devel-DProf/Makefile
+++ b/devel/p5-Devel-DProf/Makefile
@@ -17,7 +17,6 @@ COMMENT=	A Perl code profiler
 
 PERL_CONFIGURE=	yes
 
-MAN1PREFIX=	${PREFIX}
 MAN1=		dprofpp.1
 MAN3=		Devel::DProf.3
 
diff --git a/devel/p5-Glib2/Makefile b/devel/p5-Glib2/Makefile
index afeee330b9c5..67597dccaed9 100644
--- a/devel/p5-Glib2/Makefile
+++ b/devel/p5-Glib2/Makefile
@@ -35,6 +35,6 @@ IGNORE=		requires perl 5.8.0 or later. Install lang/perl5.8 then try again
 
 post-install:
 	@cd ${WRKSRC}/blib/man3 && ${FIND} * -name "*.3" | ${SED} \
-		's,^,${MAN3PREFIX:S,^${PREFIX}/,,}/man/man3/,' >> ${TMPPLIST}
+		's,^,${MAN3PREFIX:S,^${TARGETDIR}/,,}/man/man3/,' >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-SDL/Makefile b/devel/p5-SDL/Makefile
index d7c377183396..83078e18a258 100644
--- a/devel/p5-SDL/Makefile
+++ b/devel/p5-SDL/Makefile
@@ -54,7 +54,7 @@ USE_PERL5=	yes
 INSTALLS_SHLIB=	yes
 INSTALL_TARGET=	pure_install
 
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
 MAN3=		SDL.3		\
 		SDL::App.3	\
 		SDL::Cdrom.3	\
diff --git a/devel/plan9port/Makefile b/devel/plan9port/Makefile
index 6bc4f0b411aa..488944d2607f 100644
--- a/devel/plan9port/Makefile
+++ b/devel/plan9port/Makefile
@@ -23,7 +23,7 @@ SUB_FILES=	pkg-message
 REINPLACE_ARGS=	-i ""
 ONLY_FOR_ARCHS=	i386
 
-PLAN9=		${PREFIX}/plan9
+PLAN9=		${TARGETDIR}/plan9
 MANPREFIX=	${PLAN9}
 
 MAN1=		9term.1 acmeevent.1 ascii.1 acme.1 9p.1 basename.1 cal.1 \
diff --git a/devel/subversion-devel/Makefile b/devel/subversion-devel/Makefile
index 2a574ac8b7f7..df96ae7a7eea 100644
--- a/devel/subversion-devel/Makefile
+++ b/devel/subversion-devel/Makefile
@@ -92,7 +92,7 @@ IGNORE=	subversion\'s Perl bindings need perl 5.8.0 or greater. Upgrade your per
 SWIG_BINDINGS+=		yes
 USE_PERL5=		yes
 PLIST_SUB+=		WITH_PERL=""
-MAN3PREFIX=		${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX=		${TARGETDIR}/lib/perl5/${PERL_VERSION}
 MAN3=			SVN::Base.3 \
 			SVN::Client.3 \
 			SVN::Core.3 \
diff --git a/devel/subversion-freebsd/Makefile b/devel/subversion-freebsd/Makefile
index 2a574ac8b7f7..df96ae7a7eea 100644
--- a/devel/subversion-freebsd/Makefile
+++ b/devel/subversion-freebsd/Makefile
@@ -92,7 +92,7 @@ IGNORE=	subversion\'s Perl bindings need perl 5.8.0 or greater. Upgrade your per
 SWIG_BINDINGS+=		yes
 USE_PERL5=		yes
 PLIST_SUB+=		WITH_PERL=""
-MAN3PREFIX=		${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX=		${TARGETDIR}/lib/perl5/${PERL_VERSION}
 MAN3=			SVN::Base.3 \
 			SVN::Client.3 \
 			SVN::Core.3 \
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 2a574ac8b7f7..df96ae7a7eea 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -92,7 +92,7 @@ IGNORE=	subversion\'s Perl bindings need perl 5.8.0 or greater. Upgrade your per
 SWIG_BINDINGS+=		yes
 USE_PERL5=		yes
 PLIST_SUB+=		WITH_PERL=""
-MAN3PREFIX=		${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX=		${TARGETDIR}/lib/perl5/${PERL_VERSION}
 MAN3=			SVN::Base.3 \
 			SVN::Client.3 \
 			SVN::Core.3 \
diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile
index 2a574ac8b7f7..df96ae7a7eea 100644
--- a/devel/subversion16/Makefile
+++ b/devel/subversion16/Makefile
@@ -92,7 +92,7 @@ IGNORE=	subversion\'s Perl bindings need perl 5.8.0 or greater. Upgrade your per
 SWIG_BINDINGS+=		yes
 USE_PERL5=		yes
 PLIST_SUB+=		WITH_PERL=""
-MAN3PREFIX=		${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX=		${TARGETDIR}/lib/perl5/${PERL_VERSION}
 MAN3=			SVN::Base.3 \
 			SVN::Client.3 \
 			SVN::Core.3 \
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index d618bad65c0b..530304ff54b5 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -50,7 +50,7 @@ PLIST_SUB+=	PORTVERSION=${PORTVERSION:R}
 CONFIGURE_ARGS+=	--with-perl=${PERL5}
 PLIST_SUB+=		WITH_PERL=''
 MAN3=			Image::Magick.3
-MAN3PREFIX=		${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX=		${TARGETDIR}/lib/perl5/${PERL_VER}
 .else
 CONFIGURE_ARGS+=	--without-perl
 PLIST_SUB+=		WITH_PERL='@comment '
diff --git a/graphics/p5-PGPLOT/Makefile b/graphics/p5-PGPLOT/Makefile
index 00896bf5bac6..92da0143aa69 100644
--- a/graphics/p5-PGPLOT/Makefile
+++ b/graphics/p5-PGPLOT/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	pgplot.5:${PORTSDIR}/graphics/pgplot
 BUILD_DEPENDS=	${SITE_PERL}/ExtUtils/F77.pm:${PORTSDIR}/lang/p5-F77
 
 MAN3=	PGPLOT.3
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
 
 USE_PERL5=	yes
 SCRIPTS_ENV=	PERL=${PERL}
diff --git a/graphics/pgperl/Makefile b/graphics/pgperl/Makefile
index 00896bf5bac6..92da0143aa69 100644
--- a/graphics/pgperl/Makefile
+++ b/graphics/pgperl/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	pgplot.5:${PORTSDIR}/graphics/pgplot
 BUILD_DEPENDS=	${SITE_PERL}/ExtUtils/F77.pm:${PORTSDIR}/lang/p5-F77
 
 MAN3=	PGPLOT.3
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
 
 USE_PERL5=	yes
 SCRIPTS_ENV=	PERL=${PERL}
diff --git a/graphics/tcm/Makefile b/graphics/tcm/Makefile
index c64cb720b9f0..062dd395da11 100644
--- a/graphics/tcm/Makefile
+++ b/graphics/tcm/Makefile
@@ -27,7 +27,7 @@ USE_MOTIF=	yes
 USE_BISON=	yes
 USE_GMAKE=	yes
 
-MANPREFIX=	${PREFIX}/tcm
+MANPREFIX=	${TARGETDIR}/tcm
 MAN1=		psf.1 tatd.1 tcbd.1 tcm.1 tcmd.1 tcmdv.1 tcmt.1 tcpd.1 tcrd.1 \
 		tdfd.1 tdpd.1 tefd.1 terd.1 tesd.1 text2ps.1 tfet.1 tfrt.1 \
 		tgd.1 tgt.1 tgtt.1 tpsd.1 trpg.1 tscd.1 tsnd.1 tssd.1 tstd.1 \
diff --git a/japanese/p5-manual/Makefile b/japanese/p5-manual/Makefile
index 5dc8961d316b..a809302b2cfe 100644
--- a/japanese/p5-manual/Makefile
+++ b/japanese/p5-manual/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl5 japanese manual
 
 NO_BUILD=	yes
-MANPREFIX=	${PREFIX}/man/ja
+MANPREFIX=	${TARGETDIR}/man/ja
 
 CAT1=		a2p.1 perl.1 perlapi.1 perlbook.1 perlbot.1 perlcall.1 \
 		perldata.1 perldebug.1 perldiag.1 perlembed.1 perlform.1 \
diff --git a/japanese/perl5/Makefile b/japanese/perl5/Makefile
index 8b4f2fa06c1b..e3913a4e22ff 100644
--- a/japanese/perl5/Makefile
+++ b/japanese/perl5/Makefile
@@ -120,7 +120,7 @@ MAN3=	AnyDBM_File.3 AutoLoader.3 AutoSplit.3 B.3 B::Asmdata.3 \
 	strict.3 subs.3 vars.3 \
 	I18N::Japanese.3
 
-MAN3PREFIX=	${PREFIX}/lib/perl5/${JPERL_VERSION}/
+MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
 
 test:
 	@(cd ${WRKSRC}; make test)
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 6dd5d54169e1..f208a36178a3 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -92,10 +92,10 @@ PLIST_SUB+=	ERTS_VSN=${ERTS_VSN}
 
 NOMANCOMPRESS=	yes
 
-MAN1PREFIX=	${PREFIX}/lib/erlang
-MAN3PREFIX=	${PREFIX}/lib/erlang
-MAN4PREFIX=	${PREFIX}/lib/erlang
-MAN6PREFIX=	${PREFIX}/lib/erlang
+MAN1PREFIX=	${TARGETDIR}/lib/erlang
+MAN3PREFIX=	${TARGETDIR}/lib/erlang
+MAN4PREFIX=	${TARGETDIR}/lib/erlang
+MAN6PREFIX=	${TARGETDIR}/lib/erlang
 
 # Workaround for a ./configure recursion bug which leads to INSTALL being
 # set to "../../../../[...]"
diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile
index 6dd5d54169e1..f208a36178a3 100644
--- a/lang/erlang14/Makefile
+++ b/lang/erlang14/Makefile
@@ -92,10 +92,10 @@ PLIST_SUB+=	ERTS_VSN=${ERTS_VSN}
 
 NOMANCOMPRESS=	yes
 
-MAN1PREFIX=	${PREFIX}/lib/erlang
-MAN3PREFIX=	${PREFIX}/lib/erlang
-MAN4PREFIX=	${PREFIX}/lib/erlang
-MAN6PREFIX=	${PREFIX}/lib/erlang
+MAN1PREFIX=	${TARGETDIR}/lib/erlang
+MAN3PREFIX=	${TARGETDIR}/lib/erlang
+MAN4PREFIX=	${TARGETDIR}/lib/erlang
+MAN6PREFIX=	${TARGETDIR}/lib/erlang
 
 # Workaround for a ./configure recursion bug which leads to INSTALL being
 # set to "../../../../[...]"
diff --git a/lang/icc/Makefile b/lang/icc/Makefile
index 0041f228b107..880be30e50f8 100644
--- a/lang/icc/Makefile
+++ b/lang/icc/Makefile
@@ -38,7 +38,7 @@ PATCH_WRKSRC=	${WRKSRC}/opt/${COMPILERDIR}
 
 MAN1=		icc.1
 MLINKS=		icc.1 icpc.1
-MANPREFIX=	${PREFIX}/${COMPILERDIR}/
+MANPREFIX=	${TARGETDIR}/${COMPILERDIR}/
 
 ICC_SITE=	http://www.intel.com/software/products/compilers/
 
diff --git a/lang/icc7/Makefile b/lang/icc7/Makefile
index 3d7df0e7ee2d..794eb3fe585d 100644
--- a/lang/icc7/Makefile
+++ b/lang/icc7/Makefile
@@ -33,7 +33,7 @@ PLIST_SUB=	COMPILERDIR=${COMPILERDIR}
 PATCH_WRKSRC=	${WRKSRC}/opt/intel/${COMPILERDIR}
 
 MAN1=		icc.1
-MANPREFIX=	${PREFIX}/intel/${COMPILERDIR}/
+MANPREFIX=	${TARGETDIR}/intel/${COMPILERDIR}/
 
 ICC_SITE=	http://www.intel.com/software/products/compilers/
 
diff --git a/lang/ifc/Makefile b/lang/ifc/Makefile
index 890870697ce7..b509c562dd65 100644
--- a/lang/ifc/Makefile
+++ b/lang/ifc/Makefile
@@ -38,7 +38,7 @@ PLIST_SUB=	COMPILERDIR=${COMPILERDIR}
 PATCH_WRKSRC=	${WRKSRC}/opt/${COMPILERDIR}
 
 MAN1=		ifort.1
-MANPREFIX=	${PREFIX}/${COMPILERDIR}/
+MANPREFIX=	${TARGETDIR}/${COMPILERDIR}/
 
 IFC_SITE=	http://www.intel.com/software/products/compilers/
 
diff --git a/lang/ifc7/Makefile b/lang/ifc7/Makefile
index 3570f4b9551b..07a38c1a7ba5 100644
--- a/lang/ifc7/Makefile
+++ b/lang/ifc7/Makefile
@@ -32,7 +32,7 @@ PLIST_SUB=	COMPILERDIR=${COMPILERDIR}
 PATCH_WRKSRC=	${WRKSRC}/opt/intel/${COMPILERDIR}
 
 MAN1=		ifc.1
-MANPREFIX=	${PREFIX}/intel/${COMPILERDIR}/
+MANPREFIX=	${TARGETDIR}/intel/${COMPILERDIR}/
 
 IFC_SITE=	http://www.intel.com/software/products/compilers/
 
diff --git a/lang/metaocaml/Makefile b/lang/metaocaml/Makefile
index 2010f2a68e54..d1093b1b8fa3 100644
--- a/lang/metaocaml/Makefile
+++ b/lang/metaocaml/Makefile
@@ -63,7 +63,7 @@ OPTIONS=	X11 "build the X11 graphics library" on \
 
 .include <bsd.port.pre.mk>
 # Have to set this here and can't use ${DATADIR} or MLINKS get screwed up
-MANPREFIX=	${PREFIX}/share/metaocaml
+MANPREFIX=	${TARGETDIR}/share/metaocaml
 
 .if defined(WITH_X11)
 USE_XLIB=	yes
diff --git a/lang/perl5.10/Makefile b/lang/perl5.10/Makefile
index ab06bbd8d440..4a7cf88df437 100644
--- a/lang/perl5.10/Makefile
+++ b/lang/perl5.10/Makefile
@@ -119,7 +119,7 @@ PLIST_SUB+=		NEED_USE_PERL="@comment "
 .if defined(WITH_GDBM)
 MAN3+=	GDBM_File.3
 .endif
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VER}/perl
+MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VER}/perl
 
 test:
 	@(cd ${WRKSRC}; make test)
diff --git a/lang/perl5.12/Makefile b/lang/perl5.12/Makefile
index ab06bbd8d440..4a7cf88df437 100644
--- a/lang/perl5.12/Makefile
+++ b/lang/perl5.12/Makefile
@@ -119,7 +119,7 @@ PLIST_SUB+=		NEED_USE_PERL="@comment "
 .if defined(WITH_GDBM)
 MAN3+=	GDBM_File.3
 .endif
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VER}/perl
+MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VER}/perl
 
 test:
 	@(cd ${WRKSRC}; make test)
diff --git a/lang/perl5.14/Makefile b/lang/perl5.14/Makefile
index ab06bbd8d440..4a7cf88df437 100644
--- a/lang/perl5.14/Makefile
+++ b/lang/perl5.14/Makefile
@@ -119,7 +119,7 @@ PLIST_SUB+=		NEED_USE_PERL="@comment "
 .if defined(WITH_GDBM)
 MAN3+=	GDBM_File.3
 .endif
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VER}/perl
+MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VER}/perl
 
 test:
 	@(cd ${WRKSRC}; make test)
diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile
index ab06bbd8d440..4a7cf88df437 100644
--- a/lang/perl5.16/Makefile
+++ b/lang/perl5.16/Makefile
@@ -119,7 +119,7 @@ PLIST_SUB+=		NEED_USE_PERL="@comment "
 .if defined(WITH_GDBM)
 MAN3+=	GDBM_File.3
 .endif
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VER}/perl
+MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VER}/perl
 
 test:
 	@(cd ${WRKSRC}; make test)
diff --git a/lang/perl5.6/Makefile b/lang/perl5.6/Makefile
index 8e48d5aec941..fe5fdb148699 100644
--- a/lang/perl5.6/Makefile
+++ b/lang/perl5.6/Makefile
@@ -97,7 +97,7 @@ PLIST_SUB+=		NEED_USE_PERL=""
 .if defined(WITH_GDBM)
 MAN3+=	GDBM_File.3
 .endif
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VER}/perl
+MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VER}/perl
 
 test:
 	@(cd ${WRKSRC}; make test)
diff --git a/lang/perl5.8/Makefile b/lang/perl5.8/Makefile
index ab06bbd8d440..4a7cf88df437 100644
--- a/lang/perl5.8/Makefile
+++ b/lang/perl5.8/Makefile
@@ -119,7 +119,7 @@ PLIST_SUB+=		NEED_USE_PERL="@comment "
 .if defined(WITH_GDBM)
 MAN3+=	GDBM_File.3
 .endif
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VER}/perl
+MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VER}/perl
 
 test:
 	@(cd ${WRKSRC}; make test)
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 8e48d5aec941..fe5fdb148699 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -97,7 +97,7 @@ PLIST_SUB+=		NEED_USE_PERL=""
 .if defined(WITH_GDBM)
 MAN3+=	GDBM_File.3
 .endif
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VER}/perl
+MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VER}/perl
 
 test:
 	@(cd ${WRKSRC}; make test)
diff --git a/lang/pike72/Makefile b/lang/pike72/Makefile
index 658c6be11f50..2596e7c47135 100644
--- a/lang/pike72/Makefile
+++ b/lang/pike72/Makefile
@@ -178,7 +178,7 @@ CONFIGURE_ARGS+= --without-libpdf
 
 USE_GMAKE=	yes
 MAN1=		hilfe.1 pike.1
-MAN1PREFIX=	${PREFIX}/pike/${PORTVERSION}
+MAN1PREFIX=	${TARGETDIR}/pike/${PORTVERSION}
 
 pre-everything::
 .if !defined(WITH_OPTIMIZED_CFLAGS)
diff --git a/mail/qmailanalog/Makefile b/mail/qmailanalog/Makefile
index 9109f76c21cd..18c943a095e8 100644
--- a/mail/qmailanalog/Makefile
+++ b/mail/qmailanalog/Makefile
@@ -33,7 +33,7 @@ MYSUBDIR?=
 .endif
 
 PREFIX?=	${QMAIL_PREFIX}
-QMPREFIX?=	${PREFIX}/${MYSUBDIR}
+QMPREFIX?=	${TARGETDIR}/${MYSUBDIR}
 
 NO_MTREE=	yes
 
diff --git a/mail/zmailer/Makefile b/mail/zmailer/Makefile
index 60f1f87de847..c4cf30532cea 100644
--- a/mail/zmailer/Makefile
+++ b/mail/zmailer/Makefile
@@ -54,7 +54,7 @@ CONFIGURE_ARGS+=--prefix=${PREFIX}/ \
 
 MAN1=		rmail.1zm vacation.1zm zmailer.1zm zmsh.1zm mboxpath.1zm mailq.1zm \
 		mailrm.1zm newaliases.1zm
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
 MAN3=		ZMailer::mailq.3
 MAN5=		aliases.5zm mailq-m.5zm zdbases.conf.5zm zmailer.conf.5zm
 MAN8=		hold.8zm router.8zm scheduler.8zm sendmail.8zm sm.8zm smtp.8zm \
diff --git a/math/PDL/Makefile b/math/PDL/Makefile
index f662c5d9d471..0ddad4032a14 100644
--- a/math/PDL/Makefile
+++ b/math/PDL/Makefile
@@ -73,7 +73,7 @@ test:
 # autogen plist
 post-install:
 	@(cd ${WRKSRC}/blib/man3 ; \
-	  ${FIND} *.3 | ${SED} "s,^,${MAN3PREFIX:S,^${PREFIX}/,,}/man/man3/," \
+	  ${FIND} *.3 | ${SED} "s,^,${MAN3PREFIX:S,^${TARGETDIR}/,,}/man/man3/," \
 		>> ${TMPPLIST} ; \
 	  cd ${WRKSRC}/blib/man1 ; \
 	  ${FIND} *.1 | ${SED} "s,^,man/man1/," >> ${TMPPLIST})
diff --git a/misc/ossp-uuid/Makefile b/misc/ossp-uuid/Makefile
index 85d16c3c28b8..e0530893e41e 100644
--- a/misc/ossp-uuid/Makefile
+++ b/misc/ossp-uuid/Makefile
@@ -32,7 +32,7 @@ CONFIGURE_ENV+=	PERL=${PERL5}
 CONFIGURE_ARGS+=	--with-perl
 PLIST_SUB+=	WITH_PERL=''
 MAN3=		OSSP::uuid.3
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
 .else
 PLIST_SUB+=	WITH_PERL='@comment '
 .endif
diff --git a/net-mgmt/flowd/Makefile b/net-mgmt/flowd/Makefile
index b2dec1f16093..09a34c7a0148 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=	${PREFIX}/lib/perl5/${PERL_VERSION}
+#MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
 #MAN3=		Flowd.3
 .else
 PLIST_SUB+=	WITH_PERL="@comment "
diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile
index 177fa632be89..9c859d8bef59 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=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3PERLPREFIX=	${TARGETDIR}/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 177fa632be89..9c859d8bef59 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=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3PERLPREFIX=	${TARGETDIR}/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 177fa632be89..9c859d8bef59 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=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3PERLPREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
 _MANPAGES+=	${MAN3PERL:S%^%${MAN3PERLPREFIX}/man/man3/%}
 .endif
 
diff --git a/net-mgmt/nocol/Makefile b/net-mgmt/nocol/Makefile
index e839150a122e..8b439e62be74 100644
--- a/net-mgmt/nocol/Makefile
+++ b/net-mgmt/nocol/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.netplex-tech.com/software/downloads/nocol/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Network/Service monitoring software
 
-MANPREFIX=	${PREFIX}/nocol/
+MANPREFIX=	${TARGETDIR}/nocol/
 MAN1=		netconsole.1
 MAN3=		nocol-prog.3 perlnocol.3
 MAN8=		etherload.8 eventselect.8 genmon.8 multiping.8 noclogd.8 \
diff --git a/net/globus4/Makefile b/net/globus4/Makefile
index aac3c4f4f2c2..c7d4d3a30915 100644
--- a/net/globus4/Makefile
+++ b/net/globus4/Makefile
@@ -37,7 +37,7 @@ USE_GMAKE=	yes
 USE_PERL5=	yes
 
 GLOBUS_BASE?=	globus
-GLOBUS_LOCATION=${PREFIX}/${GLOBUS_BASE}
+GLOBUS_LOCATION=${TARGETDIR}/${GLOBUS_BASE}
 TMP_GLOBUS_LOCATION=	${WRKDIR}/globus
 TMP_GLOBUS_ENV=	GLOBUS_LOCATION=${TMP_GLOBUS_LOCATION} \
 		GPT_LOCATION=${TMP_GLOBUS_LOCATION}
diff --git a/net/libpcap/Makefile b/net/libpcap/Makefile
index ce8899a25837..d184757d764e 100644
--- a/net/libpcap/Makefile
+++ b/net/libpcap/Makefile
@@ -25,7 +25,7 @@ USE_BISON=	yes
 .if defined(LIBPCAP_OVERWRITE_BASE)
 PREFIX=		/usr
 PKGNAMESUFFIX=	-overwrite-base
-MANPREFIX=	${PREFIX}/share
+MANPREFIX=	${TARGETDIR}/share
 CONFIGURE_ARGS+=--mandir=${MANPREFIX}/man
 PLIST_SUB+=	NOTBASE="@comment "
 PLIST_SUB+=	BASE=""
diff --git a/net/mpich/Makefile b/net/mpich/Makefile
index 722a8e819daa..be3cbadc95e5 100644
--- a/net/mpich/Makefile
+++ b/net/mpich/Makefile
@@ -62,7 +62,7 @@ HAS_CONFIGURE=	yes
 
 ALL_TARGET=
 
-MANPREFIX=	${PREFIX}/mpich
+MANPREFIX=	${TARGETDIR}/mpich
 
 MAN1=		MPI.1 cleanipcs.1 mpiCC.1 mpicc.1 mpif77.1 mpif90.1 mpiman.1		\
 		mpireconfig.1 mpirun.1 Jumpshots.1 chp4_servs.1 tstmachines.1
diff --git a/net/rrdtool/Makefile b/net/rrdtool/Makefile
index 1a812652c004..291d0017422d 100644
--- a/net/rrdtool/Makefile
+++ b/net/rrdtool/Makefile
@@ -36,7 +36,7 @@ MAN1=		bin_dec_hex.1 cdeftutorial.1 rpntutorial.1 rrd-beginners.1 \
 		rrdthreads.1 rrdtool.1 rrdtune.1 rrdtutorial.1 rrdupdate.1 \
 		rrdxport.1
 MAN3=		RRDp.3 RRDs.3
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
 
 post-extract:
 .if defined(NOPORTDOCS)
diff --git a/net/rrdtool10/Makefile b/net/rrdtool10/Makefile
index da30bc4b63a3..9b659fce79de 100644
--- a/net/rrdtool10/Makefile
+++ b/net/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=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
 
 OPTIONS=	"ISO-8859-2 fonts support" off
 
diff --git a/net/spread/Makefile b/net/spread/Makefile
index 9b29ba36f7d6..5390411bc8df 100644
--- a/net/spread/Makefile
+++ b/net/spread/Makefile
@@ -40,7 +40,7 @@ MAN3=		libsp.3 SP_connect.3 SP_disconnect.3 SP_equal_group_ids.3 \
 PERL_CONFIGURE_ARGS=	CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}" \
 			INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib"
 
-_MANPAGES+=	${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/Spread.3
+_MANPAGES+=	${TARGETDIR}/lib/perl5/${PERL_VERSION}/man/man3/Spread.3
 
 post-configure:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
diff --git a/net/spread4/Makefile b/net/spread4/Makefile
index 9b29ba36f7d6..5390411bc8df 100644
--- a/net/spread4/Makefile
+++ b/net/spread4/Makefile
@@ -40,7 +40,7 @@ MAN3=		libsp.3 SP_connect.3 SP_disconnect.3 SP_equal_group_ids.3 \
 PERL_CONFIGURE_ARGS=	CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}" \
 			INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib"
 
-_MANPAGES+=	${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/Spread.3
+_MANPAGES+=	${TARGETDIR}/lib/perl5/${PERL_VERSION}/man/man3/Spread.3
 
 post-configure:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
diff --git a/net/tcpdump/Makefile b/net/tcpdump/Makefile
index d025b4d16a46..e5097acd9c19 100644
--- a/net/tcpdump/Makefile
+++ b/net/tcpdump/Makefile
@@ -31,7 +31,7 @@ GNU_CONFIGURE=		yes
 .if defined(TCPDUMP_OVERWRITE_BASE)
 PREFIX=		/usr
 PKGNAMESUFFIX=	-overwrite-base
-MANPREFIX=	${PREFIX}/share
+MANPREFIX=	${TARGETDIR}/share
 CONFIGURE_ARGS+=--mandir=${MANPREFIX}/man
 PLIST_SUB+=	NOTBASE="@comment "
 PLIST_SUB+=	BASE=""
diff --git a/palm/prc-tools/Makefile b/palm/prc-tools/Makefile
index a4ff2b752436..9beeb12b03e8 100644
--- a/palm/prc-tools/Makefile
+++ b/palm/prc-tools/Makefile
@@ -41,7 +41,7 @@ CONFIGURE_ARGS=	--enable-targets=m68k-palmos,arm-palmos \
 CONFIGURE_ENV=	PATH=${PATH}:${PREFIX}/pilot/bin
 MAKE_ENV=	PATH=${PATH}:${PREFIX}/pilot/bin
 
-MANPREFIX=	${PREFIX}/pilot
+MANPREFIX=	${TARGETDIR}/pilot
 MAN1=		cccp.1 m68k-palmos-g++.1 m68k-palmos-gcc.1 \
 		m68k-palmos-addr2line.1 m68k-palmos-ar.1 \
 		m68k-palmos-as.1 m68k-palmos-c++filt.1 \
diff --git a/ports-mgmt/pkg_install-devel/pkg-deinstall b/ports-mgmt/pkg_install-devel/pkg-deinstall
index 08ffba959763..32c71c3ad15f 100644
--- a/ports-mgmt/pkg_install-devel/pkg-deinstall
+++ b/ports-mgmt/pkg_install-devel/pkg-deinstall
@@ -10,9 +10,9 @@ BACKUPDIR=/var/backups
 
 PREFIX=${PKG_PREFIX:-/usr/local}
 if [ "${PREFIX}" = "/usr" ]; then
-  MANPREFIX="${PREFIX}/share"
+  MANPREFIX="${TARGETDIR}/share"
 else
-  MANPREFIX="${PREFIX}"
+  MANPREFIX="${TARGETDIR}"
 fi
 
 case $2 in
diff --git a/ports-mgmt/pkg_install-devel/pkg-install b/ports-mgmt/pkg_install-devel/pkg-install
index 72ac81eaf581..f29172829e88 100644
--- a/ports-mgmt/pkg_install-devel/pkg-install
+++ b/ports-mgmt/pkg_install-devel/pkg-install
@@ -13,9 +13,9 @@ TOOLS="add check create delete info sign update version"
 
 PREFIX=${PKG_PREFIX:-/usr/local}
 if [ "${PREFIX}" = "/usr" ]; then
-  MANPREFIX="${PREFIX}/share"
+  MANPREFIX="${TARGETDIR}/share"
 else
-  MANPREFIX="${PREFIX}"
+  MANPREFIX="${TARGETDIR}"
 fi
 
 case $2 in
diff --git a/print/perlftlib/Makefile b/print/perlftlib/Makefile
index 89c247024135..d027492b504b 100644
--- a/print/perlftlib/Makefile
+++ b/print/perlftlib/Makefile
@@ -22,7 +22,7 @@ USE_PERL5=	yes
 NOMANCOMPRESS=	yes
 MAN1=		mkttfdir.1 ftinfo.1
 MAN3=		FreeType.3
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
 
 MAKE_ENV=	PERL_VER=${PERL_VER} PERL5=${PERL5}
 
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 8014c9b8f7b0..0c3cc498c2b6 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -948,7 +948,7 @@ pre-everything::
 BASE_SUFFIX=	-overwrite-base
 PREFIX=		/usr
 OPENSSLDIR=	/etc/ssl
-MANPREFIX=	${PREFIX}/openssl
+MANPREFIX=	${TARGETDIR}/openssl
 PLIST_SUB+=	MANDIR=""
 PLIST_SUB+=	NOBASE="@comment "
 .else
@@ -963,7 +963,7 @@ pre-everything::
 
 .endif
 OPENSSLDIR=	${PREFIX}/openssl
-MANPREFIX=	${PREFIX}
+MANPREFIX=	${TARGETDIR}
 PLIST_SUB+=	MANDIR="@comment "
 PLIST_SUB+=	NOBASE=""
 .endif
diff --git a/security/p5-openxpki/Makefile b/security/p5-openxpki/Makefile
index 4266e8a65c1b..5ff75021e4cc 100644
--- a/security/p5-openxpki/Makefile
+++ b/security/p5-openxpki/Makefile
@@ -168,10 +168,9 @@ WITH_OPENSSL_BETA=	yes
 PERL_DIRS=	${SERVER} ${CLIENT}
 NO_PERL_DIRS=	${DEPLOYMENT} ${I18N}
 MAKE_MAKER_ENV=	PREFIX=${PREFIX}
-DESTDIR?=	/
+DESTDIR?=	/.
 CONFIGURE_ARGS=	--prefix ${PREFIX} --dest ${DESTDIR}
-MAN1PREFIX=	${PREFIX}
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
 
 do-configure:
 	@ for dir in ${PERL_DIRS}; do \
diff --git a/security/pam_krb5/Makefile b/security/pam_krb5/Makefile
index 4a74548b4531..d5c8a791ade3 100644
--- a/security/pam_krb5/Makefile
+++ b/security/pam_krb5/Makefile
@@ -47,8 +47,8 @@ IGNORE=			You must define KRB5_IMPL to be \"mit\" or \"heimdal\"
 IGNORE=			FreeBSD 5.x already ships with its own version of pam_krb5
 .endif
 MANDIR=			${MANPREFIX}/man
-PREFIX=			${DESTDIR}/usr
-MANPREFIX=		${DESTDIR}/usr/share
+PREFIX=			/usr
+MANPREFIX=		${TARGETDIR}/usr/share
 MANDIR=			${PREFIX}/share/man
 KRB5_DIR?=		${LOCALBASE}
 CONFIGURE_ENV=		CFLAGS="${CFLAGS}"
diff --git a/sysutils/heirloom/Makefile b/sysutils/heirloom/Makefile
index 624416f7a60d..4d00162e25cd 100644
--- a/sysutils/heirloom/Makefile
+++ b/sysutils/heirloom/Makefile
@@ -22,7 +22,7 @@ USE_GMAKE=	yes
 MAKE_ARGS=	CC=${CC}
 MAKEFILE=	makefile
 ALL_TARGET=
-DATADIR=	${PREFIX}/${PORTNAME}
+DATADIR=	${TARGETDIR}/${PORTNAME}
 REINPLACE_SUB=	DATADIR="${DATADIR}"
 
 _MANPREFIX=	${DATADIR}/usr/share/man/5man
diff --git a/sysutils/pkg_install-devel/pkg-deinstall b/sysutils/pkg_install-devel/pkg-deinstall
index 08ffba959763..32c71c3ad15f 100644
--- a/sysutils/pkg_install-devel/pkg-deinstall
+++ b/sysutils/pkg_install-devel/pkg-deinstall
@@ -10,9 +10,9 @@ BACKUPDIR=/var/backups
 
 PREFIX=${PKG_PREFIX:-/usr/local}
 if [ "${PREFIX}" = "/usr" ]; then
-  MANPREFIX="${PREFIX}/share"
+  MANPREFIX="${TARGETDIR}/share"
 else
-  MANPREFIX="${PREFIX}"
+  MANPREFIX="${TARGETDIR}"
 fi
 
 case $2 in
diff --git a/sysutils/pkg_install-devel/pkg-install b/sysutils/pkg_install-devel/pkg-install
index 72ac81eaf581..f29172829e88 100644
--- a/sysutils/pkg_install-devel/pkg-install
+++ b/sysutils/pkg_install-devel/pkg-install
@@ -13,9 +13,9 @@ TOOLS="add check create delete info sign update version"
 
 PREFIX=${PKG_PREFIX:-/usr/local}
 if [ "${PREFIX}" = "/usr" ]; then
-  MANPREFIX="${PREFIX}/share"
+  MANPREFIX="${TARGETDIR}/share"
 else
-  MANPREFIX="${PREFIX}"
+  MANPREFIX="${TARGETDIR}"
 fi
 
 case $2 in
diff --git a/sysutils/sge/Makefile b/sysutils/sge/Makefile
index 29da6c52f880..3f2835697361 100644
--- a/sysutils/sge/Makefile
+++ b/sysutils/sge/Makefile
@@ -50,7 +50,7 @@ DISABLE_SIZE=	yes
 FETCH_CMD=	wget -c
 
 SGE_BASE?=	sge
-SGE_ROOT=	${PREFIX}/${SGE_BASE}
+SGE_ROOT=	${TARGETDIR}/${SGE_BASE}
 SGE_ARCH=	fbsd-${ARCH}
 SGE_VERSION=	6.0.7.1
 SGE_RELEASE=	6.0u7_1
diff --git a/sysutils/sge60/Makefile b/sysutils/sge60/Makefile
index 29da6c52f880..3f2835697361 100644
--- a/sysutils/sge60/Makefile
+++ b/sysutils/sge60/Makefile
@@ -50,7 +50,7 @@ DISABLE_SIZE=	yes
 FETCH_CMD=	wget -c
 
 SGE_BASE?=	sge
-SGE_ROOT=	${PREFIX}/${SGE_BASE}
+SGE_ROOT=	${TARGETDIR}/${SGE_BASE}
 SGE_ARCH=	fbsd-${ARCH}
 SGE_VERSION=	6.0.7.1
 SGE_RELEASE=	6.0u7_1
diff --git a/sysutils/sge61/Makefile b/sysutils/sge61/Makefile
index 29da6c52f880..3f2835697361 100644
--- a/sysutils/sge61/Makefile
+++ b/sysutils/sge61/Makefile
@@ -50,7 +50,7 @@ DISABLE_SIZE=	yes
 FETCH_CMD=	wget -c
 
 SGE_BASE?=	sge
-SGE_ROOT=	${PREFIX}/${SGE_BASE}
+SGE_ROOT=	${TARGETDIR}/${SGE_BASE}
 SGE_ARCH=	fbsd-${ARCH}
 SGE_VERSION=	6.0.7.1
 SGE_RELEASE=	6.0u7_1
diff --git a/sysutils/sge62/Makefile b/sysutils/sge62/Makefile
index 29da6c52f880..3f2835697361 100644
--- a/sysutils/sge62/Makefile
+++ b/sysutils/sge62/Makefile
@@ -50,7 +50,7 @@ DISABLE_SIZE=	yes
 FETCH_CMD=	wget -c
 
 SGE_BASE?=	sge
-SGE_ROOT=	${PREFIX}/${SGE_BASE}
+SGE_ROOT=	${TARGETDIR}/${SGE_BASE}
 SGE_ARCH=	fbsd-${ARCH}
 SGE_VERSION=	6.0.7.1
 SGE_RELEASE=	6.0u7_1
diff --git a/textproc/p5-SGML-DTDParse/Makefile b/textproc/p5-SGML-DTDParse/Makefile
index 7e0a2144af81..01c9304295fb 100644
--- a/textproc/p5-SGML-DTDParse/Makefile
+++ b/textproc/p5-SGML-DTDParse/Makefile
@@ -24,7 +24,6 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 PERL_CONFIGURE=	yes
 
 MAN1=		dtddiff2html.1 dtdformat.1 dtddiff.1 dtdparse.1 dtdflatten.1
-MAN1PREFIX=	${PREFIX}
 MAN3=		SGML::DTDParse::DTD.3 SGML::DTDParse.3 SGML::DTDParse::Util.3
 
 .include <bsd.port.pre.mk>
diff --git a/textproc/p5-XML-Handler-Dtd2DocBook/Makefile b/textproc/p5-XML-Handler-Dtd2DocBook/Makefile
index 40603d5d6b5a..2cda7bb9cc59 100644
--- a/textproc/p5-XML-Handler-Dtd2DocBook/Makefile
+++ b/textproc/p5-XML-Handler-Dtd2DocBook/Makefile
@@ -22,7 +22,6 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 PERL_CONFIGURE=	yes
 
 MAN1=		dtd2db.pl.1
-MAN1PREFIX=	${PREFIX}
 MAN3=		XML::Handler::Dtd2DocBook.3
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-XML-Handler-Dtd2Html/Makefile b/textproc/p5-XML-Handler-Dtd2Html/Makefile
index 975fa039a274..78f830aa6a61 100644
--- a/textproc/p5-XML-Handler-Dtd2Html/Makefile
+++ b/textproc/p5-XML-Handler-Dtd2Html/Makefile
@@ -26,7 +26,6 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 PERL_CONFIGURE=	yes
 
 MAN1=		dtd2html.pl.1
-MAN1PREFIX=	${PREFIX}
 MAN3=		XML::Handler::Dtd2Html.3
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-XML-Handler-YAWriter/Makefile b/textproc/p5-XML-Handler-YAWriter/Makefile
index 45c2c5954ca0..e288b4c59973 100644
--- a/textproc/p5-XML-Handler-YAWriter/Makefile
+++ b/textproc/p5-XML-Handler-YAWriter/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 PERL_CONFIGURE=	yes
 
 MAN1=		xmlpretty.1
-MAN1PREFIX=	${PREFIX}
 MAN3=		XML::Handler::YAWriter.3
 
 .include <bsd.port.mk>
diff --git a/textproc/po4a/Makefile b/textproc/po4a/Makefile
index 809cea796d87..1ee77cadf2ab 100644
--- a/textproc/po4a/Makefile
+++ b/textproc/po4a/Makefile
@@ -26,7 +26,7 @@ USE_PERL5=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
 MAN3=		Locale::Po4a::TransTractor.3 \
  		Locale::Po4a::LaTeX.3 \
  		Locale::Po4a::Pod.3 \
diff --git a/www/aolserver/Makefile b/www/aolserver/Makefile
index 13017df9deb1..a820dd4fc707 100644
--- a/www/aolserver/Makefile
+++ b/www/aolserver/Makefile
@@ -21,8 +21,8 @@ MAINTAINER=	aldert@nooitgedagt.net
 COMMENT=	A multithreaded web server with embedded TCL interpreter
 
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
-MANPREFIX=	${PREFIX}/${PORTNAME}
-AOLSERVERBASE=	${PREFIX}/${PORTNAME}
+MANPREFIX=	${TARGETDIR}/${PORTNAME}
+AOLSERVERBASE=	${TARGETDIR}/${PORTNAME}
 
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
diff --git a/www/apache13-modperl/Makefile b/www/apache13-modperl/Makefile
index 218f67181bb5..bb830614e418 100644
--- a/www/apache13-modperl/Makefile
+++ b/www/apache13-modperl/Makefile
@@ -39,7 +39,7 @@ DEFAULT_PATH=	/bin:/usr/bin:${PREFIX}/bin
 RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 # Perl man pages go into section 3
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
 
 .include <bsd.port.pre.mk>
 
diff --git a/www/libapreq2/Makefile b/www/libapreq2/Makefile
index 3713a9e65fa4..aa8e8bf1560a 100644
--- a/www/libapreq2/Makefile
+++ b/www/libapreq2/Makefile
@@ -32,7 +32,7 @@ RUN_DEPENDS+=	${BUILD_DEPENDS}
 USE_PERL5=	yes
 CONFIGURE_ARGS+=	--enable-perl-glue --with-perl=${PERL5}
 
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
 MAN3=		APR::Request.3 \
 		APR::Request::Apache2.3 \
 		APR::Request::CGI.3 \
diff --git a/www/p5-HTTP-DAV/Makefile b/www/p5-HTTP-DAV/Makefile
index 4c984074eb95..eeb4f379611b 100644
--- a/www/p5-HTTP-DAV/Makefile
+++ b/www/p5-HTTP-DAV/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
-MAN1PREFIX=	${PREFIX}
 MAN1=		dave.1
 MAN3=		HTTP::DAV.3 HTTP::DAV::Lock.3 HTTP::DAV::Resource.3 \
 		HTTP::DAV::Response.3
diff --git a/www/rt2/Makefile b/www/rt2/Makefile
index 52c787be6b25..0472f3193f45 100644
--- a/www/rt2/Makefile
+++ b/www/rt2/Makefile
@@ -83,7 +83,7 @@ BUILD_DEPENDS+=	${LOCALBASE}/bin/safe_mysqld:${PORTSDIR}/databases/mysql323-serv
 
 RUN_DEPENDS+=	${BUILD_DEPENDS}
 
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
 MAKE_ENV=	MAN3PREFIX=${MAN3PREFIX}
 
 .if defined(INSTALL_NEW)
diff --git a/www/slash/Makefile b/www/slash/Makefile
index 38743933bc93..11345077573d 100644
--- a/www/slash/Makefile
+++ b/www/slash/Makefile
@@ -28,7 +28,7 @@ DOCS=		README INSTALL
 
 CONFLICTS=	metalist
 
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
 MAN3=		FZ.3 Slash.3 Slash::Apache.3 Slash::Apache::Banlist.3 \
 		Slash::Apache::Log.3 Slash::Apache::User.3 \
 		Slash::Custom::Bulkmail.3 Slash::DB.3 Slash::DB::MySQL.3 \
diff --git a/www/snownews/Makefile b/www/snownews/Makefile
index bd7459149f49..62cfcc7b6605 100644
--- a/www/snownews/Makefile
+++ b/www/snownews/Makefile
@@ -44,7 +44,7 @@ PLIST_SUB+=	OPML="@comment "
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML
 PLIST_SUB+=	OPML=""
 # opml2snow only have "" manpage
-_MANPAGES+=	${PREFIX}/man/man1/opml2snow.1
+_MANPAGES+=	${TARGETDIR}/man/man1/opml2snow.1
 .endif
 
 MAN1=		snownews.1
diff --git a/x11-toolkits/p5-qt/Makefile b/x11-toolkits/p5-qt/Makefile
index 9f4378b6f2aa..29be73844a79 100644
--- a/x11-toolkits/p5-qt/Makefile
+++ b/x11-toolkits/p5-qt/Makefile
@@ -31,7 +31,7 @@ PLIST_FILES=	bin/pqtapi bin/pqtsh bin/puic include/smoke.h \
 		lib/libsmokeqt.la lib/libsmokeqt.so lib/libsmokeqt.so.3
 
 MAN1=	puic.1
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
 MAN3=	Qt.3
 
 .include <bsd.port.pre.mk>