12 files changed, 120 insertions, 42 deletions

diff --git a/x11-toolkits/wxgtk-devel/Makefile b/x11-toolkits/wxgtk-devel/Makefile
index 259bed6b04fb..301b4a5eaa26 100644
--- a/x11-toolkits/wxgtk-devel/Makefile
+++ b/x11-toolkits/wxgtk-devel/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME=	wxgtk
-PORTVERSION=	2.2.6
+PORTVERSION=	2.2.7
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/
 DISTNAME=	wxGTK-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sobomax@FreeBSD.org
 
 LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		jpeg.9:${PORTSDIR}/graphics/jpeg
+		tiff.4:${PORTSDIR}/graphics/tiff
 
 USE_X_PREFIX=	yes
+USE_MESA=	yes
 USE_GMAKE=	yes
 USE_GTK=	yes
 USE_AUTOCONF=	yes
@@ -25,9 +25,13 @@ INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-libpng=sys \
 		--with-libjpeg=sys \
 		--with-libtiff=sys \
-		--with-zlib=sys
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		--with-zlib=sys \
+		--with-opengl
+CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} \
+			  -I${LOCALBASE}/include \
+			  -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib \
+			 -L${X11BASE}/lib"
 
 AUTOCONF=	autoconf && \
 			${PERL} -pi -e 's|-l\$$THREADS_LIB|${PTHREAD_LIBS}|g ; \
diff --git a/x11-toolkits/wxgtk-devel/distinfo b/x11-toolkits/wxgtk-devel/distinfo
index 8bce90e3638e..0b003ee855af 100644
--- a/x11-toolkits/wxgtk-devel/distinfo
+++ b/x11-toolkits/wxgtk-devel/distinfo
@@ -1 +1 @@
-MD5 (wxGTK-2.2.6.tar.gz) = 926411e6184c912674a179f22f76ca38
+MD5 (wxGTK-2.2.7.tar.gz) = 042ba034e2bc31ca1df74f6f9f60fe57
diff --git a/x11-toolkits/wxgtk-devel/files/patch-aa b/x11-toolkits/wxgtk-devel/files/patch-aa
index 4e735f88282d..e4156f619bad 100644
--- a/x11-toolkits/wxgtk-devel/files/patch-aa
+++ b/x11-toolkits/wxgtk-devel/files/patch-aa
@@ -1,6 +1,9 @@
---- configure.in.orig	Tue Mar 13 00:29:09 2001
-+++ configure.in	Mon May  7 07:12:45 2001
-@@ -1948,16 +1948,12 @@
+
+$FreeBSD$
+
+--- configure.in.orig	Tue May 22 17:27:55 2001
++++ configure.in	Mon May 28 17:26:14 2001
+@@ -1968,16 +1968,12 @@
  WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a"
  
  dnl the name of the shared library
@@ -21,7 +24,23 @@
  
  dnl shared library settings
  SHARED_LD=
-@@ -2729,24 +2725,6 @@
+@@ -2074,8 +2070,13 @@
+       *-*-freebsd* | *-*-openbsd* | *-*-netbsd*)
+         SHARED_LD="${CC} -shared -o"
+         PIC_FLAG="-fPIC"
+-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+-        WX_ALL="CREATE_LINKS"
++	if test "$wxUSE_OPENGL" = "yes"; then
++	    WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
++	    WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
++	else
++	    WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
++	    WX_ALL="CREATE_LINKS"
++	fi
+       ;;
+       *-*-osf* )
+         SHARED_LD="${CXX} -shared -o"
+@@ -2749,24 +2750,6 @@
      fi
  fi
  
@@ -46,7 +65,7 @@
  dnl ---------------------------------------------------------------------------
  dnl Optional libraries
  dnl ---------------------------------------------------------------------------
-@@ -3788,8 +3766,6 @@
+@@ -3808,8 +3791,6 @@
  AC_SUBST(WX_LIBRARY)
  AC_SUBST(WX_TARGET_LIBRARY)
  AC_SUBST(WX_LIBRARY_LINK1)
@@ -55,7 +74,7 @@
  AC_SUBST(PROGRAM_EXT)
  
  dnl global gl options
-@@ -3799,8 +3775,6 @@
+@@ -3819,8 +3800,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/pkg-plist b/x11-toolkits/wxgtk-devel/pkg-plist
index f0537cdfb53e..4903b5527aac 100644
--- a/x11-toolkits/wxgtk-devel/pkg-plist
+++ b/x11-toolkits/wxgtk-devel/pkg-plist
@@ -322,10 +322,13 @@ include/wx/zipstrm.h
 include/wx/zstream.h
 lib/libwx_gtk.so
 lib/libwx_gtk.so.2
+lib/libwx_gtk_gl.so
+lib/libwx_gtk_gl.so.2
 lib/wx/include/wx/gtk/setup.h
 share/locale/cs/LC_MESSAGES/wxstd.mo
 share/locale/da/LC_MESSAGES/wxstd.mo
 share/locale/de/LC_MESSAGES/wxstd.mo
+share/locale/es/LC_MESSAGES/wxstd.mo
 share/locale/fi/LC_MESSAGES/wxstd.mo
 share/locale/fr/LC_MESSAGES/wxstd.mo
 share/locale/it/LC_MESSAGES/wxstd.mo
diff --git a/x11-toolkits/wxgtk/Makefile b/x11-toolkits/wxgtk/Makefile
index 259bed6b04fb..301b4a5eaa26 100644
--- a/x11-toolkits/wxgtk/Makefile
+++ b/x11-toolkits/wxgtk/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME=	wxgtk
-PORTVERSION=	2.2.6
+PORTVERSION=	2.2.7
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/
 DISTNAME=	wxGTK-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sobomax@FreeBSD.org
 
 LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		jpeg.9:${PORTSDIR}/graphics/jpeg
+		tiff.4:${PORTSDIR}/graphics/tiff
 
 USE_X_PREFIX=	yes
+USE_MESA=	yes
 USE_GMAKE=	yes
 USE_GTK=	yes
 USE_AUTOCONF=	yes
@@ -25,9 +25,13 @@ INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-libpng=sys \
 		--with-libjpeg=sys \
 		--with-libtiff=sys \
-		--with-zlib=sys
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		--with-zlib=sys \
+		--with-opengl
+CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} \
+			  -I${LOCALBASE}/include \
+			  -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib \
+			 -L${X11BASE}/lib"
 
 AUTOCONF=	autoconf && \
 			${PERL} -pi -e 's|-l\$$THREADS_LIB|${PTHREAD_LIBS}|g ; \
diff --git a/x11-toolkits/wxgtk/distinfo b/x11-toolkits/wxgtk/distinfo
index 8bce90e3638e..0b003ee855af 100644
--- a/x11-toolkits/wxgtk/distinfo
+++ b/x11-toolkits/wxgtk/distinfo
@@ -1 +1 @@
-MD5 (wxGTK-2.2.6.tar.gz) = 926411e6184c912674a179f22f76ca38
+MD5 (wxGTK-2.2.7.tar.gz) = 042ba034e2bc31ca1df74f6f9f60fe57
diff --git a/x11-toolkits/wxgtk/files/patch-aa b/x11-toolkits/wxgtk/files/patch-aa
index 4e735f88282d..e4156f619bad 100644
--- a/x11-toolkits/wxgtk/files/patch-aa
+++ b/x11-toolkits/wxgtk/files/patch-aa
@@ -1,6 +1,9 @@
---- configure.in.orig	Tue Mar 13 00:29:09 2001
-+++ configure.in	Mon May  7 07:12:45 2001
-@@ -1948,16 +1948,12 @@
+
+$FreeBSD$
+
+--- configure.in.orig	Tue May 22 17:27:55 2001
++++ configure.in	Mon May 28 17:26:14 2001
+@@ -1968,16 +1968,12 @@
  WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a"
  
  dnl the name of the shared library
@@ -21,7 +24,23 @@
  
  dnl shared library settings
  SHARED_LD=
-@@ -2729,24 +2725,6 @@
+@@ -2074,8 +2070,13 @@
+       *-*-freebsd* | *-*-openbsd* | *-*-netbsd*)
+         SHARED_LD="${CC} -shared -o"
+         PIC_FLAG="-fPIC"
+-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+-        WX_ALL="CREATE_LINKS"
++	if test "$wxUSE_OPENGL" = "yes"; then
++	    WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
++	    WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
++	else
++	    WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
++	    WX_ALL="CREATE_LINKS"
++	fi
+       ;;
+       *-*-osf* )
+         SHARED_LD="${CXX} -shared -o"
+@@ -2749,24 +2750,6 @@
      fi
  fi
  
@@ -46,7 +65,7 @@
  dnl ---------------------------------------------------------------------------
  dnl Optional libraries
  dnl ---------------------------------------------------------------------------
-@@ -3788,8 +3766,6 @@
+@@ -3808,8 +3791,6 @@
  AC_SUBST(WX_LIBRARY)
  AC_SUBST(WX_TARGET_LIBRARY)
  AC_SUBST(WX_LIBRARY_LINK1)
@@ -55,7 +74,7 @@
  AC_SUBST(PROGRAM_EXT)
  
  dnl global gl options
-@@ -3799,8 +3775,6 @@
+@@ -3819,8 +3800,6 @@
  AC_SUBST(WX_LIBRARY_GL)
  AC_SUBST(WX_TARGET_LIBRARY_GL)
  AC_SUBST(WX_LIBRARY_LINK1_GL)
diff --git a/x11-toolkits/wxgtk/pkg-plist b/x11-toolkits/wxgtk/pkg-plist
index f0537cdfb53e..4903b5527aac 100644
--- a/x11-toolkits/wxgtk/pkg-plist
+++ b/x11-toolkits/wxgtk/pkg-plist
@@ -322,10 +322,13 @@ include/wx/zipstrm.h
 include/wx/zstream.h
 lib/libwx_gtk.so
 lib/libwx_gtk.so.2
+lib/libwx_gtk_gl.so
+lib/libwx_gtk_gl.so.2
 lib/wx/include/wx/gtk/setup.h
 share/locale/cs/LC_MESSAGES/wxstd.mo
 share/locale/da/LC_MESSAGES/wxstd.mo
 share/locale/de/LC_MESSAGES/wxstd.mo
+share/locale/es/LC_MESSAGES/wxstd.mo
 share/locale/fi/LC_MESSAGES/wxstd.mo
 share/locale/fr/LC_MESSAGES/wxstd.mo
 share/locale/it/LC_MESSAGES/wxstd.mo
diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile
index 259bed6b04fb..301b4a5eaa26 100644
--- a/x11-toolkits/wxgtk24/Makefile
+++ b/x11-toolkits/wxgtk24/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME=	wxgtk
-PORTVERSION=	2.2.6
+PORTVERSION=	2.2.7
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/
 DISTNAME=	wxGTK-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sobomax@FreeBSD.org
 
 LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		jpeg.9:${PORTSDIR}/graphics/jpeg
+		tiff.4:${PORTSDIR}/graphics/tiff
 
 USE_X_PREFIX=	yes
+USE_MESA=	yes
 USE_GMAKE=	yes
 USE_GTK=	yes
 USE_AUTOCONF=	yes
@@ -25,9 +25,13 @@ INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-libpng=sys \
 		--with-libjpeg=sys \
 		--with-libtiff=sys \
-		--with-zlib=sys
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		--with-zlib=sys \
+		--with-opengl
+CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} \
+			  -I${LOCALBASE}/include \
+			  -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib \
+			 -L${X11BASE}/lib"
 
 AUTOCONF=	autoconf && \
 			${PERL} -pi -e 's|-l\$$THREADS_LIB|${PTHREAD_LIBS}|g ; \
diff --git a/x11-toolkits/wxgtk24/distinfo b/x11-toolkits/wxgtk24/distinfo
index 8bce90e3638e..0b003ee855af 100644
--- a/x11-toolkits/wxgtk24/distinfo
+++ b/x11-toolkits/wxgtk24/distinfo
@@ -1 +1 @@
-MD5 (wxGTK-2.2.6.tar.gz) = 926411e6184c912674a179f22f76ca38
+MD5 (wxGTK-2.2.7.tar.gz) = 042ba034e2bc31ca1df74f6f9f60fe57
diff --git a/x11-toolkits/wxgtk24/files/patch-aa b/x11-toolkits/wxgtk24/files/patch-aa
index 4e735f88282d..e4156f619bad 100644
--- a/x11-toolkits/wxgtk24/files/patch-aa
+++ b/x11-toolkits/wxgtk24/files/patch-aa
@@ -1,6 +1,9 @@
---- configure.in.orig	Tue Mar 13 00:29:09 2001
-+++ configure.in	Mon May  7 07:12:45 2001
-@@ -1948,16 +1948,12 @@
+
+$FreeBSD$
+
+--- configure.in.orig	Tue May 22 17:27:55 2001
++++ configure.in	Mon May 28 17:26:14 2001
+@@ -1968,16 +1968,12 @@
  WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a"
  
  dnl the name of the shared library
@@ -21,7 +24,23 @@
  
  dnl shared library settings
  SHARED_LD=
-@@ -2729,24 +2725,6 @@
+@@ -2074,8 +2070,13 @@
+       *-*-freebsd* | *-*-openbsd* | *-*-netbsd*)
+         SHARED_LD="${CC} -shared -o"
+         PIC_FLAG="-fPIC"
+-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+-        WX_ALL="CREATE_LINKS"
++	if test "$wxUSE_OPENGL" = "yes"; then
++	    WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
++	    WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
++	else
++	    WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
++	    WX_ALL="CREATE_LINKS"
++	fi
+       ;;
+       *-*-osf* )
+         SHARED_LD="${CXX} -shared -o"
+@@ -2749,24 +2750,6 @@
      fi
  fi
  
@@ -46,7 +65,7 @@
  dnl ---------------------------------------------------------------------------
  dnl Optional libraries
  dnl ---------------------------------------------------------------------------
-@@ -3788,8 +3766,6 @@
+@@ -3808,8 +3791,6 @@
  AC_SUBST(WX_LIBRARY)
  AC_SUBST(WX_TARGET_LIBRARY)
  AC_SUBST(WX_LIBRARY_LINK1)
@@ -55,7 +74,7 @@
  AC_SUBST(PROGRAM_EXT)
  
  dnl global gl options
-@@ -3799,8 +3775,6 @@
+@@ -3819,8 +3800,6 @@
  AC_SUBST(WX_LIBRARY_GL)
  AC_SUBST(WX_TARGET_LIBRARY_GL)
  AC_SUBST(WX_LIBRARY_LINK1_GL)
diff --git a/x11-toolkits/wxgtk24/pkg-plist b/x11-toolkits/wxgtk24/pkg-plist
index f0537cdfb53e..4903b5527aac 100644
--- a/x11-toolkits/wxgtk24/pkg-plist
+++ b/x11-toolkits/wxgtk24/pkg-plist
@@ -322,10 +322,13 @@ include/wx/zipstrm.h
 include/wx/zstream.h
 lib/libwx_gtk.so
 lib/libwx_gtk.so.2
+lib/libwx_gtk_gl.so
+lib/libwx_gtk_gl.so.2
 lib/wx/include/wx/gtk/setup.h
 share/locale/cs/LC_MESSAGES/wxstd.mo
 share/locale/da/LC_MESSAGES/wxstd.mo
 share/locale/de/LC_MESSAGES/wxstd.mo
+share/locale/es/LC_MESSAGES/wxstd.mo
 share/locale/fi/LC_MESSAGES/wxstd.mo
 share/locale/fr/LC_MESSAGES/wxstd.mo
 share/locale/it/LC_MESSAGES/wxstd.mo