Sat Jul 15 19:10:31 2017 UTC ()
Fix pkglint warnings.


(wiz)
diff -r1.20 -r1.21 pkgsrc/x11/wxGTK30/Makefile
diff -r1.5 -r1.6 pkgsrc/x11/wxGTK30/hacks.mk

cvs diff -r1.20 -r1.21 pkgsrc/x11/wxGTK30/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/wxGTK30/Makefile 2017/02/12 06:25:00 1.20
+++ pkgsrc/x11/wxGTK30/Makefile 2017/07/15 19:10:31 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.20 2017/02/12 06:25:00 ryoon Exp $ 1# $NetBSD: Makefile,v 1.21 2017/07/15 19:10:31 wiz Exp $
2 2
3VERSION= 3.0.2 3VERSION= 3.0.2
4PKGREVISION= 10 4PKGREVISION= 10
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
11PATCHFILES= ${DISTNAME}-libtool.3.diff.bz2 11PATCHFILES= ${DISTNAME}-libtool.3.diff.bz2
12PATCH_SITES= ${MASTER_SITE_LOCAL} 12PATCH_SITES= ${MASTER_SITE_LOCAL}
13PATCH_DIST_STRIP.${DISTNAME}-libtool.3.diff.bz2= -p1 13PATCH_DIST_STRIP.${DISTNAME}-libtool.3.diff.bz2= -p1
14 14
@@ -66,27 +66,27 @@ CONFIGURE_ARGS+= --with-macosx-version-m @@ -66,27 +66,27 @@ CONFIGURE_ARGS+= --with-macosx-version-m
66 66
67PLIST_SRC+= PLIST.cocoa 67PLIST_SRC+= PLIST.cocoa
68CONFIGURE_ARGS+= --with-osx_cocoa 68CONFIGURE_ARGS+= --with-osx_cocoa
69.else 69.else
70PLIST.notdarwin= yes 70PLIST.notdarwin= yes
71 71
72PLIST_SRC+= PLIST.gtk2 72PLIST_SRC+= PLIST.gtk2
73CONFIGURE_ARGS+= --with-gtk=2 73CONFIGURE_ARGS+= --with-gtk=2
74.endif 74.endif
75 75
76CONFIGURE_ARGS.SunOS+= --disable-xlocale 76CONFIGURE_ARGS.SunOS+= --disable-xlocale
77 77
78post-configure: 78post-configure:
79 echo 'install_qadll: install_xmldll' >> ${WRKSRC}/Makefile 79 ${ECHO} 'install_qadll: install_xmldll' >> ${WRKSRC}/Makefile
80 80
81post-build: 81post-build:
82 set -e; cd ${WRKSRC}/locale; \ 82 set -e; cd ${WRKSRC}/locale; \
83 for lang in *.po; do \ 83 for lang in *.po; do \
84 [ "$${lang}" = "wxstd.po" ] && continue; \ 84 [ "$${lang}" = "wxstd.po" ] && continue; \
85 ${TOOLS_PATH.msgfmt} -c -o "$${lang%.po}.mo" "$${lang}"; \ 85 ${TOOLS_PATH.msgfmt} -c -o "$${lang%.po}.mo" "$${lang}"; \
86 done 86 done
87 set -e; cd ${WRKSRC}/locale/msw; \ 87 set -e; cd ${WRKSRC}/locale/msw; \
88 for lang in it; do \ 88 for lang in it; do \
89 ${TOOLS_PATH.msgfmt} -c -o "$${lang}.mo" "$${lang}.po"; \ 89 ${TOOLS_PATH.msgfmt} -c -o "$${lang}.mo" "$${lang}.po"; \
90 done 90 done
91 91
92post-install: 92post-install:

cvs diff -r1.5 -r1.6 pkgsrc/x11/wxGTK30/hacks.mk (expand / switch to unified diff)

--- pkgsrc/x11/wxGTK30/hacks.mk 2016/08/20 13:19:21 1.5
+++ pkgsrc/x11/wxGTK30/hacks.mk 2017/07/15 19:10:31 1.6
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1# $NetBSD: hacks.mk,v 1.5 2016/08/20 13:19:21 gdt Exp $ 1# $NetBSD: hacks.mk,v 1.6 2017/07/15 19:10:31 wiz Exp $
2 2
3### [Mon Dec 14 16:58:00 MET 2015 : bouyer ] 3### [Mon Dec 14 16:58:00 MET 2015 : bouyer ]
4### g++-4.8 on NetBSD/i386 fails with an internal compiler error 4### g++-4.8 on NetBSD/i386 fails with an internal compiler error
5### when PCH is used. Be conservative and disable on all MACHINE_ARCH 5### when PCH is used. Be conservative and disable on all MACHINE_ARCH
6###  6###
7.if ${OPSYS} == "NetBSD"  7.if ${OPSYS} == "NetBSD"
8. include "../../mk/compiler.mk" 8. include "../../mk/compiler.mk"
9. if !empty(PKGSRC_COMPILER:Mgcc) && \ 9. if !empty(PKGSRC_COMPILER:Mgcc) && \
10 (!empty(CC_VERSION:Mgcc-4.8.*) || !empty(CC_VERSION:Mgcc-5.*)) 10 (!empty(CC_VERSION:Mgcc-4.8.*) || !empty(CC_VERSION:Mgcc-5.*))
11CONFIGURE_ARGS+= --disable-precomp-headers 11CONFIGURE_ARGS+= --disable-precomp-headers
12. endif 12. endif
13.endif 13.endif