Received: by mail.netbsd.org (Postfix, from userid 605) id B5CB384EB1; Wed, 2 May 2018 11:33:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 415B784D7B for ; Wed, 2 May 2018 11:33:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id wCkOU0VtcViu for ; Wed, 2 May 2018 11:33:44 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 7E9E584D04 for ; Wed, 2 May 2018 11:33:44 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 7CE0AFBEC; Wed, 2 May 2018 11:33:44 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1525260824195930" MIME-Version: 1.0 Date: Wed, 2 May 2018 11:33:44 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/x11/wxGTK30 To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20180502113344.7CE0AFBEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1525260824195930 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Wed May 2 11:33:44 UTC 2018 Modified Files: pkgsrc/x11/wxGTK30: Makefile distinfo pkgsrc/x11/wxGTK30/patches: patch-build_aclocal_bakefile.m4 patch-configure patch-configure.in patch-src_tiff_configure patch-src_tiff_configure.ac patch-src_unix_threadpsx.cpp Added Files: pkgsrc/x11/wxGTK30/patches: patch-Makefile.in Log Message: wxGTK30: fix installation of wx-config; pkglint fixes To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 pkgsrc/x11/wxGTK30/Makefile cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/wxGTK30/distinfo cvs rdiff -u -r0 -r1.3 pkgsrc/x11/wxGTK30/patches/patch-Makefile.in cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/x11/wxGTK30/patches/patch-build_aclocal_bakefile.m4 \ pkgsrc/x11/wxGTK30/patches/patch-configure \ pkgsrc/x11/wxGTK30/patches/patch-configure.in \ pkgsrc/x11/wxGTK30/patches/patch-src_tiff_configure \ pkgsrc/x11/wxGTK30/patches/patch-src_tiff_configure.ac \ pkgsrc/x11/wxGTK30/patches/patch-src_unix_threadpsx.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1525260824195930 Content-Disposition: inline Content-Length: 7342 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/wxGTK30/Makefile diff -u pkgsrc/x11/wxGTK30/Makefile:1.27 pkgsrc/x11/wxGTK30/Makefile:1.28 --- pkgsrc/x11/wxGTK30/Makefile:1.27 Sun Apr 29 05:39:33 2018 +++ pkgsrc/x11/wxGTK30/Makefile Wed May 2 11:33:44 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2018/04/29 05:39:33 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2018/05/02 11:33:44 adam Exp $ DISTNAME= wxWidgets-3.0.4 PKGNAME= ${DISTNAME:S/wxWidgets/wxGTK30/} @@ -50,7 +50,7 @@ SUBST_SED.fix-paths+= -e 's,@PREFIX@,${ .include "../../mk/bsd.prefs.mk" -PLIST_SRC+= ${PLIST_SRC_DFLT} +PLIST_SRC+= ${PLIST_SRC_DFLT} .if ${OPSYS} == "Darwin" CONFIGURE_ARGS+= --with-osx_cocoa CONFIGURE_ARGS+= --without-macosx-sdk Index: pkgsrc/x11/wxGTK30/distinfo diff -u pkgsrc/x11/wxGTK30/distinfo:1.12 pkgsrc/x11/wxGTK30/distinfo:1.13 --- pkgsrc/x11/wxGTK30/distinfo:1.12 Mon Apr 30 06:06:43 2018 +++ pkgsrc/x11/wxGTK30/distinfo Wed May 2 11:33:44 2018 @@ -1,13 +1,14 @@ -$NetBSD: distinfo,v 1.12 2018/04/30 06:06:43 wiz Exp $ +$NetBSD: distinfo,v 1.13 2018/05/02 11:33:44 adam Exp $ SHA1 (wxWidgets-3.0.4.tar.bz2) = 246561a73ec5b9a5a7aaaaed46b64515dc9039ab RMD160 (wxWidgets-3.0.4.tar.bz2) = 179bcd489aec0a56a7a2890be68ee718b87a1c7a SHA512 (wxWidgets-3.0.4.tar.bz2) = c9e6b35d541a99921c54cfdac260843f574f146b27f924a7a0fca5007344fa99865a96ded95e6802329ad9221b4880d62b92277a1b4c1ce71420acb672ad9158 Size (wxWidgets-3.0.4.tar.bz2) = 20204622 bytes -SHA1 (patch-build_aclocal_bakefile.m4) = 7d3d6fb1e6a72e370dc6147010fa5bf2c46f1206 -SHA1 (patch-configure) = 897f13daa5bc8246902d7d864096d621f2e54928 -SHA1 (patch-configure.in) = e49b9a83040201f01c22b3e1cbc4b331985f4e99 -SHA1 (patch-src_tiff_configure) = e1c002f5b7d0bf2c0bec399dbb62d0146c14ec20 -SHA1 (patch-src_tiff_configure.ac) = 0d51a7c251f897aa00e58c3a7ec5f348b50d1821 +SHA1 (patch-Makefile.in) = 5c47e2e206dc3769d378cceca6838a66ca1f29e9 +SHA1 (patch-build_aclocal_bakefile.m4) = 32cfb1b1227e97884800d27fc5fb813402059808 +SHA1 (patch-configure) = 1317c8ee9e9946cbd3fe64cf020011e9da13e2e5 +SHA1 (patch-configure.in) = 084e6966554efbe83c1f18f031e44e598c8ee23c +SHA1 (patch-src_tiff_configure) = 4bdb7b96231b4db0da3a0a1f7d8350ad4222080e +SHA1 (patch-src_tiff_configure.ac) = a1c53c4146056b0c77e55b24ad5b890b24ecf0dc SHA1 (patch-src_unix_fswatcher__kqueue.cpp) = 49e142dbdd5c8b8f449ab19b4adbe403d515ab95 -SHA1 (patch-src_unix_threadpsx.cpp) = 3ae587d56c5ea1722ff29d80ff25e894dbc16313 +SHA1 (patch-src_unix_threadpsx.cpp) = 9b77a211434184f56d0e1b342120a05acfe56fb2 Index: pkgsrc/x11/wxGTK30/patches/patch-build_aclocal_bakefile.m4 diff -u pkgsrc/x11/wxGTK30/patches/patch-build_aclocal_bakefile.m4:1.1 pkgsrc/x11/wxGTK30/patches/patch-build_aclocal_bakefile.m4:1.2 --- pkgsrc/x11/wxGTK30/patches/patch-build_aclocal_bakefile.m4:1.1 Mon Jul 21 06:53:24 2014 +++ pkgsrc/x11/wxGTK30/patches/patch-build_aclocal_bakefile.m4 Wed May 2 11:33:44 2018 @@ -1,4 +1,5 @@ -$NetBSD: patch-build_aclocal_bakefile.m4,v 1.1 2014/07/21 06:53:24 dbj Exp $ +$NetBSD: patch-build_aclocal_bakefile.m4,v 1.2 2018/05/02 11:33:44 adam Exp $ + Fix shell script portability --- build/aclocal/bakefile.m4.orig 2014-06-14 21:48:48.000000000 +0000 Index: pkgsrc/x11/wxGTK30/patches/patch-configure diff -u pkgsrc/x11/wxGTK30/patches/patch-configure:1.1 pkgsrc/x11/wxGTK30/patches/patch-configure:1.2 --- pkgsrc/x11/wxGTK30/patches/patch-configure:1.1 Mon Jul 21 06:53:24 2014 +++ pkgsrc/x11/wxGTK30/patches/patch-configure Wed May 2 11:33:44 2018 @@ -1,4 +1,5 @@ -$NetBSD: patch-configure,v 1.1 2014/07/21 06:53:24 dbj Exp $ +$NetBSD: patch-configure,v 1.2 2018/05/02 11:33:44 adam Exp $ + Fix shell script portability Add dragonfly support tweak SEARCH_LIB Index: pkgsrc/x11/wxGTK30/patches/patch-configure.in diff -u pkgsrc/x11/wxGTK30/patches/patch-configure.in:1.1 pkgsrc/x11/wxGTK30/patches/patch-configure.in:1.2 --- pkgsrc/x11/wxGTK30/patches/patch-configure.in:1.1 Mon Jul 21 06:53:24 2014 +++ pkgsrc/x11/wxGTK30/patches/patch-configure.in Wed May 2 11:33:44 2018 @@ -1,4 +1,5 @@ -$NetBSD: patch-configure.in,v 1.1 2014/07/21 06:53:24 dbj Exp $ +$NetBSD: patch-configure.in,v 1.2 2018/05/02 11:33:44 adam Exp $ + Fix shell script portability Add dragonfly support tweak SEARCH_LIB Index: pkgsrc/x11/wxGTK30/patches/patch-src_tiff_configure diff -u pkgsrc/x11/wxGTK30/patches/patch-src_tiff_configure:1.1 pkgsrc/x11/wxGTK30/patches/patch-src_tiff_configure:1.2 --- pkgsrc/x11/wxGTK30/patches/patch-src_tiff_configure:1.1 Mon Jul 21 06:53:24 2014 +++ pkgsrc/x11/wxGTK30/patches/patch-src_tiff_configure Wed May 2 11:33:44 2018 @@ -1,4 +1,5 @@ -$NetBSD: patch-src_tiff_configure,v 1.1 2014/07/21 06:53:24 dbj Exp $ +$NetBSD: patch-src_tiff_configure,v 1.2 2018/05/02 11:33:44 adam Exp $ + Fix shell script portability --- src/tiff/configure.orig 2014-06-14 21:48:48.000000000 +0000 Index: pkgsrc/x11/wxGTK30/patches/patch-src_tiff_configure.ac diff -u pkgsrc/x11/wxGTK30/patches/patch-src_tiff_configure.ac:1.1 pkgsrc/x11/wxGTK30/patches/patch-src_tiff_configure.ac:1.2 --- pkgsrc/x11/wxGTK30/patches/patch-src_tiff_configure.ac:1.1 Mon Jul 21 06:53:24 2014 +++ pkgsrc/x11/wxGTK30/patches/patch-src_tiff_configure.ac Wed May 2 11:33:44 2018 @@ -1,4 +1,5 @@ -$NetBSD: patch-src_tiff_configure.ac,v 1.1 2014/07/21 06:53:24 dbj Exp $ +$NetBSD: patch-src_tiff_configure.ac,v 1.2 2018/05/02 11:33:44 adam Exp $ + Fix shell script portability --- src/tiff/configure.ac.orig 2014-06-14 21:48:48.000000000 +0000 Index: pkgsrc/x11/wxGTK30/patches/patch-src_unix_threadpsx.cpp diff -u pkgsrc/x11/wxGTK30/patches/patch-src_unix_threadpsx.cpp:1.1 pkgsrc/x11/wxGTK30/patches/patch-src_unix_threadpsx.cpp:1.2 --- pkgsrc/x11/wxGTK30/patches/patch-src_unix_threadpsx.cpp:1.1 Mon Jul 21 06:53:24 2014 +++ pkgsrc/x11/wxGTK30/patches/patch-src_unix_threadpsx.cpp Wed May 2 11:33:44 2018 @@ -1,4 +1,5 @@ -$NetBSD: patch-src_unix_threadpsx.cpp,v 1.1 2014/07/21 06:53:24 dbj Exp $ +$NetBSD: patch-src_unix_threadpsx.cpp,v 1.2 2018/05/02 11:33:44 adam Exp $ + tweak use of thread priority functions --- src/unix/threadpsx.cpp.orig 2014-06-14 21:48:48.000000000 +0000 Added files: Index: pkgsrc/x11/wxGTK30/patches/patch-Makefile.in diff -u /dev/null pkgsrc/x11/wxGTK30/patches/patch-Makefile.in:1.3 --- /dev/null Wed May 2 11:33:44 2018 +++ pkgsrc/x11/wxGTK30/patches/patch-Makefile.in Wed May 2 11:33:44 2018 @@ -0,0 +1,23 @@ +$NetBSD: patch-Makefile.in,v 1.3 2018/05/02 11:33:44 adam Exp $ + +Install wx-config as a script, not program. + +--- Makefile.in.orig 2018-05-02 11:03:21.000000000 +0000 ++++ Makefile.in +@@ -27,6 +27,7 @@ STRIP = @STRIP@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_DIR = @INSTALL_DIR@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ + ICC_PCH_USE_SWITCH = @ICC_PCH_USE_SWITCH@ + BK_DEPS = @BK_DEPS@ + BK_MAKE_PCH = @BK_MAKE_PCH@ +@@ -16181,7 +16182,7 @@ samples: + install-wxconfig: + $(INSTALL_DIR) $(DESTDIR)$(bindir) + $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config +- $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config ++ $(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config + (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) + + locale_install: --_----------=_1525260824195930--