Do not leak .buildlink into final binaries. destdir support

4 files changed, 15 insertions, 10 deletions

diff --git a/x11/wxGTK24/Makefile b/x11/wxGTK24/Makefile
index 6f904feb839..4e1d921080e 100644
--- a/x11/wxGTK24/Makefile
+++ b/x11/wxGTK24/Makefile
@@ -1,15 +1,18 @@
-# $NetBSD: Makefile,v 1.8 2009/08/26 20:24:12 sno Exp $
+# $NetBSD: Makefile,v 1.9 2009/11/29 20:16:20 joerg Exp $
 #
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "Makefile.common"
 
-PKGREVISION=		13
+PKGREVISION=		14
 COMMENT=		GTK-based implementation of the wxWidgets GUI library
 CONFLICTS+=		wxGTK<=2.4.2nb5
 
+INSTALLATION_DIRS=	${DOCDIR}
+
 post-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/LICENCE.txt ${DOCDIR}/LICENSE
+	${INSTALL_DATA} ${WRKSRC}/LICENCE.txt ${DESTDIR}${DOCDIR}/LICENSE
 
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/wxGTK24/Makefile.common b/x11/wxGTK24/Makefile.common
index 3dc8ce41cdd..5aef3b56c18 100644
--- a/x11/wxGTK24/Makefile.common
+++ b/x11/wxGTK24/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2009/01/25 20:12:14 shattered Exp $
+# $NetBSD: Makefile.common,v 1.6 2009/11/29 20:16:20 joerg Exp $
 #
 
 DISTNAME=		wxGTK-2.4.2
@@ -23,12 +23,14 @@ CONFIGURE_ARGS+=	--with-libjpeg=sys
 CONFIGURE_ARGS+=	--with-zlib=sys
 CONFIGURE_ARGS+=	--with-libpng=sys
 CONFIGURE_ARGS+=	--with-libtiff=sys
-CONFIGURE_ENV+=		BUILDLINK_DIR=${BUILDLINK_DIR:Q}
 
 CPPFLAGS+=		-Dunix=1	# src/common/unzip.c needs this
 
 DOCDIR=			${PREFIX}/share/doc/wx/gtk
 
+INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX} \
+			mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
+
 .include "../../mk/bsd.prefs.mk"
 
 # This is needed for gtk on some platforms and
diff --git a/x11/wxGTK24/distinfo b/x11/wxGTK24/distinfo
index 34b484ac1e1..bc7972ef9ba 100644
--- a/x11/wxGTK24/distinfo
+++ b/x11/wxGTK24/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2009/10/23 10:55:06 plunky Exp $
+$NetBSD: distinfo,v 1.9 2009/11/29 20:16:20 joerg Exp $
 
 SHA1 (wxGTK-2.4.2.tar.bz2) = 3f1ebacaaf8eb5510c14ee10bafbc5f225be842c
 RMD160 (wxGTK-2.4.2.tar.bz2) = 8076d1ba31c9b23becb241cbad5a83763fee776e
 Size (wxGTK-2.4.2.tar.bz2) = 5381935 bytes
-SHA1 (patch-aa) = b59c62219e29e01b154feda85916c654570b680c
+SHA1 (patch-aa) = 1d6b86da5e7a1fd3a13805465e9059d21dbbfc7a
 SHA1 (patch-ab) = bab52051778a93439cfd3144f052bdbcc7024e30
 SHA1 (patch-ac) = 06a047a28260d30516b87d85a4dd4d5a6c18cfc4
 SHA1 (patch-ad) = 809a12f89b018373910b31442dfd315276cafbdf
diff --git a/x11/wxGTK24/patches/patch-aa b/x11/wxGTK24/patches/patch-aa
index f300cca453c..2ac91d155a9 100644
--- a/x11/wxGTK24/patches/patch-aa
+++ b/x11/wxGTK24/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2005/11/07 17:58:00 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2009/11/29 20:16:20 joerg Exp $
 
 --- configure.orig	2003-09-21 13:31:30.000000000 +0200
 +++ configure
@@ -17,7 +17,7 @@ $NetBSD: patch-aa,v 1.3 2005/11/07 17:58:00 joerg Exp $
                                \
 -    /usr/openwin/share/include"
 +    /usr/openwin/share/include\
-+    ${BUILDLINK_DIR}/include"
++    ${PREFIX}/include"
  
 -SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` "
 +SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g`"