5 files changed, 26 insertions, 58 deletions

diff --git a/graphics/glew/Makefile b/graphics/glew/Makefile
index 641e6dc4d921..9aca589eaf77 100644
--- a/graphics/glew/Makefile
+++ b/graphics/glew/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	glew
-PORTVERSION=	1.10.0
-PORTREVISION=	1
+PORTVERSION=	1.11.0
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -18,10 +17,15 @@ USE_XORG=	x11 xext xi xmu
 USE_GL=		yes
 USE_LDCONFIG=	yes
 
+MAKE_ENV+=	GLEW_DEST=${PREFIX}
+
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|CFLAGS =|CFLAGS +=|' ${WRKSRC}/Makefile
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/glewinfo ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/visualinfo ${STAGEDIR}${PREFIX}/bin
diff --git a/graphics/glew/distinfo b/graphics/glew/distinfo
index ff6a9b70ad53..4ce879cd4ddc 100644
--- a/graphics/glew/distinfo
+++ b/graphics/glew/distinfo
@@ -1,2 +1,2 @@
-SHA256 (glew-1.10.0.tgz) = 99c41320b63f6860869b5fb9af9a1854b15582796c64ee3dfd7096dc0c89f307
-SIZE (glew-1.10.0.tgz) = 567605
+SHA256 (glew-1.11.0.tgz) = 69bbce306ac281c4fa806a7a7d02c0596281a2d8f9d70690e98126f23ba513d6
+SIZE (glew-1.11.0.tgz) = 601430
diff --git a/graphics/glew/files/patch-Makefile b/graphics/glew/files/patch-Makefile
deleted file mode 100644
index 5630144d9420..000000000000
--- a/graphics/glew/files/patch-Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.orig	2013-07-22 16:11:22.000000000 +0200
-+++ Makefile	2013-10-03 21:24:28.000000000 +0200
-@@ -40,7 +40,7 @@
- $(error "Platform '$(SYSTEM)' not supported")
- endif
- 
--GLEW_DEST ?= /usr
-+GLEW_DEST ?= $(PREFIX)
- BINDIR    ?= $(GLEW_DEST)/bin
- LIBDIR    ?= $(GLEW_DEST)/lib
- INCDIR    ?= $(GLEW_DEST)/include/GL
-@@ -71,7 +71,7 @@
- OPT = $(POPT)
- endif
- INCLUDE = -Iinclude
--CFLAGS = $(OPT) $(WARN) $(INCLUDE) $(CFLAGS.EXTRA)
-+CFLAGS += $(OPT) $(WARN) $(INCLUDE) $(CFLAGS.EXTRA)
- 
- all debug: glew.lib glew.lib.mx glew.bin
- 
diff --git a/graphics/glew/files/patch-config_Makefile.freebsd b/graphics/glew/files/patch-config_Makefile.freebsd
deleted file mode 100644
index c48a4c3be498..000000000000
--- a/graphics/glew/files/patch-config_Makefile.freebsd
+++ /dev/null
@@ -1,34 +0,0 @@
-$FreeBSD$
---- config/Makefile.freebsd.orig	2012-10-04 19:47:46.000000000 +0200
-+++ config/Makefile.freebsd	2012-10-04 19:49:06.000000000 +0200
-@@ -1,22 +1,22 @@
- NAME = $(GLEW_NAME)
--CC = cc
--LD = ld
--LDFLAGS.EXTRA = -L/usr/X11R6/lib
-+CC ?= cc
-+LD ?= ld
-+LDFLAGS.EXTRA = -L${LOCALBASE}/lib
- LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11
- LDFLAGS.STATIC = -Wl,-Bstatic
- LDFLAGS.DYNAMIC = -Wl,-Bdynamic
--CFLAGS.EXTRA += -I/usr/X11R6/include
-+CFLAGS.EXTRA += -I${LOCALBASE}/include -fPIC
- NAME = GLEW
- WARN = -Wall -W
- POPT = -O2
- BIN.SUFFIX =
--LIB.SONAME    = lib$(NAME).so.$(SO_MAJOR)
-+LIB.SONAME    = lib$(NAME).so.$(GLEW_MAJOR)
- LIB.DEVLNK    = lib$(NAME).so
--LIB.SHARED    = lib$(NAME).so.$(SO_VERSION)
-+LIB.SHARED    = lib$(NAME).so.$(GLEW_VERSION)
- LIB.STATIC    = lib$(NAME).a
- LDFLAGS.SO    = -shared -soname $(LIB.SONAME)
--LIB.SONAME.MX = lib$(NAME)mx.so.$(SO_MAJOR)
-+LIB.SONAME.MX = lib$(NAME)mx.so.$(GLEW_MAJOR)
- LIB.DEVLNK.MX = lib$(NAME)mx.so
--LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION)
-+LIB.SHARED.MX = lib$(NAME)mx.so.$(GLEW_VERSION)
- LIB.STATIC.MX = lib$(NAME)mx.a
- LDFLAGS.SO.MX = -shared -soname $(LIB.SONAME.MX)
diff --git a/graphics/glew/files/patch-config__Makefile.freebsd b/graphics/glew/files/patch-config__Makefile.freebsd
new file mode 100644
index 000000000000..5ce68f1d6002
--- /dev/null
+++ b/graphics/glew/files/patch-config__Makefile.freebsd
@@ -0,0 +1,18 @@
+--- ./config/Makefile.freebsd.orig	2014-08-16 08:35:01.000000000 +0200
++++ ./config/Makefile.freebsd	2014-08-16 08:36:37.000000000 +0200
+@@ -1,11 +1,11 @@
+ NAME = $(GLEW_NAME)
+-CC = cc
+-LD = ld
+-LDFLAGS.EXTRA = -L/usr/X11R6/lib
++CC ?= cc
++LD ?= ld
++LDFLAGS.EXTRA ?= -L${LOCALBASE}/lib
+ LDFLAGS.GL = -lGL -lX11
+ LDFLAGS.STATIC = -Wl,-Bstatic
+ LDFLAGS.DYNAMIC = -Wl,-Bdynamic
+-CFLAGS.EXTRA += -I/usr/X11R6/include
++CFLAGS.EXTRA += -I${LOCALBASE}/include -fPIC
+ NAME = GLEW
+ WARN = -Wall -W
+ POPT = -O2