Date: Thu, 13 Mar 2014 19:53:39 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348121 - head/databases/cassandra Message-ID: <201403131953.s2DJrd21061073@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Thu Mar 13 19:53:38 2014 New Revision: 348121 URL: http://svnweb.freebsd.org/changeset/ports/348121 QAT: https://qat.redports.org/buildarchive/r348121/ Log: - Update to version 1.2.15 - Support staging PR: ports/187455 Submitted by: maintainer Modified: head/databases/cassandra/Makefile head/databases/cassandra/distinfo head/databases/cassandra/pkg-plist Modified: head/databases/cassandra/Makefile ============================================================================== --- head/databases/cassandra/Makefile Thu Mar 13 19:35:32 2014 (r348120) +++ head/databases/cassandra/Makefile Thu Mar 13 19:53:38 2014 (r348121) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= cassandra -PORTVERSION= 1.1.12 +PORTVERSION= 1.2.15 CATEGORIES= databases java MASTER_SITES= APACHE MASTER_SITE_SUBDIR= cassandra/${PORTVERSION} @@ -33,7 +33,8 @@ SCRIPTS= cassandra \ sstable2json \ sstablekeys \ sstableloader \ - sstablescrub + sstablescrub \ + cassandra-shuffle OPTIONS_DEFINE= MX4J JNA CQL DOCS MX4J_DESC= Enable HTTP interface for JMX @@ -43,7 +44,6 @@ DOCS_DESC= Install javadoc documentation SUB_FILES= repaircluster -NO_STAGE= yes .include <bsd.port.options.mk> RUN_DEPENDS+= ${JAVALIBDIR}/snappy-java.jar:${PORTSDIR}/archivers/snappy-java @@ -74,7 +74,8 @@ PLIST_SUB+= CQL="@comment " post-extract: @${RM} ${WRKSRC}/bin/*.bat ${WRKSRC}/bin/stop-server \ - ${WRKSRC}/tools/bin/*.bat ${WRKSRC}/lib/snappy-java-*.jar + ${WRKSRC}/tools/bin/*.bat ${WRKSRC}/lib/snappy-java-*.jar \ + ${WRKSRC}/lib/licenses/snappy-java*.txt .for i in ${CONFIGS} @${MV} ${WRKSRC}/conf/${i} ${WRKSRC}/conf/${i}.sample .endfor @@ -91,8 +92,9 @@ post-patch: ${WRKSRC}/bin/sstableloader \ ${WRKSRC}/bin/sstable2json \ ${WRKSRC}/bin/json2sstable \ - ${WRKSRC}/bin/sstablekeys - @${REINPLACE_CMD} -e 's|\`dirname \$$\0\`/..|${DATADIR}|' \ + ${WRKSRC}/bin/sstablekeys \ + ${WRKSRC}/bin/cassandra-shuffle + @${REINPLACE_CMD} -e 's|\`dirname "\$$\0"\`/..|${DATADIR}|' \ ${WRKSRC}/bin/cassandra.in.sh @${RM} -f ${WRKSRC}/conf/*.orig .if ${PORT_OPTIONS:MCQL} @@ -106,39 +108,37 @@ do-build: .endif do-install: - @${MKDIR} ${DATADIR} - @cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${DATADIR} - @${LN} -s ${JAVAJARDIR}/snappy-java.jar ${DATADIR}/lib/snappy-java.jar + @${MKDIR} ${STAGEDIR}${DATADIR} + @cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} + @${LN} -s ${JAVAJARDIR}/snappy-java.jar ${STAGEDIR}${DATADIR}/lib/snappy-java.jar .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @${MV} ${DATADIR}/javadoc ${DOCSDIR} - @${MV} ${DATADIR}/*.txt ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MV} ${STAGEDIR}${DATADIR}/javadoc ${STAGEDIR}${DOCSDIR} + @${MV} ${STAGEDIR}${DATADIR}/*.txt ${STAGEDIR}${DOCSDIR} .else - ${RM} -r ${DATADIR}/javadoc ${DATADIR}/*.txt + @${RM} -rf ${STAGEDIR}${DATADIR}/javadoc ${STAGEDIR}${DATADIR}/*.txt .endif - @cd ${DATADIR}/bin/ && ${CHMOD} ${BINMODE} ${SCRIPTS} - @${INSTALL_SCRIPT} ${WRKDIR}/repaircluster ${DATADIR}/bin - @${LN} -s ${DATADIR}/bin/cassandra-cli ${PREFIX}/bin/cassandra-cli - @${LN} -s ${DATADIR}/bin/nodetool ${PREFIX}/bin/nodetool - @${LN} -s ${DATADIR}/bin/sstableloader ${PREFIX}/bin/sstableloader - @${LN} -s ${DATADIR}/bin/repaircluster ${PREFIX}/bin/repaircluster - @${LN} -s ${DATADIR}/bin/json2sstable ${PREFIX}/bin/json2sstable - @${LN} -s ${DATADIR}/bin/sstable2json ${PREFIX}/bin/sstable2json - @${LN} -s ${DATADIR}/bin/sstablekeys ${PREFIX}/bin/sstablekeys - @${LN} -s ${DATADIR}/bin/sstablescrub ${PREFIX}/bin/sstablescrub + @cd ${STAGEDIR}${DATADIR}/bin/ && ${CHMOD} ${BINMODE} ${SCRIPTS} + @${INSTALL_SCRIPT} ${WRKDIR}/repaircluster ${STAGEDIR}${DATADIR}/bin + @${LN} -s ${DATADIR}/bin/cassandra-cli ${STAGEDIR}${PREFIX}/bin/cassandra-cli + @${LN} -s ${DATADIR}/bin/nodetool ${STAGEDIR}${PREFIX}/bin/nodetool + @${LN} -s ${DATADIR}/bin/sstableloader ${STAGEDIR}${PREFIX}/bin/sstableloader + @${LN} -s ${DATADIR}/bin/repaircluster ${STAGEDIR}${PREFIX}/bin/repaircluster + @${LN} -s ${DATADIR}/bin/json2sstable ${STAGEDIR}${PREFIX}/bin/json2sstable + @${LN} -s ${DATADIR}/bin/sstable2json ${STAGEDIR}${PREFIX}/bin/sstable2json + @${LN} -s ${DATADIR}/bin/sstablekeys ${STAGEDIR}${PREFIX}/bin/sstablekeys + @${LN} -s ${DATADIR}/bin/sstablescrub ${STAGEDIR}${PREFIX}/bin/sstablescrub + @${LN} -s ${DATADIR}/bin/cassandra-shuffle ${STAGEDIR}${PREFIX}/bin/cassandra-shuffle .if ${PORT_OPTIONS:MCQL} - @${LN} -s ${DATADIR}/bin/cqlsh ${PREFIX}/bin/cqlsh + @${LN} -s ${DATADIR}/bin/cqlsh ${STAGEDIR}${PREFIX}/bin/cqlsh .endif .if ${PORT_OPTIONS:MMX4J} - @${LN} -s ${LOCALBASE}/share/java/classes/mx4j-tools.jar ${DATADIR}/lib/mx4j-tools.jar + @${LN} -s ${LOCALBASE}/share/java/classes/mx4j-tools.jar ${STAGEDIR}${DATADIR}/lib/mx4j-tools.jar .endif .if ${PORT_OPTIONS:MJNA} - @${LN} -s ${LOCALBASE}/share/java/classes/jna.jar ${DATADIR}/lib/jna.jar - @${LN} -s ${LOCALBASE}/share/java/classes/jna-platform.jar ${DATADIR}/lib/jna-platform.jar + @${LN} -s ${LOCALBASE}/share/java/classes/jna.jar ${STAGEDIR}${DATADIR}/lib/jna.jar + @${LN} -s ${LOCALBASE}/share/java/classes/jna-platform.jar ${STAGEDIR}${DATADIR}/lib/jna-platform.jar .endif -post-install: - @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - .include <bsd.port.mk> Modified: head/databases/cassandra/distinfo ============================================================================== --- head/databases/cassandra/distinfo Thu Mar 13 19:35:32 2014 (r348120) +++ head/databases/cassandra/distinfo Thu Mar 13 19:53:38 2014 (r348121) @@ -1,2 +1,2 @@ -SHA256 (apache-cassandra-1.1.12-bin.tar.gz) = 3600f6e86e76974b38b2bf90fabff99ab2a443f444d55a93f3c677c8edbe3785 -SIZE (apache-cassandra-1.1.12-bin.tar.gz) = 12974200 +SHA256 (apache-cassandra-1.2.15-bin.tar.gz) = 9b35afb9d0fee7ac52858b4018ecf8bc69d7ad58049303a2ee8d44b8592b258b +SIZE (apache-cassandra-1.2.15-bin.tar.gz) = 16877671 Modified: head/databases/cassandra/pkg-plist ============================================================================== --- head/databases/cassandra/pkg-plist Thu Mar 13 19:35:32 2014 (r348120) +++ head/databases/cassandra/pkg-plist Thu Mar 13 19:53:38 2014 (r348121) @@ -6,6 +6,7 @@ bin/json2sstable bin/sstable2json bin/sstablekeys bin/sstablescrub +bin/cassandra-shuffle %%CQL%%bin/cqlsh %%DATADIR%%/bin/cassandra %%DATADIR%%/bin/cassandra-cli @@ -17,6 +18,10 @@ bin/sstablescrub %%DATADIR%%/bin/sstablekeys %%DATADIR%%/bin/sstableloader %%DATADIR%%/bin/sstablescrub +%%DATADIR%%/bin/cassandra-shuffle +%%DATADIR%%/bin/debug-cql +%%DATADIR%%/bin/sstablesplit +%%DATADIR%%/bin/sstableupgrade %%DATADIR%%/conf/README.txt %%DATADIR%%/conf/cassandra-env.sh %%DATADIR%%/conf/cassandra-topology.properties.sample @@ -45,64 +50,68 @@ bin/sstablescrub %%CQL%%%%DATADIR%%/pylib/cqlshlib/cql3handling.pyc %%CQL%%%%DATADIR%%/pylib/cqlshlib/util.pyc %%DATADIR%%/lib/antlr-3.2.jar -%%DATADIR%%/lib/apache-cassandra-1.1.12.jar -%%DATADIR%%/lib/apache-cassandra-clientutil-1.1.12.jar -%%DATADIR%%/lib/apache-cassandra-thrift-1.1.12.jar +%%DATADIR%%/lib/apache-cassandra-1.2.15.jar +%%DATADIR%%/lib/apache-cassandra-clientutil-1.2.15.jar +%%DATADIR%%/lib/apache-cassandra-thrift-1.2.15.jar %%DATADIR%%/lib/avro-1.4.0-fixes.jar %%DATADIR%%/lib/avro-1.4.0-sources-fixes.jar %%DATADIR%%/lib/commons-cli-1.1.jar %%DATADIR%%/lib/commons-codec-1.2.jar -%%DATADIR%%/lib/commons-lang-2.4.jar +%%DATADIR%%/lib/commons-lang-2.6.jar %%DATADIR%%/lib/compress-lzf-0.8.4.jar %%DATADIR%%/lib/concurrentlinkedhashmap-lru-1.3.jar -%%DATADIR%%/lib/guava-r08.jar +%%DATADIR%%/lib/guava-13.0.1.jar %%DATADIR%%/lib/high-scale-lib-1.1.2.jar %%DATADIR%%/lib/jackson-core-asl-1.9.2.jar %%DATADIR%%/lib/jackson-mapper-asl-1.9.2.jar %%DATADIR%%/lib/jamm-0.2.5.jar -%%DATADIR%%/lib/jline-0.9.94.jar -%%DATADIR%%/lib/metrics-core-2.0.3.jar +%%DATADIR%%/lib/jbcrypt-0.3m.jar +%%DATADIR%%/lib/jline-1.0.jar +%%DATADIR%%/lib/json-simple-1.1.jar %%DATADIR%%/lib/snaptree-0.1.jar %%DATADIR%%/lib/servlet-api-2.5-20081211.jar -%%DATADIR%%/lib/slf4j-log4j12-1.6.1.jar -%%DATADIR%%/lib/slf4j-api-1.6.1.jar +%%DATADIR%%/lib/slf4j-log4j12-1.7.2.jar +%%DATADIR%%/lib/slf4j-api-1.7.2.jar %%DATADIR%%/lib/snakeyaml-1.6.jar %%DATADIR%%/lib/snappy-java.jar +%%DATADIR%%/lib/log4j-1.2.16.jar +%%DATADIR%%/lib/libthrift-0.7.0.jar +%%DATADIR%%/lib/lz4-1.1.0.jar +%%DATADIR%%/lib/metrics-core-2.2.0.jar +%%DATADIR%%/lib/netty-3.6.6.Final.jar %%CQL%%%%DATADIR%%/lib/thrift-python-internal-only-0.7.0.zip %%CQL%%%%DATADIR%%/lib/cql-internal-only-1.4.0.zip %%JNA%%%%DATADIR%%/lib/jna.jar %%JNA%%%%DATADIR%%/lib/jna-platform.jar -%%DATADIR%%/lib/json-simple-1.1.jar -%%DATADIR%%/lib/libthrift-0.7.0.jar -%%DATADIR%%/lib/licenses/antlr-3.1.3.txt -%%DATADIR%%/lib/licenses/avro-1.3.1-dev.txt +%%MX4J%%%%DATADIR%%/lib/mx4j-tools.jar +%%DATADIR%%/lib/licenses/antlr-3.2.txt +%%DATADIR%%/lib/licenses/avro-1.4.0.txt %%DATADIR%%/lib/licenses/commons-cli-1.1.txt %%DATADIR%%/lib/licenses/commons-codec-1.2.txt -%%DATADIR%%/lib/licenses/commons-collections-3.2.1.txt -%%DATADIR%%/lib/licenses/commons-lang-2.4.txt +%%DATADIR%%/lib/licenses/commons-lang-2.6.txt %%DATADIR%%/lib/licenses/compress-lzf-0.8.4.txt -%%DATADIR%%/lib/licenses/concurrentlinkedhashmap-lru-1.2.txt -%%DATADIR%%/lib/licenses/guava-r08.txt +%%DATADIR%%/lib/licenses/concurrentlinkedhashmap-lru-1.3.txt +%%DATADIR%%/lib/licenses/cql-1.2.0.txt +%%DATADIR%%/lib/licenses/guava-13.0.1.txt %%DATADIR%%/lib/licenses/high-scale-lib-1.1.2.txt %%DATADIR%%/lib/licenses/jackson-core-asl-1.9.2.txt %%DATADIR%%/lib/licenses/jackson-mapper-asl-1.9.2.txt -%%DATADIR%%/lib/licenses/jamm-0.2.2.txt -%%DATADIR%%/lib/licenses/jetty-6.1.21.txt -%%DATADIR%%/lib/licenses/jetty-util-6.1.21.txt -%%DATADIR%%/lib/licenses/jline-0.9.94.txt +%%DATADIR%%/lib/licenses/jamm-0.2.5.txt +%%DATADIR%%/lib/licenses/jbcrypt-0.3m.txt +%%DATADIR%%/lib/licenses/jline-1.0.txt %%DATADIR%%/lib/licenses/json-simple-1.1.txt %%DATADIR%%/lib/licenses/libthrift-0.7.txt %%DATADIR%%/lib/licenses/log4j-1.2.16.txt +%%DATADIR%%/lib/licenses/lz4-1.1.0.txt +%%DATADIR%%/lib/licenses/metrics-core-2.2.0.txt +%%DATADIR%%/lib/licenses/netty-3.5.2.txt +%%DATADIR%%/lib/licenses/netty-3.6.6.txt %%DATADIR%%/lib/licenses/servlet-api-2.5-20081211.txt %%DATADIR%%/lib/licenses/slf4j-api-1.6.1.txt %%DATADIR%%/lib/licenses/slf4j-log4j12-1.6.1.txt %%DATADIR%%/lib/licenses/snakeyaml-1.6.txt -%%DATADIR%%/lib/licenses/snappy-java-1.0.3.txt %%DATADIR%%/lib/licenses/thrift-python-0.7.0.txt %%DATADIR%%/lib/licenses/snaptree-0.1.txt -%%DATADIR%%/lib/licenses/cql-1.0.8.txt -%%DATADIR%%/lib/log4j-1.2.16.jar -%%MX4J%%%%DATADIR%%/lib/mx4j-tools.jar %%DATADIR%%/tools/lib/stress.jar %%DATADIR%%/tools/bin/cassandra.in.sh %%DATADIR%%/tools/bin/cassandra-stressd
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403131953.s2DJrd21061073>