Upgrade to 2.2.6.

Approved by:	nectar

12 files changed, 54 insertions, 66 deletions

diff --git a/x11-toolkits/wxgtk-devel/Makefile b/x11-toolkits/wxgtk-devel/Makefile
index b7bcc961ee25..fb5718c62146 100644
--- a/x11-toolkits/wxgtk-devel/Makefile
+++ b/x11-toolkits/wxgtk-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wxgtk
-PORTVERSION=	2.2.4
+PORTVERSION=	2.2.6
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/
 DISTNAME=	wxGTK-${PORTVERSION}
@@ -17,10 +17,7 @@ LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-WRKSRC=		${WRKDIR}/wxGTK
-
 USE_X_PREFIX=	yes
-USE_NEWGCC=	yes
 USE_GMAKE=	yes
 USE_GTK=	yes
 USE_AUTOCONF=	yes
diff --git a/x11-toolkits/wxgtk-devel/distinfo b/x11-toolkits/wxgtk-devel/distinfo
index 74fc7be02c75..8bce90e3638e 100644
--- a/x11-toolkits/wxgtk-devel/distinfo
+++ b/x11-toolkits/wxgtk-devel/distinfo
@@ -1,2 +1 @@
-MD5 (wxGTK-2.2.4.tar.gz) = b0fe1bf18033d6768302a9187eada3fe
-MD5 (wxGTK-2.2.4.tar.gz) = 661ea2a1b088ad7edeeb3a5585ef4f09
+MD5 (wxGTK-2.2.6.tar.gz) = 926411e6184c912674a179f22f76ca38
diff --git a/x11-toolkits/wxgtk-devel/files/patch-aa b/x11-toolkits/wxgtk-devel/files/patch-aa
index a7cf0245b477..4e735f88282d 100644
--- a/x11-toolkits/wxgtk-devel/files/patch-aa
+++ b/x11-toolkits/wxgtk-devel/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.in.orig	Sun Aug 20 17:52:52 2000
-+++ configure.in	Sat Aug 26 02:03:38 2000
-@@ -1999,16 +1999,12 @@
+--- configure.in.orig	Tue Mar 13 00:29:09 2001
++++ configure.in	Mon May  7 07:12:45 2001
+@@ -1948,16 +1948,12 @@
  WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a"
  
  dnl the name of the shared library
@@ -21,7 +21,7 @@
  
  dnl shared library settings
  SHARED_LD=
-@@ -2742,24 +2738,6 @@
+@@ -2729,24 +2725,6 @@
      fi
  fi
  
@@ -46,7 +46,7 @@
  dnl ---------------------------------------------------------------------------
  dnl Optional libraries
  dnl ---------------------------------------------------------------------------
-@@ -3784,8 +3762,6 @@
+@@ -3788,8 +3766,6 @@
  AC_SUBST(WX_LIBRARY)
  AC_SUBST(WX_TARGET_LIBRARY)
  AC_SUBST(WX_LIBRARY_LINK1)
@@ -55,7 +55,7 @@
  AC_SUBST(PROGRAM_EXT)
  
  dnl global gl options
-@@ -3795,8 +3771,6 @@
+@@ -3799,8 +3775,6 @@
  AC_SUBST(WX_LIBRARY_GL)
  AC_SUBST(WX_TARGET_LIBRARY_GL)
  AC_SUBST(WX_LIBRARY_LINK1_GL)
diff --git a/x11-toolkits/wxgtk-devel/files/patch-ac b/x11-toolkits/wxgtk-devel/files/patch-ac
index ae25a9c7982d..1657f8b71cb3 100644
--- a/x11-toolkits/wxgtk-devel/files/patch-ac
+++ b/x11-toolkits/wxgtk-devel/files/patch-ac
@@ -1,7 +1,7 @@
---- Makefile.in.orig	Wed Mar 22 13:12:38 2000
-+++ Makefile.in	Sun Apr 23 08:08:08 2000
-@@ -311,39 +311,23 @@
- 	
+--- Makefile.in.orig	Mon May  7 07:14:03 2001
++++ Makefile.in	Mon May  7 07:14:46 2001
+@@ -365,39 +365,23 @@
+ 
  CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
  	@$(RM) ./lib/@WX_LIBRARY_LINK1@
 -	@$(RM) ./lib/@WX_LIBRARY_LINK2@
@@ -11,7 +11,7 @@
 -		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ \
 -		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK3@
 +		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@
- 	
+ 
  CREATE_LINKS_GL: @WX_LIBRARY_NAME_SHARED_GL@
  	@$(RM) ./lib/@WX_LIBRARY_LINK1_GL@
 -	@$(RM) ./lib/@WX_LIBRARY_LINK2_GL@
@@ -21,7 +21,7 @@
 -		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ \
 -		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK3_GL@
 +		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@
- 	
+ 
  CREATE_INSTALLED_LINKS: preinstall
  	$(RM) $(libdir)/@WX_LIBRARY_LINK1@
 -	$(RM) $(libdir)/@WX_LIBRARY_LINK2@
@@ -31,7 +31,7 @@
 -		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ \
 -		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK3@
 +		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@
- 	
+ 
  CREATE_INSTALLED_LINKS_GL: preinstall_gl
  	$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
 -	$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
@@ -41,10 +41,10 @@
 -		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ \
 -		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK3_GL@
 +		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@
- 	
+ 
  $(OBJECTS):	$(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
  
-@@ -437,13 +421,9 @@
+@@ -499,13 +483,9 @@
  	@echo " Removing library..."
  	@$(RM) $(libdir)/@WX_TARGET_LIBRARY@
  	@$(RM) $(libdir)/@WX_LIBRARY_LINK1@
@@ -56,5 +56,5 @@
 -	@$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
 -	@$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
  	@echo " Removing helper files..."
- 	@$(RM) $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
+ 	@$(RM) $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h
  	@$(RM) $(bindir)/wx-config
diff --git a/x11-toolkits/wxgtk/Makefile b/x11-toolkits/wxgtk/Makefile
index b7bcc961ee25..fb5718c62146 100644
--- a/x11-toolkits/wxgtk/Makefile
+++ b/x11-toolkits/wxgtk/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wxgtk
-PORTVERSION=	2.2.4
+PORTVERSION=	2.2.6
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/
 DISTNAME=	wxGTK-${PORTVERSION}
@@ -17,10 +17,7 @@ LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-WRKSRC=		${WRKDIR}/wxGTK
-
 USE_X_PREFIX=	yes
-USE_NEWGCC=	yes
 USE_GMAKE=	yes
 USE_GTK=	yes
 USE_AUTOCONF=	yes
diff --git a/x11-toolkits/wxgtk/distinfo b/x11-toolkits/wxgtk/distinfo
index 74fc7be02c75..8bce90e3638e 100644
--- a/x11-toolkits/wxgtk/distinfo
+++ b/x11-toolkits/wxgtk/distinfo
@@ -1,2 +1 @@
-MD5 (wxGTK-2.2.4.tar.gz) = b0fe1bf18033d6768302a9187eada3fe
-MD5 (wxGTK-2.2.4.tar.gz) = 661ea2a1b088ad7edeeb3a5585ef4f09
+MD5 (wxGTK-2.2.6.tar.gz) = 926411e6184c912674a179f22f76ca38
diff --git a/x11-toolkits/wxgtk/files/patch-aa b/x11-toolkits/wxgtk/files/patch-aa
index a7cf0245b477..4e735f88282d 100644
--- a/x11-toolkits/wxgtk/files/patch-aa
+++ b/x11-toolkits/wxgtk/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.in.orig	Sun Aug 20 17:52:52 2000
-+++ configure.in	Sat Aug 26 02:03:38 2000
-@@ -1999,16 +1999,12 @@
+--- configure.in.orig	Tue Mar 13 00:29:09 2001
++++ configure.in	Mon May  7 07:12:45 2001
+@@ -1948,16 +1948,12 @@
  WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a"
  
  dnl the name of the shared library
@@ -21,7 +21,7 @@
  
  dnl shared library settings
  SHARED_LD=
-@@ -2742,24 +2738,6 @@
+@@ -2729,24 +2725,6 @@
      fi
  fi
  
@@ -46,7 +46,7 @@
  dnl ---------------------------------------------------------------------------
  dnl Optional libraries
  dnl ---------------------------------------------------------------------------
-@@ -3784,8 +3762,6 @@
+@@ -3788,8 +3766,6 @@
  AC_SUBST(WX_LIBRARY)
  AC_SUBST(WX_TARGET_LIBRARY)
  AC_SUBST(WX_LIBRARY_LINK1)
@@ -55,7 +55,7 @@
  AC_SUBST(PROGRAM_EXT)
  
  dnl global gl options
-@@ -3795,8 +3771,6 @@
+@@ -3799,8 +3775,6 @@
  AC_SUBST(WX_LIBRARY_GL)
  AC_SUBST(WX_TARGET_LIBRARY_GL)
  AC_SUBST(WX_LIBRARY_LINK1_GL)
diff --git a/x11-toolkits/wxgtk/files/patch-ac b/x11-toolkits/wxgtk/files/patch-ac
index ae25a9c7982d..1657f8b71cb3 100644
--- a/x11-toolkits/wxgtk/files/patch-ac
+++ b/x11-toolkits/wxgtk/files/patch-ac
@@ -1,7 +1,7 @@
---- Makefile.in.orig	Wed Mar 22 13:12:38 2000
-+++ Makefile.in	Sun Apr 23 08:08:08 2000
-@@ -311,39 +311,23 @@
- 	
+--- Makefile.in.orig	Mon May  7 07:14:03 2001
++++ Makefile.in	Mon May  7 07:14:46 2001
+@@ -365,39 +365,23 @@
+ 
  CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
  	@$(RM) ./lib/@WX_LIBRARY_LINK1@
 -	@$(RM) ./lib/@WX_LIBRARY_LINK2@
@@ -11,7 +11,7 @@
 -		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ \
 -		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK3@
 +		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@
- 	
+ 
  CREATE_LINKS_GL: @WX_LIBRARY_NAME_SHARED_GL@
  	@$(RM) ./lib/@WX_LIBRARY_LINK1_GL@
 -	@$(RM) ./lib/@WX_LIBRARY_LINK2_GL@
@@ -21,7 +21,7 @@
 -		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ \
 -		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK3_GL@
 +		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@
- 	
+ 
  CREATE_INSTALLED_LINKS: preinstall
  	$(RM) $(libdir)/@WX_LIBRARY_LINK1@
 -	$(RM) $(libdir)/@WX_LIBRARY_LINK2@
@@ -31,7 +31,7 @@
 -		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ \
 -		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK3@
 +		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@
- 	
+ 
  CREATE_INSTALLED_LINKS_GL: preinstall_gl
  	$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
 -	$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
@@ -41,10 +41,10 @@
 -		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ \
 -		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK3_GL@
 +		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@
- 	
+ 
  $(OBJECTS):	$(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
  
-@@ -437,13 +421,9 @@
+@@ -499,13 +483,9 @@
  	@echo " Removing library..."
  	@$(RM) $(libdir)/@WX_TARGET_LIBRARY@
  	@$(RM) $(libdir)/@WX_LIBRARY_LINK1@
@@ -56,5 +56,5 @@
 -	@$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
 -	@$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
  	@echo " Removing helper files..."
- 	@$(RM) $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
+ 	@$(RM) $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h
  	@$(RM) $(bindir)/wx-config
diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile
index b7bcc961ee25..fb5718c62146 100644
--- a/x11-toolkits/wxgtk24/Makefile
+++ b/x11-toolkits/wxgtk24/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wxgtk
-PORTVERSION=	2.2.4
+PORTVERSION=	2.2.6
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/
 DISTNAME=	wxGTK-${PORTVERSION}
@@ -17,10 +17,7 @@ LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-WRKSRC=		${WRKDIR}/wxGTK
-
 USE_X_PREFIX=	yes
-USE_NEWGCC=	yes
 USE_GMAKE=	yes
 USE_GTK=	yes
 USE_AUTOCONF=	yes
diff --git a/x11-toolkits/wxgtk24/distinfo b/x11-toolkits/wxgtk24/distinfo
index 74fc7be02c75..8bce90e3638e 100644
--- a/x11-toolkits/wxgtk24/distinfo
+++ b/x11-toolkits/wxgtk24/distinfo
@@ -1,2 +1 @@
-MD5 (wxGTK-2.2.4.tar.gz) = b0fe1bf18033d6768302a9187eada3fe
-MD5 (wxGTK-2.2.4.tar.gz) = 661ea2a1b088ad7edeeb3a5585ef4f09
+MD5 (wxGTK-2.2.6.tar.gz) = 926411e6184c912674a179f22f76ca38
diff --git a/x11-toolkits/wxgtk24/files/patch-aa b/x11-toolkits/wxgtk24/files/patch-aa
index a7cf0245b477..4e735f88282d 100644
--- a/x11-toolkits/wxgtk24/files/patch-aa
+++ b/x11-toolkits/wxgtk24/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.in.orig	Sun Aug 20 17:52:52 2000
-+++ configure.in	Sat Aug 26 02:03:38 2000
-@@ -1999,16 +1999,12 @@
+--- configure.in.orig	Tue Mar 13 00:29:09 2001
++++ configure.in	Mon May  7 07:12:45 2001
+@@ -1948,16 +1948,12 @@
  WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a"
  
  dnl the name of the shared library
@@ -21,7 +21,7 @@
  
  dnl shared library settings
  SHARED_LD=
-@@ -2742,24 +2738,6 @@
+@@ -2729,24 +2725,6 @@
      fi
  fi
  
@@ -46,7 +46,7 @@
  dnl ---------------------------------------------------------------------------
  dnl Optional libraries
  dnl ---------------------------------------------------------------------------
-@@ -3784,8 +3762,6 @@
+@@ -3788,8 +3766,6 @@
  AC_SUBST(WX_LIBRARY)
  AC_SUBST(WX_TARGET_LIBRARY)
  AC_SUBST(WX_LIBRARY_LINK1)
@@ -55,7 +55,7 @@
  AC_SUBST(PROGRAM_EXT)
  
  dnl global gl options
-@@ -3795,8 +3771,6 @@
+@@ -3799,8 +3775,6 @@
  AC_SUBST(WX_LIBRARY_GL)
  AC_SUBST(WX_TARGET_LIBRARY_GL)
  AC_SUBST(WX_LIBRARY_LINK1_GL)
diff --git a/x11-toolkits/wxgtk24/files/patch-ac b/x11-toolkits/wxgtk24/files/patch-ac
index ae25a9c7982d..1657f8b71cb3 100644
--- a/x11-toolkits/wxgtk24/files/patch-ac
+++ b/x11-toolkits/wxgtk24/files/patch-ac
@@ -1,7 +1,7 @@
---- Makefile.in.orig	Wed Mar 22 13:12:38 2000
-+++ Makefile.in	Sun Apr 23 08:08:08 2000
-@@ -311,39 +311,23 @@
- 	
+--- Makefile.in.orig	Mon May  7 07:14:03 2001
++++ Makefile.in	Mon May  7 07:14:46 2001
+@@ -365,39 +365,23 @@
+ 
  CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
  	@$(RM) ./lib/@WX_LIBRARY_LINK1@
 -	@$(RM) ./lib/@WX_LIBRARY_LINK2@
@@ -11,7 +11,7 @@
 -		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ \
 -		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK3@
 +		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@
- 	
+ 
  CREATE_LINKS_GL: @WX_LIBRARY_NAME_SHARED_GL@
  	@$(RM) ./lib/@WX_LIBRARY_LINK1_GL@
 -	@$(RM) ./lib/@WX_LIBRARY_LINK2_GL@
@@ -21,7 +21,7 @@
 -		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ \
 -		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK3_GL@
 +		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@
- 	
+ 
  CREATE_INSTALLED_LINKS: preinstall
  	$(RM) $(libdir)/@WX_LIBRARY_LINK1@
 -	$(RM) $(libdir)/@WX_LIBRARY_LINK2@
@@ -31,7 +31,7 @@
 -		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ \
 -		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK3@
 +		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@
- 	
+ 
  CREATE_INSTALLED_LINKS_GL: preinstall_gl
  	$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
 -	$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
@@ -41,10 +41,10 @@
 -		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ \
 -		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK3_GL@
 +		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@
- 	
+ 
  $(OBJECTS):	$(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
  
-@@ -437,13 +421,9 @@
+@@ -499,13 +483,9 @@
  	@echo " Removing library..."
  	@$(RM) $(libdir)/@WX_TARGET_LIBRARY@
  	@$(RM) $(libdir)/@WX_LIBRARY_LINK1@
@@ -56,5 +56,5 @@
 -	@$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
 -	@$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
  	@echo " Removing helper files..."
- 	@$(RM) $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
+ 	@$(RM) $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h
  	@$(RM) $(bindir)/wx-config