Index: head/databases/xapian-bindings/Makefile =================================================================== --- head/databases/xapian-bindings/Makefile (revision 300075) +++ head/databases/xapian-bindings/Makefile (revision 300076) @@ -1,72 +1,71 @@ # New ports collection makefile for: xapian-bindings # Date created: 2007-05-26 # Whom: Gea-Suan Lin # # $FreeBSD$ # PORTNAME= xapian-bindings -PORTVERSION= 1.2.10 +PORTVERSION= 1.2.11 CATEGORIES= databases MASTER_SITES= http://oligarchy.co.uk/xapian/${PORTVERSION}/ \ LOCAL/sunpoet MAINTAINER= sunpoet@FreeBSD.org COMMENT= Bindings allowing Xapian to be used from various programming languages LICENSE= GPLv2 -LIB_DEPENDS= xapian.26:${PORTSDIR}/databases/xapian-core +LIB_DEPENDS= xapian:${PORTSDIR}/databases/xapian-core -OPTIONS= PHP "Build PHP binding" on \ - PYTHON "Build Python binding" on \ - RUBY "Build Ruby binding" on +OPTIONS_DEFINE= DOCS PHP PYTHON RUBY +OPTIONS_DEFAULT=PHP PYTHON RUBY PORTSCOUT= limitw:1,even -CONFIGURE_ARGS= --datarootdir="${DATADIR}" --docdir="${DOCSDIR}" \ +CONFIGURE_ARGS= --datarootdir=${DATADIR} --docdir=${DOCSDIR} \ --without-csharp --without-java --without-tcl GNU_CONFIGURE= yes .include -.if defined(WITHOUT_PHP) -CONFIGURE_ARGS+=--without-php -PLIST_SUB+= BINDING_PHP="@comment " -.else +.if ${PORT_OPTIONS:MPHP} CONFIGURE_ARGS+=--with-php CONFIGURE_ENV+= PHP_CONFIG="${LOCALBASE}/bin/php-config" -PLIST_SUB+= BINDING_PHP="" USE_PHP= yes USE_PHP_BUILD= yes +PLIST_SUB+= BINDING_PHP="" +.else +CONFIGURE_ARGS+=--without-php +PLIST_SUB+= BINDING_PHP="@comment " .endif -.if defined(WITHOUT_PYTHON) -CONFIGURE_ARGS+=--without-python -PLIST_SUB+= BINDING_PYTHON="@comment " -.else +.if ${PORT_OPTIONS:MPYTHON} CONFIGURE_ARGS+=--with-python CONFIGURE_ENV+= PYTHON_LIB="${PYTHON_SITELIBDIR}" -PLIST_SUB+= BINDING_PYTHON="" USE_PYTHON= yes +PLIST_SUB+= BINDING_PYTHON="" +.else +CONFIGURE_ARGS+=--without-python +PLIST_SUB+= BINDING_PYTHON="@comment " .endif -.if defined(WITHOUT_RUBY) -CONFIGURE_ARGS+=--without-ruby -PLIST_SUB+= BINDING_RUBY="@comment " -.else +.if ${PORT_OPTIONS:MRUBY} CONFIGURE_ARGS+=--with-ruby -PLIST_SUB+= BINDING_RUBY="" USE_RUBY= yes USE_RUBY_RDOC= no +PLIST_SUB+= BINDING_RUBY="" +.else +CONFIGURE_ARGS+=--without-ruby +PLIST_SUB+= BINDING_RUBY="@comment " .endif post-patch: # do not install rdoc @${REINPLACE_CMD} -e '/^install-data-am:/ s|install-data-local||' ${WRKSRC}/ruby/Makefile.in -.if defined(NOPORTDOCS) +.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||; 759 s|install-dist_exampledataDATA ||' ${WRKSRC}/ruby/Makefile.in + @${REINPLACE_CMD} -e '/^install-data-am:/ s|install-dist_docdataDATA||; 760 s|install-dist_exampledataDATA ||' ${WRKSRC}/ruby/Makefile.in .endif .include Property changes on: head/databases/xapian-bindings/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.19 \ No newline at end of property +1.20 \ No newline at end of property Index: head/databases/xapian-bindings/distinfo =================================================================== --- head/databases/xapian-bindings/distinfo (revision 300075) +++ head/databases/xapian-bindings/distinfo (revision 300076) @@ -1,2 +1,2 @@ -SHA256 (xapian-bindings-1.2.10.tar.gz) = dd191ad2e1134b7008b3b71c7cab41d2d80df2fe82ecdb9ad68c11209ba19382 -SIZE (xapian-bindings-1.2.10.tar.gz) = 1467592 +SHA256 (xapian-bindings-1.2.11.tar.gz) = 02caf5b56866174d09d76658300251c649c3692ae48e5a2536df58b014c0c117 +SIZE (xapian-bindings-1.2.11.tar.gz) = 1471891 Property changes on: head/databases/xapian-bindings/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.12 \ No newline at end of property +1.13 \ No newline at end of property Index: head/www/xapian-omega/Makefile =================================================================== --- head/www/xapian-omega/Makefile (revision 300075) +++ head/www/xapian-omega/Makefile (revision 300076) @@ -1,69 +1,71 @@ # New ports collection makefile for: xapian-omega # Date created: 05 Jul 2008 # Whom: Henrik Brix Andersen # # $FreeBSD$ # PORTNAME= xapian-omega -PORTVERSION= 1.2.10 +PORTVERSION= 1.2.11 CATEGORIES= www MASTER_SITES= http://oligarchy.co.uk/xapian/${PORTVERSION}/ \ LOCAL/sunpoet MAINTAINER= sunpoet@FreeBSD.org COMMENT= CGI search application built on Xapian LICENSE= GPLv2 -LIB_DEPENDS= pcre.1:${PORTSDIR}/devel/pcre \ - xapian.26:${PORTSDIR}/databases/xapian-core +LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre \ + xapian:${PORTSDIR}/databases/xapian-core -OPTIONS= ICONV "Enable iconv character set conversion support" on +OPTIONS_DEFINE= DOCS EXAMPLES ICONV +OPTIONS_DEFAULT=ICONV +ICONV_DESC= Enable iconv character set conversion support PORTSCOUT= limitw:1,even 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 index.html omegascript.html overview.html \ quickstart.html scriptindex.html termprefixes.html \ ${MORE_PORTDOCS} PORTEXAMPLES= omega.conf .include -.if defined(WITH_ICONV) +.if ${PORT_OPTIONS:MICONV} USE_ICONV= yes CONFIGURE_ARGS+=--with-iconv .else CONFIGURE_ARGS+=--without-iconv .endif post-patch: @${REINPLACE_CMD} \ -e '/^dist_sysconf_DATA = /d' \ -e '/^pkglibbindir = / s| = .*$$| = ${WWWDIR}/cgi-bin|' \ ${WRKSRC}/Makefile.in -.if defined(NOPORTDOCS) +.if empty(PORT_OPTIONS:MDOCS) @${REINPLACE_CMD} -e '/^SUBDIRS = / s| docs||' ${WRKSRC}/Makefile.in .endif post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR}/ cd ${WRKSRC}/ && ${INSTALL_DATA} ${MORE_PORTDOCS} ${DOCSDIR}/ .endif -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} ${MKDIR} ${EXAMPLESDIR}/ cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}/ .endif .include Property changes on: head/www/xapian-omega/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.29 \ No newline at end of property +1.30 \ No newline at end of property Index: head/www/xapian-omega/distinfo =================================================================== --- head/www/xapian-omega/distinfo (revision 300075) +++ head/www/xapian-omega/distinfo (revision 300076) @@ -1,2 +1,2 @@ -SHA256 (xapian-omega-1.2.10.tar.gz) = 464a681647c1348fe7ab7ab5d8e32c27dc0d48a863ce5d78881e18334dfaad4f -SIZE (xapian-omega-1.2.10.tar.gz) = 620579 +SHA256 (xapian-omega-1.2.11.tar.gz) = bf1c51681ba6e453bf6c7a9d1655ff87be0855586e3fd41ed511ab0ee127a856 +SIZE (xapian-omega-1.2.11.tar.gz) = 623989 Property changes on: head/www/xapian-omega/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.18 \ No newline at end of property +1.19 \ No newline at end of property