[129189] trunk/dports/science/lalxml

[ram at macports.org]

Revision: 129189
          https://trac.macports.org/changeset/129189
Author:   ram at macports.org
Date:     2014-12-08 14:24:33 -0800 (Mon, 08 Dec 2014)
Log Message:
-----------
science/lalxml: update to 1.1.15

Modified Paths:
--------------
    trunk/dports/science/lalxml/Portfile

Removed Paths:
-------------
    trunk/dports/science/lalxml/files/0001-SWIG-make-wrappings-compatible-with-SWIG-v3.0.0.patch

Modified: trunk/dports/science/lalxml/Portfile
===================================================================
--- trunk/dports/science/lalxml/Portfile	2014-12-08 22:24:31 UTC (rev 129188)
+++ trunk/dports/science/lalxml/Portfile	2014-12-08 22:24:33 UTC (rev 129189)
@@ -2,11 +2,9 @@
 
 PortSystem    1.0
 PortGroup     active_variants 1.1
-PortGroup     conflicts_build 1.0
 
 name          lalxml
-version       1.1.10
-revision      3
+version       1.1.15
 categories    science
 platforms     darwin
 maintainers   ram
@@ -18,14 +16,11 @@
   routines for accessing XML files using libxml2.
 
 homepage      https://www.lsc-group.phys.uwm.edu/daswg/projects/lalsuite.html
-master_sites  http://www.lsc-group.phys.uwm.edu/daswg/download/software/source/lalsuite
+master_sites  http://software.ligo.org/lscsoft/source/lalsuite
 
-checksums     rmd160 24bb89445bdfd2198d506e2384ecaa553f1532ba \
-              sha256 b36f06bc97cab401edcf6da1186eb60cfa9c66335ef310652778f05d8327be3b
+checksums     rmd160 79813266ce1ce6be07c820da6732aa7cc28886a9 \
+              sha256 b2c455b890fc8c95b7b3dd160fb18e11b9861e62c88ab7204a394d7675577d96
 
-patchfiles    0001-SWIG-make-wrappings-compatible-with-SWIG-v3.0.0.patch
-patch.pre_args -p2
-
 depends_build-append port:pkgconfig
 
 depends_lib   port:python27 \
@@ -48,9 +43,6 @@
               pkgpythondir="${pythondir}/${name}" \
               pkgpyexecdir="${pythondir}/${name}"
 
-# FIXME: fails to build if previous version active
-conflicts_build ${name}
-
 variant swig_python description {Build python SWIG bindings} {
   require_active_variants lal swig_python
   depends_build-append  port:swig-python

Deleted: trunk/dports/science/lalxml/files/0001-SWIG-make-wrappings-compatible-with-SWIG-v3.0.0.patch
===================================================================
--- trunk/dports/science/lalxml/files/0001-SWIG-make-wrappings-compatible-with-SWIG-v3.0.0.patch	2014-12-08 22:24:31 UTC (rev 129188)
+++ trunk/dports/science/lalxml/files/0001-SWIG-make-wrappings-compatible-with-SWIG-v3.0.0.patch	2014-12-08 22:24:33 UTC (rev 129189)
@@ -1,41 +0,0 @@
-From 20d0cb2d0c60c0feeb5f6ff5518b9d3b41574e2b Mon Sep 17 00:00:00 2001
-From: Karl Wette <karl.wette at ligo.org>
-Date: Sun, 30 Mar 2014 00:20:56 +0100
-Subject: [PATCH] SWIG: make wrappings compatible with SWIG v3.0.0
-
-- %typemaps_string_alloc() has an extra argument
-- structs containing pointer-to-const members now
-  need SWIGLAL(IMMUTABLE_MEMBERS(...))
-
-(cherry picked from commit 4558d05958962d8240e19651c72dc1699fa63807)
----
- lalxml/src/LALXML.h | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/lalxml/src/LALXML.h b/lalxml/src/LALXML.h
-index 1610c02..5c2f6e4 100644
---- a/lalxml/src/LALXML.h
-+++ b/lalxml/src/LALXML.h
-@@ -63,6 +63,9 @@ extern "C" {
-  * \author Oliver Bock\n
-  * Albert-Einstein-Institute Hannover, Germany
-  */
-+#ifdef SWIG /* SWIG interface directives */
-+SWIGLAL(IMMUTABLE_MEMBERS(tagXML_NAMESPACE, prefix, url));
-+#endif /* SWIG */
- typedef struct tagXML_NAMESPACE {
-     const xmlChar *prefix;
-     const xmlChar *url;
-@@ -78,6 +81,9 @@ typedef struct tagXML_NAMESPACE {
-  * \author Oliver Bock\n
-  * Albert-Einstein-Institute Hannover, Germany
-  */
-+#ifdef SWIG /* SWIG interface directives */
-+SWIGLAL(IMMUTABLE_MEMBERS(tagXML_NAMESPACE_VECTOR, items, count));
-+#endif /* SWIG */
- typedef struct tagXML_NAMESPACE_VECTOR {
-     const XML_NAMESPACE *items;
-     const int count;
--- 
-1.9.1
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141208/069c9c98/attachment.html>