Revision: 115562 https://trac.macports.org/changeset/115562 Author: ryandesign@macports.org Date: 2014-01-05 00:44:13 -0800 (Sun, 05 Jan 2014) Log Message: ----------- lz4: change build.target so we only build the files that will actually be installed; install to $prefix not /usr; patch Makefile to use $DESTDIR variable properly; use -arch flags and add universal variant Modified Paths: -------------- trunk/dports/archivers/lz4/Portfile trunk/dports/archivers/lz4/files/patch-Makefile.diff Modified: trunk/dports/archivers/lz4/Portfile =================================================================== --- trunk/dports/archivers/lz4/Portfile 2014-01-05 04:58:26 UTC (rev 115561) +++ trunk/dports/archivers/lz4/Portfile 2014-01-05 08:44:13 UTC (rev 115562) @@ -6,6 +6,7 @@ name lz4 version r110 +revision 1 categories archivers maintainers mfeiri openmaintainer license BSD GPL-2 @@ -18,11 +19,18 @@ core, typically reaching RAM speed limits on multi-core \ systems. -master_sites googlecode:${name} +master_sites googlecode checksums rmd160 9719df79ed3c238b4e168a060d2b3925b6eaac06 \ sha256 fb7b49c246bd0f6566b6f31e6f3586074277b7e3b7a2119ad728c17533331a65 patchfiles patch-Makefile.diff + use_configure no -build.args-append CC=${configure.cc} -#configure.cmd cmake cmake + +variant universal {} + +build.target default +build.args-append CC="${configure.cc} [get_canonical_archflags cc]" \ + PREFIX=${prefix} + +destroot.args-append PREFIX=${prefix} Modified: trunk/dports/archivers/lz4/files/patch-Makefile.diff =================================================================== --- trunk/dports/archivers/lz4/files/patch-Makefile.diff 2014-01-05 04:58:26 UTC (rev 115561) +++ trunk/dports/archivers/lz4/files/patch-Makefile.diff 2014-01-05 08:44:13 UTC (rev 115562) @@ -1,28 +1,33 @@ ---- Makefile 2014-01-04 16:42:11.000000000 +0100 -+++ Makefile 2014-01-04 17:16:11.000000000 +0100 -@@ -31,12 +31,10 @@ - # ################################################################ +--- Makefile.orig 2013-12-30 18:07:04.000000000 -0600 ++++ Makefile 2014-01-05 02:41:31.000000000 -0600 +@@ -32,7 +32,7 @@ RELEASE=r110 --DESTDIR= - PREFIX=${DESTDIR}/usr + DESTDIR= +-PREFIX=${DESTDIR}/usr ++PREFIX=/usr BINDIR=$(PREFIX)/bin MANDIR=$(PREFIX)/share/man/man1 DISTRIBNAME=lz4-$(RELEASE).tar.gz --CC=gcc - CFLAGS=-I. -std=c99 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\" - - # Define *.exe as extension for Windows systems -@@ -90,8 +88,6 @@ +@@ -90,13 +90,11 @@ @echo Cleaning completed -ifeq ($(shell uname),Linux) - install: lz4 lz4c - @install -d -m 755 $(BINDIR)/ $(MANDIR)/ - @install -m 755 lz4 $(BINDIR)/lz4 -@@ -116,5 +112,3 @@ +- @install -d -m 755 $(BINDIR)/ $(MANDIR)/ +- @install -m 755 lz4 $(BINDIR)/lz4 +- @install -m 755 lz4c $(BINDIR)/lz4c +- @install -m 644 lz4.1 $(MANDIR)/lz4.1 ++ @install -d -m 755 $(DESTDIR)$(BINDIR)/ $(DESTDIR)$(MANDIR)/ ++ @install -m 755 lz4 $(DESTDIR)$(BINDIR)/lz4 ++ @install -m 755 lz4c $(DESTDIR)$(BINDIR)/lz4c ++ @install -m 644 lz4.1 $(DESTDIR)$(MANDIR)/lz4.1 + + uninstall: + [ -x $(BINDIR)/lz4 ] && rm -f $(BINDIR)/lz4 +@@ -116,5 +114,3 @@ @tar -czf $(DISTRIBNAME) lz4-$(RELEASE)/ @rm -rf lz4-$(RELEASE) @echo Distribution $(DISTRIBNAME) built