diff --git a/textproc/redland-bindings/Makefile b/textproc/redland-bindings/Makefile index b64a0f5417ac..0c066bc0a701 100644 --- a/textproc/redland-bindings/Makefile +++ b/textproc/redland-bindings/Makefile @@ -6,17 +6,13 @@ # PORTNAME= redland-bindings -PORTVERSION= 1.0.1.1 +PORTVERSION= 1.0.2.1 CATEGORIES= textproc MASTER_SITES= http://download.librdf.org/source/ MAINTAINER= russell@rucus.ru.ac.za COMMENT= Language bindings for the Redland package -BROKEN= Configure fails -DEPRECATED= ${BROKEN} -EXPIRATION_DATE=2005-09-22 - #OPTIONS= JAVA "Add Java bindings" off \ # PERL "Add Perl bindings" off \ # PHP "Add PHP bindings" off \ @@ -24,13 +20,12 @@ EXPIRATION_DATE=2005-09-22 # RUBY "Add Ruby bindings" off \ # TCL "Add TCL bindings" off LIB_DEPENDS= rdf.0:${PORTSDIR}/textproc/redland -.if defined(WITH_JAVA) -BUILD_DEPENDS= ${LOCALBASE}/lib/librdf.la:${PORTSDIR}/textproc/redland -.endif + +USE_REINPLACE= yes .if defined(WITH_JAVA) USE_JAVA= yes -JAVA_VESION= 1.3+ +JAVA_VERSION= 1.3+ CONFIGURE_ARGS+= --with-java --with-jdk=${JAVA_HOME} PLIST_SUB+= WITH_JAVA="" .else @@ -88,8 +83,8 @@ TCL_SHORT_V= 84 TCL_LONG_V= 8.4 .endif PLIST_SUB+= WITH_TCL="" -PLIST_SUB+= TCL_DIR="lib/tcl/${TCL_LONG_V}" -CONFIGURE_ARGS+= --with-tcltk=${LOCALBASE}/bin/tclsh${TCL_LONG_V} +PLIST_SUB+= TCL_DIR="lib/tcl${TCL_LONG_V}" +CONFIGURE_ARGS+= --with-tcl=${LOCALBASE}/bin/tclsh${TCL_LONG_V} LIB_DEPENDS+= tcl${TCL_SHORT_V}:${PORTSDIR}/lang/tcl${TCL_SHORT_V} .else PLIST_SUB+= WITH_TCL="@comment " @@ -112,4 +107,8 @@ pre-everything:: @${ECHO_MSG} "**********************************************" @${ECHO_MSG} "" +post-patch: + ${REINPLACE_CMD} 's/^tcllib =.*/tcllib = -ltcl${TCL_SHORT_V}/' \ + ${WRKSRC}/tcl/Makefile.in + .include diff --git a/textproc/redland-bindings/distinfo b/textproc/redland-bindings/distinfo index 2373ee53af66..2314228a775e 100644 --- a/textproc/redland-bindings/distinfo +++ b/textproc/redland-bindings/distinfo @@ -1,2 +1,2 @@ -MD5 (redland-bindings-1.0.1.1.tar.gz) = 58194589828c8bfb0694158666cb4774 -SIZE (redland-bindings-1.0.1.1.tar.gz) = 751284 +MD5 (redland-bindings-1.0.2.1.tar.gz) = 16fdb1f862ac08136d786aca7f75c80a +SIZE (redland-bindings-1.0.2.1.tar.gz) = 755619 diff --git a/textproc/redland-bindings/pkg-plist b/textproc/redland-bindings/pkg-plist index 79c277f86a40..0f8bd3cc6f50 100644 --- a/textproc/redland-bindings/pkg-plist +++ b/textproc/redland-bindings/pkg-plist @@ -1,11 +1,10 @@ @comment $FreeBSD$ %%WITH_JAVA%%lib/java/librdf-java.a -@comment %%WITH_JAVA%%lib/java/librdf-java.la +%%WITH_JAVA%%lib/java/librdf-java.la %%WITH_JAVA%%lib/java/librdf-java.so %%WITH_JAVA%%lib/java/librdf-java.so.0 %%WITH_JAVA%%share/java/librdf-java.jar -%%WITH_JAVA%%@dirrm lib/java -%%WITH_JAVA%%@dirrm share/java +%%WITH_JAVA%%@unexec rmdir %D/lib/java %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/CORE.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/Iterator.pm @@ -20,13 +19,10 @@ %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/Storage.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/Stream.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RDF/Redland/URI.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Redland/CORE.bs -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Redland/CORE.so +%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Redland/CORE/CORE.bs +%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Redland/CORE/CORE.so %%WITH_PHP%%lib/php/%%PHP_EXT_DIR%%/redland.so -%%WITH_PHP%%@dirrm lib/php/%%PHP_EXT_DIR%% %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/Redland.so %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/RDF.py -%%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%% -%%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%% %%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/redland.so %%WITH_TCL%%%%TCL_DIR%%/Redland.so