[150618] trunk/dports/devel

[larryv at macports.org]

Revision: 150618
          https://trac.macports.org/changeset/150618
Author:   larryv at macports.org
Date:     2016-07-24 14:47:24 -0700 (Sun, 24 Jul 2016)
Log Message:
-----------
pcre2: Assume maintainership, merge into pcre

Modified Paths:
--------------
    trunk/dports/devel/pcre/Portfile
    trunk/dports/devel/pcre/files/no-darwin-pthread-flag.patch

Removed Paths:
-------------
    trunk/dports/devel/pcre2/

Modified: trunk/dports/devel/pcre/Portfile
===================================================================
--- trunk/dports/devel/pcre/Portfile	2016-07-24 21:47:20 UTC (rev 150617)
+++ trunk/dports/devel/pcre/Portfile	2016-07-24 21:47:24 UTC (rev 150618)
@@ -5,6 +5,9 @@
 
 name                pcre
 version             8.38
+subport pcre2 {
+    version         10.21
+}
 categories          devel
 license             BSD
 platforms           darwin freebsd
@@ -23,26 +26,33 @@
                     port:libedit \
                     port:zlib
 
-master_sites        sourceforge:project/pcre/pcre/${version} \
+master_sites        sourceforge:project/pcre/${subport}/${version} \
                     ftp://ftp.fu-berlin.de/unix/misc/pcre/ \
                     ftp://ftp.tin.org/pub/libs/pcre/ \
                     ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
+distname            ${subport}-${version}
 use_bzip2           yes
-checksums           rmd160  eba6da5ef34780f63f8b96c60bd70ac197df3b52 \
-                    sha256  b9e02d36e23024d6c02a2e5b25204b3a4fa6ade43e0a5f869f254f49535079df
 
+set rmd160(pcre)    eba6da5ef34780f63f8b96c60bd70ac197df3b52
+set sha256(pcre)    b9e02d36e23024d6c02a2e5b25204b3a4fa6ade43e0a5f869f254f49535079df
+set rmd160(pcre2)   496fc7940d59c9e70649489731338797aa4edd99
+set sha256(pcre2)   c66a17509328a7251782691093e75ede7484a203ebc6bed3c08122b092ccd4e0
+checksums           rmd160  $rmd160(${subport}) \
+                    sha256  $sha256(${subport})
+
 patchfiles          no-darwin-pthread-flag.patch
 
-
 configure.args      --disable-silent-rules \
-                    --docdir=${prefix}/share/doc/${name} \
+                    --docdir=${prefix}/share/doc/${subport} \
                     --enable-jit \
-                    --enable-pcre16 \
-                    --enable-pcre32 \
-                    --enable-pcregrep-libbz2 \
-                    --enable-pcregrep-libz \
-                    --enable-pcretest-libedit \
-                    --enable-unicode-properties
+                    --enable-[regsub {\d$} ${subport} &-]16 \
+                    --enable-[regsub {\d$} ${subport} &-]32 \
+                    --enable-${subport}grep-libbz2 \
+                    --enable-${subport}grep-libz \
+                    --enable-${subport}test-libedit
+subport pcre {
+    configure.args-append --enable-unicode-properties
+}
 
 platform darwin 8 {
     # ticket #18448
@@ -52,3 +62,8 @@
 }
 
 test.run            yes
+subport pcre2 {
+    test.cmd        ./RunTest
+    test.target
+    livecheck.regex /pcre2/(\[a-zA-Z0-9.\]+\\.\[a-zA-Z0-9.\]+)/
+}

Modified: trunk/dports/devel/pcre/files/no-darwin-pthread-flag.patch
===================================================================
--- trunk/dports/devel/pcre/files/no-darwin-pthread-flag.patch	2016-07-24 21:47:20 UTC (rev 150617)
+++ trunk/dports/devel/pcre/files/no-darwin-pthread-flag.patch	2016-07-24 21:47:24 UTC (rev 150618)
@@ -2,7 +2,7 @@
 ===================================================================
 --- configure.orig
 +++ configure
-@@ -18586,10 +18586,6 @@ case ${host_os} in
+@@ -14929,10 +14929,6 @@ case ${host_os} in
  
          ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
          ;;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160724/fa036680/attachment-0001.html>