Changes 1.2.3:

* Bug fixes

3 files changed, 35 insertions, 36 deletions

diff --git a/x11/gtkglarea/Makefile b/x11/gtkglarea/Makefile
index 8b42be3ffd2..45c6a1700cd 100644
--- a/x11/gtkglarea/Makefile
+++ b/x11/gtkglarea/Makefile
@@ -1,19 +1,18 @@
-# $NetBSD: Makefile,v 1.35 2005/02/21 20:26:15 hubertf Exp $
+# $NetBSD: Makefile,v 1.36 2005/03/24 09:52:28 adam Exp $
 
-DISTNAME=		gtkglarea-1.2.2
-PKGREVISION=		5
-CATEGORIES=		x11 graphics
-MASTER_SITES=		http://www.student.oulu.fi/~jlof/gtkglarea/download/
+DISTNAME=	gtkglarea-1.2.3
+CATEGORIES=	x11 graphics
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openev/} \
+		http://www.student.oulu.fi/~jlof/gtkglarea/download/
 
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://www.student.oulu.fi/~jlof/gtkglarea/
-COMMENT=		OpenGL/Mesa widget for GTK+ GUI toolkit
+MAINTAINER=	tech-pkg@NetBSD.org
+HOMEPAGE=	http://www.student.oulu.fi/~jlof/gtkglarea/
+COMMENT=	OpenGL/Mesa widget for GTK+ GUI toolkit
 
-USE_X11BASE=		YES
-USE_BUILDLINK3=		YES
-USE_LIBTOOL=		YES
-
-GNU_CONFIGURE=		YES
+USE_BUILDLINK3=		yes
+USE_LIBTOOL=		yes
+USE_X11BASE=		yes
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-lib-MesaGL
 
 PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
diff --git a/x11/gtkglarea/distinfo b/x11/gtkglarea/distinfo
index f60b9634ba1..90de71eac85 100644
--- a/x11/gtkglarea/distinfo
+++ b/x11/gtkglarea/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 17:36:12 wiz Exp $
+$NetBSD: distinfo,v 1.4 2005/03/24 09:52:28 adam Exp $
 
-SHA1 (gtkglarea-1.2.2.tar.gz) = acb8bc15b4ae64f579d72433b9a281134d061e40
-RMD160 (gtkglarea-1.2.2.tar.gz) = 5b685c4a9b434ae649a303749f0b5084dc0d86ba
-Size (gtkglarea-1.2.2.tar.gz) = 173949 bytes
-SHA1 (patch-aa) = 5c0e4542c291035943758d040136cc5abb8b1f2c
+SHA1 (gtkglarea-1.2.3.tar.gz) = 90ba606881601b1d7faad3a6b828ab4eb7cecb74
+RMD160 (gtkglarea-1.2.3.tar.gz) = 23b658d3b767e94971eca9aaa32f906b99df8e16
+Size (gtkglarea-1.2.3.tar.gz) = 291368 bytes
+SHA1 (patch-aa) = b5765afd457fdf652e4e254d4e06385062238215
diff --git a/x11/gtkglarea/patches/patch-aa b/x11/gtkglarea/patches/patch-aa
index 2ff72277123..9ee5a966cfd 100644
--- a/x11/gtkglarea/patches/patch-aa
+++ b/x11/gtkglarea/patches/patch-aa
@@ -1,26 +1,26 @@
-$NetBSD: patch-aa,v 1.5 2001/04/07 19:34:32 rh Exp $
+$NetBSD: patch-aa,v 1.6 2005/03/24 09:52:28 adam Exp $
 
---- configure.orig	Wed Feb 16 21:30:35 2000
+--- configure.orig	2001-08-25 13:05:33.000000000 +0000
 +++ configure
-@@ -1965,7 +1965,7 @@
+@@ -12748,7 +12748,7 @@ echo "${ECHO_T}$have_GL" >&6
  
- echo $ac_n "checking Mesa""... $ac_c" 1>&6
- echo "configure:1968: checking Mesa" >&5
+ echo "$as_me:12749: checking Mesa" >&5
+ echo $ECHO_N "checking Mesa... $ECHO_C" >&6
 -LIBS="$saved_LIBS $GTK_LIBS $GL_LDOPTS -lMesaGL"
 +LIBS="$saved_LIBS $GTK_LIBS $GL_LDOPTS -lGL"
- cat > conftest.$ac_ext <<EOF
- #line 1971 "configure"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line 12753 "configure"
  #include "confdefs.h"
-@@ -1989,7 +1989,7 @@
+@@ -12786,7 +12786,7 @@ echo "${ECHO_T}$have_MesaGL" >&6
  if test "x$have_MesaGL" = "xno"; then
-  echo $ac_n "checking Mesa with pthreads""... $ac_c" 1>&6
- echo "configure:1992: checking Mesa with pthreads" >&5
+  echo "$as_me:12787: checking Mesa with pthreads" >&5
+ echo $ECHO_N "checking Mesa with pthreads... $ECHO_C" >&6
 - LIBS="$saved_LIBS $GTK_LIBS $GL_LDOPTS -lMesaGL -lpthread"
 + LIBS="$saved_LIBS $GTK_LIBS $GL_LDOPTS -lGL -lpthread"
-  cat > conftest.$ac_ext <<EOF
- #line 1995 "configure"
+  cat >conftest.$ac_ext <<_ACEOF
+ #line 12791 "configure"
  #include "confdefs.h"
-@@ -2025,9 +2025,9 @@
+@@ -12837,9 +12837,9 @@ echo "$as_me: error: Missing GL library"
  elif test "x$with_lib_MesaGL" = "xyes"; then
  
   if test "x$have_MesaGL" = "xyes"; then
@@ -30,9 +30,9 @@ $NetBSD: patch-aa,v 1.5 2001/04/07 19:34:32 rh Exp $
 -  GL_LIBS="$GL_LDOPTS -lMesaGLU -lMesaGL -lpthread"
 +  GL_LIBS="$GL_LDOPTS -lGLU -lGL -lpthread"
   else
-   { echo "configure: error: Missing MesaGL library" 1>&2; exit 1; }
-  fi
-@@ -2037,9 +2037,9 @@
+   { { echo "$as_me:12844: error: Missing MesaGL library" >&5
+ echo "$as_me: error: Missing MesaGL library" >&2;}
+@@ -12851,9 +12851,9 @@ else
   if test "x$have_GL" = "xyes"; then
    GL_LIBS="$GL_LDOPTS -lGLU -lGL"
   elif test "x$have_MesaGL" = "xyes"; then
@@ -42,5 +42,5 @@ $NetBSD: patch-aa,v 1.5 2001/04/07 19:34:32 rh Exp $
 -  GL_LIBS="$GL_LDOPTS -lMesaGLU -lMesaGL -lpthread"
 +  GL_LIBS="$GL_LDOPTS -lGLU -lGL -lpthread"
   else
-   { echo "configure: error: You need GL or MesaGL libraries" 1>&2; exit 1; }
-  fi
+   { { echo "$as_me:12858: error: You need GL or MesaGL libraries" >&5
+ echo "$as_me: error: You need GL or MesaGL libraries" >&2;}