Changes 1.10.0:

adds support for OpenGL 4.4, new extensions

8 files changed, 37 insertions, 99 deletions

diff --git a/graphics/glew/DESCR b/graphics/glew/DESCR
index 3354386cc40..0e18a3a0874 100644
--- a/graphics/glew/DESCR
+++ b/graphics/glew/DESCR
@@ -1,5 +1,4 @@
-The OpenGL Extension Wrangler Library (GLEW) is a cross-platform
-C/C++ extension loading library. GLEW provides efficient run-time
-mechanisms for determining which OpenGL extensions are supported
-on the target platform. OpenGL core and extension functionality is
-exposed in a single header file.
+The OpenGL Extension Wrangler Library (GLEW) is a cross-platform C/C++
+extension loading library. GLEW provides efficient run-time mechanisms for
+determining which OpenGL extensions are supported on the target platform.
+OpenGL core and extension functionality is exposed in a single header file.
diff --git a/graphics/glew/Makefile b/graphics/glew/Makefile
index 3c2b11c5e95..d2f6e29cacc 100644
--- a/graphics/glew/Makefile
+++ b/graphics/glew/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2012/12/07 16:01:15 adam Exp $
+# $NetBSD: Makefile,v 1.16 2013/08/04 18:00:52 adam Exp $
 
-DISTNAME=	glew-1.9.0
+DISTNAME=	glew-1.10.0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=glew/}
 EXTRACT_SUFX=	.tgz
@@ -13,25 +13,27 @@ LICENSE=	modified-bsd AND mit
 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}
+MAKEFLAGS+=		CC=${CC:Q} GLEW_DEST=${PREFIX} POPT=${CFLAGS:Q}
+MAKEFLAGS+=		LDFLAGS.EXTRA=${X11_LDFLAGS:Q}
 INSTALL_TARGET=		install.all
 INSTALLATION_DIRS+=	lib/pkgconfig
 
-post-patch:
-	${LN} -sf Makefile.netbsdelf ${WRKSRC}/config/Makefile.dragonfly
-	${LN} -sf Makefile.netbsdelf ${WRKSRC}/config/Makefile.netbsd
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS" && !empty(CC:M*gcc*)
-MAKE_ENV+=	SYSTEM=solaris-gcc
+MAKEFLAGS+=	SYSTEM=solaris-gcc
 .endif
 
 .if ${OPSYS} != "Darwin"
-.include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/libXi/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
+MAKEFLAGS+=	LD=${LD:Q}
+.else
+MAKEFLAGS+=	LD=${CC:Q}
 .endif
+
+pre-configure:
+	${LN} -sf Makefile.netbsd ${WRKSRC}/config/Makefile.dragonfly
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/glew/PLIST b/graphics/glew/PLIST
index 361edbc866f..5242d4957a0 100644
--- a/graphics/glew/PLIST
+++ b/graphics/glew/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2012/12/07 16:01:15 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2013/08/04 18:00:52 adam Exp $
 bin/glewinfo
 bin/visualinfo
 include/GL/glew.h
@@ -6,11 +6,11 @@ include/GL/glxew.h
 include/GL/wglew.h
 lib/libGLEW.a
 lib/libGLEW.so
-lib/libGLEW.so.1.9
+lib/libGLEW.so.1.10
 lib/libGLEW.so.${PKGVERSION}
 lib/libGLEWmx.a
 lib/libGLEWmx.so
-lib/libGLEWmx.so.1.9
+lib/libGLEWmx.so.1.10
 lib/libGLEWmx.so.${PKGVERSION}
 lib/pkgconfig/glew.pc
 lib/pkgconfig/glewmx.pc
diff --git a/graphics/glew/distinfo b/graphics/glew/distinfo
index 643cf7dac1e..52174a2a162 100644
--- a/graphics/glew/distinfo
+++ b/graphics/glew/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.14 2012/12/07 16:01:15 adam Exp $
+$NetBSD: distinfo,v 1.15 2013/08/04 18:00:52 adam Exp $
 
-SHA1 (glew-1.9.0.tgz) = 9291f5c5afefd482c7f3e91ffb3cd4716c6c9ffe
-RMD160 (glew-1.9.0.tgz) = 4324e82ab858c53b0c69006c48b81f0fdd831725
-Size (glew-1.9.0.tgz) = 544440 bytes
-SHA1 (patch-aa) = 0d1afd9009f5bb89868ca6d9c5f6561fce3d9e4b
-SHA1 (patch-ac) = 5f0968ec0213f7248dee770f3e2938d8996f756e
-SHA1 (patch-ad) = c24278334609bc6fd24fc3a205b01ba2ece6d1fa
-SHA1 (patch-config_Makefile.linux) = 59b956186b30b593ba3ff131b2d9262c61c6b27d
+SHA1 (glew-1.10.0.tgz) = f41b45ca4a630ad1d00b8b87c5f493781a380300
+RMD160 (glew-1.10.0.tgz) = cd9772b37e4f48fe2e25a55303eb89363ce91467
+Size (glew-1.10.0.tgz) = 567605 bytes
+SHA1 (patch-ac) = 4de0f7c88dea7410f38ecfd046989a7db412e588
+SHA1 (patch-config_Makefile.linux) = 214c43b15229a8b8d61455ef9370542e8d5b526e
diff --git a/graphics/glew/patches/patch-aa b/graphics/glew/patches/patch-aa
deleted file mode 100644
index 0d619a4beb6..00000000000
--- a/graphics/glew/patches/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2011/07/17 07:45:19 dholland Exp $
-
-Configuration for NetBSD. (Also used for Dragonfly.)
-
---- config/Makefile.netbsdelf.orig	2011-07-17 07:35:16.000000000 +0000
-+++ config/Makefile.netbsdelf
-@@ -0,0 +1,29 @@
-+NAME = $(GLEW_NAME)
-+CC = cc
-+LD = ld
-+ifneq (undefined, $(origin GLEW_MX))
-+CFLAGS.EXTRA = -DGLEW_MX
-+endif
-+PICFLAG = -fPIC
-+X11 ?= /usr/X11R6
-+LDFLAGS.SO = -shared -soname $(LIB.SONAME)
-+LDFLAGS.EXTRA ?= -L${X11}/lib
-+LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11
-+LDFLAGS.STATIC = -Wl,-Bstatic
-+LDFLAGS.DYNAMIC = -Wl,-Bdynamic
-+CFLAGS.EXTRA += -I${X11}/include
-+NAME = GLEW
-+WARN = -Wall -W
-+POPT ?= -O2
-+BIN.SUFFIX =
-+LIB.SONAME    = lib$(NAME).so.$(SO_MAJOR)
-+LIB.DEVLNK    = lib$(NAME).so
-+LIB.SHARED    = lib$(NAME).so.$(SO_VERSION)
-+LIB.STATIC    = lib$(NAME).a
-+LDFLAGS.SO    = -shared -soname $(LIB.SONAME)
-+LIB.SONAME.MX = lib$(NAME)mx.so.$(SO_MAJOR)
-+LIB.DEVLNK.MX = lib$(NAME)mx.so
-+LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION)
-+LIB.STATIC.MX = lib$(NAME)mx.a
-+LDFLAGS.SO.MX = -shared -soname $(LIB.SONAME.MX)
-+SHARED_OBJ_EXT = pic_o
diff --git a/graphics/glew/patches/patch-ac b/graphics/glew/patches/patch-ac
index b7b555ccad6..4d31620d66c 100644
--- a/graphics/glew/patches/patch-ac
+++ b/graphics/glew/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.9 2012/12/07 16:01:16 adam Exp $
+$NetBSD: patch-ac,v 1.10 2013/08/04 18:00:52 adam Exp $
 
---- Makefile.orig	2012-08-06 15:59:08.000000000 +0000
+--- Makefile.orig	2013-07-22 14:11:22.000000000 +0000
 +++ Makefile
-@@ -106,7 +106,7 @@ ifneq ($(STRIP),)
+@@ -105,7 +105,7 @@ ifneq ($(STRIP),)
  endif
  
  lib/$(LIB.SHARED): $(LIB.SOBJS)
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.9 2012/12/07 16:01:16 adam Exp $
  ifneq ($(LN),)
  	$(LN) $(LIB.SHARED) lib/$(LIB.SONAME)
  	$(LN) $(LIB.SHARED) lib/$(LIB.DEVLNK)
-@@ -190,13 +190,13 @@ bin:
+@@ -203,13 +203,13 @@ bin:
  	mkdir bin
  
  bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.OBJ) lib/$(LIB.SHARED)
@@ -27,7 +27,7 @@ $NetBSD: patch-ac,v 1.9 2012/12/07 16:01:16 adam Exp $
  ifneq ($(STRIP),)
  	$(STRIP) -x $@
  endif
-@@ -218,16 +218,16 @@ install:     install.include install.lib
+@@ -231,16 +231,16 @@ install:     install.include install.lib
  install.mx:  install.include install.lib.mx install.pkgconfig.mx
  
  install.lib: glew.lib
@@ -47,7 +47,7 @@ $NetBSD: patch-ac,v 1.9 2012/12/07 16:01:16 adam Exp $
  endif
  
  # development files
-@@ -235,50 +235,50 @@ ifeq ($(filter-out mingw% cygwin,$(SYSTE
+@@ -248,50 +248,50 @@ ifeq ($(filter-out mingw% cygwin,$(SYSTE
  	$(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(LIBDIR)/
  endif
  ifneq ($(LN),)
diff --git a/graphics/glew/patches/patch-ad b/graphics/glew/patches/patch-ad
deleted file mode 100644
index b830815d461..00000000000
--- a/graphics/glew/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2012/12/07 16:01:16 adam Exp $
-
---- config/Makefile.darwin.orig	2011-04-27 16:16:34.000000000 +0000
-+++ config/Makefile.darwin
-@@ -14,7 +14,7 @@ endif
- LDFLAGS.STATIC =
- LDFLAGS.DYNAMIC =
- WARN = -Wall -W
--POPT = -O2
-+POPT ?= -O2
- BIN.SUFFIX =
- LIB.SONAME    = lib$(NAME).$(SO_MAJOR).dylib
- LIB.DEVLNK    = lib$(NAME).dylib
diff --git a/graphics/glew/patches/patch-config_Makefile.linux b/graphics/glew/patches/patch-config_Makefile.linux
index 1712763b23d..460fe988685 100644
--- a/graphics/glew/patches/patch-config_Makefile.linux
+++ b/graphics/glew/patches/patch-config_Makefile.linux
@@ -1,23 +1,11 @@
-$NetBSD: patch-config_Makefile.linux,v 1.2 2012/12/07 16:01:16 adam Exp $
+$NetBSD: patch-config_Makefile.linux,v 1.3 2013/08/04 18:00:52 adam Exp $
 
---- config/Makefile.linux.orig	2012-12-07 09:27:51.000000000 +0000
+--- config/Makefile.linux.orig	2013-07-22 14:11:22.000000000 +0000
 +++ config/Makefile.linux
-@@ -1,16 +1,12 @@
- NAME = $(GLEW_NAME)
- CC = cc
--LD = cc
-+LD = ld
- PICFLAG = -fPIC
-+X11 ?= /usr/X11R6
- M_ARCH ?= $(shell uname -m)
--ifeq (x86_64,${M_ARCH})
--LDFLAGS.EXTRA = -L/usr/X11R6/lib64 -L/usr/lib64
--LIBDIR = $(GLEW_DEST)/lib64
--else
--LDFLAGS.EXTRA = -L/usr/X11R6/lib -L/usr/lib
-+LDFLAGS.EXTRA ?= -L/usr/X11R6/lib -L/usr/lib
- LIBDIR = $(GLEW_DEST)/lib
--endif
+@@ -16,7 +16,7 @@ else
+   LDFLAGS.EXTRA = -L/usr/X11R6/lib -L/usr/lib
+   LIBDIR = $(GLEW_DEST)/lib
+ endif
 -LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11
 +LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 -lpthread
  LDFLAGS.STATIC = -Wl,-Bstatic