Date: Sat, 8 Oct 2011 00:22:28 +0800 (CST) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: jf@dockes.org Subject: ports/161375: [PATCH] databases/xapian-bindings: update to 1.2.7 Message-ID: <20111007162228.57F545CBA@sunpoet.net> Resent-Message-ID: <201110071630.p97GU2FG090720@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 161375 >Category: ports >Synopsis: [PATCH] databases/xapian-bindings: 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:02 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: PHP, PYTHON and RUBY - Fix NOPORTDOCS handler: patch Makefile instead of removing installed files in DOCSDIR Removed file(s): - files/patch-configure Port maintainer (jf@dockes.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- xapian-bindings-1.2.7.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/databases/xapian-bindings/Makefile,v retrieving revision 1.11 diff -u -u -r1.11 Makefile --- Makefile 24 May 2011 16:17:17 -0000 1.11 +++ Makefile 7 Oct 2011 16:21:50 -0000 @@ -6,22 +6,29 @@ # PORTNAME= xapian-bindings -PORTVERSION= 1.0.22 +PORTVERSION= 1.2.7 CATEGORIES= databases -MASTER_SITES= http://oligarchy.co.uk/xapian/${PORTVERSION}/ +MASTER_SITES= http://oligarchy.co.uk/xapian/${PORTVERSION}/ \ + LOCAL/sunpoet MAINTAINER= jf@dockes.org COMMENT= Bindings allowing Xapian to be used from various programming languages -RUN_DEPENDS= xapian-core>=1.0.22:${PORTSDIR}/databases/xapian-core -BUILD_DEPENDS:= ${RUN_DEPENDS} - LICENSE= GPLv2 -CONFIGURE_ARGS+= --datarootdir="${DATADIR}" --docdir="${DOCSDIR}" \ + +LIB_DEPENDS= xapian.26:${PORTSDIR}/databases/xapian-core + +OPTIONS= PHP "Build PHP binding" on \ + PYTHON "Build Python binding" on \ + RUBY "Build Ruby binding" on + +CONFIGURE_ARGS= --datarootdir="${DATADIR}" --docdir="${DOCSDIR}" \ --without-csharp --without-java --without-tcl GNU_CONFIGURE= yes -.ifdef(WITHOUT_PHP) +.include <bsd.port.options.mk> + +.if defined(WITHOUT_PHP) CONFIGURE_ARGS+= --without-php PLIST_SUB+= BINDING_PHP="@comment " .else @@ -32,7 +39,7 @@ USE_PHP_BUILD= yes .endif -.ifdef(WITHOUT_PYTHON) +.if defined(WITHOUT_PYTHON) CONFIGURE_ARGS+= --without-python PLIST_SUB+= BINDING_PYTHON="@comment " .else @@ -42,7 +49,7 @@ USE_PYTHON= yes .endif -.ifdef(WITHOUT_RUBY) +.if defined(WITHOUT_RUBY) CONFIGURE_ARGS+= --without-ruby PLIST_SUB+= BINDING_RUBY="@comment " .else @@ -52,12 +59,12 @@ USE_RUBY= yes .endif -post-install: -.ifdef(NOPORTDOCS) - ${RM} -fr ${DOCSDIR} -.endif -.ifndef(WITHOUT_RUBY) - ${RM} -fr ${DOCSDIR}/ruby/rdocs +post-patch: +# do not install rdoc + @${REINPLACE_CMD} -e '/^install-data-am:/ s|install-data-local||' ${WRKSRC}/ruby/Makefile.in +.if defined(NOPORTDOCS) + @${REINPLACE_CMD} -e '/^install-data-am:/ s|install-dist_docdataDATA install-dist_exampledataDATA ||' ${WRKSRC}/php/Makefile.in ${WRKSRC}/python/Makefile.in + @${REINPLACE_CMD} -e '/^install-data-am:/ s|install-dist_docdataDATA||; 759 s|install-dist_exampledataDATA ||' ${WRKSRC}/ruby/Makefile.in .endif .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /home/ncvs/ports/databases/xapian-bindings/distinfo,v retrieving revision 1.8 diff -u -u -r1.8 distinfo --- distinfo 20 Mar 2011 12:48:09 -0000 1.8 +++ distinfo 7 Oct 2011 16:21:50 -0000 @@ -1,2 +1,2 @@ -SHA256 (xapian-bindings-1.0.22.tar.gz) = 9790f6df53e952e95f0b343fb297540ea1785e08d06125e32975ec35919b42a2 -SIZE (xapian-bindings-1.0.22.tar.gz) = 1071588 +SHA256 (xapian-bindings-1.2.7.tar.gz) = c9f63ad7a032c260f0617e029327d7b05dd986d91af401032268a9f7b2eabde8 +SIZE (xapian-bindings-1.2.7.tar.gz) = 1447683 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/databases/xapian-bindings/pkg-plist,v retrieving revision 1.4 diff -u -u -r1.4 pkg-plist --- pkg-plist 19 Sep 2009 11:58:20 -0000 1.4 +++ pkg-plist 7 Oct 2011 16:21:50 -0000 @@ -1,39 +1,35 @@ -@comment $FreeBSD: ports/databases/xapian-bindings/pkg-plist,v 1.4 2009/09/19 11:58:20 miwi Exp $ +%%BINDING_PHP%%lib/php/%%PHP_EXT_DIR%%/xapian.so %%BINDING_PHP%%%%DATADIR%%/php5/xapian.php -%%BINDING_PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/examples/simpleexpand.php4 %%BINDING_PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/examples/simpleexpand.php5 -%%BINDING_PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/examples/simpleindex.php4 %%BINDING_PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/examples/simpleindex.php5 -%%BINDING_PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/examples/simplesearch.php4 +%%BINDING_PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/examples/simplematchdecider.php5 %%BINDING_PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/examples/simplesearch.php5 %%BINDING_PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/index.html -%%BINDING_PHP%%lib/php/%%PHP_EXT_DIR%%/xapian.so +%%BINDING_PHP%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/php/examples +%%BINDING_PHP%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/php +%%BINDING_PHP%%@dirrmtry %%DATADIR%%/php5 +%%BINDING_PHP%%@dirrmtry %%DATADIR%% +%%BINDING_PHP%%@dirrmtry lib/php/%%PHP_EXT_DIR%% +%%BINDING_PYTHON%%%%PYTHON_SITELIBDIR%%/xapian/__init__.py +%%BINDING_PYTHON%%%%PYTHON_SITELIBDIR%%/xapian/__init__.pyc +%%BINDING_PYTHON%%%%PYTHON_SITELIBDIR%%/xapian/__init__.pyo +%%BINDING_PYTHON%%%%PYTHON_SITELIBDIR%%/xapian/_xapian.so %%BINDING_PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/examples/simpleexpand.py %%BINDING_PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/examples/simpleindex.py %%BINDING_PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/examples/simplematchdecider.py %%BINDING_PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/examples/simplesearch.py %%BINDING_PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/index.html -%%BINDING_PYTHON%%%%PYTHON_SITELIBDIR%%/_xapian.so -%%BINDING_PYTHON%%%%PYTHON_SITELIBDIR%%/xapian.py -%%BINDING_PYTHON%%%%PYTHON_SITELIBDIR%%/xapian.pyc -%%BINDING_PYTHON%%%%PYTHON_SITELIBDIR%%/xapian.pyo +%%BINDING_PYTHON%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/python/examples +%%BINDING_PYTHON%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/python +%%BINDING_PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%/xapian +%%BINDING_RUBY%%%%RUBY_SITELIBDIR%%/xapian.rb +%%BINDING_RUBY%%%%RUBY_SITEARCHLIBDIR%%/_xapian.so %%BINDING_RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/examples/simpleexpand.rb %%BINDING_RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/examples/simpleindex.rb %%BINDING_RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/examples/simplematchdecider.rb %%BINDING_RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/examples/simplesearch.rb %%BINDING_RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/index.html -%%BINDING_RUBY%%%%RUBY_SITELIBDIR%%/xapian.rb -%%BINDING_RUBY%%%%RUBY_SITEARCHLIBDIR%%/_xapian.so -%%BINDING_RUBY%%@dirrmtry %%RUBY_SITELIBDIR%% %%BINDING_RUBY%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/ruby/examples %%BINDING_RUBY%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/ruby -%%BINDING_PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%% -%%BINDING_PYTHON%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/python/examples -%%BINDING_PYTHON%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/python -%%BINDING_PHP%%@dirrmtry lib/php/%%PHP_EXT_DIR%% -%%BINDING_PHP%%@dirrmtry lib/php -%%BINDING_PHP%%@dirrmtry %%DATADIR%%/php5 -%%BINDING_PHP%%@dirrmtry %%DATADIR%% -%%BINDING_PHP%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/php/examples -%%BINDING_PHP%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/php +%%BINDING_RUBY%%@dirrmtry %%RUBY_SITELIBDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% Index: files/patch-configure =================================================================== RCS file: files/patch-configure diff -N files/patch-configure --- files/patch-configure 29 Oct 2010 16:27:22 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- configure.orig 2010-10-28 16:54:25.000000000 +0000 -+++ configure 2010-10-28 16:54:39.000000000 +0000 -@@ -15156,7 +15156,7 @@ $as_echo_n "checking for python librarie - mingw* | pw32*) - PYTHON_LIBS=`$PYTHON -c 'import os,sys;print("-L"+os.path.join(sys.prefix,"libs").replace(os.sep,"/")+" -lpython"+sys.version[:3].replace(".",""))'` ;; - cygwin*) -- PYTHON_LIBS=`$PYTHON -c 'import os,sys;print("-L"+os.path.join(sys.path[3],"config")+" -lpython"+sys.version[:3]')` ;; -+ PYTHON_LIBS=`$PYTHON -c 'import os,sys;print("-L"+os.path.join(sys.path[3],"config")+" -lpython"+sys.version[:3])'` ;; - *) - PYTHON_LIBS= ;; - esac --- xapian-bindings-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?20111007162228.57F545CBA>