wxgtk30: Back out regen of patch-configure

Building and running mkpatches apparently does the wrong thing,
perhaps due to interaction with SUBST of the same file.  Rather than
figure that out, just restore the patch.

In makeosxtags, quote variables formerly in [[.

3 files changed, 12 insertions, 12 deletions

diff --git a/x11/wxGTK30/distinfo b/x11/wxGTK30/distinfo
index 691f09c4b7b..fe8dbe26ea5 100644
--- a/x11/wxGTK30/distinfo
+++ b/x11/wxGTK30/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2020/03/17 23:39:15 gdt Exp $
+$NetBSD: distinfo,v 1.20 2020/03/18 14:11:37 gdt Exp $
 
 SHA1 (wxWidgets-3.0.4.tar.bz2) = 246561a73ec5b9a5a7aaaaed46b64515dc9039ab
 RMD160 (wxWidgets-3.0.4.tar.bz2) = 179bcd489aec0a56a7a2890be68ee718b87a1c7a
@@ -6,9 +6,9 @@ SHA512 (wxWidgets-3.0.4.tar.bz2) = c9e6b35d541a99921c54cfdac260843f574f146b27f92
 Size (wxWidgets-3.0.4.tar.bz2) = 20204622 bytes
 SHA1 (patch-Makefile.in) = 27546d03ba497f485fed323192c09f6f9ae67554
 SHA1 (patch-build_aclocal_bakefile.m4) = b74cb570e95eb5443756490b3be50eb33d3acc34
-SHA1 (patch-configure) = a6e1a2d95fc499f75ca0befa340a69d79f1cb731
+SHA1 (patch-configure) = c63471b4f1b24ab0d97846f452c3c186e2d207b5
 SHA1 (patch-configure.in) = 420105dca608dcdcc6ee6a1e9b6da14049681a4e
-SHA1 (patch-misc_scripts_makeosxtags.sh) = d4314aa82300ad821672c962b0cc49a01d894088
+SHA1 (patch-misc_scripts_makeosxtags.sh) = a18e1c44f1cbc0e81cb75ae9df1eedd3643446c4
 SHA1 (patch-src_tiff_configure) = 4bdb7b96231b4db0da3a0a1f7d8350ad4222080e
 SHA1 (patch-src_tiff_configure.ac) = de55f861e64fd0bbecc10086213dd98bd3b4f3ca
 SHA1 (patch-src_unix_fswatcher__kqueue.cpp) = 6a8924975690854e9c162fed906b6ecca77874b5
diff --git a/x11/wxGTK30/patches/patch-configure b/x11/wxGTK30/patches/patch-configure
index 21ef4f48a4a..a41ee22ece1 100644
--- a/x11/wxGTK30/patches/patch-configure
+++ b/x11/wxGTK30/patches/patch-configure
@@ -1,11 +1,11 @@
-$NetBSD: patch-configure,v 1.5 2020/03/17 23:39:15 gdt Exp $
+$NetBSD: patch-configure,v 1.6 2020/03/18 14:11:37 gdt Exp $
 
 Fix shell script portability
 tweak SEARCH_LIB
 
---- configure.orig	2018-03-07 16:55:38.000000000 +0000
+--- configure.orig	2014-06-14 21:48:48.000000000 +0000
 +++ configure
-@@ -19600,7 +19600,7 @@ $as_echo_n "checking SDK deployment vers
+@@ -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/'`
  
          # If that failed, try again with the new key
@@ -14,16 +14,16 @@ tweak SEARCH_LIB
  
              MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" DefaultProperties | 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/'`
  
-@@ -22169,7 +22169,7 @@ fi
+@@ -22015,7 +22015,7 @@ fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_std_libfullpath" >&5
  $as_echo "$wx_cv_std_libfullpath" >&6; }
  
 -SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` $wx_cv_std_libfullpath"
-+SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` $wx_cv_std_libfullpath /usr/pkg/lib"
++SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` $wx_cv_std_libfullpath @PREFIX@/lib"
  
  if test "$build" != "$host" -a "$GCC" = yes; then
                      if cross_root=`$CC -print-prog-name=ld 2>/dev/null`; then
-@@ -39383,7 +39383,7 @@ $as_echo "$bakefile_cv_gcc31" >&6; }
+@@ -38819,7 +38822,7 @@ $as_echo "$bakefile_cv_gcc31" >&6; }
              SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
          fi
  
@@ -32,7 +32,7 @@ tweak SEARCH_LIB
              PIC_FLAG="-dynamic -fPIC"
          fi
          if test "x$XLCC" = "xyes"; then
-@@ -40007,7 +40007,8 @@ EOF
+@@ -40007,7 +40011,8 @@ EOF
        *-*-solaris2* )
          SONAME_FLAG="-h "
          USE_SOVERSION=1
diff --git a/x11/wxGTK30/patches/patch-misc_scripts_makeosxtags.sh b/x11/wxGTK30/patches/patch-misc_scripts_makeosxtags.sh
index 30ce3a2c475..7de92f79835 100644
--- a/x11/wxGTK30/patches/patch-misc_scripts_makeosxtags.sh
+++ b/x11/wxGTK30/patches/patch-misc_scripts_makeosxtags.sh
@@ -1,4 +1,4 @@
-$NetBSD: patch-misc_scripts_makeosxtags.sh,v 1.1 2020/03/17 23:39:15 gdt Exp $
+$NetBSD: patch-misc_scripts_makeosxtags.sh,v 1.2 2020/03/18 14:11:37 gdt Exp $
 
 Remediate bashism.
 
@@ -11,7 +11,7 @@ Not yet filed uptream.
  
  osx_port=${1-cocoa}
 -if [[ $osx_port = carbon ]]; then
-+if [ $osx_port = carbon ]; then
++if [ "$osx_port" = carbon ]; then
      ext=cpp
  else
      ext=mm