CVS commit: pkgsrc/archivers/lz4

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jan  5 11:07:55 UTC 2017

Modified Files:
        pkgsrc/archivers/lz4: distinfo
        pkgsrc/archivers/lz4/patches: patch-lib_Makefile

Log Message:
Fix installation and PLIST.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/archivers/lz4/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/archivers/lz4/patches/patch-lib_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/archivers/lz4/distinfo
diff -u pkgsrc/archivers/lz4/distinfo:1.10 pkgsrc/archivers/lz4/distinfo:1.11
--- pkgsrc/archivers/lz4/distinfo:1.10  Wed Jan  4 15:43:51 2017
+++ pkgsrc/archivers/lz4/distinfo       Thu Jan  5 11:07:55 2017
@@ -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

Index: pkgsrc/archivers/lz4/patches/patch-lib_Makefile
diff -u pkgsrc/archivers/lz4/patches/patch-lib_Makefile:1.4 pkgsrc/archivers/lz4/patches/patch-lib_Makefile:1.5
--- pkgsrc/archivers/lz4/patches/patch-lib_Makefile:1.4 Wed Jan  4 15:43:51 2017
+++ pkgsrc/archivers/lz4/patches/patch-lib_Makefile     Thu Jan  5 11:07:55 2017
@@ -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. Us
  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. Us
        @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