Tue Nov 3 20:28:45 2015 UTC ()
Fix for pkg-config creation on Darwin


(adam)
diff -r1.19 -r1.20 pkgsrc/graphics/glew/distinfo
diff -r1.12 -r1.13 pkgsrc/graphics/glew/patches/patch-ac
cvs diff -r1.19 -r1.20 pkgsrc/graphics/glew/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/glew/distinfo 2015/08/12 10:52:48 1.19
+++ pkgsrc/graphics/glew/distinfo 2015/11/03 20:28:45 1.20
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.19 2015/08/12 10:52:48 adam Exp $ 1$NetBSD: distinfo,v 1.20 2015/11/03 20:28:45 adam Exp $
2 2
3SHA1 (glew-1.13.0.tgz) = d5b1c499f429aa91c466193b4e8ea94a84019e37 3SHA1 (glew-1.13.0.tgz) = d5b1c499f429aa91c466193b4e8ea94a84019e37
4RMD160 (glew-1.13.0.tgz) = 4ed99bea403cbe72d05cfca25694b31209922f9f 4RMD160 (glew-1.13.0.tgz) = 4ed99bea403cbe72d05cfca25694b31209922f9f
 5SHA512 (glew-1.13.0.tgz) = 8fc8d7c0d2cd9235ea51db9972f492701827bff40642fdb3cc54c10b0737dba8e6d8d0dcd8c5aa5bfaaae39c6198ba3d4292cd1662fbe1977eb9a5d187ba635f
5Size (glew-1.13.0.tgz) = 616070 bytes 6Size (glew-1.13.0.tgz) = 616070 bytes
6SHA1 (patch-ac) = 2b2e391420a6467808530d387871e708f70a4a11 7SHA1 (patch-ac) = c660635a526a7da09282b50567b9b230a35bd774
7SHA1 (patch-config_Makefile.linux) = 49ae0366211065225c944cd0088af6e591f12aa9 8SHA1 (patch-config_Makefile.linux) = 49ae0366211065225c944cd0088af6e591f12aa9
cvs diff -r1.12 -r1.13 pkgsrc/graphics/glew/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/graphics/glew/patches/Attic/patch-ac 2015/08/12 10:52:49 1.12
+++ pkgsrc/graphics/glew/patches/Attic/patch-ac 2015/11/03 20:28:45 1.13
@@ -1,38 +1,50 @@ @@ -1,38 +1,50 @@
1$NetBSD: patch-ac,v 1.12 2015/08/12 10:52:49 adam Exp $ 1$NetBSD: patch-ac,v 1.13 2015/11/03 20:28:45 adam Exp $
2 2
 3On Darwin, do not put GLU as required lib in glew.pc.
3Use LDFLAGS for linking. 4Use LDFLAGS for linking.
4 5
5--- Makefile.orig 2015-08-10 11:47:22.000000000 +0000 6--- Makefile.orig 2015-11-03 19:58:23.000000000 +0000
6+++ Makefile 7+++ Makefile
7@@ -115,7 +115,7 @@ ifneq ($(STRIP),) 8@@ -47,8 +47,10 @@ LIBDIR ?= $(GLEW_DEST)/lib
 9 INCDIR ?= $(GLEW_DEST)/include/GL
 10
 11 ifneq ($(GLEW_NO_GLU), -DGLEW_NO_GLU)
 12+ifneq ($(SYSTEM), darwin)
 13 LIBGLU = glu
 14 endif
 15+endif
 16
 17 DIST_NAME ?= glew-$(GLEW_VERSION)
 18 DIST_SRC_ZIP ?= $(shell pwd)/$(DIST_NAME).zip
 19@@ -115,7 +117,7 @@ ifneq ($(STRIP),)
8 endif 20 endif
9  21
10 lib/$(LIB.SHARED): $(LIB.SOBJS) 22 lib/$(LIB.SHARED): $(LIB.SOBJS)
11- $(LD) $(LDFLAGS.SO) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS) 23- $(LD) $(LDFLAGS.SO) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS)
12+ $(LD) $(LDFLAGS) $(LDFLAGS.SO) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS) 24+ $(LD) $(LDFLAGS) $(LDFLAGS.SO) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS)
13 ifneq ($(LN),) 25 ifneq ($(LN),)
14 $(LN) $(LIB.SHARED) lib/$(LIB.SONAME) 26 $(LN) $(LIB.SHARED) lib/$(LIB.SONAME)
15 $(LN) $(LIB.SHARED) lib/$(LIB.DEVLNK) 27 $(LN) $(LIB.SHARED) lib/$(LIB.DEVLNK)
16@@ -163,7 +163,7 @@ ifneq ($(STRIP),) 28@@ -163,7 +165,7 @@ ifneq ($(STRIP),)
17 endif 29 endif
18  30
19 lib/$(LIB.SHARED.MX): $(LIB.SOBJS.MX) 31 lib/$(LIB.SHARED.MX): $(LIB.SOBJS.MX)
20- $(LD) $(LDFLAGS.SO.MX) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS) 32- $(LD) $(LDFLAGS.SO.MX) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS)
21+ $(LD) $(LDFLAGS) $(LDFLAGS.SO.MX) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS) 33+ $(LD) $(LDFLAGS) $(LDFLAGS.SO.MX) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS)
22 ifneq ($(LN),) 34 ifneq ($(LN),)
23 $(LN) $(LIB.SHARED.MX) lib/$(LIB.SONAME.MX) 35 $(LN) $(LIB.SHARED.MX) lib/$(LIB.SONAME.MX)
24 $(LN) $(LIB.SHARED.MX) lib/$(LIB.DEVLNK.MX) 36 $(LN) $(LIB.SHARED.MX) lib/$(LIB.DEVLNK.MX)
25@@ -222,13 +222,13 @@ bin: 37@@ -222,13 +224,13 @@ bin:
26 mkdir bin 38 mkdir bin
27  39
28 bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.OBJ) lib/$(LIB.SHARED) 40 bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.OBJ) lib/$(LIB.SHARED)
29- $(CC) $(CFLAGS) -o $@ $(GLEWINFO.BIN.OBJ) $(BIN.LIBS) 41- $(CC) $(CFLAGS) -o $@ $(GLEWINFO.BIN.OBJ) $(BIN.LIBS)
30+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(GLEWINFO.BIN.OBJ) $(BIN.LIBS) 42+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(GLEWINFO.BIN.OBJ) $(BIN.LIBS)
31 ifneq ($(STRIP),) 43 ifneq ($(STRIP),)
32 $(STRIP) -x $@ 44 $(STRIP) -x $@
33 endif 45 endif
34  46
35 bin/$(VISUALINFO.BIN): $(VISUALINFO.BIN.OBJ) lib/$(LIB.SHARED) 47 bin/$(VISUALINFO.BIN): $(VISUALINFO.BIN.OBJ) lib/$(LIB.SHARED)
36- $(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.OBJ) $(BIN.LIBS) 48- $(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.OBJ) $(BIN.LIBS)
37+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(VISUALINFO.BIN.OBJ) $(BIN.LIBS) 49+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(VISUALINFO.BIN.OBJ) $(BIN.LIBS)
38 ifneq ($(STRIP),) 50 ifneq ($(STRIP),)