Add DESTDIR support.

39 files changed, 148 insertions, 68 deletions

diff --git a/x11/bwidget/Makefile b/x11/bwidget/Makefile
index 11bda1fed09..f7288ab1da8 100644
--- a/x11/bwidget/Makefile
+++ b/x11/bwidget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/05/26 02:13:26 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2008/06/20 01:09:44 joerg Exp $
 #
 
 DISTNAME=	BWidget-1.8.0
@@ -10,16 +10,18 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://tcllib.sourceforge.net/
 COMMENT=	High-level widget set for Tcl/Tk
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_BUILD=	yes
 USE_TOOLS+=	wish:run pax
 
+INSTALLATION_DIRS=	lib/bwidget share/doc/bwidget
+
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/bwidget
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bwidget
-	${INSTALL_DATA} ${WRKSRC}/*.tcl ${PREFIX}/lib/bwidget
+	${INSTALL_DATA} ${WRKSRC}/*.tcl ${DESTDIR}${PREFIX}/lib/bwidget
 	cd ${WRKSRC} && \
-	pax -rw -pm lang ${PREFIX}/lib/bwidget && \
-	pax -rw -pm images ${PREFIX}/lib/bwidget
-	${INSTALL_DATA} ${WRKSRC}/BWman/*.htm* ${PREFIX}/share/doc/bwidget
+	pax -rw -pm lang ${DESTDIR}${PREFIX}/lib/bwidget && \
+	pax -rw -pm images ${DESTDIR}${PREFIX}/lib/bwidget
+	${INSTALL_DATA} ${WRKSRC}/BWman/*.htm* ${DESTDIR}${PREFIX}/share/doc/bwidget
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 6f3f0b50832..4fa63c34e08 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.141 2008/05/29 17:21:45 drochner Exp $
+# $NetBSD: Makefile,v 1.142 2008/06/20 01:09:44 joerg Exp $
 #
 
 DISTNAME=	gdm-2.20.6
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Gnome Display Manager - a re-implementation of the xdm program
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	zenity>=2.16.0:../../x11/zenity
 
 BUILDLINK_API_DEPENDS.libart+=	libart>=2.3.11
@@ -151,8 +153,8 @@ PRINT_PLIST_AWK+=	/gdmopen/ { print "$${GDMOPEN}" $$0; next }
 .include "../../x11/gtk2/buildlink3.mk"
 
 post-install:
-	${INSTALL_DATA} ${FILESDIR}/NetBSD.xpm ${PREFIX}/share/pixmaps
+	${INSTALL_DATA} ${FILESDIR}/NetBSD.xpm ${DESTDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${FILESDIR}/custom.desktop \
-		${PREFIX}/share/gdm/BuiltInSessions
+		${DESTDIR}${PREFIX}/share/gdm/BuiltInSessions
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/ggiterm/Makefile b/x11/ggiterm/Makefile
index 0ba3262ccf3..9b9fd58ea2e 100644
--- a/x11/ggiterm/Makefile
+++ b/x11/ggiterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/03/04 21:31:08 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2008/06/20 01:09:44 joerg Exp $
 #
 
 DISTNAME=		ggiterm-0.7.0
@@ -10,16 +10,19 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://ggiterm.sourceforge.net/
 COMMENT=		Libggi-based terminal emulator
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
 PTHREAD_AUTO_VARS=	yes
 
+INSTALLATION_DIRS=	share/doc/ggiterm
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ggiterm
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ggiterm
-	${INSTALL_DATA} ${WRKSRC}/ggiterm.termcap ${PREFIX}/share/doc/ggiterm
-	${INSTALL_DATA} ${WRKSRC}/ggiterm.terminfo ${PREFIX}/share/doc/ggiterm
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/ggiterm
+	${INSTALL_DATA} ${WRKSRC}/ggiterm.termcap ${DESTDIR}${PREFIX}/share/doc/ggiterm
+	${INSTALL_DATA} ${WRKSRC}/ggiterm.terminfo ${DESTDIR}${PREFIX}/share/doc/ggiterm
 
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/libggiwmh/buildlink3.mk"
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 91954e74bd8..2152a2d20c9 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2008/05/29 11:32:26 drochner Exp $
+# $NetBSD: Makefile,v 1.59 2008/06/20 01:09:44 joerg Exp $
 #
 
 DISTNAME=		gnome-applets-2.22.2
@@ -10,6 +10,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME2 panel applets
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 BUILD_DEPENDS+=		gst-plugins0.10-esound>=0.10.0:../../audio/gst-plugins0.10-esound
 BUILD_DEPENDS+=		gst-plugins0.10-oss>=0.10.0:../../audio/gst-plugins0.10-oss
 
diff --git a/x11/gnome-control-center/Makefile b/x11/gnome-control-center/Makefile
index ce4a816c424..fbe648479df 100644
--- a/x11/gnome-control-center/Makefile
+++ b/x11/gnome-control-center/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/05/29 11:28:46 drochner Exp $
+# $NetBSD: Makefile,v 1.12 2008/06/20 01:09:44 joerg Exp $
 #
 
 DISTNAME=	gnome-control-center-2.22.2.1
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	GNOME2 configuration utility
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 USE_DIRS+=		gnome2-1.6
 USE_PKGLOCALEDIR=	yes
@@ -30,6 +32,8 @@ INSTALL_MAKE_FLAGS+=	vfsmoduleconfdir=${PREFIX}/share/examples/${PKGBASE}
 INSTALL_MAKE_FLAGS+=	menudir=${PREFIX}/share/examples/${PKGBASE}
 INSTALL_MAKE_FLAGS+=	autostartdir=${PREFIX}/share/applications
 
+INSTALLATION_DIRS=	${EGDIR}
+
 GCONF_SCHEMAS+=	control-center.schemas
 GCONF_SCHEMAS+=	themus.schemas
 GCONF_SCHEMAS+=	fontilus.schemas
@@ -98,10 +102,9 @@ PLIST.evolution=	yes
 .include "../../sysutils/gnome-settings-daemon/buildlink3.mk"
 
 post-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/vfs-methods/themus/theme-method.conf \
-		${EGDIR}
+	    ${DESTDIR}${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/vfs-methods/fontilus/font-method.conf \
-		${EGDIR}
+	    ${DESTDIR}${EGDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-desktop-sharp/Makefile b/x11/gnome-desktop-sharp/Makefile
index 648020d9a1c..a05631e4e49 100644
--- a/x11/gnome-desktop-sharp/Makefile
+++ b/x11/gnome-desktop-sharp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/04/27 23:12:54 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:44 joerg Exp $
 #
 
 DISTNAME=	gnome-desktop-sharp-2.20.1
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.mono-project.com/GtkSharp
 COMMENT=	C\# bindings for the GNOME platform, Desktop part
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index f609bf7d9d2..dada319c7c0 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2008/05/29 11:06:12 drochner Exp $
+# $NetBSD: Makefile,v 1.79 2008/06/20 01:09:44 joerg Exp $
 #
 
 DISTNAME=		gnome-desktop-2.22.2
@@ -10,6 +10,8 @@ MAINTAINER=		drochner@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Common GNOME2 desktop files and libgnome-desktop library
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	yes
@@ -23,7 +25,7 @@ BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.8.0
 
 post-install:
 .for f in netbsd-logo-icon.png netbsd-logo-icon-transparent.png
-	${INSTALL_DATA} ${FILESDIR}/${f} ${PREFIX}/share/pixmaps/${f}
+	${INSTALL_DATA} ${FILESDIR}/${f} ${DESTDIR}${PREFIX}/share/pixmaps/${f}
 .endfor
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/x11/gnome-mag/Makefile b/x11/gnome-mag/Makefile
index 17c1b36d33d..c63b6e8f344 100644
--- a/x11/gnome-mag/Makefile
+++ b/x11/gnome-mag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2008/04/26 00:11:29 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2008/06/20 01:09:44 joerg Exp $
 #
 
 DISTNAME=		gnome-mag-0.15.0
@@ -10,6 +10,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME screen magnifier
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_PKGLOCALEDIR=	yes
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 7b6bf66ff65..417df5cac91 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.98 2008/05/29 11:15:49 drochner Exp $
+# $NetBSD: Makefile,v 1.99 2008/06/20 01:09:44 joerg Exp $
 #
 
 DISTNAME=		gnome-panel-2.22.2
@@ -10,6 +10,8 @@ MAINTAINER=		drochner@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME2 panel application
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		gmake intltool msgfmt perl:run pkg-config
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 5a658c38cab..ef46717ec00 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2008/04/30 13:38:17 jmmv Exp $
+# $NetBSD: Makefile,v 1.30 2008/06/20 01:09:44 joerg Exp $
 #
 
 DISTNAME=	gnome-screensaver-2.22.2
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://live.gnome.org/GnomeScreensaver/
 COMMENT=	Screen saver and locker for the GNOME desktop
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 USE_DIRS+=		xdg-1.3
 USE_LIBTOOL=		yes
@@ -51,14 +53,16 @@ BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.8.0
 BUILDLINK_API_DEPENDS.libexif+=		libexif>=0.6.12
 BUILDLINK_API_DEPENDS.libglade+=	libglade>=2.5.0
 
+INSTALLATION_DIRS=	${EGDIR}/pam.d
+
 post-install:
-	${INSTALL_DATA_DIR} ${EGDIR}/pam.d
 	${INSTALL_DATA} ${FILESDIR}/pam-gnome-screensaver-NetBSD \
-		${EGDIR}/pam.d/gnome-screensaver-NetBSD
+	    ${DESTDIR}${EGDIR}/pam.d/gnome-screensaver-NetBSD
 	${INSTALL_DATA} ${WRKSRC}/data/gnome-screensaver \
-		${EGDIR}/pam.d/gnome-screensaver-Linux
+	    ${DESTDIR}${EGDIR}/pam.d/gnome-screensaver-Linux
+
 .if empty(PKG_OPTIONS:Mpam)
-	${CHMOD} 04555 ${PREFIX}/libexec/gnome-screensaver-dialog
+SPECIAL_PERMS+=	libexec/gnome-screensaver-dialog ${SETUID_ROOT_PERMS}
 .endif
 
 .include "../../devel/GConf/schemas.mk"
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 3b0394e85b5..b5dcddccfc3 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.99 2008/05/29 16:32:23 drochner Exp $
+# $NetBSD: Makefile,v 1.100 2008/06/20 01:09:44 joerg Exp $
 #
 
 DISTNAME=		gnome-session-2.22.2
@@ -12,6 +12,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME2 session management utilities
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS+=		gnome-core<1.4.2nb4
 
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
@@ -62,6 +64,6 @@ post-extract:
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/data/gnome-splash-orig.png \
-	    ${PREFIX}/share/pixmaps/splash/gnome-splash-orig.png
+	    ${DESTDIR}${PREFIX}/share/pixmaps/splash/gnome-splash-orig.png
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-sharp/Makefile b/x11/gnome-sharp/Makefile
index c4953a4bfe8..ffc353526ad 100644
--- a/x11/gnome-sharp/Makefile
+++ b/x11/gnome-sharp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/04/27 23:03:09 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2008/06/20 01:09:44 joerg Exp $
 #
 
 DISTNAME=	gnome-sharp-2.20.1
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.mono-project.com/GtkSharp
 COMMENT=	C\# bindings for the GNOME platform
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 95fae699a05..3bafed8363d 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/04/30 13:38:17 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2008/06/20 01:09:44 joerg Exp $
 #
 
 DISTNAME=		gnome-terminal-2.22.1
@@ -10,6 +10,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Xterm like terminal program for GNOME 2
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS=		gnome-core-[0-9]* gnome2-terminal-[0-9]*
 
 GNU_CONFIGURE=		YES
diff --git a/x11/gnome-themes-extras/Makefile b/x11/gnome-themes-extras/Makefile
index 311bdc07c36..4b3f3e82ed0 100644
--- a/x11/gnome-themes-extras/Makefile
+++ b/x11/gnome-themes-extras/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2008/05/25 21:42:22 joerg Exp $
+# $NetBSD: Makefile,v 1.38 2008/06/20 01:09:44 joerg Exp $
 #
 
 DISTNAME=	gnome-themes-extras-2.22.0
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Collection of metathemes for the GNOME desktop environment
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 EXTRACT_USING=		bsdtar
diff --git a/x11/gnome-themes/Makefile b/x11/gnome-themes/Makefile
index 1748d452f32..c2e71df5846 100644
--- a/x11/gnome-themes/Makefile
+++ b/x11/gnome-themes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2008/05/29 11:34:16 drochner Exp $
+# $NetBSD: Makefile,v 1.61 2008/06/20 01:09:44 joerg Exp $
 #
 
 DISTNAME=		gnome-themes-2.22.2
@@ -10,6 +10,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Collection of themes and icons for GNOME 2
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS+=		clearlooks-metacity-[0-9]*
 
 USE_DIRS+=		gnome2-1.5 theme-1.0 xdg-1.4
diff --git a/x11/gnopernicus/Makefile b/x11/gnopernicus/Makefile
index 93fee8fb8b2..eac29e4609c 100644
--- a/x11/gnopernicus/Makefile
+++ b/x11/gnopernicus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2008/06/12 15:03:16 obache Exp $
+# $NetBSD: Makefile,v 1.56 2008/06/20 01:09:44 joerg Exp $
 #
 
 DISTNAME=		gnopernicus-1.1.1
@@ -11,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Collection of accessibility apps for GNOME 2
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_PKGLOCALEDIR=	yes
diff --git a/x11/grandr_applet/Makefile b/x11/grandr_applet/Makefile
index ead4b5e5976..699a12a706e 100644
--- a/x11/grandr_applet/Makefile
+++ b/x11/grandr_applet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/03/06 14:53:56 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2008/06/20 01:09:44 joerg Exp $
 #
 
 DISTNAME=	grandr_applet-0.4
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://dekorte.homeip.net/download/grandr-applet/
 COMMENT=	gnome-panel front end to the xrandr extension
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/x11/gst-plugins0.10-x11/Makefile b/x11/gst-plugins0.10-x11/Makefile
index 37118d18f85..7131726e482 100644
--- a/x11/gst-plugins0.10-x11/Makefile
+++ b/x11/gst-plugins0.10-x11/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.4 2007/01/15 16:23:33 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2008/06/20 01:09:44 joerg Exp $
 #
 
 GST_PLUGINS0.10_NAME=	x11
 GST_PLUGINS0.10_DIRS=	sys/ximage sys/xvimage
 GST_PLUGINS0.10_FLAGS=	x xshm xvideo
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../multimedia/gst-plugins0.10-base/Makefile.common"
 
 .include "../../x11/libXv/buildlink3.mk"
diff --git a/x11/gtk-engines/Makefile b/x11/gtk-engines/Makefile
index 9f04a3148f4..fa3ebce4040 100644
--- a/x11/gtk-engines/Makefile
+++ b/x11/gtk-engines/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2007/09/19 06:46:52 tron Exp $
+# $NetBSD: Makefile,v 1.32 2008/06/20 01:09:44 joerg Exp $
 
 DISTNAME=		gtk-engines-0.12
 PKGREVISION=		9
@@ -9,6 +9,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Theme engines for GTK+
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS+=		gtk2-engines-*
 
 GNU_CONFIGURE=		yes
diff --git a/x11/oneko/Makefile b/x11/oneko/Makefile
index d13e47c1bb0..bc5370443df 100644
--- a/x11/oneko/Makefile
+++ b/x11/oneko/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/12/27 13:37:43 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2008/06/20 01:09:44 joerg Exp $
 
 DISTNAME=		oneko-1.1b
 PKGNAME=		oneko-1.2
@@ -13,6 +13,8 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=		johnam@mail.kemper.org
 COMMENT=		Like xneko except on the desktop and with other animals
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/oneko
 USE_IMAKE=		yes
 
diff --git a/x11/qt2/Makefile b/x11/qt2/Makefile
index c9c11f0e04d..d36b6301601 100644
--- a/x11/qt2/Makefile
+++ b/x11/qt2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/10/25 22:01:09 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2008/06/20 01:09:45 joerg Exp $
 #
 
 DISTNAME=	qt2-${QTVERSION}
@@ -9,6 +9,8 @@ DISTFILES=	# empty
 
 COMMENT=	"meta-package" for the QT GUI C++ toolkit
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "Makefile.common"
 
 DEPENDS+=	qt2-libs-${QTVERSION}{,nb[0-9]*}:../../x11/qt2-libs
diff --git a/x11/qt3/Makefile b/x11/qt3/Makefile
index 12a7fb22a8a..2a2ebb9ed29 100644
--- a/x11/qt3/Makefile
+++ b/x11/qt3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2007/10/25 22:01:09 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2008/06/20 01:09:45 joerg Exp $
 
 DISTNAME=	qt3-${QTVERSION}
 CATEGORIES=	x11
@@ -7,6 +7,8 @@ DISTFILES=	# empty
 
 COMMENT=	"meta-package" for the QT GUI C++ toolkit
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "./Makefile.common"
 
 DEPENDS+=	qt3-libs-${QTVERSION}{,nb[0-9]*}:../../x11/qt3-libs
diff --git a/x11/rep-gtk2/Makefile b/x11/rep-gtk2/Makefile
index 411f5122564..45abee008f5 100644
--- a/x11/rep-gtk2/Makefile
+++ b/x11/rep-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/09/21 13:04:44 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2008/06/20 01:09:45 joerg Exp $
 
 DISTNAME=		rep-gtk-0.18
 PKGNAME=		rep-gtk2-0.18
@@ -10,6 +10,8 @@ MAINTAINER=		tnn@NetBSD.org
 HOMEPAGE=		http://rep-gtk.sourceforge.net/
 COMMENT=		librep bindings for gtk2 (used by wm/sawfish)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS=		rep-gtk-[0-9]*
 
 USE_LIBTOOL=		yes
diff --git a/x11/speyes/Makefile b/x11/speyes/Makefile
index d0368cc0e91..8659478d9d7 100644
--- a/x11/speyes/Makefile
+++ b/x11/speyes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/12/27 13:37:43 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2008/06/20 01:09:45 joerg Exp $
 
 DISTNAME=	speyes-1.2.0
 PKGREVISION=	1
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.okb-1.org/speyes/speyes.html
 COMMENT=	South Park XEyes clone
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_IMAKE=	YES
 
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/x11/unclutter/Makefile b/x11/unclutter/Makefile
index 516c2e99767..2307e4cdd33 100644
--- a/x11/unclutter/Makefile
+++ b/x11/unclutter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/12/27 13:37:43 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2008/06/20 01:09:45 joerg Exp $
 #
 
 DISTNAME=	unclutter-8
@@ -10,6 +10,8 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Remove idle cursor image from screen
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/unclutter
 USE_IMAKE=	yes
 
diff --git a/x11/worker/Makefile b/x11/worker/Makefile
index 76e2055f210..c6c31ea3e15 100644
--- a/x11/worker/Makefile
+++ b/x11/worker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/01/20 13:06:16 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2008/06/20 01:09:45 joerg Exp $
 #
 
 DISTNAME=	worker-2.14.1
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.boomerangsworld.de/cms/worker/
 COMMENT=	Highly configurable two-panes file manager for X11
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	YES
 
diff --git a/x11/x2x/Makefile b/x11/x2x/Makefile
index 11b337e53e2..afe9f8bb01f 100644
--- a/x11/x2x/Makefile
+++ b/x11/x2x/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/04/19 06:04:56 obache Exp $
+# $NetBSD: Makefile,v 1.15 2008/06/20 01:09:45 joerg Exp $
 
 DISTNAME=	x2x-1.27
 PKGREVISION=	2
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://x2x.dottedmag.net/
 COMMENT=	One keyboard and mouse to control multiple X displays
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_IMAKE=	yes
 
 post-configure:
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index a5f6bd3ae6f..40618e3de89 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2007/02/22 19:27:28 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2008/06/20 01:09:45 joerg Exp $
 
 DISTNAME=	x3270-3213
 PKGNAME=	x3270-3.2.13
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.geocities.com/SiliconValley/Peaks/7814/
 COMMENT=	3270 Terminal emulator
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/x3270-3.2
 USE_IMAKE=	yes
 
diff --git a/x11/xaniroc/Makefile b/x11/xaniroc/Makefile
index 94f7e8c4b5b..cd12d9e93c0 100644
--- a/x11/xaniroc/Makefile
+++ b/x11/xaniroc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/04/16 05:34:51 obache Exp $
+# $NetBSD: Makefile,v 1.14 2008/06/20 01:09:45 joerg Exp $
 
 DISTNAME=	xaniroc
 PKGNAME=	xaniroc-1.02
@@ -10,6 +10,8 @@ EXTRACT_SUFX=	.src.tar.Z
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Animate your root-cursor
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_IMAKE=	yes
 
 post-extract:
diff --git a/x11/xautolock/Makefile b/x11/xautolock/Makefile
index 4574fb1e767..679d22f3aa8 100644
--- a/x11/xautolock/Makefile
+++ b/x11/xautolock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2008/05/25 14:45:18 tron Exp $
+# $NetBSD: Makefile,v 1.22 2008/06/20 01:09:45 joerg Exp $
 
 DISTNAME=	xautolock-pl15
 PKGNAME=	xautolock-1.15
@@ -11,6 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Activate xlock after a user defined time of inactivity
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_IMAKE=	YES
 
diff --git a/x11/xbindkeys/Makefile b/x11/xbindkeys/Makefile
index 28bded9a025..689c1058fa1 100644
--- a/x11/xbindkeys/Makefile
+++ b/x11/xbindkeys/Makefile
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2007/06/17 20:01:39 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2008/06/20 01:09:45 joerg Exp $
 #
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "Makefile.common"
 
diff --git a/x11/xcb/Makefile b/x11/xcb/Makefile
index 4c301eb2356..6817657464b 100644
--- a/x11/xcb/Makefile
+++ b/x11/xcb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/05/25 14:45:18 tron Exp $
+# $NetBSD: Makefile,v 1.12 2008/06/20 01:09:45 joerg Exp $
 
 DISTNAME=	xcb-2.4
 CATEGORIES=	x11
@@ -8,6 +8,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.goof.com/pcg/marc/xcb.html
 COMMENT=	Extensible, multiple cut buffers for X
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_IMAKE=	YES
 BUILD_TARGET=	all Xcb.ad
 
diff --git a/x11/xcolors/Makefile b/x11/xcolors/Makefile
index 7ef24b088ae..754bd8b15f8 100644
--- a/x11/xcolors/Makefile
+++ b/x11/xcolors/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/01/17 07:04:09 tnn Exp $
+# $NetBSD: Makefile,v 1.18 2008/06/20 01:09:45 joerg Exp $
 
 DISTNAME=	xcolors
 PKGNAME=	xcolors-1.3
@@ -9,6 +9,8 @@ MASTER_SITES=	ftp://ftp.tut.ac.jp/X11/X11R6/contrib/programs/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Display all (ok, most of) the colors in the universe
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/xcolors
 USE_IMAKE=	yes
 
diff --git a/x11/xcolorsel/Makefile b/x11/xcolorsel/Makefile
index 5a452776c51..5c5d2086e6d 100644
--- a/x11/xcolorsel/Makefile
+++ b/x11/xcolorsel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2007/02/15 22:37:06 perry Exp $
+# $NetBSD: Makefile,v 1.21 2008/06/20 01:09:45 joerg Exp $
 #
 
 DISTNAME=	xcolorsel-1.1a-src
@@ -10,6 +10,8 @@ MASTER_SITES=	${MASTER_SITE_XCONTRIB:=utilities/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Browse and select named X colors from rgb.txt
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/xcolorsel
 MAKE_ENV+=	LIBXAW=${LIBXAW:Q}
 USE_IMAKE=	yes
diff --git a/x11/xcursorgen/Makefile b/x11/xcursorgen/Makefile
index 6c656afef6d..f63b3e09c82 100644
--- a/x11/xcursorgen/Makefile
+++ b/x11/xcursorgen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/12/27 13:37:44 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2008/06/20 01:09:45 joerg Exp $
 
 DISTNAME=	xcursorgen-4.3.0
 PKGREVISION=	4
@@ -10,6 +10,8 @@ MAINTAINER=	xsrc-manager@NetBSD.org
 HOMEPAGE=	http://www.xfree86.org/
 COMMENT=	Create an X cursor file from a collection of PNG images
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/${DISTNAME:C/-.*//}
 USE_IMAKE=	YES
 
diff --git a/x11/xdaemon/Makefile b/x11/xdaemon/Makefile
index c46f43ee23b..eb8918a0c4d 100644
--- a/x11/xdaemon/Makefile
+++ b/x11/xdaemon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/06/06 20:44:50 hubertf Exp $
+# $NetBSD: Makefile,v 1.19 2008/06/20 01:09:45 joerg Exp $
 
 DISTNAME=	xdaemon-1.2
 CATEGORIES=	games x11
@@ -13,6 +13,8 @@ MAINTAINER=	hubertf@NetBSD.org
 HOMEPAGE=	http://www.NetBSD.org/
 COMMENT=	BSD Daemon sticking on your desktop (like xteddy)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	xteddy-1.*:../../x11/xteddy
 
 CONFLICTS+=	xdaemon-2.*
@@ -34,11 +36,11 @@ do-extract:
 do-install:
 .for img in ${IMAGES}
 .for sufx in _bw.xbm _color.xpm _icon.xbm _mask.xbm
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${img}${sufx} ${PREFIX}/share/xteddy/pixmaps/${img}${sufx}
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${img}${sufx} ${DESTDIR}${PREFIX}/share/xteddy/pixmaps/${img}${sufx}
 .endfor # sufx
-	${RM} -f ${PREFIX}/bin/${img}
-	${LN} -s xteddy ${PREFIX}/bin/${img}
+	${RM} -f ${DESTDIR}${PREFIX}/bin/${img}
+	${LN} -s xteddy ${DESTDIR}${PREFIX}/bin/${img}
 .endfor # img
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/Daemon.README ${PREFIX}/share/doc/xdaemon.README
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/Daemon.README ${DESTDIR}${PREFIX}/share/doc/xdaemon.README
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xdaemon2/Makefile b/x11/xdaemon2/Makefile
index 523c91c53f5..9dccb361c2d 100644
--- a/x11/xdaemon2/Makefile
+++ b/x11/xdaemon2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/02 22:58:56 hubertf Exp $
+# $NetBSD: Makefile,v 1.16 2008/06/20 01:09:45 joerg Exp $
 
 DISTNAME=	xdaemon-2.1
 CATEGORIES=	games x11
@@ -9,6 +9,8 @@ MAINTAINER=	hubertf@NetBSD.org
 HOMEPAGE=	http://www.NetBSD.org/
 COMMENT=	BSD Daemon sticking on your desktop (like xteddy)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	xteddy-2.*:../../x11/xteddy2
 
 CONFLICTS+=	xdaemon-1.*
@@ -28,10 +30,10 @@ do-extract:
 
 do-install:
 .for img in ${IMAGES}
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${img}.png ${PREFIX}/share/xteddy/${img}.png
-	${RM} -f ${PREFIX}/bin/${img}
-	${LN} -s xteddy ${PREFIX}/bin/${img}
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${img}.png ${DESTDIR}${PREFIX}/share/xteddy/${img}.png
+	${RM} -f ${DESTDIR}${PREFIX}/bin/${img}
+	${LN} -s xteddy ${DESTDIR}${PREFIX}/bin/${img}
 .endfor
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/Daemon.README ${PREFIX}/share/doc/xdaemon.README
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/Daemon.README ${DESTDIR}${PREFIX}/share/doc/xdaemon.README
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xearth/Makefile b/x11/xearth/Makefile
index 554e42a3199..055cbec9862 100644
--- a/x11/xearth/Makefile
+++ b/x11/xearth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/12/27 13:37:44 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2008/06/20 01:09:45 joerg Exp $
 #
 
 DISTNAME=	xearth-1.1
@@ -11,6 +11,8 @@ MAINTAINER=	agc@NetBSD.org
 HOMEPAGE=	# AWOL
 COMMENT=	Rotating map of the Earth in X11 root window
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_IMAKE=	yes
 INSTALL_MAKE_FLAGS=	MANPATH=${PREFIX}/${PKGMANDIR}
 
diff --git a/x11/xfce3/Makefile b/x11/xfce3/Makefile
index a10ae07c7a7..a6c92d5f79e 100644
--- a/x11/xfce3/Makefile
+++ b/x11/xfce3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2007/02/15 14:52:58 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2008/06/20 01:09:45 joerg Exp $
 
 DISTNAME=		xfce-3.8.18
 PKGREVISION=		9
@@ -9,6 +9,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.xfce.org/
 COMMENT=		Lightweight desktop environment with CDE look and feel
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_X11BASE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes