Sun Jan 29 15:53:27 2012 UTC ()
time/glclock: Restore libGL reference to patch-aa

On 24 April 2008, the GL library was removed from the configuration
to "Fix build with the latest version of the Mesalib package".  Symbols
from this library are still referenced though.

The patch was changed to the original libraries and order with the
exception of the additional libSM and libICE.  It builds fine using
the latest Mesalib package.


(marino)
diff -r1.8 -r1.9 pkgsrc/time/glclock/distinfo
diff -r1.5 -r1.6 pkgsrc/time/glclock/patches/patch-aa
cvs diff -r1.8 -r1.9 pkgsrc/time/glclock/distinfo (expand / switch to unified diff)

--- pkgsrc/time/glclock/distinfo 2011/11/25 22:19:56 1.8
+++ pkgsrc/time/glclock/distinfo 2012/01/29 15:53:27 1.9
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.8 2011/11/25 22:19:56 joerg Exp $ 1$NetBSD: distinfo,v 1.9 2012/01/29 15:53:27 marino Exp $
2 2
3SHA1 (glclock-6.0b6.0.tar.gz) = e276a516d543c9a6c04f06cfa046f89a476a8685 3SHA1 (glclock-6.0b6.0.tar.gz) = e276a516d543c9a6c04f06cfa046f89a476a8685
4RMD160 (glclock-6.0b6.0.tar.gz) = f0bd207a47a01e3dc3d3da5b107b168a3210d2a3 4RMD160 (glclock-6.0b6.0.tar.gz) = f0bd207a47a01e3dc3d3da5b107b168a3210d2a3
5Size (glclock-6.0b6.0.tar.gz) = 811803 bytes 5Size (glclock-6.0b6.0.tar.gz) = 811803 bytes
6SHA1 (patch-GLObject.H) = 62040251be8e6dba3d744640fdcb614eed30a306 6SHA1 (patch-GLObject.H) = 62040251be8e6dba3d744640fdcb614eed30a306
7SHA1 (patch-MString.H) = 3d31d19c33327d6b6775d9bb7db165a8949e4fc2 7SHA1 (patch-MString.H) = 3d31d19c33327d6b6775d9bb7db165a8949e4fc2
8SHA1 (patch-aa) = d2526e6ce7679ce67835b6b916b4524b4249d7e5 8SHA1 (patch-aa) = 922d73d2c864abde5ca9a39ca27d4740ceedb616
9SHA1 (patch-ab) = 8d4f12c9948d703e4fbff68282388efc7a352f59 9SHA1 (patch-ab) = 8d4f12c9948d703e4fbff68282388efc7a352f59
10SHA1 (patch-ac) = d06a44d725820c2988888665c4d5dd75161525b8 10SHA1 (patch-ac) = d06a44d725820c2988888665c4d5dd75161525b8
cvs diff -r1.5 -r1.6 pkgsrc/time/glclock/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/time/glclock/patches/patch-aa 2008/04/24 13:57:08 1.5
+++ pkgsrc/time/glclock/patches/patch-aa 2012/01/29 15:53:27 1.6
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: patch-aa,v 1.5 2008/04/24 13:57:08 tron Exp $ 1$NetBSD: patch-aa,v 1.6 2012/01/29 15:53:27 marino Exp $
2 2
3--- makefile.orig 2000-06-18 15:37:40.000000000 +0100 3--- makefile.orig 2000-06-18 15:37:40.000000000 +0100
4+++ makefile 2008-04-24 14:54:35.000000000 +0100 4+++ makefile 2008-04-24 14:54:35.000000000 +0100
5@@ -13,12 +13,12 @@ 5@@ -13,12 +13,12 @@
6  6
7 COMPILER = g++ -c 7 COMPILER = g++ -c
8 LINKER = g++ 8 LINKER = g++
9- OPT = -O2 9- OPT = -O2
10+ OPT =  10+ OPT =
11  11
12- INCLUDE_PATH = -I/usr/X11R6/include 12- INCLUDE_PATH = -I/usr/X11R6/include
13- LIB_PATH = -L/usr/X11R6/lib 13- LIB_PATH = -L/usr/X11R6/lib
14+ INCLUDE_PATH = -I${LOCALBASE}/include 14+ INCLUDE_PATH = -I${LOCALBASE}/include
15+ LIB_PATH = -L${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -Wl,-R${LOCALBASE}/lib 15+ LIB_PATH = -L${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -Wl,-R${LOCALBASE}/lib
16  16
17- LIBS = -lglut -lGLU -lGL -lXi -lXmu -lXext -lX11 -lm 17- LIBS = -lglut -lGLU -lGL -lXi -lXmu -lXext -lX11 -lm
18+ LIBS = -lglut -lGLU -lXext -lXmu -lXt -lSM -lICE -lXi -lX11 -lm 18+ LIBS = -lglut -lGLU -lGL -lXi -lXmu -lXext -lX11 -lXt -lSM -lICE -lm
19 MARK_LIBS = -lm 19 MARK_LIBS = -lm
20  20
21 # 21 #