Index: head/graphics/glew/Makefile =================================================================== --- head/graphics/glew/Makefile (revision 538090) +++ head/graphics/glew/Makefile (revision 538091) @@ -1,38 +1,38 @@ # Created by: Igor Pokrovsky # $FreeBSD$ PORTNAME= glew -PORTVERSION= 2.1.0 +PORTVERSION= 2.2.0 PORTREVISION?= 0 CATEGORIES= graphics MASTER_SITES= SF MAINTAINER?= zeising@FreeBSD.org COMMENT= OpenGL Extension Wrangler Library LICENSE= MIT BSD3CLAUSE LICENSE_COMB= dual USES= gmake gl tar:tgz xorg USE_XORG?= x11 xext xi xmu USE_GL?= gl glu USE_LDCONFIG= yes MAKE_ENV= GLEW_DEST=${PREFIX} GLEW_PREFIX=${PREFIX} INSTALL_TARGET?=install.all OPTIONS_DEFINE?=DOCS post-patch: @${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} .for i in css html jpg png ${INSTALL_DATA} ${WRKSRC}/doc/*.${i} ${STAGEDIR}${DOCSDIR} .endfor .include Index: head/graphics/glew/distinfo =================================================================== --- head/graphics/glew/distinfo (revision 538090) +++ head/graphics/glew/distinfo (revision 538091) @@ -1,3 +1,3 @@ -TIMESTAMP = 1509375302 -SHA256 (glew-2.1.0.tgz) = 04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95 -SIZE (glew-2.1.0.tgz) = 764073 +TIMESTAMP = 1584273239 +SHA256 (glew-2.2.0.tgz) = d4fc82893cfb00109578d0a1a2337fb8ca335b3ceccf97b97e5cc7f08e4353e1 +SIZE (glew-2.2.0.tgz) = 835861 Index: head/graphics/glew/files/patch-Makefile =================================================================== --- head/graphics/glew/files/patch-Makefile (revision 538090) +++ head/graphics/glew/files/patch-Makefile (revision 538091) @@ -1,72 +1,74 @@ ---- Makefile.orig 2017-10-30 16:24:12 UTC +--- Makefile.orig 2020-03-15 11:53:59 UTC +++ Makefile -@@ -115,7 +115,7 @@ else ifneq ($(LIBTOOL),) +@@ -116,7 +116,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) + $(LIB.SHARED.DIR)/$(LIB.SHARED): $(LIB.SOBJS) +@@ -126,8 +126,9 @@ ifneq ($(LN),) + $(LN) $(LIB.SHARED) $(LIB.SHARED.DIR)/$(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 +@@ -143,15 +144,15 @@ 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|@libgl@|$(LDFLAGS.GL)|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|@libgl@|$(LDFLAGS.GL)|g' \ + -e 's|@requireslib@|$(LIBGLU)|g' \ < $< > $@ # GLEW utility programs -@@ -180,22 +181,22 @@ bin: - bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.OBJ) lib/$(LIB.SHARED) +@@ -182,22 +183,22 @@ bin: + bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.OBJ) $(LIB.SHARED.DIR)/$(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) + bin/$(VISUALINFO.BIN): $(VISUALINFO.BIN.OBJ) $(LIB.SHARED.DIR)/$(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 Index: head/graphics/glew/files/patch-config__Makefile.freebsd =================================================================== --- head/graphics/glew/files/patch-config__Makefile.freebsd (revision 538090) +++ head/graphics/glew/files/patch-config__Makefile.freebsd (revision 538091) @@ -1,26 +1,28 @@ ---- config/Makefile.freebsd.orig 2017-07-31 11:25:39 UTC +--- config/Makefile.freebsd.orig 2020-03-15 11:53:59 UTC +++ config/Makefile.freebsd -@@ -1,17 +1,17 @@ +@@ -1,19 +1,19 @@ + # As of FreeBSD12 X11 is in /usr/local + NAME = $(GLEW_NAME) -CC = cc -LD = ld --LDFLAGS.EXTRA = -L/usr/X11R6/lib +-LDFLAGS.EXTRA = -L/usr/local/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 -fPIC +-CFLAGS.EXTRA += -I/usr/local/include -fPIC +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) Index: head/graphics/glew/pkg-plist =================================================================== --- head/graphics/glew/pkg-plist (revision 538090) +++ head/graphics/glew/pkg-plist (revision 538091) @@ -1,26 +1,26 @@ 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.2 -lib/libGLEW.so.2.1.0 +lib/libGLEW.so.2.2.0 libdata/pkgconfig/glew.pc %%PORTDOCS%%%%DOCSDIR%%/advanced.html %%PORTDOCS%%%%DOCSDIR%%/basic.html %%PORTDOCS%%%%DOCSDIR%%/build.html %%PORTDOCS%%%%DOCSDIR%%/credits.html %%PORTDOCS%%%%DOCSDIR%%/github.png %%PORTDOCS%%%%DOCSDIR%%/glew.css %%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%%/travis.png %%PORTDOCS%%%%DOCSDIR%%/wglew.html Index: head/graphics/glew-wayland/Makefile =================================================================== --- head/graphics/glew-wayland/Makefile (revision 538090) +++ head/graphics/glew-wayland/Makefile (revision 538091) @@ -1,42 +1,42 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= -wayland # https://github.com/nigels-com/glew/issues/172 MAINTAINER= jbeich@FreeBSD.org MASTERDIR= ${.CURDIR}/../glew PLIST= ${.CURDIR}/pkg-plist PKGMESSAGE= ${.CURDIR}/pkg-message USE_GL= gl egl USE_XORG= # empty MAKE_ARGS= NAME=${PORTNAME:tu}${PKGNAMESUFFIX} INSTALL_TARGET= install.lib OPTIONS_DEFINE= # empty post-patch: slave-post-patch slave-post-patch: @${REINPLACE_CMD} 's/Makefile.$$(SYSTEM)/&-egl/' ${WRKSRC}/Makefile @${SED} 's/linux/${OPSYS:tl}/' ${WRKSRC}/config/Makefile.linux-egl \ >${WRKSRC}/config/Makefile.${OPSYS:tl}-egl @${REINPLACE_CMD} -e '/^Requires:/d' \ -e '/^Name:/s/${PORTNAME}/${PKGBASE}/' \ ${WRKSRC}/${PORTNAME}.pc.in # GCC 4.2 doesn't support redefining same typedef @${REINPLACE_CMD} '/typedef.*EGLint;/d' ${WRKSRC}/include/GL/eglew.h post-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/glewinfo \ ${STAGEDIR}${PREFIX}/bin/glewinfo${PKGNAMESUFFIX} ${INSTALL_PROGRAM} ${WRKSRC}/bin/visualinfo \ ${STAGEDIR}${PREFIX}/bin/visualinfo${PKGNAMESUFFIX} ${MKDIR} ${STAGEDIR}${PREFIX}/include/GL ${INSTALL_DATA} ${WRKSRC}/include/GL/eglew.h \ ${STAGEDIR}${PREFIX}/include/GL ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/${PKGBASE}.pc .include "${MASTERDIR}/Makefile" Index: head/graphics/glew-wayland/pkg-plist =================================================================== --- head/graphics/glew-wayland/pkg-plist (revision 538090) +++ head/graphics/glew-wayland/pkg-plist (revision 538091) @@ -1,8 +1,8 @@ bin/glewinfo-wayland bin/visualinfo-wayland include/GL/eglew.h lib/libGLEW-wayland.a lib/libGLEW-wayland.so lib/libGLEW-wayland.so.2 -lib/libGLEW-wayland.so.2.1.0 +lib/libGLEW-wayland.so.2.2.0 libdata/pkgconfig/glew-wayland.pc