From owner-svn-ports-all@FreeBSD.ORG Fri Jul 4 15:27:37 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 78D38F62; Fri, 4 Jul 2014 15:27:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5B18D24A7; Fri, 4 Jul 2014 15:27:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s64FRbPd017397; Fri, 4 Jul 2014 15:27:37 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s64FRaCA017394; Fri, 4 Jul 2014 15:27:36 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201407041527.s64FRaCA017394@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Fri, 4 Jul 2014 15:27:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360634 - head/databases/cassandra X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jul 2014 15:27:37 -0000 Author: danilo Date: Fri Jul 4 15:27:36 2014 New Revision: 360634 URL: http://svnweb.freebsd.org/changeset/ports/360634 QAT: https://qat.redports.org/buildarchive/r360634/ Log: - Update from 1.2.16 to 1.2.17 - Use options helpers PR: ports/191513 Submitted by: Radim Kolar Modified: head/databases/cassandra/Makefile head/databases/cassandra/distinfo head/databases/cassandra/pkg-plist Modified: head/databases/cassandra/Makefile ============================================================================== --- head/databases/cassandra/Makefile Fri Jul 4 15:23:04 2014 (r360633) +++ head/databases/cassandra/Makefile Fri Jul 4 15:27:36 2014 (r360634) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= cassandra -PORTVERSION= 1.2.16 +PORTVERSION= 1.2.17 CATEGORIES= databases java MASTER_SITES= APACHE MASTER_SITE_SUBDIR= cassandra/${PORTVERSION} @@ -14,6 +14,8 @@ COMMENT= Open source distributed databas LICENSE= APACHE20 +RUN_DEPENDS= ${JAVALIBDIR}/snappy-java.jar:${PORTSDIR}/archivers/snappy-java + JAVA_VERSION= 1.7 JAVA_VENDOR= openjdk REINPLACE_ARGS= -i '' @@ -28,6 +30,7 @@ CONFIGS= cassandra-topology.properties \ commitlog_archiving.properties SCRIPTS= cassandra \ cassandra-cli \ + cqlsh \ json2sstable \ nodetool \ sstable2json \ @@ -41,36 +44,17 @@ MX4J_DESC= Enable HTTP interface for JMX JNA_DESC= Use JNA native access CQL_DESC= Install cqlsh DOCS_DESC= Install javadoc documentation +OPTIONS_SUB= yes SUB_FILES= repaircluster -.include - -RUN_DEPENDS+= ${JAVALIBDIR}/snappy-java.jar:${PORTSDIR}/archivers/snappy-java +MX4J_RUN_DEPENDS= ${JAVAJARDIR}/mx4j-tools.jar:${PORTSDIR}/java/mx4j +JNA_RUN_DEPENDS= ${JAVAJARDIR}/jna.jar:${PORTSDIR}/devel/jna +CQL_USE= PYTHON=yes -.if ${PORT_OPTIONS:MDOCS} PORTDOCS= javadoc *.txt -.endif -.if ${PORT_OPTIONS:MMX4J} -RUN_DEPENDS+= ${JAVAJARDIR}/mx4j-tools.jar:${PORTSDIR}/java/mx4j -PLIST_SUB+= MX4J="" -.else -PLIST_SUB+= MX4J="@comment " -.endif -.if ${PORT_OPTIONS:MJNA} -RUN_DEPENDS+= ${JAVAJARDIR}/jna.jar:${PORTSDIR}/devel/jna -PLIST_SUB+= JNA="" -.else -PLIST_SUB+= JNA="@comment " -.endif -.if ${PORT_OPTIONS:MCQL} -USE_PYTHON= yes -PLIST_SUB+= CQL="" -SCRIPTS+= cqlsh -.else -PLIST_SUB+= CQL="@comment " -.endif +.include post-extract: @${RM} ${WRKSRC}/bin/*.bat ${WRKSRC}/bin/stop-server \ @@ -79,11 +63,6 @@ post-extract: .for i in ${CONFIGS} @${MV} ${WRKSRC}/conf/${i} ${WRKSRC}/conf/${i}.sample .endfor -.if empty(PORT_OPTIONS:MCQL) - @${RM} -r ${WRKSRC}/pylib - @${RM} ${WRKSRC}/bin/cqlsh - @${RM} ${WRKSRC}/lib/*.zip -.endif post-patch: @${REINPLACE_CMD} -e 's|/usr/share/cassandra|${DATADIR}/bin|' \ @@ -97,48 +76,35 @@ post-patch: @${REINPLACE_CMD} -e 's|\`dirname "\$$\0"\`/..|${DATADIR}|' \ ${WRKSRC}/bin/cassandra.in.sh @${RM} -f ${WRKSRC}/conf/*.orig -.if ${PORT_OPTIONS:MCQL} @${REINPLACE_CMD} -e 's|os.path.dirname(__file__)|"${DATADIR}/bin"|' \ ${WRKSRC}/bin/cqlsh -.endif do-build: .if ${PORT_OPTIONS:MCQL} - @${PYTHON_CMD} -m compileall ${WRKSRC}/pylib + ${PYTHON_CMD} -m compileall ${WRKSRC}/pylib .endif do-install: @${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} + cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} + ${LN} -s ${JAVAJARDIR}/snappy-java.jar ${STAGEDIR}${DATADIR}/lib/snappy-java.jar @${MKDIR} ${STAGEDIR}${DOCSDIR} - @${MV} ${STAGEDIR}${DATADIR}/javadoc ${STAGEDIR}${DOCSDIR} - @${MV} ${STAGEDIR}${DATADIR}/*.txt ${STAGEDIR}${DOCSDIR} -.else - @${RM} -rf ${STAGEDIR}${DATADIR}/javadoc ${STAGEDIR}${DATADIR}/*.txt -.endif + ${MV} ${STAGEDIR}${DATADIR}/javadoc ${STAGEDIR}${DOCSDIR} + ${MV} ${STAGEDIR}${DATADIR}/*.txt ${STAGEDIR}${DOCSDIR} @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 ${STAGEDIR}${PREFIX}/bin/cqlsh -.endif -.if ${PORT_OPTIONS:MMX4J} - @${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 ${STAGEDIR}${DATADIR}/lib/jna.jar - @${LN} -s ${LOCALBASE}/share/java/classes/jna-platform.jar ${STAGEDIR}${DATADIR}/lib/jna-platform.jar -.endif + ${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 + ${LN} -s ${DATADIR}/bin/cqlsh ${STAGEDIR}${PREFIX}/bin/cqlsh + ${LN} -s ${LOCALBASE}/share/java/classes/mx4j-tools.jar ${STAGEDIR}${DATADIR}/lib/mx4j-tools.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 .include Modified: head/databases/cassandra/distinfo ============================================================================== --- head/databases/cassandra/distinfo Fri Jul 4 15:23:04 2014 (r360633) +++ head/databases/cassandra/distinfo Fri Jul 4 15:27:36 2014 (r360634) @@ -1,2 +1,2 @@ -SHA256 (apache-cassandra-1.2.16-bin.tar.gz) = 5ff7a844fca5ec326729001703aaca436543e560485ac50a1c9a5185c205ec46 -SIZE (apache-cassandra-1.2.16-bin.tar.gz) = 16880266 +SHA256 (apache-cassandra-1.2.17-bin.tar.gz) = fbd96369a113a3eabea7d784fe9f6cadf7598ade38443fa0d70d48ff66aaf576 +SIZE (apache-cassandra-1.2.17-bin.tar.gz) = 16932862 Modified: head/databases/cassandra/pkg-plist ============================================================================== --- head/databases/cassandra/pkg-plist Fri Jul 4 15:23:04 2014 (r360633) +++ head/databases/cassandra/pkg-plist Fri Jul 4 15:27:36 2014 (r360634) @@ -85,9 +85,9 @@ bin/cassandra-shuffle %%CQL%%%%DATADIR%%/pylib/cqlshlib/util.py %%CQL%%%%DATADIR%%/pylib/cqlshlib/util.pyc %%DATADIR%%/lib/antlr-3.2.jar -%%DATADIR%%/lib/apache-cassandra-1.2.16.jar -%%DATADIR%%/lib/apache-cassandra-clientutil-1.2.16.jar -%%DATADIR%%/lib/apache-cassandra-thrift-1.2.16.jar +%%DATADIR%%/lib/apache-cassandra-1.2.17.jar +%%DATADIR%%/lib/apache-cassandra-clientutil-1.2.17.jar +%%DATADIR%%/lib/apache-cassandra-thrift-1.2.17.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