diff options
| author | wiz <wiz@pkgsrc.org> | 2017-01-05 11:07:55 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2017-01-05 11:07:55 +0000 |
| commit | ddd651f230c299206ddd7fba5d482c625d7f7ba8 (patch) | |
| tree | 2ff1c0432313f291377b8e9d41f70071f15156a6 /archivers | |
| parent | aa09014647b684f62ecd7566a7893c4f3e3bbcc2 (diff) | |
| download | pkgsrc-ddd651f230c299206ddd7fba5d482c625d7f7ba8.tar.gz | |
Fix installation and PLIST.
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/lz4/distinfo | 4 | ||||
| -rw-r--r-- | archivers/lz4/patches/patch-lib_Makefile | 18 |
2 files changed, 17 insertions, 5 deletions
diff --git a/archivers/lz4/distinfo b/archivers/lz4/distinfo index 1818fcfcae2..234368e5c7f 100644 --- a/archivers/lz4/distinfo +++ b/archivers/lz4/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.10 2017/01/04 15:43:51 fhajny Exp $ +$NetBSD: distinfo,v 1.11 2017/01/05 11:07:55 wiz Exp $ SHA1 (lz4-1.7.5.tar.gz) = a710a7d45beb0951806d2b98f0c1739107e97c14 RMD160 (lz4-1.7.5.tar.gz) = ff25713033480dead389241f572f327cb6afe175 SHA512 (lz4-1.7.5.tar.gz) = b4e5b17fe06805e676608e636a45f0b480b79a02c6b7ffce84dc4d607861cb2652b2852493ab9d9249e7caeae6f00b6834801fdc39f58d901cbc1c7347915295 Size (lz4-1.7.5.tar.gz) = 208019 bytes SHA1 (patch-Makefile) = 8519985405e6f2c0ef63cc39129b00c9867382f9 -SHA1 (patch-lib_Makefile) = 016fbc604e6c121fd2eb9d3aba5be40373c6de60 +SHA1 (patch-lib_Makefile) = cb2abb05aacc760395ae1d17e0af7ba6fba04419 SHA1 (patch-programs_Makefile) = 1bf3864515a1276cbad516ebd519caa918b847b2 diff --git a/archivers/lz4/patches/patch-lib_Makefile b/archivers/lz4/patches/patch-lib_Makefile index 09ddfd26a7b..50c4887d6c6 100644 --- a/archivers/lz4/patches/patch-lib_Makefile +++ b/archivers/lz4/patches/patch-lib_Makefile @@ -1,4 +1,4 @@ -$NetBSD: patch-lib_Makefile,v 1.4 2017/01/04 15:43:51 fhajny Exp $ +$NetBSD: patch-lib_Makefile,v 1.5 2017/01/05 11:07:55 wiz Exp $ Make portable. Unlock install target. Use pkgsrc install scripts. @@ -29,7 +29,19 @@ Make portable. Unlock install target. Use pkgsrc install scripts. ifneq (,$(filter $(shell uname),SunOS)) INSTALL ?= ginstall else -@@ -134,26 +129,26 @@ INSTALL_DATA ?= $(INSTALL) -m 644 +@@ -123,37 +118,33 @@ DESTDIR ?= + LIBDIR ?= $(PREFIX)/lib + INCLUDEDIR ?= $(PREFIX)/include + +-ifneq (,$(filter $(shell uname),OpenBSD FreeBSD NetBSD DragonFly)) +-PKGCONFIGDIR ?= $(PREFIX)/libdata/pkgconfig +-else +-PKGCONFIGDIR ?= $(LIBDIR)/pkgconfig +-endif ++PKGCONFIGDIR ?= $(PREFIX)/lib/pkgconfig + + INSTALL_LIB ?= $(INSTALL) -m 755 + INSTALL_DATA ?= $(INSTALL) -m 644 liblz4.pc: liblz4.pc.in Makefile @echo creating pkgconfig @@ -67,7 +79,7 @@ Make portable. Unlock install target. Use pkgsrc install scripts. @echo lz4 static and shared libraries installed uninstall: -@@ -167,4 +162,3 @@ uninstall: +@@ -167,4 +158,3 @@ uninstall: @$(RM) $(DESTDIR)$(INCLUDEDIR)/lz4frame.h @echo lz4 libraries successfully uninstalled |