From 9ce1d466c025a6189fd47a732ce64546c857d4a2 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Tue, 7 Jul 2009 17:22:27 +0000
Subject: user-destdir support

---
 x11/xscreensaver/Makefile        | 12 +++++++-----
 x11/xscreensaver/Makefile.common |  4 +++-
 x11/xscreensaver/options.mk      |  8 ++++----
 3 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'x11/xscreensaver')

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 4019e0e88f6..505e15d2b6d 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.84 2008/03/10 12:37:12 drochner Exp $
+# $NetBSD: Makefile,v 1.85 2009/07/07 17:28:04 joerg Exp $
 
 COMMENT=	Screen saver and locker for the X window system
 
 CONFLICTS+=	xscreensaver-gnome<4.14
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "Makefile.common"
 
 CONFIGURE_ARGS+=	--without-gtk
@@ -20,11 +22,11 @@ MESSAGE_SUBST+=		EGDIR=${EGDIR:Q}
 post-extract:
 	cd ${WRKSRC}/po && ${RM} -f ca.po pt_BR.po
 
-post-install: installpamex
-installpamex:
-	${INSTALL_DATA_DIR} ${EGDIR}/pam.d
+INSTALLATION_DIRS=	${EGDIR}/pam.d
+
+post-install:
 	${INSTALL_DATA} ${FILESDIR}/pam-xscreensaver-NetBSD \
-                ${EGDIR}/pam.d/xscreensaver-NetBSD
+	    ${DESTDIR}${EGDIR}/pam.d/xscreensaver-NetBSD
 
 .include "../../x11/libXScrnSaver/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index ccc272a4c19..8a08b0b725d 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.98 2009/01/14 13:29:15 drochner Exp $
+# $NetBSD: Makefile.common,v 1.99 2009/07/07 17:28:04 joerg Exp $
 #
 
 # When updating the package,
@@ -63,6 +63,8 @@ CFLAGS+=		-fno-strict-aliasing
 GCC_REQD+=		2.95.3
 .endif
 
+INSTALL_MAKE_FLAGS=	install_prefix=${DESTDIR}
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/gle/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
diff --git a/x11/xscreensaver/options.mk b/x11/xscreensaver/options.mk
index 965ccc71478..68687ae5abb 100644
--- a/x11/xscreensaver/options.mk
+++ b/x11/xscreensaver/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2007/01/08 21:45:10 drochner Exp $
+# $NetBSD: options.mk,v 1.5 2009/07/07 17:28:04 joerg Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.xscreensaver
 PKG_SUPPORTED_OPTIONS=	pam xscreensaver-webcollage
@@ -24,7 +24,7 @@ PLIST_SRC=	PLIST.webcollage PLIST
 .else
 post-install: delwebcollage
 delwebcollage:
-	rm ${PREFIX}/libexec/xscreensaver/config/webcollage.xml
-	rm ${PREFIX}/libexec/xscreensaver/webcollage
-	rm ${PREFIX}/${PKGMANDIR}/man6/webcollage.6
+	rm ${DESTDIR}${PREFIX}/libexec/xscreensaver/config/webcollage.xml
+	rm ${DESTDIR}${PREFIX}/libexec/xscreensaver/webcollage
+	rm ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/webcollage.6
 .endif
-- 
cgit v1.2.3