diff options
| author | fhajny <fhajny> | 2014-10-23 23:41:32 +0000 |
|---|---|---|
| committer | fhajny <fhajny> | 2014-10-23 23:41:32 +0000 |
| commit | 766c2134166c4604f7aaa88aaa1d4094bc19d8be (patch) | |
| tree | cec517a13880ea5c9a041770e9cb79e6649291e2 /graphics/netpbm/patches | |
| parent | 10f954d53e28c520addf509d37995ec0ccb5a97f (diff) | |
| download | pkgsrc-766c2134166c4604f7aaa88aaa1d4094bc19d8be.tar.gz | |
Simplify default install target. Bump PKGREVISION (symlink changes).
Diffstat (limited to 'graphics/netpbm/patches')
| -rw-r--r-- | graphics/netpbm/patches/patch-common.mk | 14 | ||||
| -rw-r--r-- | graphics/netpbm/patches/patch-lib_Makefile | 51 |
2 files changed, 65 insertions, 0 deletions
diff --git a/graphics/netpbm/patches/patch-common.mk b/graphics/netpbm/patches/patch-common.mk new file mode 100644 index 00000000000..c220461d27f --- /dev/null +++ b/graphics/netpbm/patches/patch-common.mk @@ -0,0 +1,14 @@ +$NetBSD: patch-common.mk,v 1.1 2014/10/23 23:41:32 fhajny Exp $ + +Simplify install target. +--- common.mk.orig 2014-09-08 21:26:50.000000000 +0000 ++++ common.mk +@@ -465,7 +465,7 @@ endif + + PKGMANSUBDIRS = man1 man3 man5 web + +-PKGSUBDIRS = bin include include/netpbm lib link misc \ ++PKGSUBDIRS = bin include include/netpbm lib misc \ + $(PKGMANSUBDIRS:%=$(PKGMANDIR)/%) + + $(PKGSUBDIRS:%=$(PKGDIR)/%): diff --git a/graphics/netpbm/patches/patch-lib_Makefile b/graphics/netpbm/patches/patch-lib_Makefile new file mode 100644 index 00000000000..b99ca4469ec --- /dev/null +++ b/graphics/netpbm/patches/patch-lib_Makefile @@ -0,0 +1,51 @@ +$NetBSD: patch-lib_Makefile,v 1.1 2014/10/23 23:41:32 fhajny Exp $ + +Simple install target. +--- lib/Makefile.orig 2014-09-01 21:22:27.000000000 +0000 ++++ lib/Makefile +@@ -213,7 +213,7 @@ libpm.o: compile.h + .PHONY: install.lib + ifeq ($(NETPBMLIBTYPE),unixshared) + # install a Unix-style shared library +-install.lib: $(PKGDIR)/lib $(PKGDIR)/link ++install.lib: $(PKGDIR)/lib + cd $(PKGDIR)/lib ; rm -f libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).* + $(INSTALL) -c -m $(INSTALL_PERM_LIBD) \ + libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) $(PKGDIR)/lib/ +@@ -255,28 +255,28 @@ $(INTERFACE_HEADERS:%=%_installhdr): $(P + $(SRCDIR)/lib/$(@:%_installhdr=%) $(PKGDIR)/include/netpbm/ + + .PHONY: install.staticlib +-install.staticlib: $(PKGDIR)/link ++install.staticlib: $(PKGDIR)/lib + $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \ +- $(PKGDIR)/link ++ $(PKGDIR)/lib + + # Install a shared library stub -- the ".so" file used at link time to + # prepare a program for dynamically linking a library at run time + .PHONY: install.sharedlibstub +-install.sharedlibstub: $(PKGDIR)/link ++install.sharedlibstub: $(PKGDIR)/lib + ifeq ($(NETPBMLIBTYPE),unixshared) + # install the link-time (.so) links to the runtime libraries +- cd $(PKGDIR)/link ; \ ++ cd $(PKGDIR)/lib ; \ + rm -f libnetpbm.$(NETPBMLIBSUFFIX); \ +- $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \ ++ $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \ + libnetpbm.$(NETPBMLIBSUFFIX) + endif + ifeq ($(NETPBMLIBTYPE),dll) +- $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.dll.a $(PKGDIR)/link ++ $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.dll.a $(PKGDIR)/lib + endif + ifeq ($(NETPBMLIBTYPE),dylib) +- cd $(PKGDIR)/link/ ; \ ++ cd $(PKGDIR)/lib/ ; \ + rm -f libnetpbm.dylib; \ +- $(SYMLINK) ../lib/libnetpbm.$(MAJ).$(MIN).dylib libnetpbm.dylib ++ $(SYMLINK) libnetpbm.$(MAJ).$(MIN).dylib libnetpbm.dylib + endif + + distclean clean: localclean |