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.

7 files changed, 14 insertions, 14 deletions

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