Changes 1.5.4:

* New features:
  - Support for OpenGL 3.3
  - Support for OpenGL 4.0
* New extensions:
  - GL_AMD_conservative_depth
  - GL_ARB_blend_func_extended
  - GL_ARB_draw_indirect
  - GL_ARB_explicit_attrib_location
  - GL_ARB_gpu_shader5
  - GL_ARB_gpu_shader_fp64
  - GL_ARB_occlusion_query2
  - GL_ARB_sampler_objects
  - GL_ARB_shader_bit_encoding
  - GL_ARB_shader_subroutine
  - GL_ARB_shading_language_include
  - GL_ARB_tessellation_shader
  - GL_ARB_texture_buffer_object_rgb32
  - GL_ARB_texture_compression_bptc
  - GL_ARB_texture_rgb10_a2ui
  - GL_ARB_texture_swizzle
  - GL_ARB_timer_query
  - GL_ARB_transform_feedback2
  - GL_ARB_transform_feedback3
  - GL_ARB_vertex_type_2_10_10_10_rev
  - GL_EXT_shader_image_load_store
  - GL_EXT_vertex_attrib_64bit
  - GL_NV_gpu_program5
  - GL_NV_gpu_program_fp64
  - GL_NV_gpu_shader5
  - GL_NV_tessellation_program5
  - GL_NV_vertex_attrib_integer_64bit
  - GLX_ARB_vertex_buffer_object
* Bug fixes:
  - Parameter constness fix for glPointParameteriv and glPointParameterfv

5 files changed, 29 insertions, 48 deletions

diff --git a/graphics/glew/Makefile b/graphics/glew/Makefile
index b20fd0424a6..5210ef1f52e 100644
--- a/graphics/glew/Makefile
+++ b/graphics/glew/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2009/08/31 11:18:58 adam Exp $
+# $NetBSD: Makefile,v 1.7 2010/05/23 09:52:49 adam Exp $
 
-DISTNAME=	glew-1.5.0-src
-PKGNAME=	glew-1.5.0
+DISTNAME=	glew-1.5.4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=glew/}
 EXTRACT_SUFX=	.tgz
@@ -11,14 +10,12 @@ HOMEPAGE=	http://glew.sourceforge.net/
 COMMENT=	OpenGL Extension Wrangler Library
 
 PKG_DESTDIR_SUPPORT=	user-destdir
-MAKE_JOBS_SAFE=		no
 
-WRKSRC=		${WRKDIR}/glew
-
-USE_LANGUAGES=	c c++
-USE_TOOLS+=	gmake
-MAKE_ENV+=	GLEW_DEST=${PREFIX} X11=${PREFIX} POPT=${CFLAGS:Q}
-MAKE_ENV+=	LDFLAGS.EXTRA=${X11_LDFLAGS:Q}
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		gmake
+PKGCONFIG_OVERRIDE=	glew.pc.in
+MAKE_ENV+=		GLEW_DEST=${PREFIX} X11=${PREFIX} POPT=${CFLAGS:Q}
+MAKE_ENV+=		LDFLAGS.EXTRA=${X11_LDFLAGS:Q}
 
 post-patch:
 	${LN} -s Makefile.netbsdelf ${WRKSRC}/config/Makefile.dragonfly
diff --git a/graphics/glew/PLIST b/graphics/glew/PLIST
index 5f5bb6d9096..f6a0e195760 100644
--- a/graphics/glew/PLIST
+++ b/graphics/glew/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/08/21 15:02:32 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/05/23 09:52:50 adam Exp $
 bin/glewinfo
 bin/visualinfo
 include/GL/glew.h
@@ -7,4 +7,5 @@ include/GL/wglew.h
 lib/libGLEW.a
 lib/libGLEW.so
 lib/libGLEW.so.1.5
-lib/libGLEW.so.1.5.0
+lib/libGLEW.so.1.5.4
+lib/pkgconfig/glew.pc
diff --git a/graphics/glew/distinfo b/graphics/glew/distinfo
index aff0a849ebb..c9bcb14fe9e 100644
--- a/graphics/glew/distinfo
+++ b/graphics/glew/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.5 2009/08/31 11:18:58 adam Exp $
+$NetBSD: distinfo,v 1.6 2010/05/23 09:52:50 adam Exp $
 
-SHA1 (glew-1.5.0-src.tgz) = 17fa3b2f5b72a227c5e14631c2bda3fcfd8c1663
-RMD160 (glew-1.5.0-src.tgz) = 2fa13cd326e82fc9c043d1fcbf2c4da062723296
-Size (glew-1.5.0-src.tgz) = 356247 bytes
+SHA1 (glew-1.5.4.tgz) = 332234128e67737bf60fe14c860821038ecd7399
+RMD160 (glew-1.5.4.tgz) = c882e6879ea53a9b975afb1b624409ae20d0d1c4
+Size (glew-1.5.4.tgz) = 459341 bytes
 SHA1 (patch-aa) = 8f1d6f48e26f8ce13282b676ac18ac49f596ae9b
-SHA1 (patch-ab) = a42d2fd9dc625991235d8aa806bd489f63e9d0ce
-SHA1 (patch-ac) = c6d00b36fa25c7d517837f22aa37c72c74e27a67
+SHA1 (patch-ac) = ba98dcc0860b6a0dbe35bb5e49f0f3316055800a
 SHA1 (patch-ad) = bea22c27d4574408abd6f6153b74fd97ebf4edb3
diff --git a/graphics/glew/patches/patch-ab b/graphics/glew/patches/patch-ab
deleted file mode 100644
index a1b645598b0..00000000000
--- a/graphics/glew/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2009/08/21 15:02:32 adam Exp $
-
---- include/GL/glew.h.orig	2007-12-28 04:09:49.000000000 +0100
-+++ include/GL/glew.h
-@@ -10763,8 +10763,13 @@ GLEWAPI const GLubyte* glewGetString (GL
- 
- #ifdef GLEW_APIENTRY_DEFINED
- #undef GLEW_APIENTRY_DEFINED
-+/*
-+Defining these, including glu.h which includes gl.h, and then undefining them
-+leads to them staying undefined, as even if the app later includes gl.h it
-+will leave them alone due to multiple include protection
- #undef APIENTRY
- #undef GLAPIENTRY
-+*/
- #endif
- 
- #ifdef GLEW_CALLBACK_DEFINED
diff --git a/graphics/glew/patches/patch-ac b/graphics/glew/patches/patch-ac
index 1bf0cbec156..eee0a42704f 100644
--- a/graphics/glew/patches/patch-ac
+++ b/graphics/glew/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2009/08/31 11:18:58 adam Exp $
+$NetBSD: patch-ac,v 1.5 2010/05/23 09:52:50 adam Exp $
 
---- Makefile.orig	2007-12-28 04:05:25.000000000 +0100
+--- Makefile.orig	2010-04-27 22:16:36.000000000 +0000
 +++ Makefile
-@@ -84,7 +84,7 @@ lib/$(LIB.STATIC): $(LIB.OBJS)
+@@ -89,7 +89,7 @@ lib/$(LIB.STATIC): $(LIB.OBJS)
  	$(AR) cr $@ $^
  
  lib/$(LIB.SHARED): $(LIB.SOBJS)
@@ -11,20 +11,20 @@ $NetBSD: patch-ac,v 1.4 2009/08/31 11:18:58 adam Exp $
  ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw)
  else
  	$(LN) $(LIB.SHARED) lib/$(LIB.SONAME)
-@@ -92,10 +92,10 @@ else
+@@ -97,10 +97,10 @@ else
  endif
  
- bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.SRCS) lib/$(LIB.SHARED)
--	$(CC) $(CFLAGS) -o $@ $(GLEWINFO.BIN.SRCS) $(BIN.LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(GLEWINFO.BIN.SRCS) $(BIN.LIBS)
+ bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.OBJS) lib/$(LIB.SHARED)
+-	$(CC) $(CFLAGS) -o $@ $(GLEWINFO.BIN.OBJS) $(BIN.LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(GLEWINFO.BIN.OBJS) $(BIN.LIBS)
  
- bin/$(VISUALINFO.BIN): $(VISUALINFO.BIN.SRCS) lib/$(LIB.SHARED)
--	$(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.SRCS) $(BIN.LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(VISUALINFO.BIN.SRCS) $(BIN.LIBS)
+ bin/$(VISUALINFO.BIN): $(VISUALINFO.BIN.OBJS) lib/$(LIB.SHARED)
+-	$(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.OBJS) $(BIN.LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(VISUALINFO.BIN.OBJS) $(BIN.LIBS)
  
  %.o: %.c
  	$(CC) -c $(CFLAGS) -o $@ $<
-@@ -108,31 +108,29 @@ src/glew.pic_o: src/glew.c include/GL/gl
+@@ -122,32 +122,30 @@ glew.pc: glew.pc.in
  
  install: all
  # directories
@@ -49,13 +49,15 @@ $NetBSD: patch-ac,v 1.4 2009/08/31 11:18:58 adam Exp $
 -	$(INSTALL) -m 0644 include/GL/wglew.h $(INCDIR)/
 -	$(INSTALL) -m 0644 include/GL/glew.h $(INCDIR)/
 -	$(INSTALL) -m 0644 include/GL/glxew.h $(INCDIR)/
+-	$(INSTALL) -m 0644 glew.pc $(LIBDIR)/pkgconfig/
 +	$(INSTALL) -m 0644 include/GL/wglew.h $(DESTDIR)$(INCDIR)/
 +	$(INSTALL) -m 0644 include/GL/glew.h $(DESTDIR)$(INCDIR)/
 +	$(INSTALL) -m 0644 include/GL/glxew.h $(DESTDIR)$(INCDIR)/
++	$(INSTALL) -m 0644 glew.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
  ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw)
  	$(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(LIBDIR)/
  else
--	strip -x lib/$(LIB.STATIC)
+-	$(STRIP) -x lib/$(LIB.STATIC)
 -	$(INSTALL) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/
 -	$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK)
 +	$(INSTALL) -m 0644 lib/$(LIB.STATIC) $(DESTDIR)$(LIBDIR)/