diff options
| -rw-r--r-- | graphics/glew/Makefile | 30 | ||||
| -rw-r--r-- | graphics/glew/distinfo | 5 | ||||
| -rw-r--r-- | graphics/glew/files/patch-Makefile | 72 | ||||
| -rw-r--r-- | graphics/glew/files/patch-config__Makefile.freebsd | 11 | ||||
| -rw-r--r-- | graphics/glew/pkg-plist | 8 |
5 files changed, 88 insertions, 38 deletions
diff --git a/graphics/glew/Makefile b/graphics/glew/Makefile index 2cf2e7b00688..bca418df7474 100644 --- a/graphics/glew/Makefile +++ b/graphics/glew/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= glew -PORTVERSION= 1.13.0 -PORTREVISION= 1 +PORTVERSION= 2.1.0 CATEGORIES= graphics MASTER_SITES= SF @@ -15,32 +14,19 @@ LICENSE_COMB= dual USES= gmake tar:tgz USE_XORG= x11 xext xi xmu -USE_GL= yes +USE_GL= gl glu USE_LDCONFIG= yes -MAKE_ENV= GLEW_DEST=${PREFIX} +MAKE_ENV= GLEW_DEST=${PREFIX} GLEW_PREFIX=${PREFIX} +INSTALL_TARGET= install.all OPTIONS_DEFINE= DOCS 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 - - ${INSTALL_PROGRAM} ${WRKSRC}/lib/libGLEW.so.${PORTVERSION} \ - ${STAGEDIR}${PREFIX}/lib/libGLEW.so.1 - ${INSTALL_PROGRAM} ${WRKSRC}/lib/libGLEWmx.so.${PORTVERSION} \ - ${STAGEDIR}${PREFIX}/lib/libGLEWmx.so.1 - ${LN} -sf libGLEW.so.1 ${STAGEDIR}${PREFIX}/lib/libGLEW.so - ${LN} -sf libGLEWmx.so.1 ${STAGEDIR}${PREFIX}/lib/libGLEWmx.so - ${INSTALL_DATA} ${WRKSRC}/lib/libGLEW.a ${STAGEDIR}${PREFIX}/lib - ${INSTALL_DATA} ${WRKSRC}/lib/libGLEWmx.a ${STAGEDIR}${PREFIX}/lib - @${MKDIR} ${STAGEDIR}${PREFIX}/include/GL - ${INSTALL_DATA} ${WRKSRC}/include/GL/*.h ${STAGEDIR}${PREFIX}/include/GL - ${INSTALL_DATA} ${WRKSRC}/glew.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig - ${INSTALL_DATA} ${WRKSRC}/glewmx.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig + @${REINPLACE_CMD} -e 's|CFLAGS =|CFLAGS +=|' \ + -e 's|^LIBDIR|GLEW_LIBDIR|' \ + -e 's|$$(LIBDIR)|$$(GLEW_LIBDIR)|' \ + ${WRKSRC}/Makefile do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/graphics/glew/distinfo b/graphics/glew/distinfo index af9472422d98..b9a495b1bd19 100644 --- a/graphics/glew/distinfo +++ b/graphics/glew/distinfo @@ -1,2 +1,3 @@ -SHA256 (glew-1.13.0.tgz) = aa25dc48ed84b0b64b8d41cdd42c8f40f149c37fa2ffa39cd97f42c78d128bc7 -SIZE (glew-1.13.0.tgz) = 616070 +TIMESTAMP = 1509375302 +SHA256 (glew-2.1.0.tgz) = 04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95 +SIZE (glew-2.1.0.tgz) = 764073 diff --git a/graphics/glew/files/patch-Makefile b/graphics/glew/files/patch-Makefile new file mode 100644 index 000000000000..419670dd889f --- /dev/null +++ b/graphics/glew/files/patch-Makefile @@ -0,0 +1,72 @@ +--- Makefile.orig 2017-10-30 16:24:12 UTC ++++ Makefile +@@ -115,7 +115,7 @@ else ifneq ($(LIBTOOL),) + $(LIBTOOL) $@ $^ + endif + ifneq ($(STRIP),) +- $(STRIP) -x $@ ++ $(STRIP) $@ + endif + + lib/$(LIB.SHARED): $(LIB.SOBJS) +@@ -125,8 +125,9 @@ ifneq ($(LN),) + $(LN) $(LIB.SHARED) lib/$(LIB.DEVLNK) + endif + ifneq ($(STRIP),) +- $(STRIP) -x $@ ++ $(STRIP) $@ + endif ++ /usr/bin/file $@ + + tmp/$(SYSTEM)/default/static/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h + @mkdir -p $(dir $@) +@@ -142,14 +143,14 @@ tmp/$(SYSTEM)/default/shared/glew.o: src/glew.c includ + + glew.pc: glew.pc.in + sed \ +- -e "s|@prefix@|$(GLEW_PREFIX)|g" \ +- -e "s|@libdir@|$(LIBDIR)|g" \ +- -e "s|@exec_prefix@|$(BINDIR)|g" \ +- -e "s|@includedir@|$(INCDIR)|g" \ +- -e "s|@version@|$(GLEW_VERSION)|g" \ +- -e "s|@cflags@||g" \ +- -e "s|@libname@|$(NAME)|g" \ +- -e "s|@requireslib@|$(LIBGLU)|g" \ ++ -e 's|@prefix@|$(GLEW_PREFIX)|g' \ ++ -e 's|@libdir@|$${prefix}/lib|g' \ ++ -e 's|@exec_prefix@|$${prefix}/bin|g' \ ++ -e 's|@includedir@|$${prefix}/include|g' \ ++ -e 's|@version@|$(GLEW_VERSION)|g' \ ++ -e 's|@cflags@||g' \ ++ -e 's|@libname@|$(NAME)|g' \ ++ -e 's|@requireslib@|$(LIBGLU)|g' \ + < $< > $@ + + # GLEW utility programs +@@ -180,22 +181,22 @@ bin: + bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.OBJ) lib/$(LIB.SHARED) + $(CC) $(CFLAGS) -o $@ $(GLEWINFO.BIN.OBJ) $(BIN.LIBS) + ifneq ($(STRIP),) +- $(STRIP) -x $@ ++ $(STRIP) $@ + endif + + bin/$(VISUALINFO.BIN): $(VISUALINFO.BIN.OBJ) lib/$(LIB.SHARED) + $(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.OBJ) $(BIN.LIBS) + ifneq ($(STRIP),) +- $(STRIP) -x $@ ++ $(STRIP) $@ + endif + + $(GLEWINFO.BIN.OBJ): $(GLEWINFO.BIN.SRC) include/GL/glew.h include/GL/wglew.h include/GL/glxew.h + @mkdir -p $(dir $@) +- $(CC) -DGLEW_NO_GLU $(CFLAGS) $(CFLAGS.SO) -o $@ -c $< ++ $(CC) -DGLEW_NO_GLU $(CFLAGS) -o $@ -c $< + + $(VISUALINFO.BIN.OBJ): $(VISUALINFO.BIN.SRC) include/GL/glew.h include/GL/wglew.h include/GL/glxew.h + @mkdir -p $(dir $@) +- $(CC) -DGLEW_NO_GLU $(CFLAGS) $(CFLAGS.SO) -o $@ -c $< ++ $(CC) -DGLEW_NO_GLU $(CFLAGS) -o $@ -c $< + + # Install targets + diff --git a/graphics/glew/files/patch-config__Makefile.freebsd b/graphics/glew/files/patch-config__Makefile.freebsd index d11b08dd0dc9..b36a7e3819e2 100644 --- a/graphics/glew/files/patch-config__Makefile.freebsd +++ b/graphics/glew/files/patch-config__Makefile.freebsd @@ -1,6 +1,6 @@ ---- config/Makefile.freebsd.orig 2015-02-08 09:24:57 UTC +--- config/Makefile.freebsd.orig 2017-07-31 11:25:39 UTC +++ config/Makefile.freebsd -@@ -1,22 +1,22 @@ +@@ -1,17 +1,17 @@ NAME = $(GLEW_NAME) -CC = cc -LD = ld @@ -24,10 +24,3 @@ +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/pkg-plist b/graphics/glew/pkg-plist index a0e5b508bfd9..4c9e3f7d8a95 100644 --- a/graphics/glew/pkg-plist +++ b/graphics/glew/pkg-plist @@ -4,13 +4,10 @@ include/GL/glew.h include/GL/glxew.h include/GL/wglew.h lib/libGLEW.a -lib/libGLEWmx.a -lib/libGLEWmx.so lib/libGLEW.so -lib/libGLEWmx.so.1 -lib/libGLEW.so.1 +lib/libGLEW.so.2 +lib/libGLEW.so.2.1.0 libdata/pkgconfig/glew.pc -libdata/pkgconfig/glewmx.pc %%PORTDOCS%%%%DOCSDIR%%/advanced.html %%PORTDOCS%%%%DOCSDIR%%/basic.html %%PORTDOCS%%%%DOCSDIR%%/build.html @@ -25,4 +22,5 @@ libdata/pkgconfig/glewmx.pc %%PORTDOCS%%%%DOCSDIR%%/log.html %%PORTDOCS%%%%DOCSDIR%%/new.png %%PORTDOCS%%%%DOCSDIR%%/ogl_sm.jpg +%%PORTDOCS%%%%DOCSDIR%%/travis.png %%PORTDOCS%%%%DOCSDIR%%/wglew.html |