From ef7671ddcfa5f97cf580d32f84c1a0ff6ea1c649 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Tue, 7 Jul 2009 16:49:05 +0000
Subject: user-destdir support

---
 x11/xpaste/Makefile    |  3 ++-
 x11/xpns/Makefile      | 20 +++++++++-----------
 x11/xscribble/Makefile |  9 ++++++---
 3 files changed, 17 insertions(+), 15 deletions(-)

(limited to 'x11')

diff --git a/x11/xpaste/Makefile b/x11/xpaste/Makefile
index 8669a68aec3..73c31a07c3d 100644
--- a/x11/xpaste/Makefile
+++ b/x11/xpaste/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/11/10 17:21:39 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2009/07/07 16:58:02 joerg Exp $
 #
 
 DISTNAME=	xpaste-1.1
@@ -11,6 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Display the content of the X11 paste buffer in a window
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}
 USE_IMAKE=	yes
diff --git a/x11/xpns/Makefile b/x11/xpns/Makefile
index 1c6152a6ba2..1ebe81eb8d5 100644
--- a/x11/xpns/Makefile
+++ b/x11/xpns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2008/11/10 17:21:39 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2009/07/07 16:51:09 joerg Exp $
 
 DISTNAME=	pns_source
 PKGNAME=	xpns-1.0
@@ -11,23 +11,21 @@ MAINTAINER=	pgiffuni@fps.biblos.unal.edu.co
 HOMEPAGE=	http://robotics.ee.uwa.edu.au/pns/
 COMMENT=	Petri-Net Simulator for Xwindows
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 USE_X11BASE=	yes
 MAKE_FILE=	makefile
 BUILD_TARGET=	pns
 
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	bin lib/xpns share/doc/xpns
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/xpns
-	${INSTALL_PROGRAM} ${WRKSRC}/pns ${PREFIX}/lib/xpns/
-	${INSTALL_DATA} ${WRKSRC}/pns.hlp ${PREFIX}/lib/xpns/
-	${INSTALL_DATA} ${WRKSRC}/pns.shell ${PREFIX}/lib/xpns/
-	${INSTALL_SCRIPT} ${WRKSRC}/xpns ${PREFIX}/bin/xpns
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xpns
-	${CP} ${WRKSRC}/*.net ${PREFIX}/share/doc/xpns/
+	${INSTALL_PROGRAM} ${WRKSRC}/pns ${DESTDIR}${PREFIX}/lib/xpns/
+	${INSTALL_DATA} ${WRKSRC}/pns.hlp ${DESTDIR}${PREFIX}/lib/xpns/
+	${INSTALL_DATA} ${WRKSRC}/pns.shell ${DESTDIR}${PREFIX}/lib/xpns/
+	${INSTALL_SCRIPT} ${WRKSRC}/xpns ${DESTDIR}${PREFIX}/bin/xpns
+	${INSTALL_DATA} ${WRKSRC}/*.net ${DESTDIR}${PREFIX}/share/doc/xpns/
 
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xscribble/Makefile b/x11/xscribble/Makefile
index 3e72be53c2d..b96f573ddc9 100644
--- a/x11/xscribble/Makefile
+++ b/x11/xscribble/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2009/06/30 00:07:25 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2009/07/07 16:53:43 joerg Exp $
 
 DISTNAME=	xscribble
 PKGNAME=	xscribble-20000616
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.handhelds.org/projects/xscribble.html
 COMMENT=	Handwriting recognition (like graffiti)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 MAKE_JOBS_SAFE=		no
 
 USE_IMAKE=	YES
@@ -23,9 +25,10 @@ SYS_LIBRARIES=	-lmx
 MAKE_ENV+=	SYS_LIBRARIES=${SYS_LIBRARIES:Q}
 .endif
 
+INSTALLATION_DIRS=	share/examples/xscribble
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/xscribble
-	${INSTALL_DATA} ${WRKSRC}/classifiers/*.cl ${PREFIX}/share/examples/xscribble
+	${INSTALL_DATA} ${WRKSRC}/classifiers/*.cl ${DESTDIR}${PREFIX}/share/examples/xscribble
 
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXp/buildlink3.mk"
-- 
cgit v1.2.3