<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/59a4c75dcd97a25c0dea9ed59859f630261d1477">https://github.com/macports/macports-ports/commit/59a4c75dcd97a25c0dea9ed59859f630261d1477</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 59a4c75 caffe: install headers and binaries
</span>59a4c75 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 59a4c75dcd97a25c0dea9ed59859f630261d1477
</span>Author: Paul Guyot <pguyot@kallisys.net>
AuthorDate: Tue Sep 26 08:55:38 2017 +0200
<span style='display:block; white-space:pre;color:#404040;'> caffe: install headers and binaries
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Following FreeBSD port:
</span><span style='display:block; white-space:pre;color:#404040;'> * Install C headers in ${prefix}/include
</span><span style='display:block; white-space:pre;color:#404040;'> * Install binaries in ${prefix}/bin
</span>---
math/caffe/Portfile | 18 ++++++++++--------
math/caffe/files/patch-Makefile.diff | 24 ++++++++++++++++++++++++
2 files changed, 34 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/caffe/Portfile b/math/caffe/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8b499cb..8dc6d5f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/caffe/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/caffe/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,6 +6,7 @@ PortGroup github 1.0
</span> name caffe
github.setup BVLC caffe 1de4cebfb81d50267d0d8c2595372b14e1408248
version 20170817
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories math science
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,24 +48,25 @@ set defs "-DGTEST_HAS_TR1_TUPLE=0 -Wno-deprecated -Wunused-local-typedef"
</span> build.args CXX="${configure.cxx}" \
_CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx] ${defs}" \
_PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target tools/
</span>
test.run yes
test.args ${build.args}
test.target test runtest
set caffe_root ${prefix}/libexec/${name}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args ${build.args} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DISTRIBUTE_DIR=${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.target dist
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # install libraries
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath}/.build_release/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libcaffe.a libcaffe.so \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix libraries
</span> system "install_name_tool -id ${prefix}/lib/libcaffe.so \
${destroot}${prefix}/lib/libcaffe.so"
# copy files to caffe_root
xinstall -m 755 -d ${destroot}${caffe_root}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dir {data examples models python scripts tools} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dir {data examples models scripts} {
</span> copy ${worksrcpath}/${dir} ${destroot}${caffe_root}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,7 +138,7 @@ variant python27 description {Install Python 2.7 interface} {
</span> ${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages
xinstall -m 755 -d ${destroot}${packages_dir}
system "install_name_tool -change @rpath/libcaffe.so.1.0.0 ${prefix}/lib/libcaffe.so \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${caffe_root}/python/caffe/_caffe.so"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${destroot}${caffe_root}/python/caffe ${destroot}${packages_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/python/caffe/_caffe.so"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/python/caffe ${destroot}${packages_dir}
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/caffe/files/patch-Makefile.diff b/math/caffe/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3482aad..64d102d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/caffe/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/caffe/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,3 +45,27 @@
</span>
$(TOOL_BINS): %.bin : %.o | $(DYNAMIC_NAME)
@ echo CXX/LD -o $@
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -681,19 +681,18 @@ $(DIST_ALIASES): $(DISTRIBUTE_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(DISTRIBUTE_DIR): all py | $(DISTRIBUTE_SUBDIRS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # add proto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp -r src/caffe/proto $(DISTRIBUTE_DIR)/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mkdir -p $(DISTRIBUTE_DIR)/share/caffe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cp -r src/caffe/proto $(DISTRIBUTE_DIR)/share/caffe/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # add include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp -r include $(DISTRIBUTE_DIR)/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkdir -p $(DISTRIBUTE_DIR)/include/caffe/proto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp $(PROTO_GEN_HEADER_SRCS) $(DISTRIBUTE_DIR)/include/caffe/proto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # add tool and example binaries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp $(TOOL_BINS) $(DISTRIBUTE_DIR)/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp $(EXAMPLE_BINS) $(DISTRIBUTE_DIR)/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for f in $(TOOL_BINS) $(EXAMPLE_BINS); do cp -v "$$f" "$(DISTRIBUTE_DIR)/bin/`basename -s.bin $$f`"; done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # add libraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp $(STATIC_NAME) $(DISTRIBUTE_DIR)/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install -m 644 $(DYNAMIC_NAME) $(DISTRIBUTE_DIR)/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd $(DISTRIBUTE_DIR)/lib; rm -f $(DYNAMIC_NAME_SHORT); ln -s $(DYNAMIC_VERSIONED_NAME_SHORT) $(DYNAMIC_NAME_SHORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # add python - it's not the standard way, indeed...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp -r python $(DISTRIBUTE_DIR)/python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -include $(DEPS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>