[144670] trunk/dports/devel/libphonenumber-cpp

[jeremyhu at macports.org]

Revision: 144670
          https://trac.macports.org/changeset/144670
Author:   jeremyhu at macports.org
Date:     2016-01-14 18:02:21 -0800 (Thu, 14 Jan 2016)
Log Message:
-----------
libphonenumber-cpp: Don't use headers from an existing install (#49683)

Modified Paths:
--------------
    trunk/dports/devel/libphonenumber-cpp/Portfile
    trunk/dports/devel/libphonenumber-cpp/files/patch-cpp-CMakeLists.txt.diff

Modified: trunk/dports/devel/libphonenumber-cpp/Portfile
===================================================================
--- trunk/dports/devel/libphonenumber-cpp/Portfile	2016-01-15 02:00:16 UTC (rev 144669)
+++ trunk/dports/devel/libphonenumber-cpp/Portfile	2016-01-15 02:02:21 UTC (rev 144670)
@@ -3,7 +3,6 @@
 
 PortSystem          1.0
 PortGroup           cmake 1.0
-PortGroup           conflicts_build 1.0
 PortGroup           github 1.0
 
 cmake.out_of_source yes
@@ -44,8 +43,6 @@
                     port:icu \
                     port:protobuf-cpp
 
-conflicts_build     ${name}
-
 configure.args-append \
                     -DGTEST_SOURCE_DIR=${gtest_srcdir} \
                     -DGTEST_INCLUDE_DIR=${gtest_srcdir}/include

Modified: trunk/dports/devel/libphonenumber-cpp/files/patch-cpp-CMakeLists.txt.diff
===================================================================
--- trunk/dports/devel/libphonenumber-cpp/files/patch-cpp-CMakeLists.txt.diff	2016-01-15 02:00:16 UTC (rev 144669)
+++ trunk/dports/devel/libphonenumber-cpp/files/patch-cpp-CMakeLists.txt.diff	2016-01-15 02:02:21 UTC (rev 144670)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2014-09-25 05:05:46.000000000 -0700
-+++ CMakeLists.txt	2014-10-17 09:59:32.000000000 -0700
-@@ -331,7 +331,7 @@
+--- CMakeLists.txt.orig	2016-01-08 05:49:06.000000000 -0800
++++ CMakeLists.txt	2016-01-14 17:58:20.000000000 -0800
+@@ -331,10 +331,10 @@ if (${USE_ICU_REGEXP} STREQUAL "ON")
  endif ()
  
  if (NOT WIN32)
@@ -8,8 +8,12 @@
 +  add_definitions ("-Wall")
  endif ()
  
- include_directories ("src")
-@@ -414,8 +414,8 @@
+-include_directories ("src")
++include_directories (BEFORE "src")
+ 
+ # Build a static library (without -fPIC).
+ add_library (phonenumber STATIC ${SOURCES})
+@@ -414,8 +414,8 @@ if (${BUILD_GEOCODER} STREQUAL "ON")
    list (APPEND GEOCODER_DEPS ${COMMON_DEPS})
    # Note that the subset of base/ on which the geocoder relies is implemented
    # on top of Boost header-only libraries (e.g. scoped_ptr.hpp).
@@ -20,3 +24,12 @@
  endif ()
  
  # Build a specific library for testing purposes.
+@@ -474,7 +474,7 @@ if (${USE_ICU_REGEXP} STREQUAL "ON")
+ endif ()
+ 
+ # Build the testing binary.
+-include_directories ("test")
++include_directories (BEFORE "test")
+ add_executable (libphonenumber_test ${TEST_SOURCES})
+ set (TEST_LIBS phonenumber_testing ${GTEST_LIB})
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160114/49c54ff2/attachment.html>