Changes 1.2.0:

* This is the first stable release of GtkGLExt 1.0 since maintainership changed
  to Tim Shead, tshead@k-3d.com

6 files changed, 18 insertions, 128 deletions

diff --git a/graphics/gtkglext/Makefile b/graphics/gtkglext/Makefile
index 1cf0de209f3..6bf06008f98 100644
--- a/graphics/gtkglext/Makefile
+++ b/graphics/gtkglext/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2006/02/05 23:09:33 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2006/02/13 20:56:15 adam Exp $
 
-DISTNAME=	gtkglext-1.0.6
-PKGREVISION=	3
+DISTNAME=	gtkglext-1.2.0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtkglext/}
 EXTRACT_SUFX=	.tar.bz2
@@ -10,20 +9,18 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://gtkglext.sourceforge.net/
 COMMENT=	OpenGL extension to GTK
 
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake perl pkg-config
 USE_LIBTOOL=		yes
+USE_TOOLS+=		gmake perl pkg-config
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-gtk-doc=no
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 
 PKGCONFIG_OVERRIDE=	gdkglext.pc.in
 PKGCONFIG_OVERRIDE+=	gtkglext.pc.in
 LIBS+=			-lm
 
-CONFIGURE_ARGS+=        --with-html-dir=${PREFIX}/share/doc/html
-CONFIGURE_ARGS+=        --enable-gtk-doc=no
-
-.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
-.include "../../devel/pango/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gtkglext/PLIST b/graphics/gtkglext/PLIST
index 150a6cf9161..418f0b88e79 100644
--- a/graphics/gtkglext/PLIST
+++ b/graphics/gtkglext/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/11/10 14:50:59 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/02/13 20:56:15 adam Exp $
 include/gtkglext-1.0/gdk/gdkgl.h
 include/gtkglext-1.0/gdk/gdkglconfig.h
 include/gtkglext-1.0/gdk/gdkglcontext.h
@@ -16,12 +16,12 @@ include/gtkglext-1.0/gdk/gdkgltokens.h
 include/gtkglext-1.0/gdk/gdkgltypes.h
 include/gtkglext-1.0/gdk/gdkglversion.h
 include/gtkglext-1.0/gdk/gdkglwindow.h
-include/gtkglext-1.0/gdk/glext/glext.h
-include/gtkglext-1.0/gdk/glext/glxext.h
-include/gtkglext-1.0/gdk/glext/wglext.h
 include/gtkglext-1.0/gdk/glext/glext-extra.h
+include/gtkglext-1.0/gdk/glext/glext.h
 include/gtkglext-1.0/gdk/glext/glxext-extra.h
+include/gtkglext-1.0/gdk/glext/glxext.h
 include/gtkglext-1.0/gdk/glext/wglext-extra.h
+include/gtkglext-1.0/gdk/glext/wglext.h
 include/gtkglext-1.0/gdk/x11/gdkglglxext.h
 include/gtkglext-1.0/gdk/x11/gdkglx.h
 include/gtkglext-1.0/gtk/gtkgl.h
@@ -64,6 +64,7 @@ share/doc/html/gtkglext/index.html
 share/doc/html/gtkglext/index.sgml
 share/doc/html/gtkglext/left.png
 share/doc/html/gtkglext/right.png
+share/doc/html/gtkglext/style.css
 share/doc/html/gtkglext/up.png
 @dirrm share/doc/html/gtkglext
 @dirrm lib/gtkglext-1.0/include
diff --git a/graphics/gtkglext/buildlink3.mk b/graphics/gtkglext/buildlink3.mk
index 5055fa6f32d..31ac4cff849 100644
--- a/graphics/gtkglext/buildlink3.mk
+++ b/graphics/gtkglext/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:09:33 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/02/13 20:56:15 adam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTKGLEXT_BUILDLINK3_MK:=	${GTKGLEXT_BUILDLINK3_MK}+
@@ -16,8 +16,7 @@ BUILDLINK_RECOMMENDED.gtkglext+=	gtkglext>=1.0.6nb3
 BUILDLINK_PKGSRCDIR.gtkglext?=	../../graphics/gtkglext
 .endif	# GTKGLEXT_BUILDLINK3_MK
 
-.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/gtkglext/distinfo b/graphics/gtkglext/distinfo
index 4f45562bc5a..b84b7e99c66 100644
--- a/graphics/gtkglext/distinfo
+++ b/graphics/gtkglext/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.7 2005/12/28 07:09:16 garbled Exp $
+$NetBSD: distinfo,v 1.8 2006/02/13 20:56:15 adam Exp $
 
-SHA1 (gtkglext-1.0.6.tar.bz2) = f12e9907607b6f33fb619d4f139a17442a0e1730
-RMD160 (gtkglext-1.0.6.tar.bz2) = d11ec217a483d71612479d6757c62ea3f864ff16
-Size (gtkglext-1.0.6.tar.bz2) = 681751 bytes
-SHA1 (patch-aa) = 03b26a394be6e72c49b36b48c7c21942796433d3
-SHA1 (patch-ab) = dc940f4b7fbbe3f69d75366a7d7bd15f2342f0b2
+SHA1 (gtkglext-1.2.0.tar.bz2) = d84c9472af3438fbce84189613e5370b97d9d1e7
+RMD160 (gtkglext-1.2.0.tar.bz2) = c731df1b4f0bf2ccb213fe489d2c2d08910d4c77
+Size (gtkglext-1.2.0.tar.bz2) = 703821 bytes
diff --git a/graphics/gtkglext/patches/patch-aa b/graphics/gtkglext/patches/patch-aa
deleted file mode 100644
index f96695aa0bc..00000000000
--- a/graphics/gtkglext/patches/patch-aa
+++ /dev/null
@@ -1,74 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2005/12/28 17:26:35 wiz Exp $
---- configure.orig	2005-12-27 23:48:46.000000000 -0700
-+++ configure	2005-12-27 23:49:33.000000000 -0700
-@@ -20131,12 +20131,14 @@
- gtk+-2.0 >= 2.0.0 \
- gdk-2.0 >= 2.0.0 \
- pango >= 1.0.0 \
-+pangox >= 1.0.0 \
- gmodule-2.0 >= 2.0.0 \
- " >&5
- echo $ECHO_N "checking for \
- gtk+-2.0 >= 2.0.0 \
- gdk-2.0 >= 2.0.0 \
- pango >= 1.0.0 \
-+pangox >= 1.0.0 \
- gmodule-2.0 >= 2.0.0 \
- ... $ECHO_C" >&6
- 
-@@ -20144,6 +20146,7 @@
- gtk+-2.0 >= 2.0.0 \
- gdk-2.0 >= 2.0.0 \
- pango >= 1.0.0 \
-+pangox >= 1.0.0 \
- gmodule-2.0 >= 2.0.0 \
- " ; then
-             echo "$as_me:$LINENO: result: yes" >&5
-@@ -20156,6 +20159,7 @@
- gtk+-2.0 >= 2.0.0 \
- gdk-2.0 >= 2.0.0 \
- pango >= 1.0.0 \
-+pangox >= 1.0.0 \
- gmodule-2.0 >= 2.0.0 \
- "`
-             echo "$as_me:$LINENO: result: $BASE_DEPENDENCIES_CFLAGS" >&5
-@@ -20167,6 +20171,7 @@
- gtk+-2.0 >= 2.0.0 \
- gdk-2.0 >= 2.0.0 \
- pango >= 1.0.0 \
-+pangox >= 1.0.0 \
- gmodule-2.0 >= 2.0.0 \
- "`
-             echo "$as_me:$LINENO: result: $BASE_DEPENDENCIES_LIBS" >&5
-@@ -20180,6 +20185,7 @@
- gtk+-2.0 >= 2.0.0 \
- gdk-2.0 >= 2.0.0 \
- pango >= 1.0.0 \
-+pangox >= 1.0.0 \
- gmodule-2.0 >= 2.0.0 \
- "`
-             echo $BASE_DEPENDENCIES_PKG_ERRORS
-@@ -20200,12 +20206,14 @@
- gtk+-2.0 >= 2.0.0 \
- gdk-2.0 >= 2.0.0 \
- pango >= 1.0.0 \
-+pangox >= 1.0.0 \
- gmodule-2.0 >= 2.0.0 \
- ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
- echo "$as_me: error: Library requirements (\
- gtk+-2.0 >= 2.0.0 \
- gdk-2.0 >= 2.0.0 \
- pango >= 1.0.0 \
-+pangox >= 1.0.0 \
- gmodule-2.0 >= 2.0.0 \
- ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
-    { (exit 1); exit 1; }; }
-@@ -25591,7 +25599,7 @@
- # CFLAGS and LIBS
- ##################################################
- 
--GDKGLEXT_PACKAGES="gdk-2.0 pango gmodule-2.0"
-+GDKGLEXT_PACKAGES="gdk-2.0 pango pangox gmodule-2.0"
- GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS"
- GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GDKGLEXT_WIN_LIBS"
- GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES`"
diff --git a/graphics/gtkglext/patches/patch-ab b/graphics/gtkglext/patches/patch-ab
deleted file mode 100644
index f23ae4adae0..00000000000
--- a/graphics/gtkglext/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/12/28 17:26:35 wiz Exp $
---- configure.in.orig	2005-12-27 23:47:45.000000000 -0700
-+++ configure.in	2005-12-27 23:48:38.000000000 -0700
-@@ -59,6 +59,10 @@
- m4_define([pango_pkg], [pango])
- m4_define([pango_required_version], [1.0.0])
- 
-+# Pangox
-+m4_define([pangox_pkg], [pangox])
-+m4_define([pangox_required_version], [1.0.0])
-+
- # PangoFT2
- m4_define([pangoft2_pkg], [pangoft2])
- m4_define([pangoft2_required_version], [1.0.0])
-@@ -345,6 +349,7 @@
- gtk_pkg >= gtk_required_version \
- gdk_pkg >= gdk_required_version \
- pango_pkg >= pango_required_version \
-+pangox_pkg >= pango_required_version \
- gmodule_pkg >= gmodule_required_version \
- ])
- 
-@@ -789,7 +794,7 @@
- # CFLAGS and LIBS
- ##################################################
- 
--GDKGLEXT_PACKAGES="gdk_pkg pango_pkg gmodule_pkg"
-+GDKGLEXT_PACKAGES="gdk_pkg pango_pkg pangox_pkg gmodule_pkg"
- GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS"
- GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GDKGLEXT_WIN_LIBS"
- GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES`"