Index: head/databases/cassandra/Makefile
===================================================================
--- head/databases/cassandra/Makefile	(revision 360633)
+++ head/databases/cassandra/Makefile	(revision 360634)
@@ -1,144 +1,110 @@
 # Created by: Gea-Suan Lin <gslin@gslin.org>
 # $FreeBSD$
 
 PORTNAME=	cassandra
-PORTVERSION=	1.2.16
+PORTVERSION=	1.2.17
 CATEGORIES=	databases java
 MASTER_SITES=	APACHE
 MASTER_SITE_SUBDIR=	cassandra/${PORTVERSION}
 DISTNAME=	apache-cassandra-${PORTVERSION}
 EXTRACT_SUFX=	-bin.tar.gz
 
 MAINTAINER=	hsn@sendmail.cz
 COMMENT=	Open source distributed database management system
 
 LICENSE=	APACHE20
 
+RUN_DEPENDS=	${JAVALIBDIR}/snappy-java.jar:${PORTSDIR}/archivers/snappy-java
+
 JAVA_VERSION=	1.7
 JAVA_VENDOR=	openjdk
 REINPLACE_ARGS=	-i ''
 USE_JAVA=	yes
 USE_RC_SUBR=	cassandra
 
 CONFIGS=	cassandra-topology.properties \
 		cassandra.yaml \
 		log4j-server.properties \
 		log4j-tools.properties \
 		cassandra-rackdc.properties \
 		commitlog_archiving.properties
 SCRIPTS=	cassandra \
 		cassandra-cli \
+		cqlsh \
 		json2sstable \
 		nodetool \
 		sstable2json \
 		sstablekeys \
 		sstableloader \
 		sstablescrub \
 		cassandra-shuffle
 
 OPTIONS_DEFINE=	MX4J JNA CQL DOCS
 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 <bsd.port.options.mk>
+MX4J_RUN_DEPENDS=	${JAVAJARDIR}/mx4j-tools.jar:${PORTSDIR}/java/mx4j
+JNA_RUN_DEPENDS=	${JAVAJARDIR}/jna.jar:${PORTSDIR}/devel/jna
+CQL_USE=		PYTHON=yes
 
-RUN_DEPENDS+=	${JAVALIBDIR}/snappy-java.jar:${PORTSDIR}/archivers/snappy-java
-
-.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 <bsd.port.options.mk>
 
 post-extract:
 	@${RM} ${WRKSRC}/bin/*.bat ${WRKSRC}/bin/stop-server \
 		${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
-.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|' \
 		${WRKSRC}/bin/cassandra-cli \
 		${WRKSRC}/bin/nodetool \
 		${WRKSRC}/bin/sstableloader \
 		${WRKSRC}/bin/sstable2json \
 		${WRKSRC}/bin/json2sstable \
 		${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}
 	@${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 <bsd.port.mk>
Index: head/databases/cassandra/distinfo
===================================================================
--- head/databases/cassandra/distinfo	(revision 360633)
+++ head/databases/cassandra/distinfo	(revision 360634)
@@ -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
Index: head/databases/cassandra/pkg-plist
===================================================================
--- head/databases/cassandra/pkg-plist	(revision 360633)
+++ head/databases/cassandra/pkg-plist	(revision 360634)
@@ -1,167 +1,167 @@
 bin/cassandra-cli
 bin/nodetool
 bin/repaircluster
 bin/sstableloader
 bin/json2sstable
 bin/sstable2json
 bin/sstablekeys
 bin/sstablescrub
 bin/cassandra-shuffle
 %%CQL%%bin/cqlsh
 %%DATADIR%%/bin/cassandra
 %%DATADIR%%/bin/cassandra-cli
 %%DATADIR%%/bin/cassandra.in.sh
 %%DATADIR%%/bin/json2sstable
 %%DATADIR%%/bin/nodetool
 %%DATADIR%%/bin/repaircluster
 %%DATADIR%%/bin/sstable2json
 %%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
 %%DATADIR%%/conf/cassandra.yaml.sample
 %%DATADIR%%/conf/log4j-server.properties.sample
 %%DATADIR%%/conf/log4j-tools.properties.sample
 %%DATADIR%%/conf/commitlog_archiving.properties.sample
 %%DATADIR%%/conf/cassandra-rackdc.properties.sample
 %%DATADIR%%/interface/cassandra.thrift
 %%DATADIR%%/conf/cqlshrc.sample
 %%CQL%%%%DATADIR%%/bin/cqlsh
 %%CQL%%%%DATADIR%%/pylib/setup.py
 %%CQL%%%%DATADIR%%/pylib/setup.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/__init__.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/__init__.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/cql3handling.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/cql3handling.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/cqlhandling.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/cqlhandling.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/displaying.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/displaying.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/formatting.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/formatting.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/helptopics.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/helptopics.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/pylexotron.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/pylexotron.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/saferscanner.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/saferscanner.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/ssl.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/ssl.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/__init__.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/__init__.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/ansi_colors.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/ansi_colors.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/basecase.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/basecase.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/cassconnect.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/cassconnect.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/run_cqlsh.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/run_cqlsh.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/table_arrangements.cql
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cql_parsing.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cql_parsing.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_commands.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_commands.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_completion.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_completion.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_invocation.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_invocation.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_output.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_output.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_keyspace_init2.cql
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_keyspace_init3.cql
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/tfactory.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/tfactory.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/tracing.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/tracing.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/wcwidth.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/wcwidth.py
 %%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
 %%DATADIR%%/lib/commons-codec-1.2.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-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/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.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.1.zip
 %%JNA%%%%DATADIR%%/lib/jna.jar
 %%JNA%%%%DATADIR%%/lib/jna-platform.jar
 %%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-lang-2.6.txt
 %%DATADIR%%/lib/licenses/compress-lzf-0.8.4.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.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/thrift-python-0.7.0.txt
 %%DATADIR%%/lib/licenses/snaptree-0.1.txt
 %%DATADIR%%/tools/lib/stress.jar
 %%DATADIR%%/tools/bin/cassandra.in.sh
 %%DATADIR%%/tools/bin/cassandra-stressd
 %%DATADIR%%/tools/bin/cassandra-stress
 %%DATADIR%%/tools/bin/sstablemetadata
 %%DATADIR%%/tools/bin/token-generator
 @dirrm %%DATADIR%%/tools/lib
 @dirrm %%DATADIR%%/tools/bin
 @dirrm %%DATADIR%%/tools
 @dirrm %%DATADIR%%/lib/licenses
 @dirrm %%DATADIR%%/lib
 @dirrm %%DATADIR%%/interface
 %%CQL%%@dirrmtry %%DATADIR%%/pylib/cqlshlib/test
 %%CQL%%@dirrmtry %%DATADIR%%/pylib/cqlshlib
 %%CQL%%@dirrmtry %%DATADIR%%/pylib
 @dirrmtry %%DATADIR%%/conf
 @dirrm %%DATADIR%%/bin
 @dirrmtry %%DATADIR%%