diff options
Diffstat (limited to 'archivers/lz4/patches')
| -rw-r--r-- | archivers/lz4/patches/patch-Makefile | 10 | ||||
| -rw-r--r-- | archivers/lz4/patches/patch-lib_Makefile | 18 | ||||
| -rw-r--r-- | archivers/lz4/patches/patch-programs_Makefile | 18 |
3 files changed, 23 insertions, 23 deletions
diff --git a/archivers/lz4/patches/patch-Makefile b/archivers/lz4/patches/patch-Makefile index 285d0c5639a..d205ba8c380 100644 --- a/archivers/lz4/patches/patch-Makefile +++ b/archivers/lz4/patches/patch-Makefile @@ -1,18 +1,18 @@ -$NetBSD: patch-Makefile,v 1.7 2017/08/19 14:54:25 adam Exp $ +$NetBSD: patch-Makefile,v 1.8 2018/09/14 09:48:56 fhajny Exp $ Unlock install target. ---- Makefile.orig 2017-08-17 17:55:30.000000000 +0000 +--- Makefile.orig 2018-09-11 19:52:06.000000000 +0000 +++ Makefile -@@ -90,7 +90,6 @@ clean: +@@ -89,7 +89,6 @@ clean: #----------------------------------------------------------------------------- # make install is validated only for Linux, OSX, BSD, Hurd and Solaris targets #----------------------------------------------------------------------------- --ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS)) +-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku MidnightBSD)) HOST_OS = POSIX .PHONY: install uninstall -@@ -104,7 +103,6 @@ travis-install: +@@ -103,7 +102,6 @@ travis-install: cmake: @cd contrib/cmake_unofficial; cmake $(CMAKE_PARAMS) CMakeLists.txt; $(MAKE) diff --git a/archivers/lz4/patches/patch-lib_Makefile b/archivers/lz4/patches/patch-lib_Makefile index 2898a5d55b5..8673c33a5ff 100644 --- a/archivers/lz4/patches/patch-lib_Makefile +++ b/archivers/lz4/patches/patch-lib_Makefile @@ -1,8 +1,8 @@ -$NetBSD: patch-lib_Makefile,v 1.8 2018/05/10 13:16:27 adam Exp $ +$NetBSD: patch-lib_Makefile,v 1.9 2018/09/14 09:48:56 fhajny Exp $ Make portable. Unlock install target. Use pkgsrc install scripts. ---- lib/Makefile.orig 2018-05-07 21:38:45.000000000 +0000 +--- lib/Makefile.orig 2018-09-11 19:52:06.000000000 +0000 +++ lib/Makefile @@ -33,9 +33,9 @@ # ################################################################ @@ -17,19 +17,19 @@ Make portable. Unlock install target. Use pkgsrc install scripts. LIBVER_SCRIPT:= $(LIBVER_MAJOR_SCRIPT).$(LIBVER_MINOR_SCRIPT).$(LIBVER_PATCH_SCRIPT) LIBVER_MAJOR := $(shell echo $(LIBVER_MAJOR_SCRIPT)) LIBVER_MINOR := $(shell echo $(LIBVER_MINOR_SCRIPT)) -@@ -123,7 +123,6 @@ clean: +@@ -124,7 +124,6 @@ clean: #----------------------------------------------------------------------------- # make install is validated only for Linux, OSX, BSD, Hurd and Solaris targets #----------------------------------------------------------------------------- --ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS)) +-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku MidnightBSD)) .PHONY: listL120 listL120: # extract lines >= 120 characters in *.{c,h}, by Takayuki Matsuoka (note : $$, for Makefile compatibility) -@@ -142,12 +141,7 @@ libdir ?= $(LIBDIR) +@@ -143,12 +142,7 @@ libdir ?= $(LIBDIR) INCLUDEDIR ?= $(prefix)/include includedir ?= $(INCLUDEDIR) --ifneq (,$(filter $(shell uname),OpenBSD FreeBSD NetBSD DragonFly)) +-ifneq (,$(filter $(OS),OpenBSD FreeBSD NetBSD DragonFly)) -PKGCONFIGDIR ?= $(prefix)/libdata/pkgconfig -else -PKGCONFIGDIR ?= $(libdir)/pkgconfig @@ -37,9 +37,9 @@ Make portable. Unlock install target. Use pkgsrc install scripts. -pkgconfigdir ?= $(PKGCONFIGDIR) +pkgconfigdir ?= $(prefix)/lib/pkgconfig - ifneq (,$(filter $(shell uname),SunOS)) + ifneq (,$(filter $(OS),SunOS)) INSTALL ?= ginstall -@@ -160,29 +154,29 @@ INSTALL_DATA ?= $(INSTALL) -m 644 +@@ -161,29 +155,29 @@ INSTALL_DATA ?= $(INSTALL) -m 644 liblz4.pc: liblz4.pc.in Makefile @echo creating pkgconfig @@ -81,7 +81,7 @@ Make portable. Unlock install target. Use pkgsrc install scripts. @echo lz4 libraries installed uninstall: -@@ -197,4 +191,3 @@ uninstall: +@@ -198,4 +192,3 @@ uninstall: $(Q)$(RM) $(DESTDIR)$(includedir)/lz4frame_static.h @echo lz4 libraries successfully uninstalled diff --git a/archivers/lz4/patches/patch-programs_Makefile b/archivers/lz4/patches/patch-programs_Makefile index f9bcd42c4f0..21a92c4826a 100644 --- a/archivers/lz4/patches/patch-programs_Makefile +++ b/archivers/lz4/patches/patch-programs_Makefile @@ -1,8 +1,8 @@ -$NetBSD: patch-programs_Makefile,v 1.10 2018/05/10 13:16:27 adam Exp $ +$NetBSD: patch-programs_Makefile,v 1.11 2018/09/14 09:48:56 fhajny Exp $ Unlock install target. Use pkgsrc install scripts. ---- programs/Makefile.orig 2018-05-07 21:38:45.000000000 +0000 +--- programs/Makefile.orig 2018-09-11 19:52:06.000000000 +0000 +++ programs/Makefile @@ -106,11 +106,6 @@ clean: @echo Cleaning completed @@ -11,10 +11,10 @@ Unlock install target. Use pkgsrc install scripts. -#----------------------------------------------------------------------------- -# make install is validated only for Linux, OSX, BSD, Hurd and Solaris targets -#----------------------------------------------------------------------------- --ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS)) +-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku MidnightBSD)) - unlz4: lz4 - ln -s lz4 unlz4 + ln -s lz4$(EXT) unlz4$(EXT) @@ -129,7 +124,7 @@ BINDIR ?= $(exec_prefix)/bin bindir ?= $(BINDIR) @@ -30,12 +30,12 @@ Unlock install target. Use pkgsrc install scripts. install: lz4 @echo Installing binaries - @$(INSTALL) -d -m 755 $(DESTDIR)$(bindir)/ $(DESTDIR)$(man1dir)/ -- @$(INSTALL_PROGRAM) lz4 $(DESTDIR)$(bindir)/lz4 +- @$(INSTALL_PROGRAM) lz4$(EXT) $(DESTDIR)$(bindir)/lz4$(EXT) + @$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir)/ $(DESTDIR)$(man1dir)/ -+ @$(BSD_INSTALL_PROGRAM) lz4 $(DESTDIR)$(bindir)/lz4 - @ln -sf lz4 $(DESTDIR)$(bindir)/lz4c - @ln -sf lz4 $(DESTDIR)$(bindir)/lz4cat - @ln -sf lz4 $(DESTDIR)$(bindir)/unlz4 ++ @$(BSD_INSTALL_PROGRAM) lz4$(EXT) $(DESTDIR)$(bindir)/lz4$(EXT) + @ln -sf lz4$(EXT) $(DESTDIR)$(bindir)/lz4c$(EXT) + @ln -sf lz4$(EXT) $(DESTDIR)$(bindir)/lz4cat$(EXT) + @ln -sf lz4$(EXT) $(DESTDIR)$(bindir)/unlz4$(EXT) @echo Installing man pages - @$(INSTALL_DATA) lz4.1 $(DESTDIR)$(man1dir)/lz4.1 + @$(BSD_INSTALL_MAN) lz4.1 $(DESTDIR)$(man1dir)/lz4.1 |