git: b7c05a1a7954 - main - graphics/glew{,-wayland}: Update to 2.3.1

The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b7c05a1a795472d9f17847090bfe4cf14a4b2dab

commit b7c05a1a795472d9f17847090bfe4cf14a4b2dab
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2026-07-13 17:02:14 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2026-07-24 18:49:38 +0000

    graphics/glew{,-wayland}: Update to 2.3.1
    
    Approved by:    jbeich
    Pull Request:   https://github.com/freebsd/freebsd-ports/pull/565
---
 graphics/glew-wayland/Makefile     |  2 +-
 graphics/glew-wayland/pkg-plist    |  2 +-
 graphics/glew/Makefile             |  9 ++-------
 graphics/glew/distinfo             | 10 +++-------
 graphics/glew/files/patch-Makefile | 24 +++++++-----------------
 graphics/glew/pkg-plist            |  5 +++--
 6 files changed, 17 insertions(+), 35 deletions(-)

diff --git a/graphics/glew-wayland/Makefile b/graphics/glew-wayland/Makefile
index 67821b95362e..6ba5b4fd0b5e 100644
--- a/graphics/glew-wayland/Makefile
+++ b/graphics/glew-wayland/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	3
+PORTREVISION=	0
 PKGNAMESUFFIX=	-wayland
 
 # https://github.com/nigels-com/glew/issues/172
diff --git a/graphics/glew-wayland/pkg-plist b/graphics/glew-wayland/pkg-plist
index a77a3b8c0afb..923b02f68b2b 100644
--- a/graphics/glew-wayland/pkg-plist
+++ b/graphics/glew-wayland/pkg-plist
@@ -4,5 +4,5 @@ include/GL/eglew.h
 lib/libGLEW-wayland.a
 lib/libGLEW-wayland.so
 lib/libGLEW-wayland.so.2
-lib/libGLEW-wayland.so.2.2.0
+lib/libGLEW-wayland.so.2.3.1
 libdata/pkgconfig/glew-wayland.pc
diff --git a/graphics/glew/Makefile b/graphics/glew/Makefile
index 01288b358686..d0e7b1a9c880 100644
--- a/graphics/glew/Makefile
+++ b/graphics/glew/Makefile
@@ -1,14 +1,9 @@
 PORTNAME=	glew
-PORTVERSION=	2.2.0
-PORTREVISION?=	3
+PORTVERSION=	2.3.1
+PORTREVISION?=	0
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
-# Keep glew-wayland patches here to avoid version desync in distinfo
-PATCH_SITES=	https://github.com/nigels-com/${PORTNAME}/commit/
-PATCHFILES+=	8e2e31e69bb6.patch:-p1 # https://github.com/nigels-com/glew/pull/329
-PATCHFILES+=	062067f2bad8.patch:-p1 # https://github.com/nigels-com/glew/pull/330
-
 MAINTAINER?=	x11@FreeBSD.org
 COMMENT=	OpenGL Extension Wrangler Library
 WWW=		https://glew.sourceforge.net/
diff --git a/graphics/glew/distinfo b/graphics/glew/distinfo
index 0f61f19a10a9..8d900c7bb48a 100644
--- a/graphics/glew/distinfo
+++ b/graphics/glew/distinfo
@@ -1,7 +1,3 @@
-TIMESTAMP = 1584273239
-SHA256 (glew-2.2.0.tgz) = d4fc82893cfb00109578d0a1a2337fb8ca335b3ceccf97b97e5cc7f08e4353e1
-SIZE (glew-2.2.0.tgz) = 835861
-SHA256 (8e2e31e69bb6.patch) = 27bfa5fd5047603d179ef0fe46601eb10fb3fb522b9736a5f10fc33ea9b5ec04
-SIZE (8e2e31e69bb6.patch) = 668
-SHA256 (062067f2bad8.patch) = 7dc10ff7464e1bcef7bf82c3f3e09f16317ec6b0f3936c1a3079dc1efcd68190
-SIZE (062067f2bad8.patch) = 607
+TIMESTAMP = 1783945884
+SHA256 (glew-2.3.1.tgz) = b64790f94b926acd7e8f84c5d6000a86cb43967bd1e688b03089079799c9e889
+SIZE (glew-2.3.1.tgz) = 866060
diff --git a/graphics/glew/files/patch-Makefile b/graphics/glew/files/patch-Makefile
index 0c1bb95f8167..53a7bfec4e22 100644
--- a/graphics/glew/files/patch-Makefile
+++ b/graphics/glew/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2020-03-15 11:53:59 UTC
+--- Makefile.orig	2026-01-23 23:00:13 UTC
 +++ Makefile
-@@ -116,7 +116,7 @@ else ifneq ($(LIBTOOL),)
+@@ -116,7 +116,7 @@ ifneq ($(STRIP),)
  	$(LIBTOOL) $@ $^
  endif
  ifneq ($(STRIP),)
@@ -9,7 +9,7 @@
  endif
  
  $(LIB.SHARED.DIR)/$(LIB.SHARED): $(LIB.SOBJS)
-@@ -126,8 +126,9 @@ ifneq ($(LN),)
+@@ -126,8 +126,9 @@ ifneq ($(STRIP),)
  	$(LN) $(LIB.SHARED) $(LIB.SHARED.DIR)/$(LIB.DEVLNK)
  endif
  ifneq ($(STRIP),)
@@ -20,7 +20,7 @@
  
  tmp/$(SYSTEM)/default/static/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
  	@mkdir -p $(dir $@)
-@@ -143,15 +144,15 @@ tmp/$(SYSTEM)/default/shared/glew.o: src/glew.c includ
+@@ -143,15 +144,15 @@ glew.pc: glew.pc.in
  
  glew.pc: glew.pc.in
  	sed \
@@ -45,8 +45,8 @@
  		< $< > $@
  
  # GLEW utility programs
-@@ -182,22 +183,22 @@ bin:
- bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.OBJ) $(LIB.SHARED.DIR)/$(LIB.SHARED)
+@@ -180,14 +181,14 @@ ifneq ($(STRIP),)
+ 	@mkdir -p $(dir $@)
  	$(CC) $(CFLAGS) -o $@ $(GLEWINFO.BIN.OBJ) $(BIN.LIBS)
  ifneq ($(STRIP),)
 -	$(STRIP) -x $@
@@ -54,6 +54,7 @@
  endif
  
  bin/$(VISUALINFO.BIN): $(VISUALINFO.BIN.OBJ) $(LIB.SHARED.DIR)/$(LIB.SHARED)
+ 	@mkdir -p $(dir $@)
  	$(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.OBJ) $(BIN.LIBS)
  ifneq ($(STRIP),)
 -	$(STRIP) -x $@
@@ -61,14 +62,3 @@
  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/pkg-plist b/graphics/glew/pkg-plist
index 4bb9319a5135..17ec29bbaa90 100644
--- a/graphics/glew/pkg-plist
+++ b/graphics/glew/pkg-plist
@@ -1,17 +1,19 @@
 bin/glewinfo
 bin/visualinfo
+@comment include/GL/eglew.h
 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.2.0
+lib/libGLEW.so.2.3.1
 libdata/pkgconfig/glew.pc
 %%PORTDOCS%%%%DOCSDIR%%/advanced.html
 %%PORTDOCS%%%%DOCSDIR%%/basic.html
 %%PORTDOCS%%%%DOCSDIR%%/build.html
 %%PORTDOCS%%%%DOCSDIR%%/credits.html
+@comment %%PORTDOCS%%%%DOCSDIR%%/eglew.html
 %%PORTDOCS%%%%DOCSDIR%%/github.png
 %%PORTDOCS%%%%DOCSDIR%%/glew.css
 %%PORTDOCS%%%%DOCSDIR%%/glew.html
@@ -22,5 +24,4 @@ libdata/pkgconfig/glew.pc
 %%PORTDOCS%%%%DOCSDIR%%/log.html
 %%PORTDOCS%%%%DOCSDIR%%/new.png
 %%PORTDOCS%%%%DOCSDIR%%/ogl_sm.jpg
-%%PORTDOCS%%%%DOCSDIR%%/travis.png
 %%PORTDOCS%%%%DOCSDIR%%/wglew.html