apache-cassandra2: fix hard-coded /var, fix pkglint warnings

The hard-coded /var had made the SUBST block from Makefile.common fail in
the install stage.

4 files changed, 29 insertions, 15 deletions

diff --git a/databases/apache-cassandra2/Makefile b/databases/apache-cassandra2/Makefile
index 7be61e754b2..96be4691b81 100644
--- a/databases/apache-cassandra2/Makefile
+++ b/databases/apache-cassandra2/Makefile
@@ -1,23 +1,21 @@
-# $NetBSD: Makefile,v 1.5 2019/04/25 07:32:40 maya Exp $
+# $NetBSD: Makefile,v 1.6 2020/07/27 17:21:40 rillig Exp $
 #
 
 CASSANDRA_VER=	2.2.12
-PKGREVISION=	2
-
-MASTER_SITES=	${MASTER_SITE_APACHE:=cassandra/${CASSANDRA_VER:C/-.*//}/}
+PKGREVISION=	3
 
 DEPENDS+=	snappy-java>=1.0.5.4<1.1:../../devel/snappy-java10
 
 USE_JAVA2=	6
 
-BINFILES=	cassandra cassandra.in.sh cqlsh cqlsh.py debug-cql		\
-		nodetool sstablekeys sstableloader sstablescrub sstableupgrade	\
-		sstableverify stop-server
+BINFILES=	cassandra cassandra.in.sh cqlsh cqlsh.py debug-cql	\
+		nodetool sstablekeys sstableloader sstablescrub		\
+		sstableupgrade sstableverify stop-server
 DOCFILES=	CHANGES LICENSE NEWS NOTICE
-EGFILES=	cassandra-env.sh cassandra-rackdc.properties			\
-		cassandra-topology.properties cassandra.yaml			\
-		commitlog_archiving.properties cqlshrc.sample			\
-		hotspot_compiler logback-tools.xml logback.xml			\
+EGFILES=	cassandra-env.sh cassandra-rackdc.properties		\
+		cassandra-topology.properties cassandra.yaml		\
+		commitlog_archiving.properties cqlshrc.sample		\
+		hotspot_compiler logback-tools.xml logback.xml		\
 		metrics-reporter-config-sample.yaml
 
 .include "../../databases/apache-cassandra/Makefile.common"
diff --git a/databases/apache-cassandra2/distinfo b/databases/apache-cassandra2/distinfo
index d2177e67421..43e2fd536e1 100644
--- a/databases/apache-cassandra2/distinfo
+++ b/databases/apache-cassandra2/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.4 2018/06/08 09:34:01 fhajny Exp $
+$NetBSD: distinfo,v 1.5 2020/07/27 17:21:40 rillig Exp $
 
 SHA1 (apache-cassandra-2.2.12-bin.tar.gz) = bfe56d81f777f3aa06fed34c6e1302ba0187e0ce
 RMD160 (apache-cassandra-2.2.12-bin.tar.gz) = 6264b73630ad0130b8c2eef4a19ec55379fe5b25
 SHA512 (apache-cassandra-2.2.12-bin.tar.gz) = 8e8ed8db71664d43a720ef7126989ebc81ea76f2c94ddb79d8c6323a2e6b389923dc80d7cef474408be2898879bd8fadb16c0f1c13b55aa45347f93b4d9a402b
 Size (apache-cassandra-2.2.12-bin.tar.gz) = 30253276 bytes
-SHA1 (patch-bin_cassandra) = 02d6aa07576cd38c90311aca7b89cf1c1225088a
+SHA1 (patch-bin_cassandra) = 220a600fd4e8e03454d013b97d9907842d608543
 SHA1 (patch-bin_cassandra.in.sh) = a20393676952286640e97bc4be4326ff4d85d6fd
+SHA1 (patch-conf_cassandra-env.sh) = 40ef228d60cdb032cdca3c390f3351c4eb193a81
diff --git a/databases/apache-cassandra2/patches/patch-bin_cassandra b/databases/apache-cassandra2/patches/patch-bin_cassandra
index 595add642da..58638ff4d59 100644
--- a/databases/apache-cassandra2/patches/patch-bin_cassandra
+++ b/databases/apache-cassandra2/patches/patch-bin_cassandra
@@ -1,10 +1,10 @@
-$NetBSD: patch-bin_cassandra,v 1.1 2015/10/21 12:55:29 fhajny Exp $
+$NetBSD: patch-bin_cassandra,v 1.2 2020/07/27 17:21:40 rillig Exp $
 
 Fix default log dir.
 
 --- bin/cassandra.orig	2014-09-07 13:29:54.000000000 +0000
 +++ bin/cassandra
-@@ -134,7 +134,7 @@ launch_service()
+@@ -189,7 +189,7 @@ launch_service()
      props="$3"
      class="$4"
      cassandra_parms="-Dlogback.configurationFile=logback.xml"
diff --git a/databases/apache-cassandra2/patches/patch-conf_cassandra-env.sh b/databases/apache-cassandra2/patches/patch-conf_cassandra-env.sh
new file mode 100644
index 00000000000..27634a93057
--- /dev/null
+++ b/databases/apache-cassandra2/patches/patch-conf_cassandra-env.sh
@@ -0,0 +1,15 @@
+$NetBSD: patch-conf_cassandra-env.sh,v 1.1 2020/07/27 17:21:40 rillig Exp $
+
+Fix hard-coded path to /var.
+
+--- conf/cassandra-env.sh.orig	2018-02-12 17:50:00.000000000 +0000
++++ conf/cassandra-env.sh
+@@ -258,7 +258,7 @@ JVM_OPTS="$JVM_OPTS -XX:+UseGCLogFileRot
+ JVM_OPTS="$JVM_OPTS -XX:NumberOfGCLogFiles=10"
+ JVM_OPTS="$JVM_OPTS -XX:GCLogFileSize=10M"
+ # if using version before JDK 6u34 or 7u2 use this instead of log rotation
+-# JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc-`date +%s`.log"
++# JVM_OPTS="$JVM_OPTS -Xloggc:@VARBASE@/log/cassandra/gc-`date +%s`.log"
+ 
+ # uncomment to have Cassandra JVM listen for remote debuggers/profilers on port 1414
+ # JVM_OPTS="$JVM_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=1414"