[pkgsrc/trunk]: pkgsrc/x11 - DESTDIR support

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/586ae61f44df
branches:  trunk
changeset: 523089:586ae61f44df
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Jan 02 11:00:24 2007 +0000

description:
- DESTDIR support
- simplified Makefile of wxGTK-contrib using BUILD_DIRS
- don't include x11.b3.mk as it is not needed

diffstat:

 x11/wxGTK-contrib/Makefile |  8 ++------
 x11/wxGTK/Makefile         |  6 +++---
 x11/wxGTK/Makefile.common  |  5 +++--
 3 files changed, 8 insertions(+), 11 deletions(-)

diffs (65 lines):

diff -r 25ecc5928d0f -r 586ae61f44df x11/wxGTK-contrib/Makefile
--- a/x11/wxGTK-contrib/Makefile        Tue Jan 02 10:42:58 2007 +0000
+++ b/x11/wxGTK-contrib/Makefile        Tue Jan 02 11:00:24 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/04/17 13:46:00 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/01/02 11:00:25 joerg Exp $
 #
 
 .include "../../x11/wxGTK/Makefile.common"
@@ -10,11 +10,7 @@
 
 USE_TOOLS+=            gmake
 
-do-build:
-       cd ${WRKSRC}/contrib/src && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS}
-
-do-install:
-       cd ${WRKSRC}/contrib/src && ${SETENV} ${MAKE_ENV} ${MAKE} install ${MAKE_FLAGS}
+BUILD_DIRS=            contrib/src
 
 .include "../../x11/wxGTK/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 25ecc5928d0f -r 586ae61f44df x11/wxGTK/Makefile
--- a/x11/wxGTK/Makefile        Tue Jan 02 10:42:58 2007 +0000
+++ b/x11/wxGTK/Makefile        Tue Jan 02 11:00:24 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2006/04/17 14:52:12 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2007/01/02 11:00:24 joerg Exp $
 #
 
 .include "Makefile.common"
@@ -18,8 +18,8 @@
        done
 
 post-install:
-       ${INSTALL_DATA_DIR} ${DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/LICENCE.txt ${DOCDIR}/LICENSE
+       ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/LICENCE.txt ${DESTDIR}${DOCDIR}/LICENSE
 
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
diff -r 25ecc5928d0f -r 586ae61f44df x11/wxGTK/Makefile.common
--- a/x11/wxGTK/Makefile.common Tue Jan 02 10:42:58 2007 +0000
+++ b/x11/wxGTK/Makefile.common Tue Jan 02 11:00:24 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2006/12/05 08:30:20 joerg Exp $
+# $NetBSD: Makefile.common,v 1.13 2007/01/02 11:00:24 joerg Exp $
 #
 
 DISTNAME=              wxGTK-2.6.3
@@ -15,6 +15,8 @@
 PATCHFILES=            ${DISTNAME}-libtool.diff2.bz2
 PATCH_SITES=           ${MASTER_SITE_LOCAL}
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_TOOLS+=            pkg-config msgfmt
 USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      YES
@@ -54,4 +56,3 @@
 .include "../../x11/gtk2/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"