Changes 1.5.0:

New features:
* Licensing change (BSD, Mesa 3-D, Khronos)
* Switch to using registry on www.opengl.org
* Support for major and minor version strings
New extensions:
* GL_APPLE_flush_buffer_range
* GL_GREMEDY_frame_terminator
* GLX_EXT_texture_from_pixmap
Bug fixes:
* Incorrent 64-bit type definitions
* Do not strip static library on install
* Missing tokens in GL_ATI_fragment_shader and WGL_{ARB,EXT}_make_current_read
* Missing tokens in GL_VERSION_2_1
* Missing functions in GL_VERSION_1_4
* Incorrect parameter type for glXCopyContext

5 files changed, 46 insertions, 63 deletions

diff --git a/graphics/glew/Makefile b/graphics/glew/Makefile
index 8cdbd10faa9..3dd94702eac 100644
--- a/graphics/glew/Makefile
+++ b/graphics/glew/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2009/03/02 15:31:16 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.5 2009/08/21 15:02:32 adam Exp $
 
-DISTNAME=	glew-1.3.4-src
-PKGNAME=	glew-1.3.4
-PKGREVISION=	1
+DISTNAME=	glew-1.5.0-src
+PKGNAME=	glew-1.5.0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=glew/}
 EXTRACT_SUFX=	.tgz
@@ -19,7 +17,7 @@ WRKSRC=		${WRKDIR}/glew
 
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
-MAKE_ENV+=	GLEW_DEST=${PREFIX:Q} X11=${PREFIX:Q} POPT=${CFLAGS:M*:Q}
+MAKE_ENV+=	GLEW_DEST=${PREFIX} X11=${PREFIX} POPT=${CFLAGS:Q}
 MAKE_ENV+=	LDFLAGS.EXTRA=${X11_LDFLAGS:Q}
 
 post-extract:
diff --git a/graphics/glew/PLIST b/graphics/glew/PLIST
index 962fda438b9..5f5bb6d9096 100644
--- a/graphics/glew/PLIST
+++ b/graphics/glew/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/08/15 15:21:27 abs Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/08/21 15:02:32 adam Exp $
 bin/glewinfo
 bin/visualinfo
-include/GL/wglew.h
 include/GL/glew.h
 include/GL/glxew.h
-lib/libGLEW.so.1.3.4
-lib/libGLEW.so.1.3
+include/GL/wglew.h
 lib/libGLEW.a
 lib/libGLEW.so
+lib/libGLEW.so.1.5
+lib/libGLEW.so.1.5.0
diff --git a/graphics/glew/distinfo b/graphics/glew/distinfo
index 274a96cd80b..19e8503c88d 100644
--- a/graphics/glew/distinfo
+++ b/graphics/glew/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2008/09/01 10:06:33 dholland Exp $
+$NetBSD: distinfo,v 1.4 2009/08/21 15:02:32 adam Exp $
 
-SHA1 (glew-1.3.4-src.tgz) = d70fb9fc07b99ec87a192818f73fc31b42c0811b
-RMD160 (glew-1.3.4-src.tgz) = 1f845fddb61c5a679a105aeae9ff21037d9fab6d
-Size (glew-1.3.4-src.tgz) = 362854 bytes
+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 (patch-aa) = 8f1d6f48e26f8ce13282b676ac18ac49f596ae9b
-SHA1 (patch-ab) = 35e46b52e743d2d4e3dcb275c57d91676f64b9b4
-SHA1 (patch-ac) = 21e8ec234672357bae7a3ac0123d0ddd90987246
+SHA1 (patch-ab) = a42d2fd9dc625991235d8aa806bd489f63e9d0ce
+SHA1 (patch-ac) = 64a66dc580afb076f5521469612521b9ad802c43
diff --git a/graphics/glew/patches/patch-ab b/graphics/glew/patches/patch-ab
index 1cae64e8e70..a1b645598b0 100644
--- a/graphics/glew/patches/patch-ab
+++ b/graphics/glew/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/08/15 15:21:27 abs Exp $
+$NetBSD: patch-ab,v 1.2 2009/08/21 15:02:32 adam Exp $
 
---- include/GL/glew.h.orig	2006-03-04 08:18:54.000000000 +0000
+--- include/GL/glew.h.orig	2007-12-28 04:09:49.000000000 +0100
 +++ include/GL/glew.h
-@@ -9770,8 +9770,13 @@ GLEWAPI const GLubyte* glewGetString (GL
+@@ -10763,8 +10763,13 @@ GLEWAPI const GLubyte* glewGetString (GL
  
  #ifdef GLEW_APIENTRY_DEFINED
  #undef GLEW_APIENTRY_DEFINED
diff --git a/graphics/glew/patches/patch-ac b/graphics/glew/patches/patch-ac
index 511c0ed565e..bab3eead5f9 100644
--- a/graphics/glew/patches/patch-ac
+++ b/graphics/glew/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2008/09/01 10:06:33 dholland Exp $
+$NetBSD: patch-ac,v 1.3 2009/08/21 15:02:32 adam Exp $
 
---- Makefile.orig	2006-03-02 18:02:51.000000000 -0500
-+++ Makefile	2008-09-01 06:02:30.000000000 -0400
-@@ -87,7 +87,7 @@ lib/$(LIB.STATIC): $(LIB.OBJS)
+--- Makefile.orig	2009-08-19 19:40:40.000000000 +0200
++++ Makefile
+@@ -84,7 +84,7 @@ lib/$(LIB.STATIC): $(LIB.OBJS)
  	$(AR) cr $@ $^
  
  lib/$(LIB.SHARED): $(LIB.SOBJS)
@@ -11,74 +11,59 @@ $NetBSD: patch-ac,v 1.2 2008/09/01 10:06:33 dholland Exp $
  ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw)
  else
  	$(LN) $(LIB.SHARED) lib/$(LIB.SONAME)
-@@ -95,10 +95,10 @@ else
+@@ -92,10 +92,10 @@ else
  endif
  
- bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.SRCS)
--	$(CC) $(CFLAGS) -o $@ $^ $(BIN.LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(BIN.LIBS)
+ 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/$(VISUALINFO.BIN): $(VISUALINFO.BIN.SRCS)
--	$(CC) $(CFLAGS) -o $@ $^ $(BIN.LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(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)
  
  %.o: %.c
  	$(CC) -c $(CFLAGS) -o $@ $<
-@@ -111,40 +111,40 @@ src/glew.pic_o: src/glew.c include/GL/gl
+@@ -108,31 +108,31 @@ src/glew.pic_o: src/glew.c include/GL/gl
  
  install: all
  # directories
--	$(INSTALL) -d -m 0755 $(GLEW_DEST)/bin
--	$(INSTALL) -d -m 0755 $(GLEW_DEST)/include/GL
+-	$(INSTALL) -d -m 0755 $(BINDIR)
+-	$(INSTALL) -d -m 0755 $(INCDIR)
 -	$(INSTALL) -d -m 0755 $(LIBDIR)
-+	$(INSTALL) -d -m 0755 $(DESTDIR)$(GLEW_DEST)/bin
-+	$(INSTALL) -d -m 0755 $(DESTDIR)$(GLEW_DEST)/include/GL
++	$(INSTALL) -d -m 0755 $(DESTDIR)$(BINDIR)
++	$(INSTALL) -d -m 0755 $(DESTDIR)$(INCDIR)
 +	$(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR)
  # runtime
  ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw)
--	$(INSTALL) $(STRIP) -m 0644 lib/$(LIB.SHARED) $(GLEW_DEST)/bin/
-+	$(INSTALL) $(STRIP) -m 0644 lib/$(LIB.SHARED) $(DESTDIR)$(GLEW_DEST)/bin/
+ 	$(STRIP) -x lib/$(LIB.SHARED)
+ 	$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(BINDIR)/
  else
-   ifeq ($(patsubst darwin%,darwin,$(SYSTEM)), darwin)
- 	strip -x lib/$(LIB.SHARED)
+ 	$(STRIP) -x lib/$(LIB.SHARED)
 -	$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/
 -	$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME)
 +	$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(DESTDIR)$(LIBDIR)/
 +	$(LN) $(LIB.SHARED) $(DESTDIR)$(LIBDIR)/$(LIB.SONAME)
-   else
--	$(INSTALL) $(STRIP) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/
--	$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME)
-+	$(INSTALL) $(STRIP) -m 0644 lib/$(LIB.SHARED) $(DESTDIR)$(LIBDIR)/
-+	$(LN) $(LIB.SHARED) $(DESTDIR)$(LIBDIR)/$(LIB.SONAME)
-   endif
  endif
  # development files
--	$(INSTALL) -m 0644 include/GL/wglew.h $(GLEW_DEST)/include/GL
--	$(INSTALL) -m 0644 include/GL/glew.h $(GLEW_DEST)/include/GL
--	$(INSTALL) -m 0644 include/GL/glxew.h $(GLEW_DEST)/include/GL
-+	$(INSTALL) -m 0644 include/GL/wglew.h $(DESTDIR)$(GLEW_DEST)/include/GL
-+	$(INSTALL) -m 0644 include/GL/glew.h $(DESTDIR)$(GLEW_DEST)/include/GL
-+	$(INSTALL) -m 0644 include/GL/glxew.h $(DESTDIR)$(GLEW_DEST)/include/GL
+-	$(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 include/GL/wglew.h $(DESTDIR)$(INCDIR)/
++	$(INSTALL) -m 0644 include/GL/glew.h $(DESTDIR)$(INCDIR)/
++	$(INSTALL) -m 0644 include/GL/glxew.h $(DESTDIR)$(INCDIR)/
  ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw)
--	$(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(LIBDIR)/
-+	$(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(DESTDIR)$(LIBDIR)/
+ 	$(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(LIBDIR)/
  else
-   ifeq ($(patsubst darwin%,darwin,$(SYSTEM)), darwin)
  	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)/
 +	$(LN) $(LIB.SHARED) $(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK)
-   else
--	$(INSTALL) $(STRIP) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/
--	$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK)
-+	$(INSTALL) $(STRIP) -m 0644 lib/$(LIB.STATIC) $(DESTDIR)$(LIBDIR)/
-+	$(LN) $(LIB.SHARED) $(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK)
-   endif
  endif
  # utilities
--	$(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(GLEW_DEST)/bin/
-+	$(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(DESTDIR)$(GLEW_DEST)/bin/
+-	$(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/
++	$(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(DESTDIR)$(BINDIR)/
  
  uninstall:
- 	$(RM) $(GLEW_DEST)/include/GL/wglew.h
+ 	$(RM) $(INCDIR)/wglew.h