[133390] trunk/dports/math/caffe

28 Feb 2015

Revision: 133390
          https://trac.macports.org/changeset/133390
Author:   hum@macports.org
Date:     2015-02-28 03:38:35 -0800 (Sat, 28 Feb 2015)
Log Message:
-----------
caffe: update to 20150228

Modified Paths:
--------------
    trunk/dports/math/caffe/Portfile
    trunk/dports/math/caffe/files/patch-Makefile.diff

Modified: trunk/dports/math/caffe/Portfile
===================================================================

--- trunk/dports/math/caffe/Portfile	2015-02-28 07:23:54 UTC (rev 133389)
+++ trunk/dports/math/caffe/Portfile	2015-02-28 11:38:35 UTC (rev 133390)
@@ -4,8 +4,8 @@
 PortSystem          1.0
 PortGroup           github 1.0
 
-github.setup        BVLC caffe 682d9da0dba98788dd01723a16a257df4382376c
-version             20150221
+github.setup        BVLC caffe 4fba3daed38b70ef6b913db2546c8d26268279d3
+version             20150228
 categories          math science
 maintainers         hum openmaintainer
 
@@ -16,8 +16,8 @@
 platforms           darwin
 license             BSD
 
-checksums           rmd160  f8f7ae76ad25ba9fa4fe5f48bf9e7f35ebeda265 \
-                    sha256  e6c1fc9fe0092e3a2f2df1b3092d6641cae1edde9cd0e00144d490623873cc9b
+checksums           rmd160  811178e2b0ff3d7ded1197d203552fda3ae15f25 \
+                    sha256  26b4e30a398bf7d6d076108187d02e1536be1737061b47389897f8c932d3a7c6
 
 depends_lib-append  port:google-glog \
                     port:gflags \
@@ -43,7 +43,7 @@
 
 variant universal {}
 
-set defs "-DGTEST_HAS_TR1_TUPLE=0 -DGTEST_USE_OWN_TR1_TUPLE=0"
+set defs "-DGTEST_HAS_TR1_TUPLE=0"
 build.args          CXX="${configure.cxx}" \
                     _CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx] ${defs}" \
                     _PREFIX=${prefix}

Modified: trunk/dports/math/caffe/files/patch-Makefile.diff
===================================================================
--- trunk/dports/math/caffe/files/patch-Makefile.diff	2015-02-28 07:23:54 UTC (rev 133389)
+++ trunk/dports/math/caffe/files/patch-Makefile.diff	2015-02-28 11:38:35 UTC (rev 133390)
@@ -31,7 +31,7 @@
  	# clang throws this warning for cuda headers
  	WARNINGS += -Wno-unneeded-internal-declaration
  	# gtest needs to use its own tuple to not conflict with clang
-@@ -337,7 +337,7 @@
+@@ -338,7 +338,7 @@
  
  # Complete build flags.
  COMMON_FLAGS += $(foreach includedir,$(INCLUDE_DIRS),-I$(includedir))
@@ -40,7 +40,7 @@
  NVCCFLAGS += -ccbin=$(CXX) -Xcompiler -fPIC $(COMMON_FLAGS)
  # mex may invoke an older gcc that is too liberal with -Wuninitalized
  MATLAB_CXXFLAGS := $(CXXFLAGS) -Wno-uninitialized
-@@ -535,7 +535,7 @@
+@@ -537,7 +537,7 @@
  # Target for extension-less symlinks to tool binaries with extension '*.bin'.
  $(TOOL_BUILD_DIR)/%: $(TOOL_BUILD_DIR)/%.bin | $(TOOL_BUILD_DIR)
  	@ $(RM) $@

    

[133390] trunk/dports/math/caffe

hum＠macports.org