pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/wm DESTDIR support. Use OWN_DIRS.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f5da33a389f2
branches:  trunk
changeset: 571471:f5da33a389f2
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Feb 12 19:59:29 2010 +0000

description:
DESTDIR support. Use OWN_DIRS.

diffstat:

 wm/wmx-gnome/Makefile  |   4 +++-
 wm/wmx/Makefile        |   4 +++-
 wm/wmx/Makefile.common |  11 ++++++-----
 wm/wmx/PLIST           |   4 +---
 4 files changed, 13 insertions(+), 10 deletions(-)

diffs (71 lines):

diff -r 31db84cea856 -r f5da33a389f2 wm/wmx-gnome/Makefile
--- a/wm/wmx-gnome/Makefile     Fri Feb 12 19:57:51 2010 +0000
+++ b/wm/wmx-gnome/Makefile     Fri Feb 12 19:59:29 2010 +0000
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:11:16 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2010/02/12 19:59:29 joerg Exp $
 
 PKGNAME=       wmx-gnome-${WMX_VERS}
 PKGREVISION=   2
 CATEGORIES+=   gnome
 COMMENT=       Another X11 window manager based on wm2, with GNOME compliance
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 .include "../../wm/wmx/Makefile.common"
 
 CPPFLAGS+=     -DCONFIG_GNOME_COMPLIANCE=True
diff -r 31db84cea856 -r f5da33a389f2 wm/wmx/Makefile
--- a/wm/wmx/Makefile   Fri Feb 12 19:57:51 2010 +0000
+++ b/wm/wmx/Makefile   Fri Feb 12 19:59:29 2010 +0000
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2007/10/11 21:26:10 adam Exp $
+# $NetBSD: Makefile,v 1.13 2010/02/12 19:59:29 joerg Exp $
 
 PKGNAME=       wmx-${WMX_VERS}
 PKGREVISION=   3
 COMMENT=       Another X11 window manager based on wm2
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 .include "../../wm/wmx/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff -r 31db84cea856 -r f5da33a389f2 wm/wmx/Makefile.common
--- a/wm/wmx/Makefile.common    Fri Feb 12 19:57:51 2010 +0000
+++ b/wm/wmx/Makefile.common    Fri Feb 12 19:59:29 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2007/10/11 21:26:10 adam Exp $
+# $NetBSD: Makefile.common,v 1.21 2010/02/12 19:59:29 joerg Exp $
 
 DISTNAME=      wmx-6
 WMX_VERS=      6.0
@@ -22,13 +22,14 @@
 PLIST_SRC=             ${.CURDIR}/../../wm/wmx/PLIST
 
 INSTALLATION_DIRS=     bin
-INSTALLATION_DIRS+=    etc/wmx
 INSTALLATION_DIRS+=    share/doc/wmx
 
+OWN_DIRS+=     etc/wmx
+
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/wmx ${PREFIX}/bin
-       ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/wmx
-       ${INSTALL_DATA} ${WRKSRC}/README.contrib ${PREFIX}/share/doc/wmx
+       ${INSTALL_PROGRAM} ${WRKSRC}/wmx ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/wmx
+       ${INSTALL_DATA} ${WRKSRC}/README.contrib ${DESTDIR}${PREFIX}/share/doc/wmx
 
 BUILDLINK_DEPMETHOD.libXt+=    build
 
diff -r 31db84cea856 -r f5da33a389f2 wm/wmx/PLIST
--- a/wm/wmx/PLIST      Fri Feb 12 19:57:51 2010 +0000
+++ b/wm/wmx/PLIST      Fri Feb 12 19:59:29 2010 +0000
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:19:03 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2010/02/12 19:59:29 joerg Exp $
 bin/wmx
 share/doc/wmx/README
 share/doc/wmx/README.contrib
-@exec  ${MKDIR} %D/etc/wmx
-@unexec        ${RMDIR} -p %D/etc/wmx 2>/dev/null || ${TRUE}



Home | Main Index | Thread Index | Old Index