Wed Dec 10 14:02:32 2014 UTC ()
Add explicit dependency to ensure relinking is done in the correct
order.


(joerg)
diff -r1.30 -r1.31 pkgsrc/x11/wxGTK26/Makefile
diff -r1.40 -r1.41 pkgsrc/x11/wxGTK28/Makefile
diff -r1.5 -r1.6 pkgsrc/x11/wxGTK30/Makefile
cvs diff -r1.30 -r1.31 pkgsrc/x11/wxGTK26/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/wxGTK26/Attic/Makefile 2014/06/09 14:18:09 1.30
+++ pkgsrc/x11/wxGTK26/Attic/Makefile 2014/12/10 14:02:31 1.31
@@ -1,23 +1,26 @@ @@ -1,23 +1,26 @@
1# $NetBSD: Makefile,v 1.30 2014/06/09 14:18:09 ryoon Exp $ 1# $NetBSD: Makefile,v 1.31 2014/12/10 14:02:31 joerg Exp $
2# 2#
3 3
4.include "Makefile.common" 4.include "Makefile.common"
5 5
6PKGREVISION= 28 6PKGREVISION= 28
7COMMENT= GTK-based implementation of the wxWidgets GUI library 7COMMENT= GTK-based implementation of the wxWidgets GUI library
8 8
9REPLACE_SH= wx-config.in wx-config-inplace.in 9REPLACE_SH= wx-config.in wx-config-inplace.in
10 10
 11post-configure:
 12 echo 'install_qadll: install_xmldll' >> ${WRKSRC}/Makefile
 13
11post-build: 14post-build:
12 set -e; cd ${WRKSRC}/locale; \ 15 set -e; cd ${WRKSRC}/locale; \
13 for lang in ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk \ 16 for lang in ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk \
14 zh_CN zh_TW; do \ 17 zh_CN zh_TW; do \
15 ${TOOLS_PATH.msgfmt} -c -o $${lang}.mo $${lang}.po; \ 18 ${TOOLS_PATH.msgfmt} -c -o $${lang}.mo $${lang}.po; \
16 done 19 done
17 set -e; cd ${WRKSRC}/locale/msw; \ 20 set -e; cd ${WRKSRC}/locale/msw; \
18 for lang in it; do \ 21 for lang in it; do \
19 ${TOOLS_PATH.msgfmt} -c -o $${lang}.mo $${lang}.po; \ 22 ${TOOLS_PATH.msgfmt} -c -o $${lang}.mo $${lang}.po; \
20 done 23 done
21 24
22post-install: 25post-install:
23 ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR} 26 ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
cvs diff -r1.40 -r1.41 pkgsrc/x11/wxGTK28/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/wxGTK28/Attic/Makefile 2014/06/09 14:18:09 1.40
+++ pkgsrc/x11/wxGTK28/Attic/Makefile 2014/12/10 14:02:32 1.41
@@ -1,29 +1,33 @@ @@ -1,29 +1,33 @@
1# $NetBSD: Makefile,v 1.40 2014/06/09 14:18:09 ryoon Exp $ 1# $NetBSD: Makefile,v 1.41 2014/12/10 14:02:32 joerg Exp $
2# 2#
3 3
4.include "../../x11/wxGTK28/Makefile.common" 4.include "../../x11/wxGTK28/Makefile.common"
5 5
6PKGNAME= ${DISTNAME:S/wxGTK/wxGTK28/} 6PKGNAME= ${DISTNAME:S/wxGTK/wxGTK28/}
7PKGREVISION= 7 7PKGREVISION= 7
8COMMENT= GTK-based implementation of the wxWidgets GUI library 8COMMENT= GTK-based implementation of the wxWidgets GUI library
9 9
10BUILD_TARGET= all 10BUILD_TARGET= all
11INSTALL_TARGET= install 11INSTALL_TARGET= install
12 12
13INSTALLATION_DIRS= ${DOCDIR} 13INSTALLATION_DIRS= ${DOCDIR}
14 14
15REPLACE_SH= wx-config.in wx-config-inplace.in 15REPLACE_SH= wx-config.in wx-config-inplace.in
16 16
 17post-configure:
 18 echo 'install_qadll: install_xmldll' >> ${WRKSRC}/build-unicode/Makefile
 19 echo 'install_qadll: install_xmldll' >> ${WRKSRC}/build-non-unicode/Makefile
 20
17post-build: 21post-build:
18 set -e; cd ${WRKSRC}/locale; \ 22 set -e; cd ${WRKSRC}/locale; \
19 for lang in *.po; do \ 23 for lang in *.po; do \
20 [ "$${lang}" = "wxstd.po" ] && continue; \ 24 [ "$${lang}" = "wxstd.po" ] && continue; \
21 ${TOOLS_PATH.msgfmt} -c -o "$${lang%.po}.mo" "$${lang}"; \ 25 ${TOOLS_PATH.msgfmt} -c -o "$${lang%.po}.mo" "$${lang}"; \
22 done 26 done
23 set -e; cd ${WRKSRC}/locale/msw; \ 27 set -e; cd ${WRKSRC}/locale/msw; \
24 for lang in it; do \ 28 for lang in it; do \
25 ${TOOLS_PATH.msgfmt} -c -o "$${lang}.mo" "$${lang}.po"; \ 29 ${TOOLS_PATH.msgfmt} -c -o "$${lang}.mo" "$${lang}.po"; \
26 done 30 done
27 31
28post-install: 32post-install:
29 ${INSTALL_DATA} ${WRKSRC}/docs/licence.txt ${DESTDIR}${DOCDIR} 33 ${INSTALL_DATA} ${WRKSRC}/docs/licence.txt ${DESTDIR}${DOCDIR}
cvs diff -r1.5 -r1.6 pkgsrc/x11/wxGTK30/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/wxGTK30/Makefile 2014/09/19 08:35:41 1.5
+++ pkgsrc/x11/wxGTK30/Makefile 2014/12/10 14:02:32 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.5 2014/09/19 08:35:41 wiz Exp $ 1# $NetBSD: Makefile,v 1.6 2014/12/10 14:02:32 joerg Exp $
2 2
3VERSION= 3.0.1 3VERSION= 3.0.1
4PKGREVISION= 3 4PKGREVISION= 3
5DISTNAME= wxWidgets-${VERSION} 5DISTNAME= wxWidgets-${VERSION}
6PKGNAME= wxGTK30-${VERSION} 6PKGNAME= wxGTK30-${VERSION}
7CATEGORIES= x11 7CATEGORIES= x11
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxwindows/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxwindows/}
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= dbj@NetBSD.org 11MAINTAINER= dbj@NetBSD.org
12HOMEPAGE= http://www.wxwidgets.org/ 12HOMEPAGE= http://www.wxwidgets.org/
13COMMENT= GTK-based implementation of the wxWidgets GUI library 13COMMENT= GTK-based implementation of the wxWidgets GUI library
14# LGPLv2 with additional permission; http://opensource.org/licenses/wxwindows 14# LGPLv2 with additional permission; http://opensource.org/licenses/wxwindows
@@ -50,26 +50,29 @@ SUBST_CLASSES+= fix-paths @@ -50,26 +50,29 @@ SUBST_CLASSES+= fix-paths
50SUBST_STAGE.fix-paths= pre-configure 50SUBST_STAGE.fix-paths= pre-configure
51SUBST_MESSAGE.fix-paths= Fixing absolute paths. 51SUBST_MESSAGE.fix-paths= Fixing absolute paths.
52SUBST_FILES.fix-paths= configure 52SUBST_FILES.fix-paths= configure
53SUBST_SED.fix-paths= -e 's,/usr/pkg/include,${PREFIX}/include,g' 53SUBST_SED.fix-paths= -e 's,/usr/pkg/include,${PREFIX}/include,g'
54SUBST_SED.fix-paths+= -e 's,@PREFIX@,${PREFIX},g' 54SUBST_SED.fix-paths+= -e 's,@PREFIX@,${PREFIX},g'
55 55
56.include "../../mk/bsd.prefs.mk" 56.include "../../mk/bsd.prefs.mk"
57 57
58PLIST_VARS+= notdarwin 58PLIST_VARS+= notdarwin
59.if ${OPSYS} != "Darwin" 59.if ${OPSYS} != "Darwin"
60PLIST.notdarwin= yes 60PLIST.notdarwin= yes
61.endif 61.endif
62 62
 63post-configure:
 64 echo 'install_qadll: install_xmldll' >> ${WRKSRC}/Makefile
 65
63post-build: 66post-build:
64 set -e; cd ${WRKSRC}/locale; \ 67 set -e; cd ${WRKSRC}/locale; \
65 for lang in *.po; do \ 68 for lang in *.po; do \
66 [ "$${lang}" = "wxstd.po" ] && continue; \ 69 [ "$${lang}" = "wxstd.po" ] && continue; \
67 ${TOOLS_PATH.msgfmt} -c -o "$${lang%.po}.mo" "$${lang}"; \ 70 ${TOOLS_PATH.msgfmt} -c -o "$${lang%.po}.mo" "$${lang}"; \
68 done 71 done
69 set -e; cd ${WRKSRC}/locale/msw; \ 72 set -e; cd ${WRKSRC}/locale/msw; \
70 for lang in it; do \ 73 for lang in it; do \
71 ${TOOLS_PATH.msgfmt} -c -o "$${lang}.mo" "$${lang}.po"; \ 74 ${TOOLS_PATH.msgfmt} -c -o "$${lang}.mo" "$${lang}.po"; \
72 done 75 done
73 76
74post-install: 77post-install:
75 ${INSTALL_DATA} ${WRKSRC}/docs/licence.txt ${DESTDIR}${PREFIX}/${DOCDIR} 78 ${INSTALL_DATA} ${WRKSRC}/docs/licence.txt ${DESTDIR}${PREFIX}/${DOCDIR}