7 files changed, 47 insertions, 11 deletions
diff --git a/time/xchrono/Makefile b/time/xchrono/Makefile
index 62d50c32903..49952a84528 100644
--- a/time/xchrono/Makefile
+++ b/time/xchrono/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/11/12 13:18:50 obache Exp $
+# $NetBSD: Makefile,v 1.10 2009/07/07 19:52:35 joerg Exp $
 #
 
 DISTNAME=		xchrono
@@ -11,11 +11,14 @@ EXTRACT_SUFX=		.shar
 MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Multi-timezone X11-based clock
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_IMAKE=		yes
 
+INSTALLATION_DIRS=	share/doc/xchrono
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xchrono
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xchrono/
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/xchrono/
 
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
diff --git a/time/xdaliclock/Makefile b/time/xdaliclock/Makefile
index 41b383a63c8..958eaa7dfd4 100644
--- a/time/xdaliclock/Makefile
+++ b/time/xdaliclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/02/02 00:06:52 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/07 19:49:51 joerg Exp $
 #
 
 DISTNAME=		xdaliclock-2.18
@@ -11,9 +11,14 @@ MAINTAINER=		nathanw@NetBSD.org
 HOMEPAGE=		http://www.jwz.org/xdaliclock/
 COMMENT=		Animated digital clock
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/${DISTNAME}/X11
 GNU_CONFIGURE=		yes
 
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+INSTALL_MAKE_FLAGS+=	install_prefix=${DESTDIR}
+
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/xdkcal/Makefile b/time/xdkcal/Makefile
index f81eb2a6817..fee21a6541b 100644
--- a/time/xdkcal/Makefile
+++ b/time/xdkcal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/07/15 15:33:46 mishka Exp $
+# $NetBSD: Makefile,v 1.8 2009/07/07 19:46:58 joerg Exp $
 #
 
 DISTNAME=	xdkcal-0.9d
@@ -11,14 +11,15 @@ HOMEPAGE=	http://www.shiratori.riec.tohoku.ac.jp/~jir/linux/products/xdkcal/inde
 COMMENT=	X Desktop Calendar
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xdkcal ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/xdkcal.1x ${PREFIX}/${PKGMANDIR}/man1/xdkcal.1
+	${INSTALL_PROGRAM} ${WRKSRC}/xdkcal ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/xdkcal.1x ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xdkcal.1
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
diff --git a/time/xtu/Makefile b/time/xtu/Makefile
index 42941aaf6ee..49b098d4322 100644
--- a/time/xtu/Makefile
+++ b/time/xtu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/02/02 00:00:45 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/07 19:46:23 joerg Exp $
 #
 
 DISTNAME=	xtu-1.2
@@ -10,13 +10,15 @@ MAINTAINER=	sketch@NetBSD.org
 HOMEPAGE=	http://core.de/~coto/projects/xtu/
 COMMENT=	Small configurable X11 analog clock
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 INSTALLATION_DIRS=	bin
 
 do-build:
 	cd ${WRKSRC} && ${CC} *.c -o xtu -I${X11BASE}/include ${X11_LDFLAGS} -lX11 -lXext
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xtu ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/xtu ${DESTDIR}${PREFIX}/bin/
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/wm/fluxconf/Makefile b/wm/fluxconf/Makefile
index f5f6c4228e1..9152c4f4fff 100644
--- a/wm/fluxconf/Makefile
+++ b/wm/fluxconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/11/01 14:52:25 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/07 19:52:56 joerg Exp $
 #
 
 DISTNAME=	fluxconf-0.9.9
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://devaux.fabien.free.fr/flux/
 COMMENT=	GTK based configuration tool for the fluxbox window manager
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=		fluxbox-[0-9]*:../../wm/fluxbox
 
 GNU_CONFIGURE=		yes
diff --git a/wm/fluxconf/distinfo b/wm/fluxconf/distinfo
index c569d212f47..8fe196ec20a 100644
--- a/wm/fluxconf/distinfo
+++ b/wm/fluxconf/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2007/11/04 15:46:58 rillig Exp $
+$NetBSD: distinfo,v 1.3 2009/07/07 19:52:56 joerg Exp $
 
 SHA1 (fluxconf-0.9.9.tar.gz) = c9e262d21b4badfcebccb0f500af10c854bda9eb
 RMD160 (fluxconf-0.9.9.tar.gz) = 0e9e29292d6679f0a43d6fb4d091015f66e4cf20
 Size (fluxconf-0.9.9.tar.gz) = 234276 bytes
 SHA1 (patch-aa) = b30a016ed61e64672240f9eb392244839c9adad9
+SHA1 (patch-ab) = 0314ff3610c6ba9c0feab523bd2d3d13a9c6970a
diff --git a/wm/fluxconf/patches/patch-ab b/wm/fluxconf/patches/patch-ab
new file mode 100644
index 00000000000..5addfa4c24a
--- /dev/null
+++ b/wm/fluxconf/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.1 2009/07/07 19:52:56 joerg Exp $
+
+--- src/Makefile.in.orig	2009-07-07 21:50:26.000000000 +0200
++++ src/Makefile.in
+@@ -645,12 +645,12 @@ uninstall-info: uninstall-info-recursive
+ #fluxkeys: fluxconf
+ #	ln -sf fluxconf fluxkeys
+ install-exec-hook:
+-	@ln -sf $(bindir)/fluxconf $(bindir)/fluxkeys
+-	@ln -sf $(bindir)/fluxconf $(bindir)/fluxbare
+-	@if ldd fluxconf |grep pango > /dev/null ; then ln -sf $(bindir)/fluxconf $(bindir)/fluxmenu; fi
++	@ln -sf ${DESTDIR}$(bindir)/fluxconf ${DESTDIR}$(bindir)/fluxkeys
++	@ln -sf ${DESTDIR}$(bindir)/fluxconf ${DESTDIR}$(bindir)/fluxbare
++	@if ldd fluxconf |grep pango > /dev/null ; then ln -sf ${DESTDIR}$(bindir)/fluxconf ${DESTDIR}$(bindir)/fluxmenu; fi
+ 	@for lan in ${ALL_LANG} ; do \
+-		${mkinstalldirs} $(datadir)/locale/$$lan/LC_MESSAGES; \
+-		${INSTALL} -m444 $(top_srcdir)/po/$$lan.mo $(datadir)/locale/$$lan/LC_MESSAGES/fluxconf.mo ;\
++		${mkinstalldirs} ${DESTDIR}$(datadir)/locale/$$lan/LC_MESSAGES; \
++		${INSTALL} -m444 $(top_srcdir)/po/$$lan.mo ${DESTDIR}$(datadir)/locale/$$lan/LC_MESSAGES/fluxconf.mo ;\
+ 	done ;
+ 
+ uninstall-local: