SOURCES: glut-examples-paths.patch, glut-lib64.patch, glut-link.pa...

[qboosh]

Author: qboosh                       Date: Sat Apr 15 21:21:00 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- killed /usr/X11R6

---- Files affected:
SOURCES:
   glut-examples-paths.patch (1.1 -> 1.2) , glut-lib64.patch (1.1 -> 1.2) , glut-link.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/glut-examples-paths.patch
diff -u SOURCES/glut-examples-paths.patch:1.1 SOURCES/glut-examples-paths.patch:1.2
--- SOURCES/glut-examples-paths.patch:1.1	Thu Apr  5 18:06:53 2001
+++ SOURCES/glut-examples-paths.patch	Sat Apr 15 23:20:55 2006
@@ -87,7 +87,7 @@
 +XMU_HEADERS = /usr/contrib/X11R5/include/
 +EXTRA_INCLUDES = -I$(TOP)/include -I$(XMU_HEADERS)
 +#else
-+EXTRA_INCLUDES = -I/usr/X11R6/include
++EXTRA_INCLUDES =
 +#endif
 +
 +GLUT_DEPLIBS = $(DEPGLUT) $(DEPXMULIB) $(DEPXLIB)
@@ -108,15 +108,15 @@
 +#endif
 +
 +#ifndef AlphaArchitecture
-+DEPGLUT = /usr/X11R6/lib/libglut.so
-+GLUT = -L/usr/X11R6/lib -lglut
++DEPGLUT = /usr/lib/libglut.so
++GLUT = -lglut
 +#endif
-+DEPMUI = /usr/X11R6/lib/libmui.a
-+MUI = -L/usr/X11R6/lib -lmui
-+DEPGLE = /usr/X11R6/lib/libgle.a
-+GLE = -L/usr/X11R6/lib -lgle
-+DEPGLSMAP = /usr/X11R6/lib/libglsmap.a
-+GLSMAP = -L/usr/X11R6/lib -lglsmap
++DEPMUI = /usr/lib/libmui.a
++MUI = -lmui
++DEPGLE = /usr/lib/libgle.a
++GLE = -lgle
++DEPGLSMAP = /usr/lib/libglsmap.a
++GLSMAP = -lglsmap
 +
 +CXXEXTRA_INCLUDES = -I/usr/include/CC $(EXTRA_INCLUDES)
 +GLUT_INVENTOR_DEPLIBS = $(GLUT_DEPLIBS)

================================================================
Index: SOURCES/glut-lib64.patch
diff -u SOURCES/glut-lib64.patch:1.1 SOURCES/glut-lib64.patch:1.2
--- SOURCES/glut-lib64.patch:1.1	Mon Dec 29 18:42:24 2003
+++ SOURCES/glut-lib64.patch	Sat Apr 15 23:20:55 2006
@@ -37,23 +37,23 @@
  #endif
  
  #ifndef AlphaArchitecture
--DEPGLUT = /usr/X11R6/lib/libglut.so
--GLUT = -L/usr/X11R6/lib -lglut
-+DEPGLUT = /usr/X11R6/lib64/libglut.so
-+GLUT = -L/usr/X11R6/lib64 -lglut
+-DEPGLUT = /usr/lib/libglut.so
+-GLUT = -lglut
++DEPGLUT = /usr/lib64/libglut.so
++GLUT = -lglut
  #endif
--DEPMUI = /usr/X11R6/lib/libmui.a
--MUI = -L/usr/X11R6/lib -lmui
--DEPGLE = /usr/X11R6/lib/libgle.a
--GLE = -L/usr/X11R6/lib -lgle
--DEPGLSMAP = /usr/X11R6/lib/libglsmap.a
--GLSMAP = -L/usr/X11R6/lib -lglsmap
-+DEPMUI = /usr/X11R6/lib64/libmui.a
-+MUI = -L/usr/X11R6/lib64 -lmui
-+DEPGLE = /usr/X11R6/lib64/libgle.a
-+GLE = -L/usr/X11R6/lib64 -lgle
-+DEPGLSMAP = /usr/X11R6/lib64/libglsmap.a
-+GLSMAP = -L/usr/X11R6/lib64 -lglsmap
+-DEPMUI = /usr/lib/libmui.a
+-MUI = -lmui
+-DEPGLE = /usr/lib/libgle.a
+-GLE = -lgle
+-DEPGLSMAP = /usr/lib/libglsmap.a
+-GLSMAP = -lglsmap
++DEPMUI = /usr/lib64/libmui.a
++MUI = -lmui
++DEPGLE = /usr/lib64/libgle.a
++GLE = -lgle
++DEPGLSMAP = /usr/lib64/libglsmap.a
++GLSMAP = -lglsmap
  
  CXXEXTRA_INCLUDES = -I/usr/include/CC $(EXTRA_INCLUDES)
  GLUT_INVENTOR_DEPLIBS = $(GLUT_DEPLIBS)

================================================================
Index: SOURCES/glut-link.patch
diff -u SOURCES/glut-link.patch:1.1 SOURCES/glut-link.patch:1.2
--- SOURCES/glut-link.patch:1.1	Sat Oct 20 18:50:17 2001
+++ SOURCES/glut-link.patch	Sat Apr 15 23:20:55 2006
@@ -5,7 +5,7 @@
  
  libglut.so: $(OBJS)
 -	gcc -shared -Wl,-soname,libglut.so.3 -o libglut.so.3.7 $(OBJS)
-+	gcc -shared -Wl,-soname,libglut.so.3 -o libglut.so.3.7 $(OBJS) -L/usr/X11R6/lib -lX11 -lXmu -lXi -lGL -lGLU -lm
++	gcc -shared -Wl,-soname,libglut.so.3 -o libglut.so.3.7 $(OBJS) -lX11 -lXmu  -lGL -lGLU -lm
  	$(_NULLCMD_)
  
  clean::
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/glut-examples-paths.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/glut-lib64.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/glut-link.patch?r1=1.1&r2=1.2&f=u