From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Aug 30 18:30:03 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7E3391065673 for ; Mon, 30 Aug 2010 18:30:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 387478FC17 for ; Mon, 30 Aug 2010 18:30:03 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o7UIU3pZ036128 for ; Mon, 30 Aug 2010 18:30:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o7UIU3A2036123; Mon, 30 Aug 2010 18:30:03 GMT (envelope-from gnats) Resent-Date: Mon, 30 Aug 2010 18:30:03 GMT Resent-Message-Id: <201008301830.o7UIU3A2036123@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jean-Francois Dockes Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4612F10656AA for ; Mon, 30 Aug 2010 18:26:30 +0000 (UTC) (envelope-from dockes@wanadoo.fr) Received: from smtpfb1-g21.free.fr (smtpfb1-g21.free.fr [212.27.42.9]) by mx1.freebsd.org (Postfix) with ESMTP id 884668FC12 for ; Mon, 30 Aug 2010 18:26:27 +0000 (UTC) Received: from smtp4-g21.free.fr (smtp4-g21.free.fr [212.27.42.4]) by smtpfb1-g21.free.fr (Postfix) with ESMTP id BB6E22D6DD for ; Mon, 30 Aug 2010 20:06:40 +0200 (CEST) Received: from y.dockes.com (unknown [82.227.105.245]) by smtp4-g21.free.fr (Postfix) with ESMTP id BCF9C4C81A8 for ; Mon, 30 Aug 2010 20:06:32 +0200 (CEST) Received: from y.dockes.com (localhost [127.0.0.1]) by y.dockes.com (8.14.4/8.14.1) with ESMTP id o7UI64d8051740 for ; Mon, 30 Aug 2010 20:06:04 +0200 (CEST) (envelope-from dockes@y.dockes.com) Received: (from root@localhost) by y.dockes.com (8.14.4/8.14.4/Submit) id o7UI64Jn051739; Mon, 30 Aug 2010 20:06:04 +0200 (CEST) (envelope-from dockes) Message-Id: <201008301806.o7UI64Jn051739@y.dockes.com> Date: Mon, 30 Aug 2010 20:06:04 +0200 (CEST) From: Jean-Francois Dockes To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/150129: [PATCH] databases/xapian-core update to version 1.2.3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Jean-Francois Dockes List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Aug 2010 18:30:03 -0000 >Number: 150129 >Category: ports >Synopsis: [PATCH] databases/xapian-core update to version 1.2.3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Aug 30 18:30:02 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Jean-Francois Dockes >Release: FreeBSD 7.3-STABLE amd64 >Organization: >Environment: System: FreeBSD y 7.3-STABLE FreeBSD 7.3-STABLE #3: Fri Jul 23 10:11:13 CEST 2010 dockes@y:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Update to upstream release 1.2.3 >How-To-Repeat: >Fix: diff -ruN xapian-core.prev/Makefile xapian-core/Makefile --- xapian-core.prev/Makefile 2010-04-30 11:37:20.000000000 +0200 +++ xapian-core/Makefile 2010-08-30 19:31:50.000000000 +0200 @@ -6,11 +6,11 @@ # PORTNAME= xapian-core -PORTVERSION= 1.2.0 +PORTVERSION= 1.2.3 CATEGORIES= databases MASTER_SITES= http://oligarchy.co.uk/xapian/${PORTVERSION}/ -MAINTAINER= jean-francois.dockes@wanadoo.fr +MAINTAINER= jf@dockes.org COMMENT= A probabilistic text search database engine LIB_DEPENDS= uuid:${PORTSDIR}/misc/e2fsprogs-libuuid @@ -29,10 +29,6 @@ xapian-progsrv.1 xapian-replicate-server.1 xapian-tcpsrv.1 \ xapian-replicate.1 -post-install: - mv ${LOCALBASE}/include/xapian/xapian.h ${LOCALBASE}/include/xapian.h - mv ${LOCALBASE}/include/xapian/xapian/* ${LOCALBASE}/include/xapian - rmdir ${LOCALBASE}/include/xapian/xapian .ifdef(NOPORTDOCS) ${RM} -rf ${DOCSDIR} .endif diff -ruN xapian-core.prev/distinfo xapian-core/distinfo --- xapian-core.prev/distinfo 2010-04-30 10:28:22.000000000 +0200 +++ xapian-core/distinfo 2010-08-30 18:50:10.000000000 +0200 @@ -1,3 +1,3 @@ -MD5 (xapian-core-1.2.0.tar.gz) = 121b5333d3debcf08ed0be714a641eef -SHA256 (xapian-core-1.2.0.tar.gz) = 6feb0bb1dc4bae36a0aac1bf289ef48a0cba7b1c5c30679818f604577a9b0db3 -SIZE (xapian-core-1.2.0.tar.gz) = 3817970 +MD5 (xapian-core-1.2.3.tar.gz) = 999c1bb3a6226ed13c9cd05face89041 +SHA256 (xapian-core-1.2.3.tar.gz) = a0dc3a14d26a0ffbaa7aacd7ec85d26640e0edfb4ea7267138d729d3a59d5a62 +SIZE (xapian-core-1.2.3.tar.gz) = 3855690 diff -ruN xapian-core.prev/files/patch-Makefile.in xapian-core/files/patch-Makefile.in --- xapian-core.prev/files/patch-Makefile.in 2010-04-30 11:22:51.000000000 +0200 +++ xapian-core/files/patch-Makefile.in 2010-08-30 19:38:10.000000000 +0200 @@ -1,27 +1,24 @@ ---- Makefile.in.orig 2010-04-28 15:45:19.000000000 +0200 -+++ Makefile.in 2010-04-30 11:22:47.000000000 +0200 -@@ -51,13 +51,13 @@ - bin/xapian-chert-update$(EXEEXT) bin/xapian-compact$(EXEEXT) \ - bin/xapian-inspect$(EXEEXT) bin/xapian-replicate$(EXEEXT) \ - bin/xapian-replicate-server$(EXEEXT) $(am__EXEEXT_1) \ -- examples/copydatabase$(EXEEXT) examples/delve$(EXEEXT) \ -- examples/quest$(EXEEXT) examples/simpleexpand$(EXEEXT) \ +--- Makefile.in.orig 2010-08-24 09:57:14.000000000 +0200 ++++ Makefile.in 2010-08-30 19:37:33.000000000 +0200 +@@ -48,11 +48,11 @@ + @VPATH_BUILD_TRUE@ -I$(top_srcdir)/languages -Ilanguages \ + @VPATH_BUILD_TRUE@ -I$(top_srcdir)/queryparser + bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \ ++ examples/xapian-metadata$(EXEEXT) ++EXTRA_PROGRAMS = \ + examples/copydatabase$(EXEEXT) examples/delve$(EXEEXT) \ + examples/quest$(EXEEXT) examples/simpleexpand$(EXEEXT) \ - examples/simpleindex$(EXEEXT) examples/simplesearch$(EXEEXT) \ - examples/xapian-metadata$(EXEEXT) - EXTRA_PROGRAMS = bin/xapian-check$(EXEEXT) bin/xapian-compact$(EXEEXT) \ - bin/xapian-inspect$(EXEEXT) bin/xapian-progsrv$(EXEEXT) \ -- bin/xapian-tcpsrv$(EXEEXT) -+ bin/xapian-tcpsrv$(EXEEXT) \ -+ examples/copydatabase$(EXEEXT) examples/delve$(EXEEXT) \ -+ examples/quest$(EXEEXT) examples/simpleexpand$(EXEEXT) \ -+ examples/simpleindex$(EXEEXT) examples/simplesearch$(EXEEXT) +- examples/xapian-metadata$(EXEEXT) +-EXTRA_PROGRAMS = ++ examples/simpleindex$(EXEEXT) examples/simplesearch$(EXEEXT) DIST_COMMON = README $(am__configure_deps) $(am__noinst_HEADERS_DIST) \ $(dist_m4data_DATA) $(dist_man_MANS) $(inc_HEADERS) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -@@ -1273,8 +1273,6 @@ - @MAINTAINER_NO_DOCS_FALSE@ bin/xapian-replicate.1 \ - @MAINTAINER_NO_DOCS_FALSE@ bin/xapian-replicate-server.1 \ - @MAINTAINER_NO_DOCS_FALSE@ $(am__append_3) \ +@@ -1314,8 +1314,6 @@ + @MAINTAINER_NO_DOCS_FALSE@dist_man_MANS = xapian-config.1 \ + @MAINTAINER_NO_DOCS_FALSE@ $(am__append_3) $(am__append_5) \ + @MAINTAINER_NO_DOCS_FALSE@ $(am__append_7) \ -@MAINTAINER_NO_DOCS_FALSE@ examples/copydatabase.1 \ -@MAINTAINER_NO_DOCS_FALSE@ examples/delve.1 examples/quest.1 \ @MAINTAINER_NO_DOCS_FALSE@ examples/xapian-metadata.1 diff -ruN xapian-core.prev/pkg-plist xapian-core/pkg-plist --- xapian-core.prev/pkg-plist 2010-04-30 11:13:21.000000000 +0200 +++ xapian-core/pkg-plist 2010-08-30 20:02:22.000000000 +0200 @@ -39,9 +39,11 @@ include/xapian/visibility.h include/xapian/weight.h lib/libxapian.a +lib/cmake/xapian/xapian-config.cmake +lib/cmake/xapian/xapian-config-version.cmake lib/libxapian.la lib/libxapian.so -lib/libxapian.so.22 +lib/libxapian.so.23 share/aclocal/xapian.m4 %%PORTDOCS%%%%DOCSDIR%%/admin_notes.html %%PORTDOCS%%%%DOCSDIR%%/apidoc.pdf @@ -323,6 +325,7 @@ %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__25.png %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__26.png %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__27.png +%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__28.png %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__3.png %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__4.png %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__5.png @@ -356,6 +359,8 @@ %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/queryparser_8h.html %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/registry_8h.html %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/stem_8h.html +%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/structXapian_1_1StemImplementation-members.html +%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/structXapian_1_1StemImplementation.html %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/structXapian_1_1ValueRangeProcessor-members.html %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/structXapian_1_1ValueRangeProcessor.html %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/structXapian_1_1ValueRangeProcessor__inherit__graph.png @@ -406,3 +411,5 @@ %%PORTDOCS%%@dirrm %%DOCSDIR%%/apidoc %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm include/xapian +@dirrm lib/cmake/xapian +@dirrmtry lib/cmake >Release-Note: >Audit-Trail: >Unformatted: