[135700] trunk/dports/devel/xapian-core

[ryandesign at macports.org]

Revision: 135700
          https://trac.macports.org/changeset/135700
Author:   ryandesign at macports.org
Date:     2015-04-29 21:22:44 -0700 (Wed, 29 Apr 2015)
Log Message:
-----------
xapian-core: update to 1.2.20 (#38672; maintainer timeout); fix livecheck; license GPL-2+

Modified Paths:
--------------
    trunk/dports/devel/xapian-core/Portfile

Added Paths:
-----------
    trunk/dports/devel/xapian-core/files/
    trunk/dports/devel/xapian-core/files/patch-xapian-config.in.diff

Modified: trunk/dports/devel/xapian-core/Portfile
===================================================================
--- trunk/dports/devel/xapian-core/Portfile	2015-04-30 03:12:20 UTC (rev 135699)
+++ trunk/dports/devel/xapian-core/Portfile	2015-04-30 04:22:44 UTC (rev 135700)
@@ -3,11 +3,15 @@
 
 PortSystem 1.0
 
+# version.h does not get generated properly when there are multiple -arch flags
+PortGroup           muniversal 1.0
+
 name                xapian-core
-version             1.2.8
-revision            1
+version             1.2.20
 categories          devel
 maintainers         gmail.com:dcolish
+license             GPL-2+
+
 description         Xapian search library
 long_description    Xapian is a highly adaptable toolkit which allows \
                     developers to easily add advanced indexing and search \
@@ -15,12 +19,13 @@
                     Probabilistic Information Retrieval model and also \
                     supports a rich set of boolean query operators.
 
-homepage            http://www.xapian.org/
+homepage            http://xapian.org/
 platforms           darwin
 master_sites        http://oligarchy.co.uk/xapian/${version}/
+use_xz              yes
 
-checksums           rmd160  f6a88984e553cbf6c56c339bcb61a68c45e905ed \
-                    sha256  00411ebac66a5592b87fc57ccfeb234c84b929ed23c185befb5df9929df3d4f9
+checksums           rmd160  40239b0f5c6f2cbea02fe2a9fd0897d8a39637a7 \
+                    sha256  c4f8d5b9e393ea32912955a17e6b6ea3f6c052ae9133ded6fe48582c25b1aa8f
 
 # TODO: Fix xapian-config to not require the .la file
 # /opt/local/bin/xapian-config --ltlibs --cxxflags
@@ -28,3 +33,9 @@
 destroot.delete_la_files no
 
 depends_lib         port:zlib
+
+patchfiles          patch-xapian-config.in.diff
+
+livecheck.type      regex
+livecheck.url       ${homepage}download
+livecheck.regex     ${name}-(\[0-9\]+\\.\[0-9\]*\[02468\](\\.\[0-9\]+)*)${extract.suffix}

Added: trunk/dports/devel/xapian-core/files/patch-xapian-config.in.diff
===================================================================
--- trunk/dports/devel/xapian-core/files/patch-xapian-config.in.diff	                        (rev 0)
+++ trunk/dports/devel/xapian-core/files/patch-xapian-config.in.diff	2015-04-30 04:22:44 UTC (rev 135700)
@@ -0,0 +1,24 @@
+http://trac.xapian.org/ticket/676
+http://trac.xapian.org/changeset/716a2f331b9e34351b976cc680892d76c76e07c1/git
+--- xapian-config.in.orig	2015-03-03 22:36:08.000000000 -0600
++++ xapian-config.in	2015-04-29 22:48:17.000000000 -0500
+@@ -55,7 +55,7 @@
+ # Check if this is an uninstalled xapian-config.
+ is_uninstalled()
+ {
+-    if [ -z "$uninstalled_cache" ]; then
++    if [ -z "$is_uninstalled_cache" ]; then
+ 	[ -n "$builddir" -a -f "${builddir}Makefile" ]
+ 	is_uninstalled_cache=$?
+     fi
+@@ -100,10 +100,6 @@
+ # -I options for compiling against an uninstalled xapian.
+ set_I_for_uninstalled() {
+     I=
+-    # version.h is generated by configure, so we also need builddir
+-    # in the include path if it's different to srcdir.
+-    [ "@abs_srcdir@" != "@abs_builddir@" ] && I="-I at abs_builddir@/include "
+-    I="$I-I at abs_srcdir@/include"
+ }
+ 
+ # Extract dlname from a libtool .la file.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150429/65749fa5/attachment.html>