diff options
| -rw-r--r-- | textproc/xapian-omega/Makefile | 8 | ||||
| -rw-r--r-- | textproc/xapian-omega/distinfo | 12 | ||||
| -rw-r--r-- | textproc/xapian-omega/patches/patch-aa | 26 | ||||
| -rw-r--r-- | textproc/xapian-omega/patches/patch-ab | 4 |
4 files changed, 25 insertions, 25 deletions
diff --git a/textproc/xapian-omega/Makefile b/textproc/xapian-omega/Makefile index 6bbee825df3..b3aa8e374d1 100644 --- a/textproc/xapian-omega/Makefile +++ b/textproc/xapian-omega/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.20 2013/05/31 12:42:24 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2013/06/04 21:28:26 schmonz Exp $ # -DISTNAME= xapian-omega-1.2.8 -PKGREVISION= 4 +DISTNAME= xapian-omega-${VERSION} +VERSION= 1.2.15 CATEGORIES= textproc -MASTER_SITES= http://oligarchy.co.uk/xapian/1.2.8/ +MASTER_SITES= http://oligarchy.co.uk/xapian/${VERSION}/ MAINTAINER= schmonz@NetBSD.org HOMEPAGE= http://xapian.org/docs/omega/overview.html diff --git a/textproc/xapian-omega/distinfo b/textproc/xapian-omega/distinfo index d5345f9cbf4..e9e7b48b6d4 100644 --- a/textproc/xapian-omega/distinfo +++ b/textproc/xapian-omega/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.10 2012/01/10 01:03:59 schmonz Exp $ +$NetBSD: distinfo,v 1.11 2013/06/04 21:28:26 schmonz Exp $ -SHA1 (xapian-omega-1.2.8.tar.gz) = c4d4c030ac72f85c46a681914bca7de154373a98 -RMD160 (xapian-omega-1.2.8.tar.gz) = 2288159a0c388706d737825d33d222b68292b9fb -Size (xapian-omega-1.2.8.tar.gz) = 615930 bytes -SHA1 (patch-aa) = 674bc7c739b870888a7a01e0eb832e025c55c4b8 -SHA1 (patch-ab) = 40b2d59423f3bb60b801bbcec7a5db2140686b61 +SHA1 (xapian-omega-1.2.15.tar.gz) = a6aef085b1e63262c2f8ff7cd9419f28c8a53623 +RMD160 (xapian-omega-1.2.15.tar.gz) = d9931283d9d6d174cc8136ed3e0df925e67e27cf +Size (xapian-omega-1.2.15.tar.gz) = 627733 bytes +SHA1 (patch-aa) = 033625ce1ac9797c8bf193fe3549a637410c1307 +SHA1 (patch-ab) = f84d1d457218186dff2a31e7d621085b58c891c8 diff --git a/textproc/xapian-omega/patches/patch-aa b/textproc/xapian-omega/patches/patch-aa index a2cc033c8b1..0a9344cf716 100644 --- a/textproc/xapian-omega/patches/patch-aa +++ b/textproc/xapian-omega/patches/patch-aa @@ -1,19 +1,19 @@ -$NetBSD: patch-aa,v 1.3 2012/01/10 01:04:00 schmonz Exp $ +$NetBSD: patch-aa,v 1.4 2013/06/04 21:28:26 schmonz Exp $ Call it "xapian-omega" and follow hier(7). ---- Makefile.in.orig 2011-12-14 05:34:48.000000000 +0000 +--- Makefile.in.orig 2013-04-17 00:14:08.000000000 +0000 +++ Makefile.in -@@ -38,7 +38,7 @@ PRE_UNINSTALL = : +@@ -55,7 +55,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -pkglibbin_PROGRAMS = omega$(EXEEXT) +pkglibbin_PROGRAMS = xapian-omega$(EXEEXT) bin_PROGRAMS = omindex$(EXEEXT) scriptindex$(EXEEXT) - check_PROGRAMS = htmlparsetest$(EXEEXT) md5test$(EXEEXT) \ - urlenctest$(EXEEXT) utf8converttest$(EXEEXT) -@@ -423,7 +423,7 @@ AM_CPPFLAGS = \ + check_PROGRAMS = atomparsetest$(EXEEXT) htmlparsetest$(EXEEXT) \ + md5test$(EXEEXT) urlenctest$(EXEEXT) utf8converttest$(EXEEXT) +@@ -461,7 +461,7 @@ AM_CPPFLAGS = \ -DCONFIGFILE_SYSTEM=\"$(sysconfdir)/omega.conf\" \ -DPKGLIBBINDIR=\"$(pkglibbindir)\" @@ -21,8 +21,8 @@ Call it "xapian-omega" and follow hier(7). +pkglibbindir = $(libexecdir)/cgi-bin dist_pkglibbin_SCRIPTS = outlookmsg2html dist_bin_SCRIPTS = dbi2omega htdig2omega mbox2omega - TESTS = htmlparsetest$(EXEEXT)\ -@@ -431,7 +431,7 @@ TESTS = htmlparsetest$(EXEEXT)\ + TESTS = atomparsetest$(EXEEXT)\ +@@ -470,7 +470,7 @@ TESTS = atomparsetest$(EXEEXT)\ urlenctest$(EXEEXT)\ utf8converttest$(EXEEXT) @@ -31,14 +31,14 @@ Call it "xapian-omega" and follow hier(7). dist_omegadata_DATA = htdig2omega.script mbox2omega.script dist_sysconf_DATA = omega.conf -@@ -662,8 +662,8 @@ htmlparsetest$(EXEEXT): $(htmlparsetest_ - md5test$(EXEEXT): $(md5test_OBJECTS) $(md5test_DEPENDENCIES) +@@ -714,8 +714,8 @@ htmlparsetest$(EXEEXT): $(htmlparsetest_ + md5test$(EXEEXT): $(md5test_OBJECTS) $(md5test_DEPENDENCIES) $(EXTRA_md5test_DEPENDENCIES) @rm -f md5test$(EXEEXT) $(CXXLINK) $(md5test_OBJECTS) $(md5test_LDADD) $(LIBS) --omega$(EXEEXT): $(omega_OBJECTS) $(omega_DEPENDENCIES) +-omega$(EXEEXT): $(omega_OBJECTS) $(omega_DEPENDENCIES) $(EXTRA_omega_DEPENDENCIES) - @rm -f omega$(EXEEXT) -+xapian-omega$(EXEEXT): $(omega_OBJECTS) $(omega_DEPENDENCIES) ++xapian-omega$(EXEEXT): $(omega_OBJECTS) $(omega_DEPENDENCIES) $(EXTRA_omega_DEPENDENCIES) + @rm -f xapian-omega$(EXEEXT) $(CXXLINK) $(omega_OBJECTS) $(omega_LDADD) $(LIBS) - omindex$(EXEEXT): $(omindex_OBJECTS) $(omindex_DEPENDENCIES) + omindex$(EXEEXT): $(omindex_OBJECTS) $(omindex_DEPENDENCIES) $(EXTRA_omindex_DEPENDENCIES) @rm -f omindex$(EXEEXT) diff --git a/textproc/xapian-omega/patches/patch-ab b/textproc/xapian-omega/patches/patch-ab index 768471bc74e..1bbd4cea371 100644 --- a/textproc/xapian-omega/patches/patch-ab +++ b/textproc/xapian-omega/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.2 2012/01/10 01:04:00 schmonz Exp $ +$NetBSD: patch-ab,v 1.3 2013/06/04 21:28:26 schmonz Exp $ Respect ${VARBASE} and follow hier(7). ---- omega.conf.orig 2008-07-16 00:42:17.000000000 -0400 +--- omega.conf.orig 2013-04-17 00:01:38.000000000 +0000 +++ omega.conf @@ -1,11 +1,11 @@ # Directory containing Xapian databases: |