4 files changed, 18 insertions, 32 deletions

diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile
index 105c1c948870..d0eda9105659 100644
--- a/x11-toolkits/gtkglext/Makefile
+++ b/x11-toolkits/gtkglext/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gtkglext
-PORTVERSION=	1.0.6
-PORTREVISION=	5
+PORTVERSION=	1.2.0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.0
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	ports@FreeBSD.org
@@ -18,14 +17,10 @@ COMMENT=	An OpenGL extension to GTK
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack gtk20
+USE_GNOME=	gnomehack gnomeprefix gnometarget gtk20
 USE_GL=		yes
-GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|pango gmodule-2.0|pango pangox gmodule-2.0|g' \
-		${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtkglext/distinfo b/x11-toolkits/gtkglext/distinfo
index 3d3f0cda492a..c545462d7df7 100644
--- a/x11-toolkits/gtkglext/distinfo
+++ b/x11-toolkits/gtkglext/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtkglext-1.0.6.tar.bz2) = e347e028dfe98d69c5995f547108db77
-SHA256 (gnome2/gtkglext-1.0.6.tar.bz2) = b2b1fb80b1a6a3d9793a4837e767debeb62ee444ceec27a96fa0992e03bf33a9
-SIZE (gnome2/gtkglext-1.0.6.tar.bz2) = 681751
+MD5 (gnome2/gtkglext-1.2.0.tar.bz2) = ed7ba24ce06a8630c07f2d0ee5f04ab4
+SHA256 (gnome2/gtkglext-1.2.0.tar.bz2) = 16bd736074f6b14180f206b7e91263fc721b49912ea3258ab5f094cfa5497f51
+SIZE (gnome2/gtkglext-1.2.0.tar.bz2) = 703821
diff --git a/x11-toolkits/gtkglext/files/patch-configure b/x11-toolkits/gtkglext/files/patch-configure
deleted file mode 100644
index 6d08f16b63f0..000000000000
--- a/x11-toolkits/gtkglext/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Mon Oct 21 11:28:19 2002
-+++ configure	Mon Oct 21 11:28:54 2002
-@@ -7024,6 +7024,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11-toolkits/gtkglext/pkg-plist b/x11-toolkits/gtkglext/pkg-plist
index 0c7241dec65a..2dacbc9d1973 100644
--- a/x11-toolkits/gtkglext/pkg-plist
+++ b/x11-toolkits/gtkglext/pkg-plist
@@ -29,22 +29,15 @@ include/gtkglext-1.0/gtk/gtkgldefs.h
 include/gtkglext-1.0/gtk/gtkglinit.h
 include/gtkglext-1.0/gtk/gtkglversion.h
 include/gtkglext-1.0/gtk/gtkglwidget.h
-@dirrm include/gtkglext-1.0/gtk
-@dirrm include/gtkglext-1.0/gdk/x11
-@dirrm include/gtkglext-1.0/gdk/glext
-@dirrm include/gtkglext-1.0/gdk
-@dirrm include/gtkglext-1.0
 lib/gtkglext-1.0/include/gdkglext-config.h
 lib/libgdkglext-x11-1.0.a
 lib/libgdkglext-x11-1.0.la
 lib/libgdkglext-x11-1.0.so
-lib/libgdkglext-x11-1.0.so.2
+lib/libgdkglext-x11-1.0.so.0
 lib/libgtkglext-x11-1.0.a
 lib/libgtkglext-x11-1.0.la
 lib/libgtkglext-x11-1.0.so
-lib/libgtkglext-x11-1.0.so.2
-@dirrm lib/gtkglext-1.0/include
-@dirrm lib/gtkglext-1.0
+lib/libgtkglext-x11-1.0.so.0
 libdata/pkgconfig/gdkglext-1.0.pc
 libdata/pkgconfig/gdkglext-x11-1.0.pc
 libdata/pkgconfig/gtkglext-1.0.pc
@@ -76,5 +69,13 @@ share/aclocal/gtkglext-1.0.m4
 %%DOCSDIR%%/index.sgml
 %%DOCSDIR%%/left.png
 %%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
 %%DOCSDIR%%/up.png
 @dirrm %%DOCSDIR%%
+@dirrm include/gtkglext-1.0/gtk
+@dirrm include/gtkglext-1.0/gdk/x11
+@dirrm include/gtkglext-1.0/gdk/glext
+@dirrm include/gtkglext-1.0/gdk
+@dirrm include/gtkglext-1.0
+@dirrm lib/gtkglext-1.0/include
+@dirrm lib/gtkglext-1.0