[pkgsrc/trunk]: pkgsrc/graphics/glew Fix config issues leading to broken buil...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/graphics/glew Fix config issues leading to broken buil...
From: dholland <dholland%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 06:31:38 +0000

details:   https://anonhg.NetBSD.org/pkgsrc/rev/de6c9f4f747e
branches:  trunk
changeset: 546436:de6c9f4f747e
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Mon Sep 01 10:06:33 2008 +0000

description:
Fix config issues leading to broken build. Set -fPIC. Add destdir support.
PKGREVISION++

diffstat:

 graphics/glew/Makefile         |   8 +++-
 graphics/glew/distinfo         |   6 +-
 graphics/glew/patches/patch-aa |   6 ++-
 graphics/glew/patches/patch-ac |  64 ++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 74 insertions(+), 10 deletions(-)

diffs (144 lines):

diff -r ecfe79e5a5b8 -r de6c9f4f747e graphics/glew/Makefile
--- a/graphics/glew/Makefile    Mon Sep 01 09:28:54 2008 +0000
+++ b/graphics/glew/Makefile    Mon Sep 01 10:06:33 2008 +0000
@@ -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 @@
 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 -r ecfe79e5a5b8 -r de6c9f4f747e graphics/glew/distinfo
--- a/graphics/glew/distinfo    Mon Sep 01 09:28:54 2008 +0000
+++ b/graphics/glew/distinfo    Mon Sep 01 10:06:33 2008 +0000
@@ -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 -r ecfe79e5a5b8 -r de6c9f4f747e graphics/glew/patches/patch-aa
--- a/graphics/glew/patches/patch-aa    Mon Sep 01 09:28:54 2008 +0000
+++ b/graphics/glew/patches/patch-aa    Mon Sep 01 10:06:33 2008 +0000
@@ -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 @@
 +LIB.DEVLNK = lib$(NAME).so
 +LIB.SHARED = lib$(NAME).so.$(SO_VERSION)
 +LIB.STATIC = lib$(NAME).a
++SHARED_OBJ_EXT = pic_o
diff -r ecfe79e5a5b8 -r de6c9f4f747e graphics/glew/patches/patch-ac
--- a/graphics/glew/patches/patch-ac    Mon Sep 01 09:28:54 2008 +0000
+++ b/graphics/glew/patches/patch-ac    Mon Sep 01 10:06:33 2008 +0000
@@ -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 @@
  
  %.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

Prev by Date: [pkgsrc/trunk]: pkgsrc/lang/mono Merge fix for Bug 418620 (SVN revision 11127...
Next by Date: [pkgsrc/trunk]: pkgsrc/math/yorick MASTER_SITES (and HOMPAGE) gone away, chan...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/lang/mono Merge fix for Bug 418620 (SVN revision 11127...
Next by Thread: [pkgsrc/trunk]: pkgsrc/math/yorick MASTER_SITES (and HOMPAGE) gone away, chan...
Indexes:

Home | Main Index | Thread Index | Old Index