Update 2.1.0b9 -> 2.1.11

2 files changed, 63 insertions, 30 deletions

diff --git a/x11-toolkits/wxgtk/files/patch-aa b/x11-toolkits/wxgtk/files/patch-aa
index c2d2fde6c6e8..c176d82fe805 100644
--- a/x11-toolkits/wxgtk/files/patch-aa
+++ b/x11-toolkits/wxgtk/files/patch-aa
@@ -1,34 +1,26 @@
---- configure.orig	Thu Aug 26 11:03:32 1999
-+++ configure	Sun Sep 19 13:24:58 1999
-@@ -6730,7 +6730,7 @@
-     fi
+--- configure.in.orig	Fri Jan 14 09:24:19 2000
++++ configure.in	Fri Jan 14 09:26:29 2000
+@@ -1701,12 +1701,10 @@
+ WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
  
-     TOOLKIT_INCLUDE="$GTK_CFLAGS"
--    GUI_TK_LIBRARY="$GTK_LIBS -ldl"
-+    GUI_TK_LIBRARY="$GTK_LIBS"
-     TOOLKIT=GTK
-   
-     GUIHEADERS=GTK_HEADERS
-@@ -7834,11 +7834,8 @@
+ dnl the name of the shared library
+-WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
++WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.so.2"
  
- WX_LIBRARY_NAME_STATIC="libwx_${TOOLKIT_DIR}.a"
- 
--WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
--
--WX_LIBRARY_LINK1="libwx_${TOOLKIT_DIR}-${WX_RELEASE}.so.${WX_CURRENT}"
--WX_LIBRARY_LINK2="libwx_${TOOLKIT_DIR}-${WX_RELEASE}.so"
--WX_LIBRARY_LINK3="libwx_${TOOLKIT_DIR}.so"
-+WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}.so.1"
-+WX_LIBRARY_LINK1="libwx_${TOOLKIT_DIR}.so"
+ dnl the name of the links to the shared library
+-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="lib${WX_LIBRARY}.so"
  
+ dnl shared library settings
  SHARED_LD=
- PIC_FLAG=
-@@ -12035,8 +12032,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_CREATE_LINKS@%$WX_CREATE_LINKS%g
- s%@WX_CREATE_INSTALLED_LINKS@%$WX_CREATE_INSTALLED_LINKS%g
+@@ -2964,8 +2962,6 @@
+ AC_SUBST(WX_LIBRARY)
+ AC_SUBST(WX_TARGET_LIBRARY)
+ AC_SUBST(WX_LIBRARY_LINK1)
+-AC_SUBST(WX_LIBRARY_LINK2)
+-AC_SUBST(WX_LIBRARY_LINK3)
+ AC_SUBST(PROGRAM_EXT)
+ 
+ dnl are we supposed to create the links?
diff --git a/x11-toolkits/wxgtk/files/patch-ac b/x11-toolkits/wxgtk/files/patch-ac
new file mode 100644
index 000000000000..6af51255b4b9
--- /dev/null
+++ b/x11-toolkits/wxgtk/files/patch-ac
@@ -0,0 +1,41 @@
+--- Makefile.in.orig	Fri Jan 14 09:27:03 2000
++++ Makefile.in	Fri Jan 14 09:27:48 2000
+@@ -2050,19 +2050,11 @@
+ 	
+ CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
+ 	@$(RM) ./lib/@WX_LIBRARY_LINK1@
+-	@$(RM) ./lib/@WX_LIBRARY_LINK2@
+-	@$(RM) ./lib/@WX_LIBRARY_LINK3@
+ 	$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK1@
+-	$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@
+-	$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@
+ 	
+ CREATE_INSTALLED_LINKS:  $(libdir)/@WX_LIBRARY_NAME_SHARED@
+ 	$(RM) $(libdir)/@WX_LIBRARY_LINK1@
+-	$(RM) $(libdir)/@WX_LIBRARY_LINK2@
+-	$(RM) $(libdir)/@WX_LIBRARY_LINK3@
+ 	$(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK1@
+-	$(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK2@
+-	$(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK3@
+ 	
+ $(OBJECTS):	$(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
+ 
+@@ -2115,9 +2107,7 @@
+ 	$(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm
+ 	
+ 	$(INSTALL) -d $(includedir)/wx
+-	$(INSTALL) -d $(includedir)/wx/msw
+ 	$(INSTALL) -d $(includedir)/wx/gtk
+-	$(INSTALL) -d $(includedir)/wx/motif
+ 	$(INSTALL) -d $(includedir)/wx/html
+ 	$(INSTALL) -d $(includedir)/wx/protocol
+ 	$(INSTALL) -d $(includedir)/wx/unix
+@@ -2148,8 +2138,6 @@
+ 	@echo " Removing library..."
+ 	@$(RM) $(libdir)/@WX_TARGET_LIBRARY@
+ 	@$(RM) $(libdir)/@WX_LIBRARY_LINK1@
+-	@$(RM) $(libdir)/@WX_LIBRARY_LINK2@
+-	@$(RM) $(libdir)/@WX_LIBRARY_LINK3@
+ 	@echo " Removing helper files..."
+ 	@$(RM) $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
+ 	@$(RM) $(bindir)/wx-config