<pre style='margin:0'>
Eric A. Borisch (eborisch) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6e96c190c77f756e10a1baeeb1c4ba6c007666ae">https://github.com/macports/macports-ports/commit/6e96c190c77f756e10a1baeeb1c4ba6c007666ae</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 6e96c19 hdf5-lz4-plugin: Move off hdf5-18
</span>6e96c19 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6e96c190c77f756e10a1baeeb1c4ba6c007666ae
</span>Author: Eric A. Borisch <eborisch@macports.org>
AuthorDate: Mon Feb 26 12:13:44 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> hdf5-lz4-plugin: Move off hdf5-18
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> As hdf5-18 has been marked obsolete / replaced by hdf5, update the lz4
</span><span style='display:block; white-space:pre;color:#404040;'> plugin to build off of port:hdf5 headers.
</span>---
science/hdf5-lz4-plugin/Portfile | 13 ++++++++-----
science/hdf5-lz4-plugin/files/Makefile.patch | 24 ++++++++++++------------
2 files changed, 20 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/hdf5-lz4-plugin/Portfile b/science/hdf5-lz4-plugin/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9e626d2..9e2a168 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/hdf5-lz4-plugin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/hdf5-lz4-plugin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ name hdf5-lz4-plugin
</span> categories science
platforms darwin
license bsd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers eborisch
</span> description An HDF5 plugin supporting LZ4 compression/decompression.
long_description ${description} Provides very high throughput compression \
and decompression. Use filter ID = 32004 to access. See \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +19,7 @@ long_description ${description} Provides very high throughput compression \
</span> set commit 8fa813aa369c15127c551cfdeebe4cbc090b4687
github.setup dectris HDF5Plugin ${commit}
version 20130903
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span>
checksums \
rmd160 03229c8803b5ba198cca61bab8788353d0cc00a2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,16 +37,19 @@ post-extract {
</span> patchfiles Makefile.patch
post-patch {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s^#define (hton|ntoh)ll.*^^" h5zlz4.c
</span> # API change in lz4
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s/uncompress/decompress_fast/" h5zlz4.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|%%PREFIX%%|${prefix}|g" Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s^uncompress^decompress_fast^" h5zlz4.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s^%%PREFIX%%^${prefix}^" Makefile
</span> }
configure {
}
build.target lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CC=${configure.cc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC="${configure.cc}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CFLAGS="${configure.cflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append LDFLAGS="${configure.ldflags}"
</span>
destroot {
file mkdir \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/hdf5-lz4-plugin/files/Makefile.patch b/science/hdf5-lz4-plugin/files/Makefile.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 6526542..79f957e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/hdf5-lz4-plugin/files/Makefile.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/hdf5-lz4-plugin/files/Makefile.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,26 +1,26 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./Makefile 2013-09-03 04:20:45.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ /Users/m028373/src/macports/trunk/science/hdf5-lz4-plugin/Makefile 2015-01-02 16:15:07.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2013-09-03 04:20:45.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2018-02-26 10:49:23.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,16 +1,13 @@
</span> -CFLAGS = -fPIC -g -O3 -std=c99
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+CFLAGS += -fPIC -std=c99
</span> -CC = gcc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+CC ?= gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # install directory of HDF5 1.8.11 #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# install directory of HDF5 1.8.11 #
</span> -HDF5_INSTALL = /home/det/hdf5-1.8.11/hdf5/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+HDF5_INSTALL = %%PREFIX%%
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS += -fPIC -std=c99
</span> MAJOR = 0
MINOR = 2
NAME1 = h5zlz4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10,7 +10,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VERSION = $(MAJOR).$(MINOR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- INCLUDES = -I./ -I$(HDF5_INSTALL)/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-INCLUDES = -I./ -I$(HDF5_INSTALL)/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++INCLUDES = -I./ -I%%PREFIX%%/include
</span>
-lib: lib$(NAME1).so.$(VERSION)
+lib: lib$(NAME1).dylib.$(VERSION)
$(NAME1).o: $(NAME1).c
$(CC) $(CFLAGS) $(INCLUDES) -c $(NAME1).c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,13 +19,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,13 +16,15 @@
</span> $(CC) $(CFLAGS) $(INCLUDES) -c lz4.c
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,10 +30,10 @@
</span> - ln -sf lib$(NAME1).so.$(VERSION) lib$(NAME1).so
- ln -sf lib$(NAME1).so.$(VERSION) lib$(NAME1).so.$(MAJOR)
+lib$(NAME1).dylib.$(VERSION): $(NAME1).o
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) $^ -o $@ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) $^ -o $@ $(LDFLAGS) \
</span> + -dynamiclib \
+ -Wl,-install_name,%%PREFIX%%/lib/hdf5/$@ \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -L%%PREFIX%%/lib/ -llz4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -L%%PREFIX%%/lib -llz4
</span> + ln -sf lib$(NAME1).dylib.$(VERSION) lib$(NAME1).dylib
+ ln -sf lib$(NAME1).dylib.$(VERSION) lib$(NAME1).dylib.$(MAJOR)
clean:
</pre><pre style='margin:0'>
</pre>