From owner-svn-ports-head@FreeBSD.ORG Tue Aug 14 09:17:38 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D64D01065784; Tue, 14 Aug 2012 09:17:37 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C095B8FC0C; Tue, 14 Aug 2012 09:17:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7E9HbPB072206; Tue, 14 Aug 2012 09:17:37 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7E9HbFA072203; Tue, 14 Aug 2012 09:17:37 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201208140917.q7E9HbFA072203@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Tue, 14 Aug 2012 09:17:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r302509 - head/databases/xapian-bindings X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Aug 2012 09:17:38 -0000 Author: sunpoet Date: Tue Aug 14 09:17:37 2012 New Revision: 302509 URL: http://svn.freebsd.org/changeset/ports/302509 Log: - Add Lua and Perl bindings [1] - Simplify PLIST_SUB: remove BINDING_ prefix PR: ports/169912 [1] Submitted by: Veniamin Gvozdikov [1] Modified: head/databases/xapian-bindings/Makefile (contents, props changed) head/databases/xapian-bindings/pkg-plist (contents, props changed) Modified: head/databases/xapian-bindings/Makefile ============================================================================== --- head/databases/xapian-bindings/Makefile Tue Aug 14 09:15:18 2012 (r302508) +++ head/databases/xapian-bindings/Makefile Tue Aug 14 09:17:37 2012 (r302509) @@ -18,7 +18,7 @@ LICENSE= GPLv2 LIB_DEPENDS= xapian:${PORTSDIR}/databases/xapian-core -OPTIONS_DEFINE= DOCS PHP PYTHON RUBY +OPTIONS_DEFINE= DOCS LUA PERL PHP PYTHON RUBY OPTIONS_DEFAULT=PHP PYTHON RUBY PORTSCOUT= limitw:1,even @@ -29,42 +29,60 @@ GNU_CONFIGURE= yes .include +.if ${PORT_OPTIONS:MLUA} +CONFIGURE_ARGS+=--with-lua +CONFIGURE_ENV+= LUA="${LUA_CMD}" LUA_INC="${LUA_INCDIR}" LUA_LIB="${LUA_MODLIBDIR}" LUA_SO=.so +USE_LUA= 5.1+ +PLIST_SUB+= LUA="" +.else +PLIST_SUB+= LUA="@comment " +.endif + +.if ${PORT_OPTIONS:MPERL} +CONFIGURE_ARGS+=--with-perl +CONFIGURE_ENV+= PERL_LIB="${SITE_PERL}" +USE_PERL5= yes +PLIST_SUB+= PERL="" +.else +PLIST_SUB+= PERL="@comment " +.endif + .if ${PORT_OPTIONS:MPHP} CONFIGURE_ARGS+=--with-php CONFIGURE_ENV+= PHP_CONFIG="${LOCALBASE}/bin/php-config" USE_PHP= yes USE_PHP_BUILD= yes -PLIST_SUB+= BINDING_PHP="" +PLIST_SUB+= PHP="" .else CONFIGURE_ARGS+=--without-php -PLIST_SUB+= BINDING_PHP="@comment " +PLIST_SUB+= PHP="@comment " .endif .if ${PORT_OPTIONS:MPYTHON} CONFIGURE_ARGS+=--with-python CONFIGURE_ENV+= PYTHON_LIB="${PYTHON_SITELIBDIR}" USE_PYTHON= yes -PLIST_SUB+= BINDING_PYTHON="" +PLIST_SUB+= PYTHON="" .else CONFIGURE_ARGS+=--without-python -PLIST_SUB+= BINDING_PYTHON="@comment " +PLIST_SUB+= PYTHON="@comment " .endif .if ${PORT_OPTIONS:MRUBY} CONFIGURE_ARGS+=--with-ruby USE_RUBY= yes USE_RUBY_RDOC= no -PLIST_SUB+= BINDING_RUBY="" +PLIST_SUB+= RUBY="" .else CONFIGURE_ARGS+=--without-ruby -PLIST_SUB+= BINDING_RUBY="@comment " +PLIST_SUB+= RUBY="@comment " .endif post-patch: # do not install rdoc @${REINPLACE_CMD} -e '/^install-data-am:/ s|install-data-local||' ${WRKSRC}/ruby/Makefile.in .if empty(PORT_OPTIONS:MDOCS) - @${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 install-dist_exampledataDATA ||' ${WRKSRC}/lua/Makefile.in ${WRKSRC}/php/Makefile.in ${WRKSRC}/python/Makefile.in @${REINPLACE_CMD} -e '/^install-data-am:/ s|install-dist_docdataDATA||; 760 s|install-dist_exampledataDATA ||' ${WRKSRC}/ruby/Makefile.in .endif Modified: head/databases/xapian-bindings/pkg-plist ============================================================================== --- head/databases/xapian-bindings/pkg-plist Tue Aug 14 09:15:18 2012 (r302508) +++ head/databases/xapian-bindings/pkg-plist Tue Aug 14 09:17:37 2012 (r302509) @@ -1,35 +1,104 @@ -%%BINDING_PHP%%lib/php/%%PHP_EXT_DIR%%/xapian.so -%%BINDING_PHP%%%%DATADIR%%/php5/xapian.php -%%BINDING_PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/examples/simpleexpand.php5 -%%BINDING_PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/examples/simpleindex.php5 -%%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%%%%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%%%%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%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/ruby/examples -%%BINDING_RUBY%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/ruby -%%BINDING_RUBY%%@dirrmtry %%RUBY_SITELIBDIR%% +%%LUA%%%%LUA_MODLIBDIR%%/xapian.so +%%LUA%%%%PORTDOCS%%%%DOCSDIR%%/lua/examples/simpleexpand.lua +%%LUA%%%%PORTDOCS%%%%DOCSDIR%%/lua/examples/simpleindex.lua +%%LUA%%%%PORTDOCS%%%%DOCSDIR%%/lua/examples/simplematchdecider.lua +%%LUA%%%%PORTDOCS%%%%DOCSDIR%%/lua/examples/simplesearch.lua +%%LUA%%%%PORTDOCS%%%%DOCSDIR%%/lua/index.html +%%LUA%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/lua/examples +%%LUA%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/lua +%%PERL%%%%SITE_PERL%%/Search/Xapian.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/AssertionError.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/BM25Weight.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/BoolWeight.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/Database.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/DatabaseCorruptError.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/DatabaseCreateError.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/DatabaseError.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/DatabaseLockError.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/DatabaseModifiedError.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/DatabaseOpeningError.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/DatabaseVersionError.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/DocNotFoundError.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/Document.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/ESet.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/ESetIterator.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/Enquire.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/Error.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/FeatureUnavailableError.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/InternalError.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/InvalidArgumentError.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/InvalidOperationError.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/LogicError.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/MSet.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/MSetIterator.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/MultiValueSorter.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/NetworkError.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/NetworkTimeoutError.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/PerlStopper.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/PositionIterator.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/PostingIterator.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/Query.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/QueryParser.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/QueryParserError.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/RSet.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/RangeError.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/RuntimeError.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/SimpleStopper.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/Stem.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/Stopper.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/TermGenerator.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/TermIterator.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/TradWeight.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/UnimplementedError.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/ValueIterator.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/Weight.pm +%%PERL%%%%SITE_PERL%%/Search/Xapian/WritableDatabase.pm +%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Xapian/Xapian.so +%%PERL%%%%PORTDOCS%%%%DOCSDIR%%/perl/examples/full-indexer.pl +%%PERL%%%%PORTDOCS%%%%DOCSDIR%%/perl/examples/full-searcher.pl +%%PERL%%%%PORTDOCS%%%%DOCSDIR%%/perl/examples/simpleexpand.pl +%%PERL%%%%PORTDOCS%%%%DOCSDIR%%/perl/examples/simpleindex.pl +%%PERL%%%%PORTDOCS%%%%DOCSDIR%%/perl/examples/simplematchdecider.pl +%%PERL%%%%PORTDOCS%%%%DOCSDIR%%/perl/examples/simplesearch.pl +%%PERL%%%%PORTDOCS%%%%DOCSDIR%%/perl/index.html +%%PERL%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/perl/examples +%%PERL%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/perl +%%PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Xapian +%%PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search +%%PERL%%@dirrm %%SITE_PERL%%/Search/Xapian +%%PERL%%@dirrm %%SITE_PERL%%/Search +%%PHP%%lib/php/%%PHP_EXT_DIR%%/xapian.so +%%PHP%%%%DATADIR%%/php5/xapian.php +%%PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/examples/simpleexpand.php5 +%%PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/examples/simpleindex.php5 +%%PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/examples/simplematchdecider.php5 +%%PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/examples/simplesearch.php5 +%%PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/index.html +%%PHP%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/php/examples +%%PHP%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/php +%%PHP%%@dirrmtry %%DATADIR%%/php5 +%%PHP%%@dirrmtry %%DATADIR%% +%%PHP%%@dirrmtry lib/php/%%PHP_EXT_DIR%% +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xapian/__init__.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xapian/__init__.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xapian/__init__.pyo +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xapian/_xapian.so +%%PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/examples/simpleexpand.py +%%PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/examples/simpleindex.py +%%PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/examples/simplematchdecider.py +%%PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/examples/simplesearch.py +%%PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/index.html +%%PYTHON%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/python/examples +%%PYTHON%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/python +%%PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%/xapian +%%RUBY%%%%RUBY_SITELIBDIR%%/xapian.rb +%%RUBY%%%%RUBY_SITEARCHLIBDIR%%/_xapian.so +%%RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/examples/simpleexpand.rb +%%RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/examples/simpleindex.rb +%%RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/examples/simplematchdecider.rb +%%RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/examples/simplesearch.rb +%%RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/index.html +%%RUBY%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/ruby/examples +%%RUBY%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/ruby +%%RUBY%%@dirrmtry %%RUBY_SITELIBDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%%