[118771] trunk/dports/devel

[sean at macports.org]

Revision: 118771
          https://trac.macports.org/changeset/118771
Author:   sean at macports.org
Date:     2014-04-10 17:13:11 -0700 (Thu, 10 Apr 2014)
Log Message:
-----------
valgrind{,-devel}: combine into one portfile using subport

Modified Paths:
--------------
    trunk/dports/devel/valgrind/Portfile

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

Modified: trunk/dports/devel/valgrind/Portfile
===================================================================
--- trunk/dports/devel/valgrind/Portfile	2014-04-11 00:13:06 UTC (rev 118770)
+++ trunk/dports/devel/valgrind/Portfile	2014-04-11 00:13:11 UTC (rev 118771)
@@ -9,7 +9,6 @@
 mpi.setup
 
 name                valgrind
-conflicts           valgrind-devel
 version             3.9.0
 revision            1
 categories          devel
@@ -27,29 +26,15 @@
 
 homepage            http://valgrind.org
 master_sites        http://valgrind.org/downloads/
-use_bzip2           yes
 
 checksums           md5     0947de8112f946b9ce64764af7be6df2 \
                     sha1    9415e28933de9d6687f993c4bb797e6bd49583f1 \
                     sha256  e6af71a06bc2534541b07743e1d58dc3caf744f38205ca3e5b5a0bdf372ed6f0
 
-# Avoid conflict of faq.html and FAQ.html, #30541
-extract.post_args-append --exclude=${distname}/docs/html/FAQ.html
-
-pre-fetch {
-    if {${os.platform} eq "darwin" && (${os.major} < 9 || ${os.major} > 12)} {
-        ui_error "${name} ${version} is only compatible with Mac OS X 10.5, 10.6, 10.7 and 10.8"
-        return -code error "incompatible Mac OS X version"
-    }
-}
-
 depends_build       bin:perl:perl5
 # Ignore trace reports about boost, Qt and OpenMP
 # as they are only used for tests
 
-patchfiles          link_tool_exe_darwin-ccache.diff \
-                    patch-compat-snowleo.diff
-
 configure.args      --mandir=${prefix}/share/man \
                     --without-mpicc
 
@@ -85,6 +70,46 @@
     }
 }
 
-livecheck.type      regex
-livecheck.url       ${homepage}
-livecheck.regex     ${name}-(\\d(?:\\.\\d)+)
+if {$subport eq $name} {
+    conflicts           valgrind-devel
+    use_bzip2           yes
+
+    # Avoid conflict of faq.html and FAQ.html, #30541
+    extract.post_args-append --exclude=${distname}/docs/html/FAQ.html
+
+    pre-fetch {
+        if {${os.platform} eq "darwin" && (${os.major} < 9 || ${os.major} > 12)} {
+            ui_error "${name} ${version} is only compatible with Mac OS X 10.5, 10.6, 10.7 and 10.8"
+            return -code error "incompatible Mac OS X version"
+        }
+    }
+
+    patchfiles-append   link_tool_exe_darwin-ccache.diff \
+                        patch-compat-snowleo.diff
+
+    livecheck.type      regex
+    livecheck.url       ${homepage}
+    livecheck.regex     ${name}-(\\d(?:\\.\\d)+)
+}
+
+subport valgrind-devel {
+    conflicts           valgrind
+
+    svn.revision        13710
+    set vex_revision    2797
+    version             3.9.0-r${svn.revision}
+    revision            1
+
+    fetch.type      svn
+    svn.url         svn://svn.valgrind.org/valgrind/trunk
+    svn.args        --ignore-externals
+    worksrcdir      trunk
+
+    post-fetch {
+        system -W ${worksrcpath} "${svn.cmd} ${svn.pre_args} ${svn.method} svn://svn.valgrind.org/vex/trunk@${vex_revision} VEX"
+    }
+
+    use_autoreconf yes
+
+    livecheck.type none
+}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140410/398e585b/attachment-0001.html>