Wed May 2 11:33:44 2018 UTC ()
wxGTK30: fix installation of wx-config; pkglint fixes


(adam)
diff -r1.27 -r1.28 pkgsrc/x11/wxGTK30/Makefile
diff -r1.12 -r1.13 pkgsrc/x11/wxGTK30/distinfo
diff -r0 -r1.3 pkgsrc/x11/wxGTK30/patches/patch-Makefile.in
diff -r1.1 -r1.2 pkgsrc/x11/wxGTK30/patches/patch-build_aclocal_bakefile.m4
diff -r1.1 -r1.2 pkgsrc/x11/wxGTK30/patches/patch-configure
diff -r1.1 -r1.2 pkgsrc/x11/wxGTK30/patches/patch-configure.in
diff -r1.1 -r1.2 pkgsrc/x11/wxGTK30/patches/patch-src_tiff_configure
diff -r1.1 -r1.2 pkgsrc/x11/wxGTK30/patches/patch-src_tiff_configure.ac
diff -r1.1 -r1.2 pkgsrc/x11/wxGTK30/patches/patch-src_unix_threadpsx.cpp
cvs diff -r1.27 -r1.28 pkgsrc/x11/wxGTK30/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/wxGTK30/Makefile 2018/04/29 05:39:33 1.27
+++ pkgsrc/x11/wxGTK30/Makefile 2018/05/02 11:33:44 1.28
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.27 2018/04/29 05:39:33 wiz Exp $ 1# $NetBSD: Makefile,v 1.28 2018/05/02 11:33:44 adam Exp $
2 2
3DISTNAME= wxWidgets-3.0.4 3DISTNAME= wxWidgets-3.0.4
4PKGNAME= ${DISTNAME:S/wxWidgets/wxGTK30/} 4PKGNAME= ${DISTNAME:S/wxWidgets/wxGTK30/}
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= ${MASTER_SITE_GITHUB:=wxWidgets/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=wxWidgets/}
7GITHUB_PROJECT= wxWidgets 7GITHUB_PROJECT= wxWidgets
8GITHUB_RELEASE= v${PKGVERSION_NOREV} 8GITHUB_RELEASE= v${PKGVERSION_NOREV}
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= Cross-platform wxWidgets GUI library 13COMMENT= Cross-platform wxWidgets GUI library
14# LGPLv2 with additional permission; http://opensource.org/licenses/wxwindows 14# LGPLv2 with additional permission; http://opensource.org/licenses/wxwindows
@@ -40,27 +40,27 @@ INSTALLATION_DIRS+= ${DOCDIR} @@ -40,27 +40,27 @@ INSTALLATION_DIRS+= ${DOCDIR}
40INSTALLATION_DIRS+= bin 40INSTALLATION_DIRS+= bin
41 41
42REPLACE_SH= wx-config.in wx-config-inplace.in 42REPLACE_SH= wx-config.in wx-config-inplace.in
43 43
44SUBST_CLASSES+= fix-paths 44SUBST_CLASSES+= fix-paths
45SUBST_STAGE.fix-paths= pre-configure 45SUBST_STAGE.fix-paths= pre-configure
46SUBST_MESSAGE.fix-paths= Fixing absolute paths. 46SUBST_MESSAGE.fix-paths= Fixing absolute paths.
47SUBST_FILES.fix-paths= configure 47SUBST_FILES.fix-paths= configure
48SUBST_SED.fix-paths= -e 's,/usr/pkg/include,${PREFIX}/include,g' 48SUBST_SED.fix-paths= -e 's,/usr/pkg/include,${PREFIX}/include,g'
49SUBST_SED.fix-paths+= -e 's,@PREFIX@,${PREFIX},g' 49SUBST_SED.fix-paths+= -e 's,@PREFIX@,${PREFIX},g'
50 50
51.include "../../mk/bsd.prefs.mk" 51.include "../../mk/bsd.prefs.mk"
52 52
53PLIST_SRC+= ${PLIST_SRC_DFLT} 53PLIST_SRC+= ${PLIST_SRC_DFLT}
54.if ${OPSYS} == "Darwin" 54.if ${OPSYS} == "Darwin"
55CONFIGURE_ARGS+= --with-osx_cocoa 55CONFIGURE_ARGS+= --with-osx_cocoa
56CONFIGURE_ARGS+= --without-macosx-sdk 56CONFIGURE_ARGS+= --without-macosx-sdk
57CONFIGURE_ARGS+= --without-macosx-version-min 57CONFIGURE_ARGS+= --without-macosx-version-min
58CPPFLAGS+= -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=1 58CPPFLAGS+= -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=1
59.else 59.else
60PLIST_SRC+= PLIST.gtk3 60PLIST_SRC+= PLIST.gtk3
61CONFIGURE_ARGS+= --with-gtk=3 61CONFIGURE_ARGS+= --with-gtk=3
62.endif 62.endif
63 63
64CONFIGURE_ARGS.SunOS+= --disable-xlocale 64CONFIGURE_ARGS.SunOS+= --disable-xlocale
65 65
66post-configure: 66post-configure:
cvs diff -r1.12 -r1.13 pkgsrc/x11/wxGTK30/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/wxGTK30/distinfo 2018/04/30 06:06:43 1.12
+++ pkgsrc/x11/wxGTK30/distinfo 2018/05/02 11:33:44 1.13
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1$NetBSD: distinfo,v 1.12 2018/04/30 06:06:43 wiz Exp $ 1$NetBSD: distinfo,v 1.13 2018/05/02 11:33:44 adam Exp $
2 2
3SHA1 (wxWidgets-3.0.4.tar.bz2) = 246561a73ec5b9a5a7aaaaed46b64515dc9039ab 3SHA1 (wxWidgets-3.0.4.tar.bz2) = 246561a73ec5b9a5a7aaaaed46b64515dc9039ab
4RMD160 (wxWidgets-3.0.4.tar.bz2) = 179bcd489aec0a56a7a2890be68ee718b87a1c7a 4RMD160 (wxWidgets-3.0.4.tar.bz2) = 179bcd489aec0a56a7a2890be68ee718b87a1c7a
5SHA512 (wxWidgets-3.0.4.tar.bz2) = c9e6b35d541a99921c54cfdac260843f574f146b27f924a7a0fca5007344fa99865a96ded95e6802329ad9221b4880d62b92277a1b4c1ce71420acb672ad9158 5SHA512 (wxWidgets-3.0.4.tar.bz2) = c9e6b35d541a99921c54cfdac260843f574f146b27f924a7a0fca5007344fa99865a96ded95e6802329ad9221b4880d62b92277a1b4c1ce71420acb672ad9158
6Size (wxWidgets-3.0.4.tar.bz2) = 20204622 bytes 6Size (wxWidgets-3.0.4.tar.bz2) = 20204622 bytes
7SHA1 (patch-build_aclocal_bakefile.m4) = 7d3d6fb1e6a72e370dc6147010fa5bf2c46f1206 7SHA1 (patch-Makefile.in) = 5c47e2e206dc3769d378cceca6838a66ca1f29e9
8SHA1 (patch-configure) = 897f13daa5bc8246902d7d864096d621f2e54928 8SHA1 (patch-build_aclocal_bakefile.m4) = 32cfb1b1227e97884800d27fc5fb813402059808
9SHA1 (patch-configure.in) = e49b9a83040201f01c22b3e1cbc4b331985f4e99 9SHA1 (patch-configure) = 1317c8ee9e9946cbd3fe64cf020011e9da13e2e5
10SHA1 (patch-src_tiff_configure) = e1c002f5b7d0bf2c0bec399dbb62d0146c14ec20 10SHA1 (patch-configure.in) = 084e6966554efbe83c1f18f031e44e598c8ee23c
11SHA1 (patch-src_tiff_configure.ac) = 0d51a7c251f897aa00e58c3a7ec5f348b50d1821 11SHA1 (patch-src_tiff_configure) = 4bdb7b96231b4db0da3a0a1f7d8350ad4222080e
 12SHA1 (patch-src_tiff_configure.ac) = a1c53c4146056b0c77e55b24ad5b890b24ecf0dc
12SHA1 (patch-src_unix_fswatcher__kqueue.cpp) = 49e142dbdd5c8b8f449ab19b4adbe403d515ab95 13SHA1 (patch-src_unix_fswatcher__kqueue.cpp) = 49e142dbdd5c8b8f449ab19b4adbe403d515ab95
13SHA1 (patch-src_unix_threadpsx.cpp) = 3ae587d56c5ea1722ff29d80ff25e894dbc16313 14SHA1 (patch-src_unix_threadpsx.cpp) = 9b77a211434184f56d0e1b342120a05acfe56fb2
File Added: pkgsrc/x11/wxGTK30/patches/Attic/patch-Makefile.in
$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:
cvs diff -r1.1 -r1.2 pkgsrc/x11/wxGTK30/patches/Attic/patch-build_aclocal_bakefile.m4 (expand / switch to unified diff)

--- pkgsrc/x11/wxGTK30/patches/Attic/patch-build_aclocal_bakefile.m4 2014/07/21 06:53:24 1.1
+++ pkgsrc/x11/wxGTK30/patches/Attic/patch-build_aclocal_bakefile.m4 2018/05/02 11:33:44 1.2
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1$NetBSD: patch-build_aclocal_bakefile.m4,v 1.1 2014/07/21 06:53:24 dbj Exp $ 1$NetBSD: patch-build_aclocal_bakefile.m4,v 1.2 2018/05/02 11:33:44 adam Exp $
 2
2Fix shell script portability 3Fix shell script portability
3 4
4--- build/aclocal/bakefile.m4.orig 2014-06-14 21:48:48.000000000 +0000 5--- build/aclocal/bakefile.m4.orig 2014-06-14 21:48:48.000000000 +0000
5+++ build/aclocal/bakefile.m4 6+++ build/aclocal/bakefile.m4
6@@ -371,7 +371,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD], 7@@ -371,7 +371,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
7 SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o" 8 SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
8 fi 9 fi
9  10
10- if test "x$GCC" == "xyes"; then 11- if test "x$GCC" == "xyes"; then
11+ if test "x$GCC" = "xyes"; then 12+ if test "x$GCC" = "xyes"; then
12 PIC_FLAG="-dynamic -fPIC" 13 PIC_FLAG="-dynamic -fPIC"
13 fi 14 fi
14 if test "x$XLCC" = "xyes"; then 15 if test "x$XLCC" = "xyes"; then
cvs diff -r1.1 -r1.2 pkgsrc/x11/wxGTK30/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/x11/wxGTK30/patches/patch-configure 2014/07/21 06:53:24 1.1
+++ pkgsrc/x11/wxGTK30/patches/patch-configure 2018/05/02 11:33:44 1.2
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1$NetBSD: patch-configure,v 1.1 2014/07/21 06:53:24 dbj Exp $ 1$NetBSD: patch-configure,v 1.2 2018/05/02 11:33:44 adam Exp $
 2
2Fix shell script portability 3Fix shell script portability
3Add dragonfly support 4Add dragonfly support
4tweak SEARCH_LIB 5tweak SEARCH_LIB
5 6
6--- configure.orig 2014-06-14 21:48:48.000000000 +0000 7--- configure.orig 2014-06-14 21:48:48.000000000 +0000
7+++ configure 8+++ configure
8@@ -3947,7 +3947,7 @@ case "${host}" in 9@@ -3947,7 +3947,7 @@ case "${host}" in
9  10
10 DEFAULT_DEFAULT_wxUSE_MOTIF=1 11 DEFAULT_DEFAULT_wxUSE_MOTIF=1
11 ;; 12 ;;
12- *-*-freebsd*) 13- *-*-freebsd*)
13+ *-*-freebsd* | *-*-dragonfly*) 14+ *-*-freebsd* | *-*-dragonfly*)
14 USE_BSD=1 15 USE_BSD=1
cvs diff -r1.1 -r1.2 pkgsrc/x11/wxGTK30/patches/Attic/patch-configure.in (expand / switch to unified diff)

--- pkgsrc/x11/wxGTK30/patches/Attic/patch-configure.in 2014/07/21 06:53:24 1.1
+++ pkgsrc/x11/wxGTK30/patches/Attic/patch-configure.in 2018/05/02 11:33:44 1.2
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1$NetBSD: patch-configure.in,v 1.1 2014/07/21 06:53:24 dbj Exp $ 1$NetBSD: patch-configure.in,v 1.2 2018/05/02 11:33:44 adam Exp $
 2
2Fix shell script portability 3Fix shell script portability
3Add dragonfly support 4Add dragonfly support
4tweak SEARCH_LIB 5tweak SEARCH_LIB
5 6
6--- configure.in.orig 2014-06-14 21:48:48.000000000 +0000 7--- configure.in.orig 2014-06-14 21:48:48.000000000 +0000
7+++ configure.in 8+++ configure.in
8@@ -203,7 +203,7 @@ case "${host}" in 9@@ -203,7 +203,7 @@ case "${host}" in
9 AC_DEFINE(__BSD__) 10 AC_DEFINE(__BSD__)
10 DEFAULT_DEFAULT_wxUSE_MOTIF=1 11 DEFAULT_DEFAULT_wxUSE_MOTIF=1
11 ;; 12 ;;
12- *-*-freebsd*) 13- *-*-freebsd*)
13+ *-*-freebsd* | *-*-dragonfly*) 14+ *-*-freebsd* | *-*-dragonfly*)
14 USE_BSD=1 15 USE_BSD=1
cvs diff -r1.1 -r1.2 pkgsrc/x11/wxGTK30/patches/Attic/patch-src_tiff_configure (expand / switch to unified diff)

--- pkgsrc/x11/wxGTK30/patches/Attic/patch-src_tiff_configure 2014/07/21 06:53:24 1.1
+++ pkgsrc/x11/wxGTK30/patches/Attic/patch-src_tiff_configure 2018/05/02 11:33:44 1.2
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1$NetBSD: patch-src_tiff_configure,v 1.1 2014/07/21 06:53:24 dbj Exp $ 1$NetBSD: patch-src_tiff_configure,v 1.2 2018/05/02 11:33:44 adam Exp $
 2
2Fix shell script portability 3Fix shell script portability
3 4
4--- src/tiff/configure.orig 2014-06-14 21:48:48.000000000 +0000 5--- src/tiff/configure.orig 2014-06-14 21:48:48.000000000 +0000
5+++ src/tiff/configure 6+++ src/tiff/configure
6@@ -18145,7 +18145,7 @@ if test "${with_jpeg12_lib+set}" = set;  7@@ -18145,7 +18145,7 @@ if test "${with_jpeg12_lib+set}" = set;
7 fi 8 fi
8  9
9  10
10-if test "x$enable_jpeg12" == "xyes" ; then 11-if test "x$enable_jpeg12" == "xyes" ; then
11+if test "x$enable_jpeg12" = "xyes" ; then 12+if test "x$enable_jpeg12" = "xyes" ; then
12  13
13 if test "x$with_jpeg12_lib" != "x" ; then 14 if test "x$with_jpeg12_lib" != "x" ; then
14 LIBS="$with_jpeg12_lib $LIBS" 15 LIBS="$with_jpeg12_lib $LIBS"
cvs diff -r1.1 -r1.2 pkgsrc/x11/wxGTK30/patches/Attic/patch-src_tiff_configure.ac (expand / switch to unified diff)

--- pkgsrc/x11/wxGTK30/patches/Attic/patch-src_tiff_configure.ac 2014/07/21 06:53:24 1.1
+++ pkgsrc/x11/wxGTK30/patches/Attic/patch-src_tiff_configure.ac 2018/05/02 11:33:44 1.2
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1$NetBSD: patch-src_tiff_configure.ac,v 1.1 2014/07/21 06:53:24 dbj Exp $ 1$NetBSD: patch-src_tiff_configure.ac,v 1.2 2018/05/02 11:33:44 adam Exp $
 2
2Fix shell script portability 3Fix shell script portability
3 4
4--- src/tiff/configure.ac.orig 2014-06-14 21:48:48.000000000 +0000 5--- src/tiff/configure.ac.orig 2014-06-14 21:48:48.000000000 +0000
5+++ src/tiff/configure.ac 6+++ src/tiff/configure.ac
6@@ -772,7 +772,7 @@ AC_ARG_WITH(jpeg12-lib, 7@@ -772,7 +772,7 @@ AC_ARG_WITH(jpeg12-lib,
7 AS_HELP_STRING([--with-jpeg12-lib=LIBRARY], 8 AS_HELP_STRING([--with-jpeg12-lib=LIBRARY],
8 [path to libjpeg 12bit library]),,) 9 [path to libjpeg 12bit library]),,)
9  10
10-if test "x$enable_jpeg12" == "xyes" ; then 11-if test "x$enable_jpeg12" == "xyes" ; then
11+if test "x$enable_jpeg12" = "xyes" ; then 12+if test "x$enable_jpeg12" = "xyes" ; then
12  13
13 if test "x$with_jpeg12_lib" != "x" ; then 14 if test "x$with_jpeg12_lib" != "x" ; then
14 LIBS="$with_jpeg12_lib $LIBS" 15 LIBS="$with_jpeg12_lib $LIBS"
cvs diff -r1.1 -r1.2 pkgsrc/x11/wxGTK30/patches/Attic/patch-src_unix_threadpsx.cpp (expand / switch to unified diff)

--- pkgsrc/x11/wxGTK30/patches/Attic/patch-src_unix_threadpsx.cpp 2014/07/21 06:53:24 1.1
+++ pkgsrc/x11/wxGTK30/patches/Attic/patch-src_unix_threadpsx.cpp 2018/05/02 11:33:44 1.2
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1$NetBSD: patch-src_unix_threadpsx.cpp,v 1.1 2014/07/21 06:53:24 dbj Exp $ 1$NetBSD: patch-src_unix_threadpsx.cpp,v 1.2 2018/05/02 11:33:44 adam Exp $
 2
2tweak use of thread priority functions 3tweak use of thread priority functions
3 4
4--- src/unix/threadpsx.cpp.orig 2014-06-14 21:48:48.000000000 +0000 5--- src/unix/threadpsx.cpp.orig 2014-06-14 21:48:48.000000000 +0000
5+++ src/unix/threadpsx.cpp 6+++ src/unix/threadpsx.cpp
6@@ -69,6 +69,13 @@ 7@@ -69,6 +69,13 @@
7 #define THR_ID_CAST(id) (reinterpret_cast<void*>(id)) 8 #define THR_ID_CAST(id) (reinterpret_cast<void*>(id))
8 #define THR_ID(thr) THR_ID_CAST((thr)->GetId()) 9 #define THR_ID(thr) THR_ID_CAST((thr)->GetId())
9  10
10+#ifdef __NetBSD__ 11+#ifdef __NetBSD__
11+#include <sys/param.h> 12+#include <sys/param.h>
12+#if __NetBSD_Version__ < 499005000 && defined(HAVE_THREAD_PRIORITY_FUNCTIONS) 13+#if __NetBSD_Version__ < 499005000 && defined(HAVE_THREAD_PRIORITY_FUNCTIONS)
13+#undef HAVE_THREAD_PRIORITY_FUNCTIONS 14+#undef HAVE_THREAD_PRIORITY_FUNCTIONS
14+#endif 15+#endif