Switch packages using GLUT to FreeGLUT.

Start building FreeGLUT with GLUT compatibility on.

- GLUT's maintainance state is much worse than FreeGLUT's, with no
  substanital commits since 2011.
- GLUT can no longer be consider a core component of Mesa or X11.
- Nobody except us seems to be using it...

Other vendors still shipping GLUT:
- GoboLinux, T2 SDE, PLD Linux

Revbump packages using GLUT or freeglut by default.

31 files changed, 80 insertions, 100 deletions

diff --git a/biology/azara/Makefile b/biology/azara/Makefile
index edb4cd44654..2c91e8867c8 100644
--- a/biology/azara/Makefile
+++ b/biology/azara/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2017/08/01 17:40:08 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/08/30 17:01:32 nia Exp $
 #
 
 DISTNAME=		azara-2.7-src
 PKGNAME=		azara-2.7
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		biology
 MASTER_SITES=		http://www.ccpn.ac.uk/download/azara/
 
@@ -30,7 +30,7 @@ do-install:
 	${INSTALL_PROGRAM} ${PROGFILES} ${DESTDIR}${PREFIX}/bin
 
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/freeglut/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
diff --git a/biology/py-mol/Makefile b/biology/py-mol/Makefile
index 6a7e6a12b4f..4195de8322c 100644
--- a/biology/py-mol/Makefile
+++ b/biology/py-mol/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2019/05/29 19:52:48 adam Exp $
+# $NetBSD: Makefile,v 1.33 2019/08/30 17:01:32 nia Exp $
 
 DISTNAME=	pymol-v1.5.0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/pymol-v/mol-/}
 EGG_NAME=	pymol-1.5.0.1
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	biology
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pymol/}
 EXTRACT_SUFX=	.tar.bz2
@@ -43,7 +43,7 @@ post-install:
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glew/buildlink3.mk"
-.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/freeglut/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/versioned_dependencies.mk"
diff --git a/devel/bullet/Makefile b/devel/bullet/Makefile
index 89cab5fc704..d7ed0043f33 100644
--- a/devel/bullet/Makefile
+++ b/devel/bullet/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2019/08/09 16:00:22 nia Exp $
+# $NetBSD: Makefile,v 1.12 2019/08/30 17:01:32 nia Exp $
 
 DISTNAME=	bullet-2.88
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=bulletphysics/}
 GITHUB_PROJECT=	bullet3
@@ -27,5 +28,5 @@ CMAKE_ARGS+=	-DBUILD_UNIT_TESTS:BOOL=off
 
 PKGCONFIG_OVERRIDE+=	bullet.pc.in
 
-.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/freeglut/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 06da2b20531..8df54b9f119 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.79 2019/07/21 22:24:47 wiz Exp $
+# $NetBSD: Makefile,v 1.80 2019/08/30 17:01:32 nia Exp $
 
 DISTNAME=	wine-1.9.18
-PKGREVISION=	18
+PKGREVISION=	19
 CATEGORIES=	emulators
 MASTER_SITES=	http://ibiblio.org/pub/linux/system/emulators/wine/
 MASTER_SITES+=	${MASTER_SITE_SOURCEFORGE:=wine/}
diff --git a/emulators/wine-devel/buildlink3.mk b/emulators/wine-devel/buildlink3.mk
index ee7cd4a5b5e..900f27e0dc1 100644
--- a/emulators/wine-devel/buildlink3.mk
+++ b/emulators/wine-devel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2015/04/25 14:20:47 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2019/08/30 17:01:32 nia Exp $
 
 BUILDLINK_TREE+=	wine
 
@@ -15,7 +15,7 @@ pkgbase:= wine
 .include "../../graphics/freetype2/buildlink3.mk"
 .if !empty(PKG_BUILD_OPTIONS.wine:Mopengl)
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/freeglut/buildlink3.mk"
 .endif
 .include "../../graphics/giflib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
diff --git a/emulators/wine-devel/options.mk b/emulators/wine-devel/options.mk
index 789d36d11b0..af65bc9d62f 100644
--- a/emulators/wine-devel/options.mk
+++ b/emulators/wine-devel/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2017/11/12 15:36:57 khorben Exp $
+# $NetBSD: options.mk,v 1.12 2019/08/30 17:01:32 nia Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.wine
 PKG_SUPPORTED_OPTIONS=	cups dbus esound hal ldap opengl sane ssl x11 pulseaudio
@@ -71,7 +71,7 @@ CONFIGURE_ARGS+=	--without-pulse
 .if !empty(PKG_OPTIONS:Mopengl) && !empty(PKG_OPTIONS:Mx11)
 PLIST.opengl=		yes
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/freeglut/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-opengl
 .endif
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 210d5076b1d..7c2f4e0075b 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.206 2019/07/21 22:24:47 wiz Exp $
+# $NetBSD: Makefile,v 1.207 2019/08/30 17:01:32 nia Exp $
 
 DISTNAME=	wine-1.6.2
-PKGREVISION=	23
+PKGREVISION=	24
 CATEGORIES=	emulators
 MASTER_SITES=	http://ibiblio.org/pub/linux/system/emulators/wine/
 MASTER_SITES+=	${MASTER_SITE_SOURCEFORGE:=wine/}
diff --git a/emulators/wine/buildlink3.mk b/emulators/wine/buildlink3.mk
index 6ca93dc63a7..e04aa377c6b 100644
--- a/emulators/wine/buildlink3.mk
+++ b/emulators/wine/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2015/04/25 14:20:47 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2019/08/30 17:01:32 nia Exp $
 
 BUILDLINK_TREE+=	wine
 
@@ -15,7 +15,7 @@ pkgbase:= wine
 .include "../../graphics/freetype2/buildlink3.mk"
 .if !empty(PKG_BUILD_OPTIONS.wine:Mopengl)
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/freeglut/buildlink3.mk"
 .endif
 .include "../../graphics/giflib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
diff --git a/emulators/wine/options.mk b/emulators/wine/options.mk
index bd681e08f71..05f7f212837 100644
--- a/emulators/wine/options.mk
+++ b/emulators/wine/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.17 2017/11/12 15:36:57 khorben Exp $
+# $NetBSD: options.mk,v 1.18 2019/08/30 17:01:32 nia Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.wine
 PKG_SUPPORTED_OPTIONS=	cups dbus esound hal ldap opengl sane ssl x11
@@ -66,7 +66,7 @@ CONFIGURE_ARGS+=	--without-x
 .if !empty(PKG_OPTIONS:Mopengl) && !empty(PKG_OPTIONS:Mx11)
 PLIST.opengl=		yes
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/freeglut/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-opengl
 .endif
diff --git a/emulators/yabause/options.mk b/emulators/yabause/options.mk
index efefc83555b..28104f71b35 100644
--- a/emulators/yabause/options.mk
+++ b/emulators/yabause/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2016/07/16 00:21:20 markd Exp $
+# $NetBSD: options.mk,v 1.7 2019/08/30 17:01:32 nia Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.yabause
 PKG_SUPPORTED_OPTIONS=	openal opengl sdl
@@ -36,7 +36,7 @@ CMAKE_ARGS+=	-DYAB_WANT_OPENAL=OFF
 .endif
 
 .if !empty(PKG_OPTIONS:Mopengl)
-.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/freeglut/buildlink3.mk"
 CMAKE_ARGS+=	-DYAB_WANT_OPENGL=ON
 .else
 CMAKE_ARGS+=	-DYAB_WANT_OPENGL=OFF
diff --git a/games/billardgl/Makefile b/games/billardgl/Makefile
index 378bbadf8a0..71c5b5b8b8f 100644
--- a/games/billardgl/Makefile
+++ b/games/billardgl/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2018/07/18 00:06:16 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2019/08/30 17:01:33 nia Exp $
 #
 
 DISTNAME=	BillardGL-1.75
 PKGNAME=	${DISTNAME:S/BillardGL/billardgl/}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=billardgl/}
 
@@ -33,5 +33,5 @@ INSTALLATION_DIRS=	bin
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/freeglut/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/chromium-bsu/Makefile b/games/chromium-bsu/Makefile
index 1cf0de9befa..aa9536240f4 100644
--- a/games/chromium-bsu/Makefile
+++ b/games/chromium-bsu/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2018/07/18 00:06:16 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2019/08/30 17:01:33 nia Exp $
 
 DISTNAME=		chromium-bsu-0.9.15.1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=chromium-bsu/}
 
@@ -25,7 +25,7 @@ LDFLAGS.SunOS=		-lSDL
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
 .include "../../graphics/glpng/buildlink3.mk"
-.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/freeglut/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/quesoglc/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/games/crossfire-client/Makefile.common b/games/crossfire-client/Makefile.common
index 7c9c0107283..28f6d48a964 100644
--- a/games/crossfire-client/Makefile.common
+++ b/games/crossfire-client/Makefile.common
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile.common,v 1.7 2018/07/04 13:40:18 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.8 2019/08/30 17:01:33 nia Exp $
 # used by games/crossfire-client/Makefile
 # used by games/crossfire-client-gtk/Makefile
 # used by games/crossfire-client-gtk2/Makefile
 
 DISTNAME=	crossfire-client-${CROSSFIRE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	games x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=crossfire/}
 
@@ -28,7 +29,7 @@ SUBST_SED.dsp=		-e "s|/dev/dsp|${DEVOSSAUDIO}|"
 
 .include "../../graphics/SDL_image/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/freeglut/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index b4d30083157..974845f05c0 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.95 2019/08/22 12:23:08 ryoon Exp $
+# $NetBSD: Makefile,v 1.96 2019/08/30 17:01:34 nia Exp $
 
 DISTNAME=	flightgear-2018.3.2
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=flightgear/release-2018.3/}
 EXTRACT_SUFX=	.tar.bz2
@@ -23,8 +23,6 @@ CMAKE_ARG_PATH=		..
 CMAKE_ARGS+=		-DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=		-DFG_BUILD_TYPE=Release
 
-BUILDLINK_TRANSFORM+=	l:glut:freeglut
-
 # The cmake script warns against building in the source directory.
 pre-configure:
 	cd ${WRKSRC} && ${MKDIR} fgbuild
diff --git a/games/glaxium/Makefile b/games/glaxium/Makefile
index b8cbc8155b0..4727494ed7e 100644
--- a/games/glaxium/Makefile
+++ b/games/glaxium/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2016/12/12 06:21:47 dholland Exp $
+# $NetBSD: Makefile,v 1.26 2019/08/30 17:01:33 nia Exp $
 #
 
 DISTNAME=	glaxium_0.5
 PKGNAME=	${DISTNAME:S/_/-/}
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	games
 MASTER_SITES=	http://xhosxe.free.fr/glaxium/
 
@@ -48,6 +48,6 @@ X_LDFLAGS=	${X11_LDFLAGS}
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/freeglut/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile
index 1cae31a6da4..bb2f7fe551a 100644
--- a/graphics/Mesa/Makefile
+++ b/graphics/Mesa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2019/08/21 16:15:57 nia Exp $
+# $NetBSD: Makefile,v 1.73 2019/08/30 17:01:33 nia Exp $
 
 PKGNAME=	Mesa-7.11.2
 MASTER_SITES=	# empty
@@ -14,7 +14,7 @@ CONFLICTS=	Mesa-glx-[0-9]*
 
 # The ordering is important here as glut/buildlink3.mk sets the version
 # of Mesa required.
-.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/freeglut/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 
diff --git a/graphics/Mesa/buildlink3.mk b/graphics/Mesa/buildlink3.mk
index 186f9358203..e32c06cc24b 100644
--- a/graphics/Mesa/buildlink3.mk
+++ b/graphics/Mesa/buildlink3.mk
@@ -1,7 +1,7 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/23 05:29:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2019/08/30 17:01:33 nia Exp $
 
 BUILDLINK_PREFIX.Mesa=	${BUILDLINK_PREFIX.MesaLib}
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/freeglut/buildlink3.mk"
diff --git a/graphics/enblend-enfuse/Makefile b/graphics/enblend-enfuse/Makefile
index 25ffdef8e17..ac74fe19538 100644
--- a/graphics/enblend-enfuse/Makefile
+++ b/graphics/enblend-enfuse/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2019/08/22 12:23:17 ryoon Exp $
+# $NetBSD: Makefile,v 1.52 2019/08/30 17:01:34 nia Exp $
 
 DISTNAME=	enblend-enfuse-4.2
-PKGREVISION=	14
+PKGREVISION=	15
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=enblend/}
 
@@ -22,7 +22,7 @@ BUILD_DEPENDS+=		help2man-[0-9]*:../../converters/help2man
 
 .if ${OPSYS} != "Darwin"
 CONFIGURE_ARGS+=	--with-x
-.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/freeglut/buildlink3.mk"
 .endif
 
 .include "../../devel/boost-headers/buildlink3.mk"
diff --git a/graphics/freeglut/DESCR b/graphics/freeglut/DESCR
index 4aa00615fbe..26c6c0b6e74 100644
--- a/graphics/freeglut/DESCR
+++ b/graphics/freeglut/DESCR
@@ -1,6 +1,6 @@
-freeglut is a completely OpenSourced alternative to the OpenGL
-Utility Toolkit (GLUT) library. GLUT was originally written by
-Mark Kilgard to support the sample programs in the second edition
-OpenGL 'RedBook'. Since then, GLUT has been used in a wide variety
-of practical applications because it is simple, universally available
-and highly portable.
+FreeGLUT is a free-software/open-source alternative to the OpenGL Utility
+Toolkit (GLUT) library.
+
+GLUT (and hence FreeGLUT) takes care of all the system-specific chores
+required for creating windows, initializing OpenGL contexts, and handling
+input events, to allow for trully portable OpenGL programs.
diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile
index 13e4563af89..f9f5851f18e 100644
--- a/graphics/freeglut/Makefile
+++ b/graphics/freeglut/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2017/04/25 11:27:00 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/08/30 17:01:33 nia Exp $
 
 DISTNAME=	freeglut-3.0.0
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=freeglut/}
 
@@ -10,11 +11,11 @@ COMMENT=	Alternative to the OpenGL Utility Toolkit (GLUT) library
 LICENSE=	x11
 
 USE_CMAKE=	yes
-CMAKE_ARGS+=	-DFREEGLUT_REPLACE_GLUT:BOOL=OFF
-
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
 
+CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
+
 PKGCONFIG_OVERRIDE=	freeglut.pc.in
 
 .include "../../graphics/MesaLib/buildlink3.mk"
diff --git a/graphics/freeglut/PLIST b/graphics/freeglut/PLIST
index bcdffd6fb2f..ca89e3f6c53 100644
--- a/graphics/freeglut/PLIST
+++ b/graphics/freeglut/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.5 2016/10/01 07:47:04 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2019/08/30 17:01:33 nia Exp $
 include/GL/freeglut.h
 include/GL/freeglut_ext.h
 include/GL/freeglut_std.h
-lib/libfreeglut.a
-lib/libfreeglut.so
-lib/libfreeglut.so.3
-lib/libfreeglut.so.3.10.0
+include/GL/glut.h
+lib/libglut.a
+lib/libglut.so
+lib/libglut.so.3
+lib/libglut.so.3.10.0
 lib/pkgconfig/freeglut.pc
diff --git a/graphics/freeglut/distinfo b/graphics/freeglut/distinfo
index c7a523fb333..6fbef4a9e6f 100644
--- a/graphics/freeglut/distinfo
+++ b/graphics/freeglut/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.9 2017/04/25 11:42:42 wiz Exp $
+$NetBSD: distinfo,v 1.10 2019/08/30 17:01:33 nia Exp $
 
 SHA1 (freeglut-3.0.0.tar.gz) = fca52242f9344627a30f11487ee42002e6b0dacd
 RMD160 (freeglut-3.0.0.tar.gz) = ce4129a22199516ecf24491f0ed026f40c3f5dae
 SHA512 (freeglut-3.0.0.tar.gz) = 9c45d5b203b26a7ff92331b3e080a48e806c92fbbe7c65d9262dd18c39cd6efdad8a795a80f499a2d23df84b4909dbd7c1bab20d7dd3555d3d88782ce9dd15b0
 Size (freeglut-3.0.0.tar.gz) = 419095 bytes
-SHA1 (patch-CMakeLists.txt) = bb53c67d35870ed077c757f39abf78cbc23b700f
 SHA1 (patch-src_freeglut__joystick.c) = fe4eda46e5aacbd81ba2946079131c7020a1fcd8
 SHA1 (patch-src_x11_fg__joystick__x11.c) = ae536397bfb000b0acb78c84b48c920c8774c4ba
diff --git a/graphics/freeglut/patches/patch-CMakeLists.txt b/graphics/freeglut/patches/patch-CMakeLists.txt
deleted file mode 100644
index 9358358b990..00000000000
--- a/graphics/freeglut/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2017/04/25 11:27:00 wiz Exp $
-
-https://github.com/dcnieho/FreeGLUT/commit/a0b77bba49573dab3564ce22a503024098664f04
-
---- CMakeLists.txt.orig	2015-02-18 04:59:57.000000000 +0000
-+++ CMakeLists.txt
-@@ -62,8 +62,12 @@ SET(FREEGLUT_HEADERS
-     include/GL/freeglut.h
-     include/GL/freeglut_ext.h
-     include/GL/freeglut_std.h
--    include/GL/glut.h
- )
-+IF(FREEGLUT_REPLACE_GLUT)
-+    LIST(APPEND FREEGLUT_SRCS
-+        include/GL/glut.h
-+    )
-+ENDIF()
- SET(FREEGLUT_SRCS
-     ${FREEGLUT_HEADERS}
-     src/fg_callbacks.c
diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile
index 09dbef70037..161c89c441a 100644
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.94 2019/08/28 01:32:11 markd Exp $
+# $NetBSD: Makefile,v 1.95 2019/08/30 17:01:34 nia Exp $
 
 DISTNAME=	hugin-2019.0.0
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hugin/}
 EXTRACT_SUFX=	.tar.bz2
@@ -47,7 +47,7 @@ SUBST_SED.apple=	-e 's,(APPLE),(ELPPA),g'
 .include "../../graphics/exiv2/buildlink3.mk"
 .include "../../graphics/glew/buildlink3.mk"
 .if ${OPSYS} != "Darwin"
-.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/freeglut/buildlink3.mk"
 .endif
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/graphics/opencsg/Makefile b/graphics/opencsg/Makefile
index 21457706276..6a1934d2b9f 100644
--- a/graphics/opencsg/Makefile
+++ b/graphics/opencsg/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2016/02/25 13:37:48 jperkin Exp $
+# $NetBSD: Makefile,v 1.9 2019/08/30 17:01:34 nia Exp $
 
 DISTNAME=	OpenCSG-1.3.2
 PKGNAME=	${DISTNAME:tl}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.opencsg.org/
 
@@ -26,6 +26,6 @@ do-install:
 	${LIBTOOL} --mode=install ${INSTALL_LIB} \
 		${WRKSRC}/src/libopencsg.la ${DESTDIR}${PREFIX}/lib
 
-.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/freeglut/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/pfstools/options.mk b/graphics/pfstools/options.mk
index 4cedada0c85..f4da078aafb 100644
--- a/graphics/pfstools/options.mk
+++ b/graphics/pfstools/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2017/02/12 21:50:17 adam Exp $
+# $NetBSD: options.mk,v 1.6 2019/08/30 17:01:34 nia Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.pfstools
 PKG_SUPPORTED_OPTIONS=	fftw imagemagick octave qt opengl
@@ -49,7 +49,7 @@ CMAKE_ARGS+=	-DWITH_QT=NO
 
 .if !empty(PKG_OPTIONS:Mopengl)
 .  if ${OPSYS} != "Darwin"
-.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/freeglut/buildlink3.mk"
 .  endif
 # XXX nasty hack
 CXXFLAGS.NetBSD+=	-lpthread
diff --git a/graphics/qore-glut-module/Makefile b/graphics/qore-glut-module/Makefile
index 9b5ca772197..a956ae5c3e3 100644
--- a/graphics/qore-glut-module/Makefile
+++ b/graphics/qore-glut-module/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2018/06/08 20:49:41 nros Exp $
+# $NetBSD: Makefile,v 1.9 2019/08/30 17:01:34 nia Exp $
 
 DISTNAME=	qore-glut-module-0.0.3
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qore/}
 
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+=--with-glut=${BUILDLINK_PREFIX.glut}
 
 .include "options.mk"
 
-.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/freeglut/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../lang/qore/module.mk"
 .include "../../graphics/qore-opengl-module/buildlink3.mk"
diff --git a/graphics/quesoglc/Makefile b/graphics/quesoglc/Makefile
index 90cf0566643..7399412ae39 100644
--- a/graphics/quesoglc/Makefile
+++ b/graphics/quesoglc/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2019/05/29 19:52:50 adam Exp $
+# $NetBSD: Makefile,v 1.10 2019/08/30 17:01:34 nia Exp $
 #
 
 DISTNAME=	quesoglc-0.7.1-free
 PKGNAME=	${DISTNAME:S/-free$//}
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=quesoglc/}
 EXTRACT_SUFX=	.tar.bz2
@@ -26,5 +26,5 @@ CONFIGURE_ARGS+=	--disable-executables
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glew/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/freeglut/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/x11-links/xorg.mk b/pkgtools/x11-links/xorg.mk
index 4f6b8d7f10f..db48bb8d29d 100644
--- a/pkgtools/x11-links/xorg.mk
+++ b/pkgtools/x11-links/xorg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.mk,v 1.36 2019/08/23 15:18:39 rjs Exp $
+# $NetBSD: xorg.mk,v 1.37 2019/08/30 17:01:32 nia Exp $
 #
 # This is for X.org, but use "xfree" files also.
 
@@ -12,7 +12,6 @@ FILES_LIST=	${FILESDIR}/xorg
 .include "../../graphics/libepoxy/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/glut/buildlink3.mk"
 .include "../../multimedia/libvdpau/buildlink3.mk"
 .include "../../sysutils/libpciaccess/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
diff --git a/print/mupdf/buildlink3.mk b/print/mupdf/buildlink3.mk
index ef431ffa62f..fb335b2eff7 100644
--- a/print/mupdf/buildlink3.mk
+++ b/print/mupdf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.31 2019/08/22 12:23:43 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.32 2019/08/30 17:01:34 nia Exp $
 
 BUILDLINK_TREE+=	mupdf
 
@@ -18,7 +18,7 @@ pkgbase := mupdf
 
 .if !empty(PKG_BUILD_OPTIONS.mupdf:Mopengl)
 .include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/freeglut/buildlink3.mk"
 .endif
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/print/mupdf/options.mk b/print/mupdf/options.mk
index e168a86ce6f..c56e99b6d18 100644
--- a/print/mupdf/options.mk
+++ b/print/mupdf/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2019/08/03 14:47:41 leot Exp $
+# $NetBSD: options.mk,v 1.9 2019/08/30 17:01:34 nia Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mupdf
 PKG_SUPPORTED_OPTIONS=	curl opengl
@@ -21,7 +21,7 @@ PLIST.curl=	yes
 .if !empty(PKG_OPTIONS:Mopengl)
 PLIST.opengl=	yes
 .include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/freeglut/buildlink3.mk"
 .else
 MAKE_ENV+=	HAVE_GLUT=no
 .endif