4 files changed, 12 insertions, 73 deletions
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