Fix config issues leading to broken build. Set -fPIC. Add destdir support.

PKGREVISION++

4 files changed, 74 insertions, 10 deletions

diff --git a/graphics/glew/Makefile b/graphics/glew/Makefile
index 0bf410931ea..a8c079591c6 100644
--- a/graphics/glew/Makefile
+++ b/graphics/glew/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/02/15 14:58:20 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/09/01 10:06:33 dholland Exp $
 #
 
+DISTNAME=	glew-1.3.4-src
 PKGNAME=	glew-1.3.4
-DISTNAME=	${PKGNAME}-src
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=glew/}
 EXTRACT_SUFX=	.tgz
@@ -18,8 +19,11 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://glew.sourceforge.net/
 COMMENT=	OpenGL Extension Wrangler Library
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 post-extract:
 	${LN} -s Makefile.netbsdelf ${WRKSRC}/config/Makefile.dragonfly
+	${LN} -s Makefile.netbsdelf ${WRKSRC}/config/Makefile.netbsd
 
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
diff --git a/graphics/glew/distinfo b/graphics/glew/distinfo
index d8810a2c149..274a96cd80b 100644
--- a/graphics/glew/distinfo
+++ b/graphics/glew/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2006/10/04 21:59:27 rillig Exp $
+$NetBSD: distinfo,v 1.3 2008/09/01 10:06:33 dholland Exp $
 
 SHA1 (glew-1.3.4-src.tgz) = d70fb9fc07b99ec87a192818f73fc31b42c0811b
 RMD160 (glew-1.3.4-src.tgz) = 1f845fddb61c5a679a105aeae9ff21037d9fab6d
 Size (glew-1.3.4-src.tgz) = 362854 bytes
-SHA1 (patch-aa) = 4d29ab40d2a12c433f804f953c0309df52611588
+SHA1 (patch-aa) = 8f1d6f48e26f8ce13282b676ac18ac49f596ae9b
 SHA1 (patch-ab) = 35e46b52e743d2d4e3dcb275c57d91676f64b9b4
-SHA1 (patch-ac) = 426186e47277f63dd7853c84e76b1192a7913b2c
+SHA1 (patch-ac) = 21e8ec234672357bae7a3ac0123d0ddd90987246
diff --git a/graphics/glew/patches/patch-aa b/graphics/glew/patches/patch-aa
index 96db5a39318..6801c128864 100644
--- a/graphics/glew/patches/patch-aa
+++ b/graphics/glew/patches/patch-aa
@@ -1,14 +1,15 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/08/15 15:21:27 abs Exp $
+$NetBSD: patch-aa,v 1.2 2008/09/01 10:06:33 dholland Exp $
 
 --- config/Makefile.netbsdelf.orig	2006-02-03 13:24:33.000000000 +0000
 +++ config/Makefile.netbsdelf
-@@ -0,0 +1,21 @@
+@@ -0,0 +1,23 @@
 +NAME = $(GLEW_NAME)
 +CC = cc
 +LD = ld
 +ifneq (undefined, $(origin GLEW_MX))
 +CFLAGS.EXTRA = -DGLEW_MX
 +endif
++PICFLAG = -fPIC
 +X11 ?= /usr/X11R6
 +LDFLAGS.SO = -shared -soname $(LIB.SONAME)
 +LDFLAGS.EXTRA ?= -L${X11}/lib
@@ -24,3 +25,4 @@ $NetBSD: patch-aa,v 1.1.1.1 2006/08/15 15:21:27 abs Exp $
 +LIB.DEVLNK = lib$(NAME).so
 +LIB.SHARED = lib$(NAME).so.$(SO_VERSION)
 +LIB.STATIC = lib$(NAME).a
++SHARED_OBJ_EXT = pic_o
diff --git a/graphics/glew/patches/patch-ac b/graphics/glew/patches/patch-ac
index 69eca5b48df..511c0ed565e 100644
--- a/graphics/glew/patches/patch-ac
+++ b/graphics/glew/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1 2006/10/04 21:59:27 rillig Exp $
+$NetBSD: patch-ac,v 1.2 2008/09/01 10:06:33 dholland Exp $
 
---- Makefile.orig	2006-03-03 00:02:51.000000000 +0100
-+++ Makefile	2006-10-04 23:57:19.000000000 +0200
+--- Makefile.orig	2006-03-02 18:02:51.000000000 -0500
++++ Makefile	2008-09-01 06:02:30.000000000 -0400
 @@ -87,7 +87,7 @@ lib/$(LIB.STATIC): $(LIB.OBJS)
  	$(AR) cr $@ $^
  
@@ -24,3 +24,61 @@ $NetBSD: patch-ac,v 1.1 2006/10/04 21:59:27 rillig Exp $
  
  %.o: %.c
  	$(CC) -c $(CFLAGS) -o $@ $<
+@@ -111,40 +111,40 @@ src/glew.pic_o: src/glew.c include/GL/gl
+ 
+ install: all
+ # directories
+-	$(INSTALL) -d -m 0755 $(GLEW_DEST)/bin
+-	$(INSTALL) -d -m 0755 $(GLEW_DEST)/include/GL
+-	$(INSTALL) -d -m 0755 $(LIBDIR)
++	$(INSTALL) -d -m 0755 $(DESTDIR)$(GLEW_DEST)/bin
++	$(INSTALL) -d -m 0755 $(DESTDIR)$(GLEW_DEST)/include/GL
++	$(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR)
+ # runtime
+ ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw)
+-	$(INSTALL) $(STRIP) -m 0644 lib/$(LIB.SHARED) $(GLEW_DEST)/bin/
++	$(INSTALL) $(STRIP) -m 0644 lib/$(LIB.SHARED) $(DESTDIR)$(GLEW_DEST)/bin/
+ else
+   ifeq ($(patsubst darwin%,darwin,$(SYSTEM)), darwin)
+ 	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)/
++	$(LN) $(LIB.SHARED) $(DESTDIR)$(LIBDIR)/$(LIB.SONAME)
+   else
+-	$(INSTALL) $(STRIP) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/
+-	$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME)
++	$(INSTALL) $(STRIP) -m 0644 lib/$(LIB.SHARED) $(DESTDIR)$(LIBDIR)/
++	$(LN) $(LIB.SHARED) $(DESTDIR)$(LIBDIR)/$(LIB.SONAME)
+   endif
+ endif
+ # development files
+-	$(INSTALL) -m 0644 include/GL/wglew.h $(GLEW_DEST)/include/GL
+-	$(INSTALL) -m 0644 include/GL/glew.h $(GLEW_DEST)/include/GL
+-	$(INSTALL) -m 0644 include/GL/glxew.h $(GLEW_DEST)/include/GL
++	$(INSTALL) -m 0644 include/GL/wglew.h $(DESTDIR)$(GLEW_DEST)/include/GL
++	$(INSTALL) -m 0644 include/GL/glew.h $(DESTDIR)$(GLEW_DEST)/include/GL
++	$(INSTALL) -m 0644 include/GL/glxew.h $(DESTDIR)$(GLEW_DEST)/include/GL
+ ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw)
+-	$(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(LIBDIR)/
++	$(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(DESTDIR)$(LIBDIR)/
+ else
+   ifeq ($(patsubst darwin%,darwin,$(SYSTEM)), darwin)
+ 	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)/
++	$(LN) $(LIB.SHARED) $(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK)
+   else
+-	$(INSTALL) $(STRIP) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/
+-	$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK)
++	$(INSTALL) $(STRIP) -m 0644 lib/$(LIB.STATIC) $(DESTDIR)$(LIBDIR)/
++	$(LN) $(LIB.SHARED) $(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK)
+   endif
+ endif
+ # utilities
+-	$(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(GLEW_DEST)/bin/
++	$(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(DESTDIR)$(GLEW_DEST)/bin/
+ 
+ uninstall:
+ 	$(RM) $(GLEW_DEST)/include/GL/wglew.h