Update to 2.3.0.

3 files changed, 149 insertions, 4 deletions

diff --git a/x11-toolkits/wxgtk-devel/files/patch-ac b/x11-toolkits/wxgtk-devel/files/patch-ac
index 1657f8b71cb3..e9cf29bb3964 100644
--- a/x11-toolkits/wxgtk-devel/files/patch-ac
+++ b/x11-toolkits/wxgtk-devel/files/patch-ac
@@ -1,6 +1,9 @@
---- Makefile.in.orig	Mon May  7 07:14:03 2001
-+++ Makefile.in	Mon May  7 07:14:46 2001
-@@ -365,39 +365,23 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig	Fri May 25 05:55:33 2001
++++ Makefile.in	Mon May 28 19:47:06 2001
+@@ -379,39 +379,23 @@
  
  CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
  	@$(RM) ./lib/@WX_LIBRARY_LINK1@
@@ -44,7 +47,24 @@
  
  $(OBJECTS):	$(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
  
-@@ -499,13 +483,9 @@
+@@ -461,11 +445,11 @@
+ 	cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLKIT_NAME@-config wx-config
+ 	$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
+ 
+-	$(INSTALL) -d $(libdir)/wx
+-	$(INSTALL) -d $(libdir)/wx/include
+-	$(INSTALL) -d $(libdir)/wx/include/wx
+-	$(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_NAME@
+-	$(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h
++#	$(INSTALL) -d $(libdir)/wx
++#	$(INSTALL) -d $(libdir)/wx/include
++	$(INSTALL) -d $(prefix)/include/wx
++	$(INSTALL) -d $(prefix)/include/wx/@TOOLKIT_NAME@
++	$(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(prefix)/include/wx/@TOOLKIT_NAME@/setup.h
+ 
+ 	$(INSTALL) -d $(includedir)/wx
+ 	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
+@@ -513,13 +497,9 @@
  	@echo " Removing library..."
  	@$(RM) $(libdir)/@WX_TARGET_LIBRARY@
  	@$(RM) $(libdir)/@WX_LIBRARY_LINK1@
diff --git a/x11-toolkits/wxgtk-devel/files/patch-configure b/x11-toolkits/wxgtk-devel/files/patch-configure
new file mode 100644
index 000000000000..05998ba6dfaa
--- /dev/null
+++ b/x11-toolkits/wxgtk-devel/files/patch-configure
@@ -0,0 +1,111 @@
+
+$FreeBSD$
+
+--- configure.orig	Mon May 28 20:11:23 2001
++++ configure	Mon May 28 20:14:20 2001
+@@ -7606,10 +7606,10 @@
+   else
+      echo "$ac_t""no" 1>&6
+      if test "$GTK_CONFIG_2_0" = "no" ; then
+-       echo "*** The gtk-config-2.0 script installed by GTK could not be found"
+-       echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
+-       echo "*** your path, or set the GTK_CONFIG_2_0 environment variable to the"
+-       echo "*** full path to gtk-config-2.0."
++#       echo "*** The gtk-config-2.0 script installed by GTK could not be found"
++#       echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
++#       echo "*** your path, or set the GTK_CONFIG_2_0 environment variable to the"
++#       echo "*** full path to gtk-config-2.0."
+      else
+        if test -f conf.gtktest ; then
+         :
+@@ -7941,14 +7941,14 @@
+     TOOLKIT=GTK
+     GUIDIST=GTK_DIST
+ 
+-        echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
+-echo "configure:7946: checking for gdk_im_open in -lgdk" >&5
++        echo $ac_n "checking for gdk_im_open in -lgdk12""... $ac_c" 1>&6
++echo "configure:7946: checking for gdk_im_open in -lgdk12" >&5
+ ac_lib_var=`echo gdk'_'gdk_im_open | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lgdk  $LIBS"
++LIBS="-lgdk12  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 7954 "configure"
+ #include "confdefs.h"
+@@ -9207,16 +9207,12 @@
+ WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
+ WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a"
+ 
+-WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+-WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+-
+-WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}"
+-WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.so"
+-WX_LIBRARY_LINK3="lib${WX_LIBRARY}.so"
+-WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}"
+-WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so"
+-WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.so"
++WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.so.2"
++WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl.so.2"
+ 
++WX_LIBRARY_LINK1="lib${WX_LIBRARY}.so"
++WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl.so"
++       
+ SHARED_LD=
+ PIC_FLAG=
+ WX_ALL=
+@@ -12945,6 +12941,7 @@
+   fi
+ fi
+ 
++WXGTK20=
+ if test "$WXGTK20" = 1 ; then
+   cat >> confdefs.h <<EOF
+ #define __WXGTK20__ $WXGTK20
+@@ -13115,24 +13112,6 @@
+ fi
+ 
+ 
+-CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" `
+-CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" `
+-if test "$wxUSE_OPTIMISE" = "no" ; then
+-    OPTIMISE=
+-else
+-    if test "$GCC" = yes ; then
+-        OPTIMISE="-O2"
+-        case "${host}" in
+-            i586-*-*|i686-*-* )
+-            OPTIMISE="${OPTIMISE} "
+-        ;;
+-        esac
+-    else
+-        OPTIMISE="-O"
+-    fi
+-fi
+-
+-
+ ZLIB_INCLUDE=
+ if test "$wxUSE_ZLIB" = "yes" -o "$wxUSE_ZLIB" = "sys" ; then
+   cat >> confdefs.h <<\EOF
+@@ -15947,8 +15926,6 @@
+ s%@WX_LIBRARY@%$WX_LIBRARY%g
+ s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g
+ s%@WX_LIBRARY_LINK1@%$WX_LIBRARY_LINK1%g
+-s%@WX_LIBRARY_LINK2@%$WX_LIBRARY_LINK2%g
+-s%@WX_LIBRARY_LINK3@%$WX_LIBRARY_LINK3%g
+ s%@PROGRAM_EXT@%$PROGRAM_EXT%g
+ s%@WX_LIBRARY_NAME_GL@%$WX_LIBRARY_NAME_GL%g
+ s%@WX_LIBRARY_NAME_STATIC_GL@%$WX_LIBRARY_NAME_STATIC_GL%g
+@@ -15956,8 +15933,6 @@
+ s%@WX_LIBRARY_GL@%$WX_LIBRARY_GL%g
+ s%@WX_TARGET_LIBRARY_GL@%$WX_TARGET_LIBRARY_GL%g
+ s%@WX_LIBRARY_LINK1_GL@%$WX_LIBRARY_LINK1_GL%g
+-s%@WX_LIBRARY_LINK2_GL@%$WX_LIBRARY_LINK2_GL%g
+-s%@WX_LIBRARY_LINK3_GL@%$WX_LIBRARY_LINK3_GL%g
+ s%@WX_ALL@%$WX_ALL%g
+ s%@WX_ALL_INSTALLED@%$WX_ALL_INSTALLED%g
+ s%@SHARED_LD@%$SHARED_LD%g
diff --git a/x11-toolkits/wxgtk-devel/files/patch-wx-config.in b/x11-toolkits/wxgtk-devel/files/patch-wx-config.in
new file mode 100644
index 000000000000..89574988948a
--- /dev/null
+++ b/x11-toolkits/wxgtk-devel/files/patch-wx-config.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- wx-config.in	2001/05/28 16:47:21	1.1
++++ wx-config.in	2001/05/28 16:50:00
+@@ -31,7 +31,7 @@
+             includes=-I@includedir@
+         fi
+     fi
+-    includes="$includes -I@libdir@/wx/include -D__USE_WXCONFIG__"
++    includes="$includes -I@prefix@/include -D__USE_WXCONFIG__"
+     echo $includes @WXDEBUG_DEFINE@ @TOOLKIT_DEF@ @WXCONFIG_INCLUDE@
+ }
+