[pkgsrc/trunk]: pkgsrc/graphics/glew Fix buildling on Darwin, including unive...

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bca99a3e7ba7
branches:  trunk
changeset: 398471:bca99a3e7ba7
user:      adam <adam%pkgsrc.org@localhost>
date:      Mon Aug 31 11:18:58 2009 +0000

description:
Fix buildling on Darwin, including universal binaries

diffstat:

 graphics/glew/Makefile         |   7 +++++--
 graphics/glew/distinfo         |   5 +++--
 graphics/glew/patches/patch-ac |  10 +++++-----
 graphics/glew/patches/patch-ad |  22 ++++++++++++++++++++++
 4 files changed, 35 insertions(+), 9 deletions(-)

diffs (106 lines):

diff -r d95c2df160bc -r bca99a3e7ba7 graphics/glew/Makefile
--- a/graphics/glew/Makefile    Mon Aug 31 10:20:25 2009 +0000
+++ b/graphics/glew/Makefile    Mon Aug 31 11:18:58 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/08/21 15:02:32 adam Exp $
+# $NetBSD: Makefile,v 1.6 2009/08/31 11:18:58 adam Exp $
 
 DISTNAME=      glew-1.5.0-src
 PKGNAME=       glew-1.5.0
@@ -20,12 +20,15 @@
 MAKE_ENV+=     GLEW_DEST=${PREFIX} X11=${PREFIX} POPT=${CFLAGS:Q}
 MAKE_ENV+=     LDFLAGS.EXTRA=${X11_LDFLAGS:Q}
 
-post-extract:
+post-patch:
        ${LN} -s Makefile.netbsdelf ${WRKSRC}/config/Makefile.dragonfly
        ${LN} -s Makefile.netbsdelf ${WRKSRC}/config/Makefile.netbsd
 
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} != "Darwin"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/libXi/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
+.endif
 .include "../../mk/bsd.pkg.mk"
diff -r d95c2df160bc -r bca99a3e7ba7 graphics/glew/distinfo
--- a/graphics/glew/distinfo    Mon Aug 31 10:20:25 2009 +0000
+++ b/graphics/glew/distinfo    Mon Aug 31 11:18:58 2009 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.4 2009/08/21 15:02:32 adam Exp $
+$NetBSD: distinfo,v 1.5 2009/08/31 11:18:58 adam Exp $
 
 SHA1 (glew-1.5.0-src.tgz) = 17fa3b2f5b72a227c5e14631c2bda3fcfd8c1663
 RMD160 (glew-1.5.0-src.tgz) = 2fa13cd326e82fc9c043d1fcbf2c4da062723296
 Size (glew-1.5.0-src.tgz) = 356247 bytes
 SHA1 (patch-aa) = 8f1d6f48e26f8ce13282b676ac18ac49f596ae9b
 SHA1 (patch-ab) = a42d2fd9dc625991235d8aa806bd489f63e9d0ce
-SHA1 (patch-ac) = 64a66dc580afb076f5521469612521b9ad802c43
+SHA1 (patch-ac) = c6d00b36fa25c7d517837f22aa37c72c74e27a67
+SHA1 (patch-ad) = bea22c27d4574408abd6f6153b74fd97ebf4edb3
diff -r d95c2df160bc -r bca99a3e7ba7 graphics/glew/patches/patch-ac
--- a/graphics/glew/patches/patch-ac    Mon Aug 31 10:20:25 2009 +0000
+++ b/graphics/glew/patches/patch-ac    Mon Aug 31 11:18:58 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.3 2009/08/21 15:02:32 adam Exp $
+$NetBSD: patch-ac,v 1.4 2009/08/31 11:18:58 adam Exp $
 
---- Makefile.orig      2009-08-19 19:40:40.000000000 +0200
+--- Makefile.orig      2007-12-28 04:05:25.000000000 +0100
 +++ Makefile
 @@ -84,7 +84,7 @@ lib/$(LIB.STATIC): $(LIB.OBJS)
        $(AR) cr $@ $^
@@ -24,7 +24,7 @@
  
  %.o: %.c
        $(CC) -c $(CFLAGS) -o $@ $<
-@@ -108,31 +108,31 @@ src/glew.pic_o: src/glew.c include/GL/gl
+@@ -108,31 +108,29 @@ src/glew.pic_o: src/glew.c include/GL/gl
  
  install: all
  # directories
@@ -39,7 +39,7 @@
        $(STRIP) -x lib/$(LIB.SHARED)
        $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(BINDIR)/
  else
-       $(STRIP) -x lib/$(LIB.SHARED)
+-      $(STRIP) -x lib/$(LIB.SHARED)
 -      $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/
 -      $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME)
 +      $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(DESTDIR)$(LIBDIR)/
@@ -55,7 +55,7 @@
  ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw)
        $(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(LIBDIR)/
  else
-       strip -x lib/$(LIB.STATIC)
+-      strip -x lib/$(LIB.STATIC)
 -      $(INSTALL) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/
 -      $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK)
 +      $(INSTALL) -m 0644 lib/$(LIB.STATIC) $(DESTDIR)$(LIBDIR)/
diff -r d95c2df160bc -r bca99a3e7ba7 graphics/glew/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/glew/patches/patch-ad    Mon Aug 31 11:18:58 2009 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1 2009/08/31 11:18:58 adam Exp $
+
+--- config/Makefile.darwin.orig        2009-08-31 11:41:51.000000000 +0200
++++ config/Makefile.darwin
+@@ -6,7 +6,7 @@ ifneq (undefined, $(origin GLEW_MX))
+ CFLAGS.EXTRA += -DGLEW_MX
+ endif
+ PICFLAG = -fPIC
+-LDFLAGS.SO = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED)
++LDFLAGS.SO = -dynamiclib -install_name $(LIB.SHARED)
+ LDFLAGS.EXTRA =
+ ifneq (undefined, $(origin GLEW_APPLE_GLX))
+ CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX'
+@@ -17,7 +17,7 @@ endif
+ LDFLAGS.STATIC =
+ LDFLAGS.DYNAMIC =
+ WARN = -Wall -W
+-POPT = -O2
++POPT ?= -O2
+ BIN.SUFFIX =
+ LIB.SONAME = lib$(NAME).$(SO_MAJOR).dylib
+ LIB.DEVLNK = lib$(NAME).dylib