[pkgsrc/trunk]: pkgsrc Switch packages using GLUT to FreeGLUT.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Switch packages using GLUT to FreeGLUT.
From: nia <nia%pkgsrc.org@localhost>
Date: Fri, 30 Aug 2019 19:58:09 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/60c80bb92178
branches:  trunk
changeset: 338780:60c80bb92178
user:      nia <nia%pkgsrc.org@localhost>
date:      Fri Aug 30 17:01:32 2019 +0000

description:
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.

diffstat:

 biology/azara/Makefile                         |   6 +++---
 biology/py-mol/Makefile                        |   6 +++---
 devel/bullet/Makefile                          |   5 +++--
 emulators/wine-devel/Makefile                  |   4 ++--
 emulators/wine-devel/buildlink3.mk             |   4 ++--
 emulators/wine-devel/options.mk                |   4 ++--
 emulators/wine/Makefile                        |   4 ++--
 emulators/wine/buildlink3.mk                   |   4 ++--
 emulators/wine/options.mk                      |   4 ++--
 emulators/yabause/options.mk                   |   4 ++--
 games/billardgl/Makefile                       |   6 +++---
 games/chromium-bsu/Makefile                    |   6 +++---
 games/crossfire-client/Makefile.common         |   5 +++--
 games/flightgear/Makefile                      |   6 ++----
 games/glaxium/Makefile                         |   6 +++---
 graphics/Mesa/Makefile                         |   4 ++--
 graphics/Mesa/buildlink3.mk                    |   4 ++--
 graphics/enblend-enfuse/Makefile               |   6 +++---
 graphics/freeglut/DESCR                        |  12 ++++++------
 graphics/freeglut/Makefile                     |   7 ++++---
 graphics/freeglut/PLIST                        |  11 ++++++-----
 graphics/freeglut/distinfo                     |   3 +--
 graphics/freeglut/patches/patch-CMakeLists.txt |  20 --------------------
 graphics/hugin/Makefile                        |   6 +++---
 graphics/opencsg/Makefile                      |   6 +++---
 graphics/pfstools/options.mk                   |   4 ++--
 graphics/qore-glut-module/Makefile             |   6 +++---
 graphics/quesoglc/Makefile                     |   6 +++---
 pkgtools/x11-links/xorg.mk                     |   3 +--
 print/mupdf/buildlink3.mk                      |   4 ++--
 print/mupdf/options.mk                         |   4 ++--
 31 files changed, 80 insertions(+), 100 deletions(-)

diffs (truncated from 607 to 300 lines):

diff -r 4657f15af4b5 -r 60c80bb92178 biology/azara/Makefile
--- a/biology/azara/Makefile    Fri Aug 30 16:30:54 2019 +0000
+++ b/biology/azara/Makefile    Fri Aug 30 17:01:32 2019 +0000
@@ -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 @@
        ${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 -r 4657f15af4b5 -r 60c80bb92178 biology/py-mol/Makefile
--- a/biology/py-mol/Makefile   Fri Aug 30 16:30:54 2019 +0000
+++ b/biology/py-mol/Makefile   Fri Aug 30 17:01:32 2019 +0000
@@ -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 @@
 .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 -r 4657f15af4b5 -r 60c80bb92178 devel/bullet/Makefile
--- a/devel/bullet/Makefile     Fri Aug 30 16:30:54 2019 +0000
+++ b/devel/bullet/Makefile     Fri Aug 30 17:01:32 2019 +0000
@@ -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 @@
 
 PKGCONFIG_OVERRIDE+=   bullet.pc.in
 
-.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/freeglut/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 4657f15af4b5 -r 60c80bb92178 emulators/wine-devel/Makefile
--- a/emulators/wine-devel/Makefile     Fri Aug 30 16:30:54 2019 +0000
+++ b/emulators/wine-devel/Makefile     Fri Aug 30 17:01:32 2019 +0000
@@ -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 -r 4657f15af4b5 -r 60c80bb92178 emulators/wine-devel/buildlink3.mk
--- a/emulators/wine-devel/buildlink3.mk        Fri Aug 30 16:30:54 2019 +0000
+++ b/emulators/wine-devel/buildlink3.mk        Fri Aug 30 17:01:32 2019 +0000
@@ -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 @@
 .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 -r 4657f15af4b5 -r 60c80bb92178 emulators/wine-devel/options.mk
--- a/emulators/wine-devel/options.mk   Fri Aug 30 16:30:54 2019 +0000
+++ b/emulators/wine-devel/options.mk   Fri Aug 30 17:01:32 2019 +0000
@@ -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 @@
 .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 -r 4657f15af4b5 -r 60c80bb92178 emulators/wine/Makefile
--- a/emulators/wine/Makefile   Fri Aug 30 16:30:54 2019 +0000
+++ b/emulators/wine/Makefile   Fri Aug 30 17:01:32 2019 +0000
@@ -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 -r 4657f15af4b5 -r 60c80bb92178 emulators/wine/buildlink3.mk
--- a/emulators/wine/buildlink3.mk      Fri Aug 30 16:30:54 2019 +0000
+++ b/emulators/wine/buildlink3.mk      Fri Aug 30 17:01:32 2019 +0000
@@ -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 @@
 .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 -r 4657f15af4b5 -r 60c80bb92178 emulators/wine/options.mk
--- a/emulators/wine/options.mk Fri Aug 30 16:30:54 2019 +0000
+++ b/emulators/wine/options.mk Fri Aug 30 17:01:32 2019 +0000
@@ -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 @@
 .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 -r 4657f15af4b5 -r 60c80bb92178 emulators/yabause/options.mk
--- a/emulators/yabause/options.mk      Fri Aug 30 16:30:54 2019 +0000
+++ b/emulators/yabause/options.mk      Fri Aug 30 17:01:32 2019 +0000
@@ -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 @@
 .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 -r 4657f15af4b5 -r 60c80bb92178 games/billardgl/Makefile
--- a/games/billardgl/Makefile  Fri Aug 30 16:30:54 2019 +0000
+++ b/games/billardgl/Makefile  Fri Aug 30 17:01:32 2019 +0000
@@ -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 @@
 
 .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 -r 4657f15af4b5 -r 60c80bb92178 games/chromium-bsu/Makefile
--- a/games/chromium-bsu/Makefile       Fri Aug 30 16:30:54 2019 +0000
+++ b/games/chromium-bsu/Makefile       Fri Aug 30 17:01:32 2019 +0000
@@ -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 @@
 .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 -r 4657f15af4b5 -r 60c80bb92178 games/crossfire-client/Makefile.common
--- a/games/crossfire-client/Makefile.common    Fri Aug 30 16:30:54 2019 +0000
+++ b/games/crossfire-client/Makefile.common    Fri Aug 30 17:01:32 2019 +0000
@@ -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 @@
 
 .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 -r 4657f15af4b5 -r 60c80bb92178 games/flightgear/Makefile
--- a/games/flightgear/Makefile Fri Aug 30 16:30:54 2019 +0000
+++ b/games/flightgear/Makefile Fri Aug 30 17:01:32 2019 +0000
@@ -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_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 -r 4657f15af4b5 -r 60c80bb92178 games/glaxium/Makefile
--- a/games/glaxium/Makefile    Fri Aug 30 16:30:54 2019 +0000
+++ b/games/glaxium/Makefile    Fri Aug 30 17:01:32 2019 +0000
@@ -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 @@
 .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 -r 4657f15af4b5 -r 60c80bb92178 graphics/Mesa/Makefile
--- a/graphics/Mesa/Makefile    Fri Aug 30 16:30:54 2019 +0000
+++ b/graphics/Mesa/Makefile    Fri Aug 30 17:01:32 2019 +0000
@@ -1,4 +1,4 @@
Prev by Date: [pkgsrc/trunk]: pkgsrc/graphics/MesaLib MesaLib: rename MESALIB_SUPPORTS_OS t...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated www/grafana to 6.3.4
Previous by Thread: [pkgsrc/trunk]: pkgsrc/graphics/MesaLib MesaLib: rename MESALIB_SUPPORTS_OS t...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated www/grafana to 6.3.4
Indexes:
Home | Main Index | Thread Index | Old Index