[Lunar-commits] <moonbase> removed %GLUT from moonbase since glut has been removed
Christian Krause
wookietreiber at lunar-linux.org
Mon Aug 29 14:45:26 CEST 2011
commit afa84e1d80a0da9156bd71b67b862ee013d87365
Author: Christian Krause <wookietreiber at lunar-linux.org>
Date: Mon Aug 29 14:45:26 2011 +0200
removed %GLUT from moonbase since glut has been removed
---
aliases | 1 -
games/TORCS/DEPENDS | 2 +-
games/asteroids3D/DEPENDS | 2 +-
games/battalion/DEPENDS | 2 +-
games/csmash/DEPENDS | 2 +-
games/glaxium/DEPENDS | 2 +-
games/gltron/DEPENDS | 2 +-
games/openuniverse/DEPENDS | 2 +-
python/PyOpenGL/DEPENDS | 2 +-
science/celestia-gtk/DEPENDS | 2 +-
science/jasper/DEPENDS | 11 ++---------
x11-apps/xlockmore/DEPENDS | 6 +++---
xorg7/mesa-lib/POST_INSTALL | 14 ++++----------
zbeta/lugaru-hg/DEPENDS | 2 +-
14 files changed, 19 insertions(+), 33 deletions(-)
diff --git a/aliases b/aliases
index 24f453f..5aa0340 100644
--- a/aliases
+++ b/aliases
@@ -1,6 +1,5 @@
%APACHE:apache2 apache apache-mod_ssl
%GECKO_RENDERER:xulrunner thunderbird seamonkey
-%GLUT:freeglut glut
%JAVA_SDK:sun-jdk sun-jre
%LISP:clisp gcl
%MTA:esmtp postfix exim sendmail
diff --git a/games/TORCS/DEPENDS b/games/TORCS/DEPENDS
index 538d1d5..a8313e5 100644
--- a/games/TORCS/DEPENDS
+++ b/games/TORCS/DEPENDS
@@ -1,3 +1,3 @@
depends plib
-depends %GLUT
+depends freeglut
depends libpng
diff --git a/games/asteroids3D/DEPENDS b/games/asteroids3D/DEPENDS
index a81271b..0ce3b44 100644
--- a/games/asteroids3D/DEPENDS
+++ b/games/asteroids3D/DEPENDS
@@ -1 +1 @@
-depends %GLUT
+depends freeglut
diff --git a/games/battalion/DEPENDS b/games/battalion/DEPENDS
index 228fc76..0ce3b44 100644
--- a/games/battalion/DEPENDS
+++ b/games/battalion/DEPENDS
@@ -1 +1 @@
-depends %GLUT
+depends freeglut
diff --git a/games/csmash/DEPENDS b/games/csmash/DEPENDS
index 82b4bd7..303511c 100644
--- a/games/csmash/DEPENDS
+++ b/games/csmash/DEPENDS
@@ -1,5 +1,5 @@
depends gtk+-2
-depends %GLUT
+depends freeglut
depends SDL_image
depends SDL_mixer
depends libvorbis
diff --git a/games/glaxium/DEPENDS b/games/glaxium/DEPENDS
index 707a197..fd52fbd 100644
--- a/games/glaxium/DEPENDS
+++ b/games/glaxium/DEPENDS
@@ -1,2 +1,2 @@
-depends %GLUT
+depends freeglut
depends SDL_mixer
diff --git a/games/gltron/DEPENDS b/games/gltron/DEPENDS
index b939d5f..651eddc 100644
--- a/games/gltron/DEPENDS
+++ b/games/gltron/DEPENDS
@@ -1,2 +1,2 @@
-depends %GLUT
+depends freeglut
depends SDL_sound
diff --git a/games/openuniverse/DEPENDS b/games/openuniverse/DEPENDS
index aee1489..3e7601d 100644
--- a/games/openuniverse/DEPENDS
+++ b/games/openuniverse/DEPENDS
@@ -1,2 +1,2 @@
-depends %GLUT
+depends freeglut
#depends glui
diff --git a/python/PyOpenGL/DEPENDS b/python/PyOpenGL/DEPENDS
index 5902cb1..7fe3ed9 100644
--- a/python/PyOpenGL/DEPENDS
+++ b/python/PyOpenGL/DEPENDS
@@ -1,2 +1,2 @@
-depends %GLUT
+depends freeglut
depends numpy
diff --git a/science/celestia-gtk/DEPENDS b/science/celestia-gtk/DEPENDS
index 47cc756..998c8db 100644
--- a/science/celestia-gtk/DEPENDS
+++ b/science/celestia-gtk/DEPENDS
@@ -2,7 +2,7 @@ depends libpng
depends %GLX
depends gtkglext
-optional_depends "%GLUT" "--with-glut" "--without-glut" "Use Glut for the UI"
+optional_depends "freeglut" "--with-glut" "--without-glut" "Use Glut for the UI"
optional_depends "lua" "--with-lua" "--without-lua" "Use Lua for Celestia Extension Language support"
optional_depends "libgnomeui" "--with-gnome" "--with-gtk" "for Gnome support (N for GTK+-2 only version)"
optional_depends "cairo" "--enable-cairo" "--disable-cairo" "use cairo for GTK splash screen"
diff --git a/science/jasper/DEPENDS b/science/jasper/DEPENDS
index 0ed92dd..a5a54c8 100644
--- a/science/jasper/DEPENDS
+++ b/science/jasper/DEPENDS
@@ -1,9 +1,2 @@
-optional_depends "%JPEG" \
- "--enable-libjpeg" \
- "--disable-libjpeg" \
- "for JPEG support"
-
-optional_depends "%GLUT" \
- "--enable-opengl" \
- "--disable-opengl" \
- "for OpenGL support"
+optional_depends "%JPEG" "--enable-libjpeg" "--disable-libjpeg" "for JPEG support"
+optional_depends "freeglut" "--enable-opengl" "--disable-opengl" "for OpenGL support"
diff --git a/x11-apps/xlockmore/DEPENDS b/x11-apps/xlockmore/DEPENDS
index 058f152..aa8e349 100644
--- a/x11-apps/xlockmore/DEPENDS
+++ b/x11-apps/xlockmore/DEPENDS
@@ -1,3 +1,3 @@
-optional_depends gtk+-2 "" "" "to build xglock, a xlock GUI configuration tool"
-optional_depends Linux-PAM "--enable-pam" "--disable-pam" "for PAM support"
-optional_depends "%GLUT" "" "" "may be required to view some 3d screen hacks"
+optional_depends gtk+-2 "" "" "to build xglock, a xlock GUI configuration tool"
+optional_depends Linux-PAM "--enable-pam" "--disable-pam" "for PAM support"
+optional_depends "freeglut" "" "" "may be required to view some 3d screen hacks"
diff --git a/xorg7/mesa-lib/POST_INSTALL b/xorg7/mesa-lib/POST_INSTALL
index 08c1dd3..b8d3fcb 100644
--- a/xorg7/mesa-lib/POST_INSTALL
+++ b/xorg7/mesa-lib/POST_INSTALL
@@ -1,13 +1,7 @@
if [[ ! -e /usr/include/GL/glut.h ]] ; then
- # freeglut provides %GLUT, previously overlapping with mesa-lib.
- # mesa-lib previously installed part of %GLUT, so install freeglut so it is complete.
- # Still need to support the deprecated glut also.
- GLUT=`unalias %GLUT`
- if [[ $GLUT == "glut" ]] ; then
- lin -c glut
- else
- # Preferred default
- lin -c freeglut
- fi
+ # mesa-lib previously installed part of glut,
+ # so install freeglut so it is complete
+ lin -c freeglut
fi
+
lin -c mesa-demos
diff --git a/zbeta/lugaru-hg/DEPENDS b/zbeta/lugaru-hg/DEPENDS
index e89e33f..60f7263 100644
--- a/zbeta/lugaru-hg/DEPENDS
+++ b/zbeta/lugaru-hg/DEPENDS
@@ -2,7 +2,7 @@ depends cmake
depends %JPEG
depends libpng
depends libvorbis
-depends %GLUT
+depends freeglut
depends openal
depends SDL
depends xdg-utils
More information about the Lunar-commits
mailing list