diff options
Diffstat (limited to 'graphics/glew/patches/patch-ac')
| -rw-r--r-- | graphics/glew/patches/patch-ac | 98 |
1 files changed, 70 insertions, 28 deletions
diff --git a/graphics/glew/patches/patch-ac b/graphics/glew/patches/patch-ac index c88ffe4625e..523503e2ea9 100644 --- a/graphics/glew/patches/patch-ac +++ b/graphics/glew/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.7 2010/11/10 20:22:54 adam Exp $ +$NetBSD: patch-ac,v 1.8 2011/07/13 19:47:38 adam Exp $ ---- Makefile.orig 2010-11-03 20:55:35.000000000 +0000 +--- Makefile.orig 2011-04-27 16:16:35.000000000 +0000 +++ Makefile -@@ -89,7 +89,7 @@ lib/$(LIB.STATIC): $(LIB.OBJS) +@@ -100,7 +100,7 @@ lib/$(LIB.STATIC): $(LIB.OBJS) $(AR) cr $@ $^ lib/$(LIB.SHARED): $(LIB.SOBJS) @@ -11,8 +11,8 @@ $NetBSD: patch-ac,v 1.7 2010/11/10 20:22:54 adam Exp $ ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) else $(LN) $(LIB.SHARED) lib/$(LIB.SONAME) -@@ -97,10 +97,10 @@ else - endif +@@ -164,10 +164,10 @@ bin: + glew.bin: glew.lib bin bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.OBJS) lib/$(LIB.SHARED) - $(CC) $(CFLAGS) -o $@ $(GLEWINFO.BIN.OBJS) $(BIN.LIBS) @@ -22,24 +22,19 @@ $NetBSD: patch-ac,v 1.7 2010/11/10 20:22:54 adam Exp $ - $(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.OBJS) $(BIN.LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(VISUALINFO.BIN.OBJS) $(BIN.LIBS) - %.o: %.c - $(CC) -c $(CFLAGS) -o $@ $< -@@ -122,33 +122,31 @@ glew.pc: glew.pc.in + # Install targets - install: all - # directories -- $(INSTALL) -d -m 0755 $(BINDIR) -- $(INSTALL) -d -m 0755 $(INCDIR) +@@ -178,66 +178,62 @@ install: install.include install.lib + install.mx: install.include install.lib.mx install.pkgconfig.mx + + install.lib: glew.lib - $(INSTALL) -d -m 0755 $(LIBDIR) -- $(INSTALL) -d -m 0755 $(LIBDIR)/pkgconfig -+ $(INSTALL) -d -m 0755 $(DESTDIR)$(BINDIR) -+ $(INSTALL) -d -m 0755 $(DESTDIR)$(INCDIR) + $(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR) -+ $(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR)/pkgconfig # runtime ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) + $(INSTALL) -d -m 0755 $(BINDIR) $(STRIP) -x lib/$(LIB.SHARED) - $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(BINDIR)/ + $(INSTALL) -m 0755 lib/$(LIB.SHARED) $(BINDIR)/ else - $(STRIP) -x lib/$(LIB.SHARED) - $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/ @@ -48,26 +43,73 @@ $NetBSD: patch-ac,v 1.7 2010/11/10 20:22:54 adam Exp $ + $(LN) $(LIB.SHARED) $(DESTDIR)$(LIBDIR)/$(LIB.SONAME) endif # development files -- $(INSTALL) -m 0644 include/GL/wglew.h $(INCDIR)/ -- $(INSTALL) -m 0644 include/GL/glew.h $(INCDIR)/ -- $(INSTALL) -m 0644 include/GL/glxew.h $(INCDIR)/ -- $(INSTALL) -m 0644 glew.pc $(LIBDIR)/pkgconfig/ -+ $(INSTALL) -m 0644 include/GL/wglew.h $(DESTDIR)$(INCDIR)/ -+ $(INSTALL) -m 0644 include/GL/glew.h $(DESTDIR)$(INCDIR)/ -+ $(INSTALL) -m 0644 include/GL/glxew.h $(DESTDIR)$(INCDIR)/ -+ $(INSTALL) -m 0644 glew.pc $(DESTDIR)$(LIBDIR)/pkgconfig/ ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) $(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(LIBDIR)/ else +- $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK) ++ $(LN) $(LIB.SHARED) $(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK) + endif - $(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) + + install.lib.mx: glew.lib.mx +- $(INSTALL) -d -m 0755 $(LIBDIR) ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR) + # runtime + ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) + $(INSTALL) -d -m 0755 $(BINDIR) + $(STRIP) -x lib/$(LIB.SHARED.MX) + $(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) $(BINDIR)/ + else +- $(STRIP) -x lib/$(LIB.SHARED.MX) +- $(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) $(LIBDIR)/ +- $(LN) $(LIB.SHARED.MX) $(LIBDIR)/$(LIB.SONAME.MX) ++ $(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) $(DESTDIR)$(LIBDIR)/ ++ $(LN) $(LIB.SHARED.MX) $(DESTDIR)$(LIBDIR)/$(LIB.SONAME.MX) endif - # utilities + # development files + ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) + $(INSTALL) -m 0644 lib/$(LIB.DEVLNK.MX) $(LIBDIR)/ + else +- $(LN) $(LIB.SHARED.MX) $(LIBDIR)/$(LIB.DEVLNK.MX) ++ $(LN) $(LIB.SHARED.MX) $(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK.MX) + endif +- $(STRIP) -x lib/$(LIB.STATIC.MX) +- $(INSTALL) -m 0644 lib/$(LIB.STATIC.MX) $(LIBDIR)/ ++ $(INSTALL) -m 0644 lib/$(LIB.STATIC.MX) $(DESTDIR)$(LIBDIR)/ + + install.bin: glew.bin +- $(INSTALL) -d -m 0755 $(BINDIR) - $(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/ ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(BINDIR) + $(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(DESTDIR)$(BINDIR)/ + install.include: +- $(INSTALL) -d -m 0755 $(INCDIR) +- $(INSTALL) -m 0644 include/GL/wglew.h $(INCDIR)/ +- $(INSTALL) -m 0644 include/GL/glew.h $(INCDIR)/ +- $(INSTALL) -m 0644 include/GL/glxew.h $(INCDIR)/ ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(INCDIR) ++ $(INSTALL) -m 0644 include/GL/wglew.h $(DESTDIR)$(INCDIR)/ ++ $(INSTALL) -m 0644 include/GL/glew.h $(DESTDIR)$(INCDIR)/ ++ $(INSTALL) -m 0644 include/GL/glxew.h $(DESTDIR)$(INCDIR)/ + + install.pkgconfig: glew.pc +- $(INSTALL) -d -m 0755 $(LIBDIR) +- $(INSTALL) -d -m 0755 $(LIBDIR)/pkgconfig +- $(INSTALL) -m 0644 glew.pc $(LIBDIR)/pkgconfig/ ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR) ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR)/pkgconfig ++ $(INSTALL) -m 0644 glew.pc $(DESTDIR)$(LIBDIR)/pkgconfig/ + + install.pkgconfig.mx: glewmx.pc +- $(INSTALL) -d -m 0755 $(LIBDIR) +- $(INSTALL) -d -m 0755 $(LIBDIR)/pkgconfig +- $(INSTALL) -m 0644 glewmx.pc $(LIBDIR)/pkgconfig/ ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR) ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR)/pkgconfig ++ $(INSTALL) -m 0644 glewmx.pc $(DESTDIR)$(LIBDIR)/pkgconfig/ + uninstall: $(RM) $(INCDIR)/wglew.h |