CVS commit: pkgsrc/x11/wxGTK30

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Aug 16 12:26:49 UTC 2018

Modified Files:
        pkgsrc/x11/wxGTK30: distinfo
        pkgsrc/x11/wxGTK30/patches: patch-configure patch-configure.in

Log Message:
wxGTK30: remove dragonfly support

Can't test this for upstreaming, and dragonfly users use dports or
ravenports anyway.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/x11/wxGTK30/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/wxGTK30/patches/patch-configure \
    pkgsrc/x11/wxGTK30/patches/patch-configure.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/wxGTK30/distinfo
diff -u pkgsrc/x11/wxGTK30/distinfo:1.16 pkgsrc/x11/wxGTK30/distinfo:1.17
--- pkgsrc/x11/wxGTK30/distinfo:1.16    Thu Aug 16 11:46:24 2018
+++ pkgsrc/x11/wxGTK30/distinfo Thu Aug 16 12:26:49 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2018/08/16 11:46:24 wiz Exp $
+$NetBSD: distinfo,v 1.17 2018/08/16 12:26:49 wiz Exp $
 
 SHA1 (wxWidgets-3.0.4.tar.bz2) = 246561a73ec5b9a5a7aaaaed46b64515dc9039ab
 RMD160 (wxWidgets-3.0.4.tar.bz2) = 179bcd489aec0a56a7a2890be68ee718b87a1c7a
@@ -6,8 +6,8 @@ SHA512 (wxWidgets-3.0.4.tar.bz2) = c9e6b
 Size (wxWidgets-3.0.4.tar.bz2) = 20204622 bytes
 SHA1 (patch-Makefile.in) = 27546d03ba497f485fed323192c09f6f9ae67554
 SHA1 (patch-build_aclocal_bakefile.m4) = b74cb570e95eb5443756490b3be50eb33d3acc34
-SHA1 (patch-configure) = 1e3e5b9b81bf61f893ef535a07e4398abd00953d
-SHA1 (patch-configure.in) = 20bbf79a3761d00b71ab6e63e678d90f9b175f8c
+SHA1 (patch-configure) = c63471b4f1b24ab0d97846f452c3c186e2d207b5
+SHA1 (patch-configure.in) = 420105dca608dcdcc6ee6a1e9b6da14049681a4e
 SHA1 (patch-src_tiff_configure) = 4bdb7b96231b4db0da3a0a1f7d8350ad4222080e
 SHA1 (patch-src_tiff_configure.ac) = de55f861e64fd0bbecc10086213dd98bd3b4f3ca
 SHA1 (patch-src_unix_fswatcher__kqueue.cpp) = 29c7887590b29dd53f9cf9ea1526f1c8d9465aed

Index: pkgsrc/x11/wxGTK30/patches/patch-configure
diff -u pkgsrc/x11/wxGTK30/patches/patch-configure:1.3 pkgsrc/x11/wxGTK30/patches/patch-configure:1.4
--- pkgsrc/x11/wxGTK30/patches/patch-configure:1.3      Mon May 14 13:19:48 2018
+++ pkgsrc/x11/wxGTK30/patches/patch-configure  Thu Aug 16 12:26:49 2018
@@ -1,20 +1,10 @@
-$NetBSD: patch-configure,v 1.3 2018/05/14 13:19:48 jperkin Exp $
+$NetBSD: patch-configure,v 1.4 2018/08/16 12:26:49 wiz Exp $
 
 Fix shell script portability
-Add dragonfly support
 tweak SEARCH_LIB
 
 --- configure.orig     2014-06-14 21:48:48.000000000 +0000
 +++ configure
-@@ -3947,7 +3947,7 @@ case "${host}" in
- 
-     DEFAULT_DEFAULT_wxUSE_MOTIF=1
-   ;;
--  *-*-freebsd*)
-+  *-*-freebsd* | *-*-dragonfly*)
-     USE_BSD=1
-     USE_FREEBSD=1
-     $as_echo "#define __FREEBSD__ 1" >>confdefs.h
 @@ -19447,7 +19447,7 @@ $as_echo_n "checking SDK deployment vers
          MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" buildSettings | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ 
*"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'`
  
@@ -33,25 +23,6 @@ tweak SEARCH_LIB
  
  if test "$build" != "$host" -a "$GCC" = yes; then
                      if cross_root=`$CC -print-prog-name=ld 2>/dev/null`; then
-@@ -31852,6 +31852,9 @@ $as_echo "$as_me: WARNING: BeOS threads 
-                                         THREAD_OPTS="-pthreads $THREAD_OPTS"
-                 fi
-                 ;;
-+        *-*-dragonfly*)
-+                THREAD_OPTS="-pthread $THREAD_OPTS"
-+                ;;
-           *-*-freebsd*)
-                                                 THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
-                 ;;
-@@ -31971,7 +31974,7 @@ $as_echo_n "checking if more special fla
-                 WXCONFIG_LDFLAGS="-L/usr/lib/threads $WXCONFIG_LDFLAGS"
-                 flag="-D_THREAD_SAFE"
-                 ;;
--            *-freebsd*)
-+            *-freebsd*|*-*-dragonfly*)
-                 flag="-D_THREAD_SAFE"
-                 ;;
-             *-hp-hpux* )
 @@ -38819,7 +38822,7 @@ $as_echo "$bakefile_cv_gcc31" >&6; }
              SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
          fi
@@ -61,23 +32,6 @@ tweak SEARCH_LIB
              PIC_FLAG="-dynamic -fPIC"
          fi
          if test "x$XLCC" = "xyes"; then
-@@ -39388,6 +39391,7 @@ EOF
- 
-       powerpc-apple-macos* | \
-       *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-gnu* | *-*-k*bsd*-gnu | \
-+      *-*-dragonfly* | \
-       *-*-mirbsd* | \
-       *-*-sunos4* | \
-       *-*-osf* | \
-@@ -39429,7 +39433,7 @@ EOF
- 
-     case "${BAKEFILE_HOST}" in
-       *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
--      *-*-k*bsd*-gnu | *-*-mirbsd* | *-*-gnu* )
-+      *-*-k*bsd*-gnu | *-*-mirbsd* | *-*-gnu* | *-*-dragonfly*)
-         if test "x$SUNCXX" = "xyes"; then
-             SONAME_FLAG="-h "
-         else
 @@ -40007,7 +40011,8 @@ EOF
        *-*-solaris2* )
          SONAME_FLAG="-h "
Index: pkgsrc/x11/wxGTK30/patches/patch-configure.in
diff -u pkgsrc/x11/wxGTK30/patches/patch-configure.in:1.3 pkgsrc/x11/wxGTK30/patches/patch-configure.in:1.4
--- pkgsrc/x11/wxGTK30/patches/patch-configure.in:1.3   Thu Aug 16 11:38:53 2018
+++ pkgsrc/x11/wxGTK30/patches/patch-configure.in       Thu Aug 16 12:26:49 2018
@@ -1,22 +1,12 @@
-$NetBSD: patch-configure.in,v 1.3 2018/08/16 11:38:53 wiz Exp $
+$NetBSD: patch-configure.in,v 1.4 2018/08/16 12:26:49 wiz Exp $
 
 Fix shell script portability
 https://trac.wxwidgets.org/ticket/18198
 
-Add dragonfly support
 tweak SEARCH_LIB
 
 --- configure.in.orig  2014-06-14 21:48:48.000000000 +0000
 +++ configure.in
-@@ -203,7 +203,7 @@ case "${host}" in
-     AC_DEFINE(__BSD__)
-     DEFAULT_DEFAULT_wxUSE_MOTIF=1
-   ;;
--  *-*-freebsd*)
-+  *-*-freebsd* | *-*-dragonfly*)
-     USE_BSD=1
-     USE_FREEBSD=1
-     AC_DEFINE(__FREEBSD__)
 @@ -1238,7 +1238,7 @@ dnl We need to quote the next line where
          MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" buildSettings | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ 
*"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'`
  ]
@@ -35,22 +25,3 @@ tweak SEARCH_LIB
  
  dnl Cross compiling with gcc?
  if test "$build" != "$host" -a "$GCC" = yes; then
-@@ -4722,6 +4722,9 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2
-                     THREAD_OPTS="-pthreads $THREAD_OPTS"
-                 fi
-                 ;;
-+          *-*-dragonfly*)
-+                THREAD_OPTS="-pthread $THREAD_OPTS"
-+                ;;
-           *-*-freebsd*)
-                 dnl look, in order, for the kernel threads, then Linux threads
-                 dnl and finally the userland threads
-@@ -4858,7 +4861,7 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2
-                 WXCONFIG_LDFLAGS="-L/usr/lib/threads $WXCONFIG_LDFLAGS"
-                 flag="-D_THREAD_SAFE"
-                 ;;
--            *-freebsd*)
-+            *-freebsd*|*-*-dragonfly*)
-                 flag="-D_THREAD_SAFE"
-                 ;;
-             *-hp-hpux* )