From 97bf08c9a936f658d778578004b5a7baa0789f2a Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Wed, 11 Sep 2013 18:13:20 +0000
Subject: [PATCH] Update to GLEW 1.10.0.

ok sthen@
---
 graphics/glew/Makefile               | 10 +++++-----
 graphics/glew/distinfo               |  4 ++--
 graphics/glew/files/Makefile.openbsd |  6 +++---
 graphics/glew/patches/patch-Makefile | 16 ++++++++--------
 graphics/glew/pkg/PFRAG.shared       |  3 ---
 graphics/glew/pkg/PLIST              |  5 +++--
 6 files changed, 21 insertions(+), 23 deletions(-)
 delete mode 100644 graphics/glew/pkg/PFRAG.shared

diff --git a/graphics/glew/Makefile b/graphics/glew/Makefile
index 153d5bc57a3..d61e0e4a03c 100644
--- a/graphics/glew/Makefile
+++ b/graphics/glew/Makefile
@@ -1,14 +1,14 @@
-# $OpenBSD: Makefile,v 1.10 2013/03/11 11:10:52 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2013/09/11 18:13:20 brad Exp $
 
 COMMENT=	GL Extension Wrangler library
 
-DISTNAME=	glew-1.9.0
+DISTNAME=	glew-1.10.0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=glew/}
 EXTRACT_SUFX=	.tgz
 
-SHARED_LIBS=	GLEW	5.0 \
-		GLEWmx	1.0
+SHARED_LIBS=	GLEW	6.0 \
+		GLEWmx	2.0
 
 HOMEPAGE=	http://glew.sourceforge.net/
 
@@ -22,7 +22,7 @@ WANTLIB=	GL GLU X11 Xext Xi Xmu c m
 MAKE_ENV=	LIBGLEW_VERSION=${LIBGLEW_VERSION} \
 		LIBGLEWMX_VERSION=${LIBGLEWmx_VERSION} \
 		GLEW_DEST=${PREFIX}
-MAKE_FLAGS=	LD=${CC}
+MAKE_FLAGS=	LD=${CC} STRIP=
 
 USE_GMAKE=	Yes
 
diff --git a/graphics/glew/distinfo b/graphics/glew/distinfo
index 0ef2bf47a0c..1985f2944a9 100644
--- a/graphics/glew/distinfo
+++ b/graphics/glew/distinfo
@@ -1,2 +1,2 @@
-SHA256 (glew-1.9.0.tgz) = mzZTDkFMldZiS+nWgVpb4VMdGYYwCuWQPxaXeriut4c=
-SIZE (glew-1.9.0.tgz) = 544440
+SHA256 (glew-1.10.0.tgz) = mcQTILY/aGCGm1+5r5oYVLFVgnlsZO49/XCW3AyJ8wc=
+SIZE (glew-1.10.0.tgz) = 567605
diff --git a/graphics/glew/files/Makefile.openbsd b/graphics/glew/files/Makefile.openbsd
index 4b99006462a..4a035379fb0 100644
--- a/graphics/glew/files/Makefile.openbsd
+++ b/graphics/glew/files/Makefile.openbsd
@@ -1,7 +1,6 @@
 NAME = $(GLEW_NAME)
 CC ?= cc
 LD ?= cc
-PICFLAG = -fPIC
 LDFLAGS.EXTRA = -L$(X11BASE)/lib
 LDFLAGS.GL = -lm -lXmu -lXi -lGLU -lGL -lXext -lX11
 LDFLAGS.STATIC = -Wl,-Bstatic
@@ -10,11 +9,12 @@ CFLAGS.EXTRA += -I$(X11BASE)/include
 NAME = GLEW
 WARN = -Wall -W
 POPT =
+CFLAGS.EXTRA += -fPIC
 BIN.SUFFIX =
 LIB.SHARED = lib$(NAME).so.$(LIBGLEW_VERSION)
 LIB.STATIC = lib$(NAME).a
-LDFLAGS.SO = -shared $(PICFLAG)
+LDFLAGS.SO = -shared -fPIC
 LIB.SHARED.MX = lib$(NAME)mx.so.$(LIBGLEWMX_VERSION)
 LIB.STATIC.MX = lib$(NAME)mx.a
-LDFLAGS.SO.MX = -shared $(PICFLAG)
+LDFLAGS.SO.MX = -shared -fPIC
 SHARED_OBJ_EXT = pic_o
diff --git a/graphics/glew/patches/patch-Makefile b/graphics/glew/patches/patch-Makefile
index 176d46e5ee9..4cfb6db2f50 100644
--- a/graphics/glew/patches/patch-Makefile
+++ b/graphics/glew/patches/patch-Makefile
@@ -1,7 +1,7 @@
-$OpenBSD: patch-Makefile,v 1.5 2012/08/27 12:40:19 ajacoutot Exp $
---- Makefile.orig	Tue Jul 17 23:46:33 2012
-+++ Makefile	Fri Aug  3 04:37:01 2012
-@@ -72,7 +72,7 @@ else
+$OpenBSD: patch-Makefile,v 1.6 2013/09/11 18:13:23 brad Exp $
+--- Makefile.orig	Mon Jul 22 10:11:22 2013
++++ Makefile	Thu Aug 22 01:39:39 2013
+@@ -71,7 +71,7 @@ else
  OPT = $(POPT)
  endif
  INCLUDE = -Iinclude
@@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile,v 1.5 2012/08/27 12:40:19 ajacoutot Exp $
  
  all debug: glew.lib glew.lib.mx glew.bin
  
-@@ -101,19 +101,9 @@ lib:
+@@ -100,19 +100,9 @@ lib:
  
  lib/$(LIB.STATIC): $(LIB.OBJS)
  	$(AR) cr $@ $^
@@ -30,7 +30,7 @@ $OpenBSD: patch-Makefile,v 1.5 2012/08/27 12:40:19 ajacoutot Exp $
  
  tmp/$(SYSTEM)/default/static/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
  	@mkdir -p $(dir $@)
-@@ -143,13 +133,6 @@ lib/$(LIB.STATIC.MX): $(LIB.OBJS.MX)
+@@ -146,13 +136,6 @@ lib/$(LIB.STATIC.MX): $(LIB.OBJS.MX)
  
  lib/$(LIB.SHARED.MX): $(LIB.SOBJS.MX)
  	$(LD) $(LDFLAGS.SO.MX) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS)
@@ -44,7 +44,7 @@ $OpenBSD: patch-Makefile,v 1.5 2012/08/27 12:40:19 ajacoutot Exp $
  
  tmp/$(SYSTEM)/mx/static/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
  	@mkdir -p $(dir $@)
-@@ -226,17 +209,11 @@ ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
+@@ -239,17 +222,11 @@ ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
  else
  	$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/
  endif
@@ -62,7 +62,7 @@ $OpenBSD: patch-Makefile,v 1.5 2012/08/27 12:40:19 ajacoutot Exp $
  	$(INSTALL) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/
  
  install.lib.mx: glew.lib.mx
-@@ -248,15 +225,9 @@ ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
+@@ -261,15 +238,9 @@ ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
  else
  	$(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) $(LIBDIR)/
  endif
diff --git a/graphics/glew/pkg/PFRAG.shared b/graphics/glew/pkg/PFRAG.shared
deleted file mode 100644
index 8b15781d36c..00000000000
--- a/graphics/glew/pkg/PFRAG.shared
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2011/11/16 22:42:02 pascal Exp $
-@lib lib/libGLEW.so.${LIBGLEW_VERSION}
-@lib lib/libGLEWmx.so.${LIBGLEWmx_VERSION}
diff --git a/graphics/glew/pkg/PLIST b/graphics/glew/pkg/PLIST
index a69e9dd433a..3a411270452 100644
--- a/graphics/glew/pkg/PLIST
+++ b/graphics/glew/pkg/PLIST
@@ -1,5 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2011/11/16 22:42:02 pascal Exp $
-%%SHARED%%
+@comment $OpenBSD: PLIST,v 1.4 2013/09/11 18:13:24 brad Exp $
 @bin bin/glewinfo
 @bin bin/visualinfo
 include/GL/
@@ -7,7 +6,9 @@ include/GL/glew.h
 include/GL/glxew.h
 include/GL/wglew.h
 lib/libGLEW.a
+@lib lib/libGLEW.so.${LIBGLEW_VERSION}
 lib/libGLEWmx.a
+@lib lib/libGLEWmx.so.${LIBGLEWmx_VERSION}
 lib/pkgconfig/
 lib/pkgconfig/glew.pc
 lib/pkgconfig/glewmx.pc