user-destdir support

6 files changed, 36 insertions, 24 deletions

diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index d9569589fe6..d24836ffdff 100644
--- a/textproc/openjade/Makefile
+++ b/textproc/openjade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/01/11 09:08:00 minskim Exp $
+# $NetBSD: Makefile,v 1.19 2009/07/07 21:34:53 joerg Exp $
 #
 
 DISTNAME=	openjade-1.3.2
@@ -10,6 +10,8 @@ MAINTAINER=	kogule@mars.dti.ne.jp
 HOMEPAGE=	http://openjade.sourceforge.net/
 COMMENT=	SGML/XML parser toolkit and DSSSL engine, successor to "jade"
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	gmake perl
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	YES
@@ -24,17 +26,17 @@ SGML_CATALOGS=		${PREFIX}/share/sgml/openjade/catalog
 OPENJADE_DATA_DIR=	${PREFIX}/share/sgml/openjade
 OPENJADE_DOC_DIR=	${PREFIX}/share/doc/openjade
 
+INSTALLATION_DIRS=	${OPENJADE_DATA_DIR}/pubtext \
+			${OPENJADE_DOC_DIR}/doc \
+			${OPENJADE_DOC_DIR}/jadedoc/images
+
 post-install:
-	${INSTALL_DATA_DIR} ${OPENJADE_DATA_DIR}/pubtext
-	${INSTALL_DATA} ${WRKSRC}/dsssl/* ${OPENJADE_DATA_DIR}
-	${INSTALL_DATA} ${WRKSRC}/pubtext/* ${OPENJADE_DATA_DIR}/pubtext
-
-	${INSTALL_DATA_DIR} ${OPENJADE_DOC_DIR}/doc
-	${INSTALL_DATA_DIR} ${OPENJADE_DOC_DIR}/jadedoc/images
-	${INSTALL_DATA} ${WRKSRC}/doc/*.htm ${OPENJADE_DOC_DIR}/doc
-	${INSTALL_DATA} ${WRKSRC}/jadedoc/copying.txt ${OPENJADE_DOC_DIR}/jadedoc
-	${INSTALL_DATA} ${WRKSRC}/jadedoc/*.htm ${OPENJADE_DOC_DIR}/jadedoc
-	${INSTALL_DATA} ${WRKSRC}/jadedoc/images/* ${OPENJADE_DOC_DIR}/jadedoc/images
+	${INSTALL_DATA} ${WRKSRC}/dsssl/* ${DESTDIR}${OPENJADE_DATA_DIR}
+	${INSTALL_DATA} ${WRKSRC}/pubtext/* ${DESTDIR}${OPENJADE_DATA_DIR}/pubtext
+	${INSTALL_DATA} ${WRKSRC}/doc/*.htm ${DESTDIR}${OPENJADE_DOC_DIR}/doc
+	${INSTALL_DATA} ${WRKSRC}/jadedoc/copying.txt ${DESTDIR}${OPENJADE_DOC_DIR}/jadedoc
+	${INSTALL_DATA} ${WRKSRC}/jadedoc/*.htm ${DESTDIR}${OPENJADE_DOC_DIR}/jadedoc
+	${INSTALL_DATA} ${WRKSRC}/jadedoc/images/* ${DESTDIR}${OPENJADE_DOC_DIR}/jadedoc/images
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../textproc/opensp/buildlink3.mk"
diff --git a/x11/transset-df/Makefile b/x11/transset-df/Makefile
index a69cd90b580..3a40eab6b05 100644
--- a/x11/transset-df/Makefile
+++ b/x11/transset-df/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/23 17:56:11 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2009/07/07 21:35:23 joerg Exp $
 #
 
 DISTNAME=	transset-df-5
@@ -9,11 +9,15 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://forchheimer.se/transset-df/
 COMMENT=	Patched version of xorg's transset
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 BUILD_TARGET=	transset-df
 USE_TOOLS+=	pkg-config
 
+INSTALLATION_DIRS=	bin
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/transset-df ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/transset-df ${DESTDIR}${PREFIX}/bin
 
 .include "../../x11/libXcomposite/buildlink3.mk"
 .include "../../x11/libXfixes/buildlink3.mk"
diff --git a/x11/xdialog/Makefile b/x11/xdialog/Makefile
index 607cd935239..817deb2916a 100644
--- a/x11/xdialog/Makefile
+++ b/x11/xdialog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/08/29 16:43:58 sborrill Exp $
+# $NetBSD: Makefile,v 1.21 2009/07/07 21:36:24 joerg Exp $
 #
 
 DISTNAME=		Xdialog-2.3.1
@@ -11,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://xdialog.dyns.net/
 COMMENT=		X11 drop-in replacement for the curses dialog program
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		msgfmt
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
@@ -20,16 +22,16 @@ EGDIR=			${PREFIX}/share/examples/xdialog
 
 CHECK_PORTABILITY_SKIP+=	samples/*
 
+INSTALLATION_DIRS=	${DOCDIR} ${EGDIR}
+
 post-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html *.png ${DOCDIR}
-	${INSTALL_DATA_DIR} ${EGDIR}
+	cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html *.png ${DESTDIR}${DOCDIR}
 	for f in Xmessage Xmore buildlist calendar chain checklist	\
 		dselect editbox fselect gauge infobox infobox2 inputbox	\
 		logbox logbox2 login menubox msgbox radiolist rangebox	\
 		tailbox textbox timebox treeview yesno;			\
 	do								\
-		${INSTALL_SCRIPT} ${WRKSRC}/samples/$${f} ${EGDIR};	\
+		${INSTALL_SCRIPT} ${WRKSRC}/samples/$${f} ${DESTDIR}${EGDIR};	\
 	done
 
 .include "options.mk"
diff --git a/x11/xkbset/Makefile b/x11/xkbset/Makefile
index a664c8d0b02..4f9d5e10896 100644
--- a/x11/xkbset/Makefile
+++ b/x11/xkbset/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/01/15 18:18:44 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2009/07/07 21:34:58 joerg Exp $
 #
 
 DISTNAME=	xkbset-0.3
@@ -10,9 +10,13 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.math.missouri.edu/~stephen/software/#xkbset
 COMMENT=	Manages XKB features of the X window system
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_X11BASE=	yes
 USE_TOOLS+=	perl
 REPLACE_PERL=	mskacc-gui
 
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xkbset/distinfo b/x11/xkbset/distinfo
index 467ae71a521..9a93877ba67 100644
--- a/x11/xkbset/distinfo
+++ b/x11/xkbset/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 17:36:24 wiz Exp $
+$NetBSD: distinfo,v 1.5 2009/07/07 21:34:58 joerg Exp $
 
 SHA1 (xkbset-0.3.tar.gz) = 23133cc74b09182c1ce8efc2dc2ff1a78feb34b6
 RMD160 (xkbset-0.3.tar.gz) = 7bc55cb450af3c32353c29f5e329e8f8b522b5f8
 Size (xkbset-0.3.tar.gz) = 13279 bytes
-SHA1 (patch-aa) = 53ac36e771d976e0785a4ee68b734e216290fcd7
+SHA1 (patch-aa) = ce46af55720ecdae4f6b12c0aceb93b4d0496655
 SHA1 (patch-ab) = b74e6eb1cbca4a3d9d20ebee7af874d5f4a4b7dd
diff --git a/x11/xkbset/patches/patch-aa b/x11/xkbset/patches/patch-aa
index a9872c27f36..5be349cb34b 100644
--- a/x11/xkbset/patches/patch-aa
+++ b/x11/xkbset/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2002/09/25 08:44:30 hubertf Exp $
+$NetBSD: patch-aa,v 1.3 2009/07/07 21:34:58 joerg Exp $
 
 --- Makefile.orig	Sun May 13 06:09:39 2001
 +++ Makefile
@@ -12,8 +12,8 @@ $NetBSD: patch-aa,v 1.2 2002/09/25 08:44:30 hubertf Exp $
  CC=cc ${INC_PATH} ${LIB_PATH} -Wall
 -INSTALL_BIN=/usr/X11R6/bin
 -INSTALL_MAN1=/usr/X11R6/man/man1
-+INSTALL_BIN=${X11PREFIX}/bin
-+INSTALL_MAN1=${X11PREFIX}/man/man1
++INSTALL_BIN=${DESTDIR}${X11PREFIX}/bin
++INSTALL_MAN1=${DESTDIR}${X11PREFIX}/man/man1
  
  all: xkbset xkbset.1