- Update to 1.1.11

PR:		ports/178561
Submitted by:	Radim Kolar <hsn@sendmail.cz> (maintainer)

databases/cassandra/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cassandra
-PORTVERSION=	1.0.12
-PORTREVISION=	2
+PORTVERSION=	1.1.11
 CATEGORIES=	databases java
 MASTER_SITES=	APACHE
 MASTER_SITE_SUBDIR=	cassandra/${PORTVERSION}
@@ -24,24 +23,34 @@ USE_RC_SUBR=	cassandra
 CONFIGS=	cassandra-topology.properties \
 		cassandra.yaml \
 		log4j-server.properties \
-		log4j-tools.properties
+		log4j-tools.properties \
+		cassandra-rackdc.properties \
+		commitlog_archiving.properties
 SCRIPTS=	cassandra \
 		cassandra-cli \
 		json2sstable \
 		nodetool \
 		sstable2json \
 		sstablekeys \
-		sstableloader
+		sstableloader \
+		sstablescrub
 
-OPTIONS_DEFINE=	MX4J JNA CQL
+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
 
 SUB_FILES=	repaircluster
 
 .include <bsd.port.options.mk>
 
+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=""
@@ -56,7 +65,6 @@ PLIST_SUB+=	JNA="@comment "
 .endif
 .if ${PORT_OPTIONS:MCQL}
 USE_PYTHON=	yes
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cql>=0:${PORTSDIR}/databases/py-cql
 PLIST_SUB+=	CQL=""
 SCRIPTS+=	cqlsh
 .else
@@ -64,14 +72,15 @@ PLIST_SUB+=	CQL="@comment "
 .endif
 
 post-extract:
-	@${RM} ${WRKSRC}/bin/*.bat ${WRKSRC}/bin/stop-server
+	@${RM} ${WRKSRC}/bin/*.bat ${WRKSRC}/bin/stop-server \
+		${WRKSRC}/tools/bin/*.bat ${WRKSRC}/lib/snappy-java-*.jar
 .for i in ${CONFIGS}
 	@${MV} ${WRKSRC}/conf/${i} ${WRKSRC}/conf/${i}.sample
 .endfor
-	@${MV} ${WRKSRC}/bin/cqlshrc.sample ${WRKSRC}/conf
 .if empty(PORT_OPTIONS:MCQL)
 	@${RM} -r ${WRKSRC}/pylib
 	@${RM} ${WRKSRC}/bin/cqlsh
+	@${RM} ${WRKSRC}/lib/*.zip
 .endif
 
 post-patch:
@@ -98,6 +107,14 @@ do-build:
 do-install:
 	@${MKDIR} ${DATADIR}
 	@cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${DATADIR}
+	@${LN} -s ${JAVAJARDIR}/snappy-java.jar ${DATADIR}/lib/snappy-java.jar
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	@${MV} ${DATADIR}/javadoc ${DOCSDIR}
+	@${MV} ${DATADIR}/*.txt ${DOCSDIR}
+.else
+	${RM} -r ${DATADIR}/javadoc ${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
@@ -107,6 +124,7 @@ do-install:
 	@${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
 
 .if ${PORT_OPTIONS:MCQL}
 	@${LN} -s ${DATADIR}/bin/cqlsh ${PREFIX}/bin/cqlsh

databases/cassandra/distinfo

@@ -1,2 +1,2 @@
-SHA256 (apache-cassandra-1.0.12-bin.tar.gz) = 97f2896263960aa53faa201b07d5a89d531d5e2ab3d9d788e5fc5bc5e9ef985a
-SIZE (apache-cassandra-1.0.12-bin.tar.gz) = 11285279
+SHA256 (apache-cassandra-1.1.11-bin.tar.gz) = 246ff0348f6e45cb0d7d2c67245fb6d5fb891cbb35b86591416ffcfc183c6ccb
+SIZE (apache-cassandra-1.1.11-bin.tar.gz) = 12973061

databases/cassandra/files/cassandra.in

@@ -60,9 +60,7 @@ export JAVA_VENDOR=openjdk
 export JAVA_VERSION=1.7
 
 cassandra_prestop() {
-	$CASSANDRA_HOME/bin/nodetool -h localhost disablegossip
-	sleep 15
-	$CASSANDRA_HOME/bin/nodetool -h localhost drain 
+	$CASSANDRA_HOME/bin/nodetool -h localhost drain
 	return 0
 }
 

databases/cassandra/pkg-deinstall

@@ -5,8 +5,9 @@
 if [ "$2" = "DEINSTALL" ]; then
    if [ ! -d $PKG_PREFIX/share/cassandra/conf ]; then exit 1; fi
    cd $PKG_PREFIX/share/cassandra/conf
-   for cfgfile in cassandra.yaml log4j-server.properties \
-                  log4j-tools.properties cassandra-topology.properties; do
+   for cfgfile in cassandra.yaml commitlog_archiving.properties \
+		log4j-server.properties log4j-tools.properties \
+		cassandra-topology.properties cassandra-rackdc.properties;do
        if cmp -s $cfgfile.sample $cfgfile; then
           rm $cfgfile
        fi

databases/cassandra/pkg-install

@@ -6,8 +6,9 @@ if [ "$2" = "POST-INSTALL" ]; then
    if [ ! -d $PKG_PREFIX/share/cassandra/conf ]; then exit 1; fi
    umask 027
    cd $PKG_PREFIX/share/cassandra/conf
-   for cfgfile in cassandra.yaml log4j-server.properties log4j-tools.properties \
-                  cassandra-topology.properties; do
+   for cfgfile in cassandra.yaml commitlog_archiving.properties \
+		log4j-server.properties log4j-tools.properties \
+		cassandra-topology.properties cassandra-rackdc.properties; do
        if [ ! -f $cfgfile ]; then
            cp -p $cfgfile.sample $cfgfile
        fi