5 files changed, 46 insertions, 37 deletions

diff --git a/graphics/glew/Makefile b/graphics/glew/Makefile
index 100b604a4ff8..d2b85878fd73 100644
--- a/graphics/glew/Makefile
+++ b/graphics/glew/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	glew
-PORTVERSION=	1.2.5
+PORTVERSION=	1.3.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,25 +20,22 @@ USE_X_PREFIX=	yes
 USE_GL=		yes
 INSTALLS_SHLIB=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
-MAKE_ENV=	CC=${CC}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/glewinfo ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/visualinfo ${PREFIX}/bin
 
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/libGLEW.so.${PORTVERSION} \
 		${PREFIX}/lib/libGLEW.so.1
 	@${LN} -sf ${PREFIX}/lib/libGLEW.so.1 ${PREFIX}/lib/libGLEW.so
 	${INSTALL_DATA} ${WRKSRC}/lib/libGLEW.a ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/include/GL/*.h ${PREFIX}/include/GL
 
-.for i in glew glxew
-	${INSTALL_DATA} ${WRKSRC}/include/GL/${i}.h ${PREFIX}/include/GL
-.endfor
-
-.if !defined(NOPORTDOCS)
+.ifndef (NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/glew.css ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/glew.png ${DOCSDIR}
+.for i in css html jpg png
+	${INSTALL_DATA} ${WRKSRC}/doc/*.${i} ${DOCSDIR}
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/glew/distinfo b/graphics/glew/distinfo
index d440f84139fb..2a89dc522fad 100644
--- a/graphics/glew/distinfo
+++ b/graphics/glew/distinfo
@@ -1,2 +1,2 @@
-MD5 (glew-1.2.5-src.tgz) = fcbefbe1ce0c6b0c9f6bd56aafe23927
-SIZE (glew-1.2.5-src.tgz) = 286866
+MD5 (glew-1.3.1-src.tgz) = ff65976bd9345624c612b4d1c31fdcec
+SIZE (glew-1.3.1-src.tgz) = 330648
diff --git a/graphics/glew/files/patch-Makefile b/graphics/glew/files/patch-Makefile
index b0c832533afd..d05780aa1bbd 100644
--- a/graphics/glew/files/patch-Makefile
+++ b/graphics/glew/files/patch-Makefile
@@ -3,29 +3,7 @@ $FreeBSD$
 
 --- Makefile.orig
 +++ Makefile
-@@ -121,17 +121,17 @@
- # ----------------------------------------------------------------------------
- ifeq ($(patsubst FreeBSD%,FreeBSD,$(SYSTEM)), FreeBSD)
- NAME = GLEW
--CC = cc
--LD = ld
-+CC ?= cc
-+LD ?= ld
- ifneq (undefined, $(origin GLEW_MX))
- CFLAGS.EXTRA = -DGLEW_MX
- endif
- LDFLAGS.SO = -shared -soname $(LIB.SONAME)
--LDFLAGS.EXTRA = -L/usr/X11R6/lib
-+LDFLAGS.EXTRA = -L${X11BASE}/lib
- LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11
- LDFLAGS.STATIC = -Wl,-Bstatic
- LDFLAGS.DYNAMIC = -Wl,-Bdynamic
--CFLAGS.EXTRA += -I/usr/X11R6/include
-+CFLAGS.EXTRA += -I${X11BASE}/include -fPIC
- NAME = GLEW
- WARN = -Wall -W
- POPT = -O2
-@@ -245,7 +245,7 @@
+@@ -61,7 +61,7 @@
  STRIP = -s
  endif
  INCLUDE = -Iinclude
diff --git a/graphics/glew/files/patch-config_Makefile.freebsd b/graphics/glew/files/patch-config_Makefile.freebsd
new file mode 100644
index 000000000000..5192b66b8bc0
--- /dev/null
+++ b/graphics/glew/files/patch-config_Makefile.freebsd
@@ -0,0 +1,25 @@
+
+$FreeBSD$
+
+--- config/Makefile.freebsd.orig
++++ config/Makefile.freebsd
+@@ -1,15 +1,15 @@
+ NAME = $(GLEW_NAME)
+-CC = cc
+-LD = ld
++CC ?= cc
++LD ?= ld
+ ifneq (undefined, $(origin GLEW_MX))
+ CFLAGS.EXTRA = -DGLEW_MX
+ endif
+ LDFLAGS.SO = -shared -soname $(LIB.SONAME)
+-LDFLAGS.EXTRA = -L/usr/X11R6/lib
++LDFLAGS.EXTRA = -L${X11BASE}/lib
+ LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11
+ LDFLAGS.STATIC = -Wl,-Bstatic
+ LDFLAGS.DYNAMIC = -Wl,-Bdynamic
+-CFLAGS.EXTRA += -I/usr/X11R6/include
++CFLAGS.EXTRA += -I${X11BASE}/include -fPIC
+ NAME = GLEW
+ WARN = -Wall -W
+ POPT = -O2
diff --git a/graphics/glew/pkg-plist b/graphics/glew/pkg-plist
index ba5ffe06121e..e4fc2863309b 100644
--- a/graphics/glew/pkg-plist
+++ b/graphics/glew/pkg-plist
@@ -1,13 +1,22 @@
 bin/glewinfo
+bin/visualinfo
 include/GL/glew.h
 include/GL/glxew.h
+include/GL/wglew.h
 lib/libGLEW.a
 lib/libGLEW.so
 lib/libGLEW.so.1
+%%PORTDOCS%%%%DOCSDIR%%/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/basic.html
+%%PORTDOCS%%%%DOCSDIR%%/credits.html
 %%PORTDOCS%%%%DOCSDIR%%/glew.css
-%%PORTDOCS%%%%DOCSDIR%%/README.html
 %%PORTDOCS%%%%DOCSDIR%%/glew.html
+%%PORTDOCS%%%%DOCSDIR%%/glew.png
 %%PORTDOCS%%%%DOCSDIR%%/glxew.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/install.html
+%%PORTDOCS%%%%DOCSDIR%%/log.html
+%%PORTDOCS%%%%DOCSDIR%%/new.png
+%%PORTDOCS%%%%DOCSDIR%%/ogl_sm.jpg
 %%PORTDOCS%%%%DOCSDIR%%/wglew.html
-%%PORTDOCS%%%%DOCSDIR%%/glew.png
 %%PORTDOCS%%@dirrm %%DOCSDIR%%