Create wxGTK30 package for wxWidgets 3.0.1

8 files changed, 521 insertions, 0 deletions

diff --git a/x11/wxGTK30/patches/manual-bakefile.diff b/x11/wxGTK30/patches/manual-bakefile.diff
new file mode 100644
index 00000000000..ad6b45ed797
--- /dev/null
+++ b/x11/wxGTK30/patches/manual-bakefile.diff
@@ -0,0 +1,230 @@
+$NetBSD: manual-bakefile.diff,v 1.1 2014/07/21 06:53:24 dbj Exp $
+This is a patch to the bakefile-0.2.9 rules to use libtool.
+
+diff -ru rules.orig/autoconf.bkl rules/autoconf.bkl
+--- rules.orig/autoconf.bkl	2011-02-02 14:04:25.000000000 -0800
++++ rules/autoconf.bkl	2013-04-06 21:35:57.000000000 -0700
+@@ -200,82 +200,19 @@
+ 
+         <set var="__linkname1">$(__linkname)</set>
+ 
+-        <set var="__targetsuf2">
+-            <if cond="USE_SOVERSION=='1' and PLATFORM_MACOSX=='0'">
+-                $(DLLEXT).$(__soversion1)
+-            </if>
+-            <if cond="USE_SOVERSION=='1' and PLATFORM_MACOSX=='1'">
+-                .$(__soversion1)$(DLLEXT)
+-            </if>
+-            <if cond="USE_SOVERSION=='0'">$(DLLEXT)</if>
+-        </set>
++        <set var="__targetsuf2">$(DLLEXT)</set>
+         <set var="__linkname2" eval="0">
+             $(DLLPREFIX)$(__dllname)$(__targetsuf2)
+         </set>
+ 
+-        <set var="__targetsuf3">
+-            <if cond="USE_SOVERSION=='1' and PLATFORM_MACOSX=='0' and USE_SOVERCYGWIN=='0'">
+-                $(DLLEXT).$(__soversion1).$(__soversion2).$(__soversion3)
+-            </if>
+-            <if cond="USE_SOVERSION=='1' and PLATFORM_MACOSX=='1'">
+-                .$(__soversion1).$(__soversion2).$(__soversion3)$(DLLEXT)
+-            </if>
+-            <if cond="USE_SOVERSION=='1' and USE_SOVERSOLARIS=='1'">
+-                $(DLLEXT).$(__soversion1)
+-            </if>
+-            <if cond="USE_SOVERSION=='1' and USE_SOVERCYGWIN=='1'">
+-                -$(__soversion1)$(DLLEXT)
+-            </if>
+-            <if cond="USE_SOVERSION=='0'">$(DLLEXT)</if>
+-        </set>
++        <set var="__targetsuf3">$(DLLEXT)</set>
+         <set var="__targetname" eval="0">
+             $(DLLPREFIX)$(__dllname)$(__targetsuf3)
+         </set>
+ 
+-        <set var="__soname_flags">
+-            <if cond="USE_SOVERLINUX=='1'"> <!-- Linux -->
+-                $(SONAME_FLAG)$(__linkname2)
+-            </if>
+-            <if cond="USE_SOVERSOLARIS=='1'"> <!-- Solaris -->
+-                $(SONAME_FLAG)$(__targetname)
+-            </if>
+-        </set>
++        <set var="__soname_flags">-version-number $(__soversion1):$(__soversion2):$(__soversion3)</set>
+         <ldflags>$(__soname_flags)</ldflags>
+ 
+-        <set var="__so_symlinks_cmd">
+-            <if cond="USE_SOTWOSYMLINKS=='1'">
+-                (cd $(pathPrefixToPath(__targetdir));
+-                $(RM) $(__linkname1) $(__linkname2);
+-                $(LN_S) $(__targetname) $(__linkname2);
+-                $(LN_S) $(__linkname2) $(__linkname1))
+-            </if>
+-            <if cond="USE_SOVERSOLARIS=='1'">
+-                (cd $(pathPrefixToPath(__targetdir));
+-                $(RM) $(__linkname1);
+-                $(LN_S) $(__targetname) $(__linkname1))
+-            </if>
+-        </set>
+-        <set var="__so_symlinks_inst_cmd">
+-            <if cond="USE_SOTWOSYMLINKS=='1'">
+-                $(RM) $(__linkname1) $(__linkname2);
+-                $(LN_S) $(__targetname) $(__linkname2);
+-                $(LN_S) $(__linkname2) $(__linkname1)
+-            </if>
+-            <if cond="USE_SOVERSOLARIS=='1'">
+-                $(RM) $(__linkname1);
+-                $(LN_S) $(__targetname) $(__linkname1);
+-            </if>
+-        </set>
+-        <set var="__so_symlinks_uninst_cmd">
+-            <if cond="USE_SOTWOSYMLINKS=='1'">
+-                $(RM) $(__linkname2) $(__linkname1)
+-            </if>
+-            <if cond="USE_SOVERSOLARIS=='1'">
+-                $(RM) $(__linkname1)
+-            </if>
+-        </set>
+-        <__command>$(LF)$(__so_symlinks_cmd)</__command>
+-
+         <set var="__mac_instname">$(__linkname2)</set>
+ 
+         <clean-files>
+@@ -298,12 +235,6 @@
+         <set var="__macinstname" eval="0">
+             $(ifthenelse(__mac_instname=='',ref('__targetname',id),ref('__mac_instname',id)))
+         </set>
+-        <set var="__macinstnamecmd">
+-            <if cond="PLATFORM_MACOSX=='1'">
+-                -install_name $(value)/$(__macinstname)
+-            </if>
+-        </set>
+-        <ldflags>$(__macinstnamecmd)</ldflags>
+ 
+         <modify-target target="install_$(id)">
+             <command>(cd $(DESTDIR)$(value) ; $(ref('__so_symlinks_inst_cmd',id)))</command>
+Only in rules: autoconf.bkl.orig
+Only in rules: autoconf.bkl.rej
+Only in rules: autoconf.bkl.save1
+Only in rules: autoconf.bkl.~1~
+diff -ru rules.orig/makefile.bkl rules/makefile.bkl
+--- rules.orig/makefile.bkl	2011-02-02 14:04:25.000000000 -0800
++++ rules/makefile.bkl	2013-04-06 21:30:45.000000000 -0700
+@@ -749,7 +749,7 @@
+         <define-tag name="install-to" rules="exe">
+             <modify-target target="install_$(id)">
+                 <command>
+-                    $(INSTALL_PROGRAM) $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(nativePaths(value))
++                    ${LIBTOOL} --mode=install $(INSTALL_PROGRAM) $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(nativePaths(value))
+                 </command>
+             </modify-target>
+             <modify-target target="uninstall_$(id)">
+@@ -762,8 +762,7 @@
+         <define-tag name="install-to" rules="dll">
+             <modify-target target="install_$(id)">
+                 <command>
+-                    $(INSTALL_DATA) $(ref('__targetdir',id))$(ref('__linkname',id)) $(DESTDIR)$(nativePaths(value))
+-                    $(INSTALL_PROGRAM) $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(nativePaths(value))
++                    ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(nativePaths(value))
+                 </command>
+             </modify-target>
+             <modify-target target="uninstall_$(id)">
+@@ -777,7 +776,7 @@
+         <define-tag name="install-to" rules="module">
+             <modify-target target="install_$(id)">
+                 <command>
+-                    $(INSTALL_PROGRAM) $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(nativePaths(value))
++                    ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(nativePaths(value))
+                 </command>
+             </modify-target>
+             <modify-target target="uninstall_$(id)">
+diff -ru rules.orig/makefile_defs_gnu.bkl rules/makefile_defs_gnu.bkl
+--- rules.orig/makefile_defs_gnu.bkl	2011-02-02 14:04:25.000000000 -0800
++++ rules/makefile_defs_gnu.bkl	2013-04-06 21:30:45.000000000 -0700
+@@ -62,12 +62,12 @@
+ 
+             <template id="__commands_templ_C">
+                 <set var="__COMPILE_C_CMD" eval="0">
+-                    $(CCC) -c -o $@ $(__cflags) $(CPPDEPS) $&lt;
++                    ${LIBTOOL} --mode=compile --tag=CC $(CCC) -c -o $@ $(__cflags) $(CPPDEPS) $&lt;
+                 </set>
+             </template>
+             <template id="__commands_templ_CXX">
+                 <set var="__COMPILE_CXX_CMD" eval="0">
+-                    $(CXXC) -c -o $@ $(__cxxflags) $(CPPDEPS) $&lt;
++                    ${LIBTOOL} --mode=compile --tag=CXX $(CXXC) -c -o $@ $(__cxxflags) $(CPPDEPS) $&lt;
+                 </set>
+             </template>
+ 
+diff -ru rules.orig/makefile_defs_unix.bkl rules/makefile_defs_unix.bkl
+--- rules.orig/makefile_defs_unix.bkl	2011-02-02 14:04:25.000000000 -0800
++++ rules/makefile_defs_unix.bkl	2013-04-06 21:30:45.000000000 -0700
+@@ -39,22 +39,23 @@
+ 
+     <set var="DIRSEP">/</set>
+ 
+-    <set var="OBJEXT">.o</set>
++    <set var="LIBTOOL">${LIBTOOL}</set>
++    <set var="OBJEXT">.lo</set>
+     <set var="LIBEXT" overwrite="0">.a</set>
+     <set var="LIBPREFIX" overwrite="0">lib</set>
+     <set var="EXEEXT" overwrite="0"></set>
+-    <set var="DLLEXT" overwrite="0">.so</set>
++    <set var="DLLEXT" overwrite="1">.la</set>
+     <set var="DLLEXT_MODULE" overwrite="0">$(DLLEXT)</set>
+     <set var="DLLIMPEXT" overwrite="0">$(DLLEXT)</set>
+     <set var="DLLPREFIX" overwrite="0">$(LIBPREFIX)</set>
+     <set var="DLLPREFIX_MODULE" overwrite="0">$(DLLPREFIX)</set>
+-    <set var="PIC_CFLAGS" overwrite="0">-fPIC -DPIC</set>
++    <set var="PIC_CFLAGS" overwrite="0"></set>
+ 
+    <set var="RM">rm -f</set>
+ 
+-    <set var="INSTALL_PROGRAM" overwrite="0">install -c</set>
+-    <set var="INSTALL_DATA" overwrite="0">$(INSTALL) -m 644</set>
+-    <set var="INSTALL_DIR" overwrite="0">$(INSTALL) -d</set>
++    <set var="INSTALL_PROGRAM" overwrite="1">${BSD_INSTALL_PROGRAM}</set>
++    <set var="INSTALL_DATA" overwrite="1">${BSD_INSTALL_DATA}</set>
++    <set var="INSTALL_DIR" overwrite="1">${BSD_INSTALL_DATA_DIR}</set>
+ 
+     <set var="UNINSTALL_PROGRAM" overwrite="0">$(RM)</set>
+     <set var="UNINSTALL_DATA" overwrite="0">$(RM)</set>
+@@ -122,12 +123,12 @@
+     <if cond="FORMAT not in ['gnu','suncc']">
+         <template id="__commands_templ_C">
+             <set var="__COMPILE_C_CMD" eval="0">
+-                $(CCC) -c -o $@ $(__cflags) $(src)
++                $(LIBTOOL) --mode=compile --tag=CC $(CCC) -c -o $@ $(__cflags) $(src)
+             </set>
+         </template>
+         <template id="__commands_templ_CXX">
+             <set var="__COMPILE_CXX_CMD" eval="0">
+-                $(CXXC) -c -o $@ $(__cxxflags) $(src)
++                $(LIBTOOL) --mode=compile --tag=CXX $(CXXC) -c -o $@ $(__cxxflags) $(src)
+             </set>
+         </template>
+         <!-- FIXME: We should allow for a different Objective-C compiler -->
+@@ -154,18 +155,16 @@
+         </set>
+ 
+         <set var="__LINK_EXE_CMD" eval="0">
+-            $(__linker) -o $@ $(__objects_var) $(__ldargs)
++            $(LIBTOOL) --mode=link --tag=CC $(__linker) -o $@ $(__objects_var) $(__ldargs)
+         </set>        
+         <set var="__LINK_LIB_CMD" eval="0">
+-            $(RM) $@
+-            $(AR) $(AROPTIONS) $@ $(__objects_var)
+-            $(RANLIB) $@
++	    $(LIBTOOL) --mode=link --tag=CC $(__linker) -o $@ $(__objects_var) $(__ldflags) $(__ldlibs)
+         </set>
+         <set var="__LINK_DLL_CMD" eval="0">
+-            $(__dll_linker) $@ $(__objects_var) $(__ldargs)
++	    $(LIBTOOL) --mode=link --tag=CC $(__linker) -rpath $(libdir) -o $@ $(__objects_var) $(__ldflags) $(__ldlibs)
+         </set>
+         <set var="__LINK_MODULE_CMD" eval="0">
+-            $(__module_linker) $@ $(__objects_var) $(__ldargs)
++	    $(LIBTOOL) --mode=link --tag=CC $(__linker) -rpath $(libdir) -o $@ $(__objects_var) $(__ldflags) $(__ldlibs)
+         </set>
+     </template>
+     
+Only in rules: makefile_defs_unix.bkl.orig
diff --git a/x11/wxGTK30/patches/manual-regen.diff b/x11/wxGTK30/patches/manual-regen.diff
new file mode 100644
index 00000000000..54e5212dba7
--- /dev/null
+++ b/x11/wxGTK30/patches/manual-regen.diff
@@ -0,0 +1,98 @@
+$NetBSD: manual-regen.diff,v 1.1 2014/07/21 06:53:24 dbj Exp $
+To regenerate the libtool patch, get the full wxWidgets tarball,
+cd to build/bakefiles, and run
+	./bakefile_gen -f autoconf
+manual-bakefile.diff contains the necessary patch for the bakefile
+ruleset to use libtool.
+
+diff -ru wxWidgets-3.0.1.dist/build/bakefiles/common.bkl wxWidgets-3.0.1/build/bakefiles/common.bkl
+--- wxWidgets-3.0.1.dist/build/bakefiles/common.bkl	2014-06-14 14:48:48.000000000 -0700
++++ wxWidgets-3.0.1/build/bakefiles/common.bkl	2014-07-20 15:07:09.000000000 -0700
+@@ -706,7 +706,6 @@
+         <if cond="FORMAT=='autoconf'">
+             <res-include>$(RCDEFDIR)</res-include>
+             <res-include>$(TOP_SRCDIR)include</res-include>
+-            <postlink-command>$(DYLIB_RPATH_POSTLINK)</postlink-command>
+         </if>
+         <win32-res>$(WXTOPDIR)src/msw/version.rc</win32-res>
+ 
+diff -ru wxWidgets-3.0.1.dist/build/bakefiles/config.bkl wxWidgets-3.0.1/build/bakefiles/config.bkl
+--- wxWidgets-3.0.1.dist/build/bakefiles/config.bkl	2014-06-14 14:48:48.000000000 -0700
++++ wxWidgets-3.0.1/build/bakefiles/config.bkl	2014-07-20 15:07:09.000000000 -0700
+@@ -425,8 +425,6 @@
+         <option name="EXTRALIBS_SDL"/>
+         <option name="CXXWARNINGS"/>
+         <option name="HOST_SUFFIX"/>
+-        <option name="DYLIB_RPATH_INSTALL"/>
+-        <option name="DYLIB_RPATH_POSTLINK"/>
+         <option name="SAMPLES_RPATH_FLAG"/>
+ 
+         <!-- see configure.in; it's required by some samples on Mac OS X -->
+diff -ru wxWidgets-3.0.1.dist/build/bakefiles/regex.bkl wxWidgets-3.0.1/build/bakefiles/regex.bkl
+--- wxWidgets-3.0.1.dist/build/bakefiles/regex.bkl	2014-06-14 14:48:48.000000000 -0700
++++ wxWidgets-3.0.1/build/bakefiles/regex.bkl	2014-07-20 15:07:09.000000000 -0700
+@@ -26,16 +26,13 @@
+         <if cond="wxUSE_REGEX=='builtin'">$(TOP_SRCDIR)src/regex</if>
+     </set>
+ 
+-    <lib id="wxregex" template="msvc_setup_h,3rdparty_lib"
++    <dll id="wxregex" template="msvc_setup_h,anylib"
+          cond="wxUSE_REGEX=='builtin' and BUILDING_LIB=='1'">
+-        <libname cond="FORMAT=='autoconf'">
+-            $(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+-        </libname>
+-        <libname cond="FORMAT!='autoconf'">
+-            $(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)
+-        </libname>
+-        <include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
+-        <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
++        <dllname>
++            $(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)
++	</dllname>
++        <version>$(WX_VERSION)</version>
++        <so_version>$(WXSOVERSION)</so_version>
+         <define>__WX$(TOOLKIT)__</define>
+         <define>$(WXUNIV_DEFINE)</define>
+         <define>$(UNICODE_DEFINE)</define>
+@@ -48,6 +45,6 @@
+             src/regex/regerror.c
+             src/regex/regfree.c
+         </sources>
+-    </lib>
++    </dll>
+ 
+ </makefile>
+diff -ru wxWidgets-3.0.1.dist/build/bakefiles/wx.bkl wxWidgets-3.0.1/build/bakefiles/wx.bkl
+--- wxWidgets-3.0.1.dist/build/bakefiles/wx.bkl	2014-06-14 14:48:48.000000000 -0700
++++ wxWidgets-3.0.1/build/bakefiles/wx.bkl	2014-07-20 15:07:09.000000000 -0700
+@@ -95,17 +95,11 @@
+             <command>
+                 $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
+                 $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/wx/config
+-                $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(LIBDIR)/wx/config
++                ${BSD_INSTALL_SCRIPT} lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(LIBDIR)/wx/config
+                 (cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) $(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config || cp -p $(DESTDIR)$(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
+             </command>
+         </action>
+ 
+-        <modify-target target="install">
+-            <command>
+-                $(DYLIB_RPATH_INSTALL)
+-            </command>
+-        </modify-target>
+-
+         <set var="RCDEFS_H">
+             <if cond="TOOLKIT=='MSW'">msw/rcdefs.h</if>
+         </set>
+diff -ru wxWidgets-3.0.1.dist/utils/wxrc/wxrc.bkl wxWidgets-3.0.1/utils/wxrc/wxrc.bkl
+--- wxWidgets-3.0.1.dist/utils/wxrc/wxrc.bkl	2014-06-14 14:48:48.000000000 -0700
++++ wxWidgets-3.0.1/utils/wxrc/wxrc.bkl	2014-07-20 15:07:09.000000000 -0700
+@@ -21,7 +21,7 @@
+         <modify-target target="install_wxrc">
+             <command>
+ 	        rm -f $(DESTDIR)$(BINDIR)/wxrc$(EXEEXT) $(DESTDIR)$(BINDIR)/$(versioned_name)
+-		$(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(BINDIR)
++		${LIBTOOL} --mode=install $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(BINDIR)
+                 mv -f $(DESTDIR)$(BINDIR)/wxrc$(EXEEXT) $(DESTDIR)$(BINDIR)/$(versioned_name)
+                 (cd $(DESTDIR)$(BINDIR) &amp;&amp; $(LN_S) $(versioned_name) wxrc$(EXEEXT))
+             </command>
diff --git a/x11/wxGTK30/patches/patch-build_aclocal_bakefile.m4 b/x11/wxGTK30/patches/patch-build_aclocal_bakefile.m4
new file mode 100644
index 00000000000..e4b1da210a2
--- /dev/null
+++ b/x11/wxGTK30/patches/patch-build_aclocal_bakefile.m4
@@ -0,0 +1,14 @@
+$NetBSD: patch-build_aclocal_bakefile.m4,v 1.1 2014/07/21 06:53:24 dbj Exp $
+Fix shell script portability
+
+--- build/aclocal/bakefile.m4.orig	2014-06-14 21:48:48.000000000 +0000
++++ build/aclocal/bakefile.m4
+@@ -371,7 +371,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
+             SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
+         fi
+ 
+-        if test "x$GCC" == "xyes"; then
++        if test "x$GCC" = "xyes"; then
+             PIC_FLAG="-dynamic -fPIC"
+         fi
+         if test "x$XLCC" = "xyes"; then
diff --git a/x11/wxGTK30/patches/patch-configure b/x11/wxGTK30/patches/patch-configure
new file mode 100644
index 00000000000..a0ee8c0e54d
--- /dev/null
+++ b/x11/wxGTK30/patches/patch-configure
@@ -0,0 +1,79 @@
+$NetBSD: patch-configure,v 1.1 2014/07/21 06:53:24 dbj 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/'`
+ 
+         # If that failed, try again with the new key
+-        if test "x$MACOSX_SDK_PLIST_VERSION_MIN" == "x"; then
++        if test "x$MACOSX_SDK_PLIST_VERSION_MIN" = "x"; then
+ 
+             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/'`
+ 
+@@ -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 @PREFIX@/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
+ 
+-        if test "x$GCC" == "xyes"; then
++        if test "x$GCC" = "xyes"; then
+             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
diff --git a/x11/wxGTK30/patches/patch-configure.in b/x11/wxGTK30/patches/patch-configure.in
new file mode 100644
index 00000000000..a84aa889c1d
--- /dev/null
+++ b/x11/wxGTK30/patches/patch-configure.in
@@ -0,0 +1,53 @@
+$NetBSD: patch-configure.in,v 1.1 2014/07/21 06:53:24 dbj Exp $
+Fix shell script portability
+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/'`
+ ]
+         # If that failed, try again with the new key
+-        if test "x$MACOSX_SDK_PLIST_VERSION_MIN" == "x"; then
++        if test "x$MACOSX_SDK_PLIST_VERSION_MIN" = "x"; then
+ [
+             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/'`
+ ]
+@@ -2245,7 +2245,7 @@ fi
+ 
+ AC_MSG_RESULT($wx_cv_std_libfullpath)
+ 
+-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 @PREFIX@/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* )
diff --git a/x11/wxGTK30/patches/patch-src_tiff_configure b/x11/wxGTK30/patches/patch-src_tiff_configure
new file mode 100644
index 00000000000..5dcb066c16c
--- /dev/null
+++ b/x11/wxGTK30/patches/patch-src_tiff_configure
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_tiff_configure,v 1.1 2014/07/21 06:53:24 dbj Exp $
+Fix shell script portability
+
+--- src/tiff/configure.orig	2014-06-14 21:48:48.000000000 +0000
++++ src/tiff/configure
+@@ -18145,7 +18145,7 @@ if test "${with_jpeg12_lib+set}" = set; 
+ fi
+ 
+ 
+-if test "x$enable_jpeg12" == "xyes" ; then
++if test "x$enable_jpeg12" = "xyes" ; then
+ 
+   if test "x$with_jpeg12_lib" != "x" ; then
+     LIBS="$with_jpeg12_lib $LIBS"
diff --git a/x11/wxGTK30/patches/patch-src_tiff_configure.ac b/x11/wxGTK30/patches/patch-src_tiff_configure.ac
new file mode 100644
index 00000000000..3f3b1f7d705
--- /dev/null
+++ b/x11/wxGTK30/patches/patch-src_tiff_configure.ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_tiff_configure.ac,v 1.1 2014/07/21 06:53:24 dbj Exp $
+Fix shell script portability
+
+--- src/tiff/configure.ac.orig	2014-06-14 21:48:48.000000000 +0000
++++ src/tiff/configure.ac
+@@ -772,7 +772,7 @@ AC_ARG_WITH(jpeg12-lib,
+ 	    AS_HELP_STRING([--with-jpeg12-lib=LIBRARY],
+ 			   [path to libjpeg 12bit library]),,)
+ 
+-if test "x$enable_jpeg12" == "xyes" ; then
++if test "x$enable_jpeg12" = "xyes" ; then
+ 
+   if test "x$with_jpeg12_lib" != "x" ; then
+     LIBS="$with_jpeg12_lib $LIBS"
diff --git a/x11/wxGTK30/patches/patch-src_unix_threadpsx.cpp b/x11/wxGTK30/patches/patch-src_unix_threadpsx.cpp
new file mode 100644
index 00000000000..ce6532bae64
--- /dev/null
+++ b/x11/wxGTK30/patches/patch-src_unix_threadpsx.cpp
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_unix_threadpsx.cpp,v 1.1 2014/07/21 06:53:24 dbj Exp $
+tweak use of thread priority functions
+
+--- src/unix/threadpsx.cpp.orig	2014-06-14 21:48:48.000000000 +0000
++++ src/unix/threadpsx.cpp
+@@ -69,6 +69,13 @@
+ #define THR_ID_CAST(id)  (reinterpret_cast<void*>(id))
+ #define THR_ID(thr)      THR_ID_CAST((thr)->GetId())
+ 
++#ifdef __NetBSD__
++#include <sys/param.h>
++#if __NetBSD_Version__ < 499005000 && defined(HAVE_THREAD_PRIORITY_FUNCTIONS)
++#undef HAVE_THREAD_PRIORITY_FUNCTIONS
++#endif
++#endif
++
+ // ----------------------------------------------------------------------------
+ // constants
+ // ----------------------------------------------------------------------------