[SM-Commit] GIT changes to master z-rejected grimoire by Arjan Bouter (1c9f8dca9a055dd59c285dc2123b654108b8a99e)

Arjan Bouter scm at sourcemage.org
Sat Jul 18 12:30:54 EDT 2009


GIT changes to master z-rejected grimoire by Arjan Bouter <abouter at sourcemage.org>:

 z-graphics/glut/BUILD   |    6 +++---
 z-graphics/glut/HISTORY |    3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 1c9f8dca9a055dd59c285dc2123b654108b8a99e
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    glut: changed to xorg locations

diff --git a/z-graphics/glut/BUILD b/z-graphics/glut/BUILD
index 7dfc795..3407b64 100755
--- a/z-graphics/glut/BUILD
+++ b/z-graphics/glut/BUILD
@@ -3,14 +3,14 @@ if  !  echo  $PATH  |  grep  -q  "/usr/X11R6/bin"  ;  then
 fi  &&
 
    MESA_FIX="s/\$(TOP)\/..\/lib\/libMesa/\/usr\/X11R6\/lib\/lib/"
-SYMBOL_LIBS="-L/usr/X11R6/lib,-lX11,-lGL,-lGLU,-lXmu,-lXi"
+SYMBOL_LIBS="-L/usr/lib,-lX11,-lGL,-lGLU,-lXmu,-lXi"
  SYMBOL_FIX="s:,libglut.so.3:,libglut.so.3,$SYMBOL_LIBS:"
  CFLAGS_FIX="s/-O2 -m486/$CFLAGS/"
 
 cp     Glut.cf  Glut.cf.bak                                   &&
 sed    $MESA_FIX < linux/Glut.cf > Glut.cf                    &&
-cp  /usr/X11R6/lib/X11/config/*  .                            &&
-imake  -DUseInstalled -I/usr/X11R6/lib/X11/config -DTOPDIR=.  &&
+cp  /usr/lib/X11/config/*  .                            &&
+imake  -DUseInstalled -I/usr/lib/X11/config -DTOPDIR=.  &&
 imake  -a                                                     &&
 cp     lib/glut/Makefile lib/glut/Makefile.bak                &&
 sed    "$CFLAGS_FIX"  <     linux/Makefile                    |
diff --git a/z-graphics/glut/HISTORY b/z-graphics/glut/HISTORY
index cc7d858..e0b3214 100644
--- a/z-graphics/glut/HISTORY
+++ b/z-graphics/glut/HISTORY
@@ -1,3 +1,6 @@
+2009-07-18 Arjan Bouter <abouter at sourcemage.org>
+	* Changed BUILD to use xorg locations
+
 2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
 	* PROVIDES: [automated] Fixed invalid entries.
 



More information about the SM-Commit mailing list