Date: Sat, 8 Oct 2011 00:26:13 +0800 (CST) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: jf@dockes.org Subject: ports/161378: [PATCH] www/xapian-omega: update to 1.2.7 Message-ID: <20111007162614.7264B5CD3@sunpoet.net> Resent-Message-ID: <201110071630.p97GU4ec090920@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 161378 >Category: ports >Synopsis: [PATCH] www/xapian-omega: update to 1.2.7 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Oct 07 16:30:04 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Sunpoet Po-Chuan Hsieh >Release: FreeBSD 8.2-STABLE amd64 >Organization: The FreeBSD Project >Environment: System: FreeBSD bonjour.sunpoet.net 8.2-STABLE FreeBSD 8.2-STABLE #0: Wed Sep 28 22:36:13 CST 2011 >Description: - Update to 1.2.7 - Add my LOCAL to MASTER_SITES - Add OPTIONS: ICONV Port maintainer (jf@dockes.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- xapian-omega-1.2.7.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/www/xapian-omega/Makefile,v retrieving revision 1.21 diff -u -u -r1.21 Makefile --- Makefile 23 Sep 2011 22:26:07 -0000 1.21 +++ Makefile 7 Oct 2011 16:25:24 -0000 @@ -3,40 +3,40 @@ # Whom: Henrik Brix Andersen <brix@FreeBSD.org> # # $FreeBSD: ports/www/xapian-omega/Makefile,v 1.21 2011/09/23 22:26:07 amdmi3 Exp $ +# PORTNAME= xapian-omega -PORTVERSION= 1.0.22 +PORTVERSION= 1.2.7 CATEGORIES= www MASTER_SITES= http://oligarchy.co.uk/xapian/${PORTVERSION}/ \ - ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= brix + LOCAL/sunpoet MAINTAINER= jf@dockes.org COMMENT= CGI search application built on Xapian -LIB_DEPENDS= xapian.21:${PORTSDIR}/databases/xapian-core - LICENSE= GPLv2 -GNU_CONFIGURE= yes -USE_LDCONFIG= yes -USE_PERL5_RUN= yes +LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \ + xapian.26:${PORTSDIR}/databases/xapian-core + +OPTIONS= ICONV "Enable iconv character set conversion support" on + +CONFIGURE_ENV= PCRE_CONFIG=${LOCALBASE}/bin/pcre-config \ + XAPIAN_CONFIG=${LOCALBASE}/bin/xapian-config CPPFLAGS+= -I${LOCALBASE}/include +GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib +USE_LDCONFIG= yes +USE_PERL5= yes MAN1= omindex.1 scriptindex.1 - MORE_PORTDOCS= AUTHORS ChangeLog NEWS README TODO -PORTDOCS= cgiparams.html omegascript.html overview.html \ +PORTDOCS= cgiparams.html index.html omegascript.html overview.html \ quickstart.html scriptindex.html termprefixes.html \ ${MORE_PORTDOCS} PORTEXAMPLES= omega.conf -OPTIONS= ICONV "Enable iconv character set conversion support" On - -PORTSCOUT= limit:^1\.0\. - -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if defined(WITH_ICONV) USE_ICONV= yes @@ -48,22 +48,20 @@ post-patch: @${REINPLACE_CMD} \ -e 's|^\(dist_sysconf_DATA\ =\ omega\.conf\)|#\1|' \ - -e "s|^\(pkglibbindir\)\ =.*/bin|\1\ =\ \$$(prefix)/${WWWDIR_REL}/cgi-bin|" \ + -e 's|^\(pkglibbindir\)\ =.*/bin|\1\ =\ \$$(prefix)/${WWWDIR_REL}/cgi-bin|' \ ${WRKSRC}/Makefile.in .if defined(NOPORTDOCS) - @${REINPLACE_CMD} \ - -e 's|^\(SUBDIRS\ =\ \.\) docs|\1|' \ - ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e '/^SUBDIRS = / s| docs||' ${WRKSRC}/Makefile.in .endif post-install: .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${MORE_PORTDOCS:S@^@${WRKSRC}/@} ${DOCSDIR} + ${MKDIR} ${DOCSDIR}/ + cd ${WRKSRC}/ && ${INSTALL_DATA} ${MORE_PORTDOCS} ${DOCSDIR}/ .endif .if !defined(NOPORTEXAMPLES) - ${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${PORTEXAMPLES:S@^@${WRKSRC}/@} ${EXAMPLESDIR} + ${MKDIR} ${EXAMPLESDIR}/ + cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}/ .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /home/ncvs/ports/www/xapian-omega/distinfo,v retrieving revision 1.14 diff -u -u -r1.14 distinfo --- distinfo 19 Mar 2011 12:37:17 -0000 1.14 +++ distinfo 7 Oct 2011 16:25:24 -0000 @@ -1,2 +1,2 @@ -SHA256 (xapian-omega-1.0.22.tar.gz) = 99ccee86642fdbb0d1c97ffb065a4fc36541c5a39163d3540500377d14ef16c5 -SIZE (xapian-omega-1.0.22.tar.gz) = 515922 +SHA256 (xapian-omega-1.2.7.tar.gz) = 867497e77ea39cde079c0a18aab1106401f6dc8bf9b5e0087d23727db4032786 +SIZE (xapian-omega-1.2.7.tar.gz) = 608920 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/www/xapian-omega/pkg-plist,v retrieving revision 1.1 diff -u -u -r1.1 pkg-plist --- pkg-plist 5 Jul 2008 09:24:34 -0000 1.1 +++ pkg-plist 7 Oct 2011 16:25:24 -0000 @@ -3,9 +3,10 @@ bin/mbox2omega bin/omindex bin/scriptindex -www/xapian-omega/cgi-bin/omega share/omega/htdig2omega.script share/omega/mbox2omega.script -@dirrm www/xapian-omega/cgi-bin -@dirrm www/xapian-omega +%%WWWDIR%%/cgi-bin/omega +%%WWWDIR%%/cgi-bin/outlookmsg2html +@dirrm %%WWWDIR%%/cgi-bin +@dirrm %%WWWDIR%% @dirrm share/omega --- xapian-omega-1.2.7.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20111007162614.7264B5CD3>