CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Fri, 30 Aug 2019 17:01:35 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Aug 30 17:01:35 UTC 2019

Modified Files:
        pkgsrc/biology/azara: Makefile
        pkgsrc/biology/py-mol: Makefile
        pkgsrc/devel/bullet: Makefile
        pkgsrc/emulators/wine: Makefile buildlink3.mk options.mk
        pkgsrc/emulators/wine-devel: Makefile buildlink3.mk options.mk
        pkgsrc/emulators/yabause: options.mk
        pkgsrc/games/billardgl: Makefile
        pkgsrc/games/chromium-bsu: Makefile
        pkgsrc/games/crossfire-client: Makefile.common
        pkgsrc/games/flightgear: Makefile
        pkgsrc/games/glaxium: Makefile
        pkgsrc/graphics/Mesa: Makefile buildlink3.mk
        pkgsrc/graphics/enblend-enfuse: Makefile
        pkgsrc/graphics/freeglut: DESCR Makefile PLIST distinfo
        pkgsrc/graphics/hugin: Makefile
        pkgsrc/graphics/opencsg: Makefile
        pkgsrc/graphics/pfstools: options.mk
        pkgsrc/graphics/qore-glut-module: Makefile
        pkgsrc/graphics/quesoglc: Makefile
        pkgsrc/pkgtools/x11-links: xorg.mk
        pkgsrc/print/mupdf: buildlink3.mk options.mk
Removed Files:
        pkgsrc/graphics/freeglut/patches: patch-CMakeLists.txt

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/biology/azara/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/biology/py-mol/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/bullet/Makefile
cvs rdiff -u -r1.206 -r1.207 pkgsrc/emulators/wine/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/emulators/wine/buildlink3.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/emulators/wine/options.mk
cvs rdiff -u -r1.79 -r1.80 pkgsrc/emulators/wine-devel/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/emulators/wine-devel/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/emulators/wine-devel/options.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/emulators/yabause/options.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/games/billardgl/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/games/chromium-bsu/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/games/crossfire-client/Makefile.common
cvs rdiff -u -r1.95 -r1.96 pkgsrc/games/flightgear/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/games/glaxium/Makefile
cvs rdiff -u -r1.72 -r1.73 pkgsrc/graphics/Mesa/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/Mesa/buildlink3.mk
cvs rdiff -u -r1.51 -r1.52 pkgsrc/graphics/enblend-enfuse/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/freeglut/DESCR
cvs rdiff -u -r1.21 -r1.22 pkgsrc/graphics/freeglut/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/freeglut/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/graphics/freeglut/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/graphics/freeglut/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.94 -r1.95 pkgsrc/graphics/hugin/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/graphics/opencsg/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/pfstools/options.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/graphics/qore-glut-module/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/graphics/quesoglc/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/pkgtools/x11-links/xorg.mk
cvs rdiff -u -r1.31 -r1.32 pkgsrc/print/mupdf/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/print/mupdf/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/biology/azara/Makefile
diff -u pkgsrc/biology/azara/Makefile:1.15 pkgsrc/biology/azara/Makefile:1.16
--- pkgsrc/biology/azara/Makefile:1.15  Tue Aug  1 17:40:08 2017
+++ pkgsrc/biology/azara/Makefile       Fri Aug 30 17:01:32 2019
@@ -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"

Index: pkgsrc/biology/py-mol/Makefile
diff -u pkgsrc/biology/py-mol/Makefile:1.32 pkgsrc/biology/py-mol/Makefile:1.33
--- pkgsrc/biology/py-mol/Makefile:1.32 Wed May 29 19:52:48 2019
+++ pkgsrc/biology/py-mol/Makefile      Fri Aug 30 17:01:32 2019
@@ -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"

Index: pkgsrc/devel/bullet/Makefile
diff -u pkgsrc/devel/bullet/Makefile:1.11 pkgsrc/devel/bullet/Makefile:1.12
--- pkgsrc/devel/bullet/Makefile:1.11   Fri Aug  9 16:00:22 2019
+++ pkgsrc/devel/bullet/Makefile        Fri Aug 30 17:01:32 2019
@@ -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"

Index: pkgsrc/emulators/wine/Makefile
diff -u pkgsrc/emulators/wine/Makefile:1.206 pkgsrc/emulators/wine/Makefile:1.207
--- pkgsrc/emulators/wine/Makefile:1.206        Sun Jul 21 22:24:47 2019
+++ pkgsrc/emulators/wine/Makefile      Fri Aug 30 17:01:32 2019
@@ -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/}

Index: pkgsrc/emulators/wine/buildlink3.mk
diff -u pkgsrc/emulators/wine/buildlink3.mk:1.27 pkgsrc/emulators/wine/buildlink3.mk:1.28
--- pkgsrc/emulators/wine/buildlink3.mk:1.27    Sat Apr 25 14:20:47 2015
+++ pkgsrc/emulators/wine/buildlink3.mk Fri Aug 30 17:01:32 2019
@@ -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"

Index: pkgsrc/emulators/wine/options.mk
diff -u pkgsrc/emulators/wine/options.mk:1.17 pkgsrc/emulators/wine/options.mk:1.18
--- pkgsrc/emulators/wine/options.mk:1.17       Sun Nov 12 15:36:57 2017
+++ pkgsrc/emulators/wine/options.mk    Fri Aug 30 17:01:32 2019
@@ -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

Index: pkgsrc/emulators/wine-devel/Makefile
diff -u pkgsrc/emulators/wine-devel/Makefile:1.79 pkgsrc/emulators/wine-devel/Makefile:1.80
--- pkgsrc/emulators/wine-devel/Makefile:1.79   Sun Jul 21 22:24:47 2019
+++ pkgsrc/emulators/wine-devel/Makefile        Fri Aug 30 17:01:32 2019
@@ -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/}

Index: pkgsrc/emulators/wine-devel/buildlink3.mk
diff -u pkgsrc/emulators/wine-devel/buildlink3.mk:1.16 pkgsrc/emulators/wine-devel/buildlink3.mk:1.17
--- pkgsrc/emulators/wine-devel/buildlink3.mk:1.16      Sat Apr 25 14:20:47 2015
+++ pkgsrc/emulators/wine-devel/buildlink3.mk   Fri Aug 30 17:01:32 2019
@@ -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"

Index: pkgsrc/emulators/wine-devel/options.mk
diff -u pkgsrc/emulators/wine-devel/options.mk:1.11 pkgsrc/emulators/wine-devel/options.mk:1.12
--- pkgsrc/emulators/wine-devel/options.mk:1.11 Sun Nov 12 15:36:57 2017
+++ pkgsrc/emulators/wine-devel/options.mk      Fri Aug 30 17:01:32 2019
@@ -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

Index: pkgsrc/emulators/yabause/options.mk
diff -u pkgsrc/emulators/yabause/options.mk:1.6 pkgsrc/emulators/yabause/options.mk:1.7
--- pkgsrc/emulators/yabause/options.mk:1.6     Sat Jul 16 00:21:20 2016
+++ pkgsrc/emulators/yabause/options.mk Fri Aug 30 17:01:32 2019
@@ -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

Index: pkgsrc/games/billardgl/Makefile
diff -u pkgsrc/games/billardgl/Makefile:1.13 pkgsrc/games/billardgl/Makefile:1.14
--- pkgsrc/games/billardgl/Makefile:1.13        Wed Jul 18 00:06:16 2018
+++ pkgsrc/games/billardgl/Makefile     Fri Aug 30 17:01:33 2019
@@ -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"

Index: pkgsrc/games/chromium-bsu/Makefile
diff -u pkgsrc/games/chromium-bsu/Makefile:1.13 pkgsrc/games/chromium-bsu/Makefile:1.14
--- pkgsrc/games/chromium-bsu/Makefile:1.13     Wed Jul 18 00:06:16 2018
+++ pkgsrc/games/chromium-bsu/Makefile  Fri Aug 30 17:01:33 2019
@@ -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"

Index: pkgsrc/games/crossfire-client/Makefile.common
diff -u pkgsrc/games/crossfire-client/Makefile.common:1.7 pkgsrc/games/crossfire-client/Makefile.common:1.8
--- pkgsrc/games/crossfire-client/Makefile.common:1.7   Wed Jul  4 13:40:18 2018
+++ pkgsrc/games/crossfire-client/Makefile.common       Fri Aug 30 17:01:33 2019
@@ -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|${DEVOSSA
 
 .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"

Index: pkgsrc/games/flightgear/Makefile
diff -u pkgsrc/games/flightgear/Makefile:1.95 pkgsrc/games/flightgear/Makefile:1.96
--- pkgsrc/games/flightgear/Makefile:1.95       Thu Aug 22 12:23:08 2019
+++ pkgsrc/games/flightgear/Makefile    Fri Aug 30 17:01:34 2019
@@ -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

Index: pkgsrc/games/glaxium/Makefile
diff -u pkgsrc/games/glaxium/Makefile:1.25 pkgsrc/games/glaxium/Makefile:1.26
--- pkgsrc/games/glaxium/Makefile:1.25  Mon Dec 12 06:21:47 2016
+++ pkgsrc/games/glaxium/Makefile       Fri Aug 30 17:01:33 2019
@@ -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"

Index: pkgsrc/graphics/Mesa/Makefile
diff -u pkgsrc/graphics/Mesa/Makefile:1.72 pkgsrc/graphics/Mesa/Makefile:1.73
--- pkgsrc/graphics/Mesa/Makefile:1.72  Wed Aug 21 16:15:57 2019
+++ pkgsrc/graphics/Mesa/Makefile       Fri Aug 30 17:01:33 2019
@@ -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"
 

Index: pkgsrc/graphics/Mesa/buildlink3.mk
diff -u pkgsrc/graphics/Mesa/buildlink3.mk:1.5 pkgsrc/graphics/Mesa/buildlink3.mk:1.6
--- pkgsrc/graphics/Mesa/buildlink3.mk:1.5      Tue Mar 23 05:29:38 2004
+++ pkgsrc/graphics/Mesa/buildlink3.mk  Fri Aug 30 17:01:33 2019
@@ -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"

Index: pkgsrc/graphics/enblend-enfuse/Makefile
diff -u pkgsrc/graphics/enblend-enfuse/Makefile:1.51 pkgsrc/graphics/enblend-enfuse/Makefile:1.52
--- pkgsrc/graphics/enblend-enfuse/Makefile:1.51        Thu Aug 22 12:23:17 2019
+++ pkgsrc/graphics/enblend-enfuse/Makefile     Fri Aug 30 17:01:34 2019
@@ -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]*:../../c
 
 .if ${OPSYS} != "Darwin"
 CONFIGURE_ARGS+=       --with-x
-.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/freeglut/buildlink3.mk"
 .endif
 
 .include "../../devel/boost-headers/buildlink3.mk"

Index: pkgsrc/graphics/freeglut/DESCR
diff -u pkgsrc/graphics/freeglut/DESCR:1.2 pkgsrc/graphics/freeglut/DESCR:1.3
--- pkgsrc/graphics/freeglut/DESCR:1.2  Mon May 23 08:26:08 2005
+++ pkgsrc/graphics/freeglut/DESCR      Fri Aug 30 17:01:33 2019
@@ -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.

Index: pkgsrc/graphics/freeglut/Makefile
diff -u pkgsrc/graphics/freeglut/Makefile:1.21 pkgsrc/graphics/freeglut/Makefile:1.22
--- pkgsrc/graphics/freeglut/Makefile:1.21      Tue Apr 25 11:27:00 2017
+++ pkgsrc/graphics/freeglut/Makefile   Fri Aug 30 17:01:33 2019
@@ -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 Utili
 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"

Index: pkgsrc/graphics/freeglut/PLIST
diff -u pkgsrc/graphics/freeglut/PLIST:1.5 pkgsrc/graphics/freeglut/PLIST:1.6
--- pkgsrc/graphics/freeglut/PLIST:1.5  Sat Oct  1 07:47:04 2016
+++ pkgsrc/graphics/freeglut/PLIST      Fri Aug 30 17:01:33 2019
@@ -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

Index: pkgsrc/graphics/freeglut/distinfo
diff -u pkgsrc/graphics/freeglut/distinfo:1.9 pkgsrc/graphics/freeglut/distinfo:1.10
--- pkgsrc/graphics/freeglut/distinfo:1.9       Tue Apr 25 11:42:42 2017
+++ pkgsrc/graphics/freeglut/distinfo   Fri Aug 30 17:01:33 2019
@@ -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

Index: pkgsrc/graphics/hugin/Makefile
diff -u pkgsrc/graphics/hugin/Makefile:1.94 pkgsrc/graphics/hugin/Makefile:1.95
--- pkgsrc/graphics/hugin/Makefile:1.94 Wed Aug 28 01:32:11 2019
+++ pkgsrc/graphics/hugin/Makefile      Fri Aug 30 17:01:34 2019
@@ -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"

Index: pkgsrc/graphics/opencsg/Makefile
diff -u pkgsrc/graphics/opencsg/Makefile:1.8 pkgsrc/graphics/opencsg/Makefile:1.9
--- pkgsrc/graphics/opencsg/Makefile:1.8        Thu Feb 25 13:37:48 2016
+++ pkgsrc/graphics/opencsg/Makefile    Fri Aug 30 17:01:34 2019
@@ -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"

Index: pkgsrc/graphics/pfstools/options.mk
diff -u pkgsrc/graphics/pfstools/options.mk:1.5 pkgsrc/graphics/pfstools/options.mk:1.6
--- pkgsrc/graphics/pfstools/options.mk:1.5     Sun Feb 12 21:50:17 2017
+++ pkgsrc/graphics/pfstools/options.mk Fri Aug 30 17:01:34 2019
@@ -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

Index: pkgsrc/graphics/qore-glut-module/Makefile
diff -u pkgsrc/graphics/qore-glut-module/Makefile:1.8 pkgsrc/graphics/qore-glut-module/Makefile:1.9
--- pkgsrc/graphics/qore-glut-module/Makefile:1.8       Fri Jun  8 20:49:41 2018
+++ pkgsrc/graphics/qore-glut-module/Makefile   Fri Aug 30 17:01:34 2019
@@ -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_
 
 .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"

Index: pkgsrc/graphics/quesoglc/Makefile
diff -u pkgsrc/graphics/quesoglc/Makefile:1.9 pkgsrc/graphics/quesoglc/Makefile:1.10
--- pkgsrc/graphics/quesoglc/Makefile:1.9       Wed May 29 19:52:50 2019
+++ pkgsrc/graphics/quesoglc/Makefile   Fri Aug 30 17:01:34 2019
@@ -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"

Index: pkgsrc/pkgtools/x11-links/xorg.mk
diff -u pkgsrc/pkgtools/x11-links/xorg.mk:1.36 pkgsrc/pkgtools/x11-links/xorg.mk:1.37
--- pkgsrc/pkgtools/x11-links/xorg.mk:1.36      Fri Aug 23 15:18:39 2019
+++ pkgsrc/pkgtools/x11-links/xorg.mk   Fri Aug 30 17:01:32 2019
@@ -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"

Index: pkgsrc/print/mupdf/buildlink3.mk
diff -u pkgsrc/print/mupdf/buildlink3.mk:1.31 pkgsrc/print/mupdf/buildlink3.mk:1.32
--- pkgsrc/print/mupdf/buildlink3.mk:1.31       Thu Aug 22 12:23:43 2019
+++ pkgsrc/print/mupdf/buildlink3.mk    Fri Aug 30 17:01:34 2019
@@ -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"

Index: pkgsrc/print/mupdf/options.mk
diff -u pkgsrc/print/mupdf/options.mk:1.8 pkgsrc/print/mupdf/options.mk:1.9
--- pkgsrc/print/mupdf/options.mk:1.8   Sat Aug  3 14:47:41 2019
+++ pkgsrc/print/mupdf/options.mk       Fri Aug 30 17:01:34 2019
@@ -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

Prev by Date: CVS commit: pkgsrc/graphics/MesaLib
Next by Date: CVS commit: pkgsrc
Previous by Thread: CVS commit: pkgsrc/graphics/MesaLib
Next by Thread: CVS commit: pkgsrc
Indexes:

Home | Main Index | Thread Index | Old Index