Index: head/databases/cassandra3/Makefile =================================================================== --- head/databases/cassandra3/Makefile (revision 564833) +++ head/databases/cassandra3/Makefile (revision 564834) @@ -1,143 +1,143 @@ # $FreeBSD$ PORTNAME= cassandra -DISTVERSION= 3.11.9 +DISTVERSION= 3.11.10 CATEGORIES= databases java MASTER_SITES= LOCAL/rene:repo PKGNAMESUFFIX= 3 DISTFILES= apache-${PORTNAME}-${DISTVERSION}-repo.tar.gz:repo MAINTAINER= language.devel@gmail.com COMMENT= Highly scalable distributed database LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= snappyjava>=0:archivers/snappy-java TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \ bash>0:shells/bash \ git>0:devel/git USES= python:3.6+ USE_ANT= yes USE_JAVA= yes JAVA_VERSION= 1.8 JAVA_VENDOR= openjdk USE_RC_SUBR= cassandra USE_GITHUB= yes GH_ACCOUNT= polo-language GH_PROJECT= cassandra -GH_TAGNAME= c6f6387 +GH_TAGNAME= 62fe1f7 TEST_TARGET= test CONFLICTS= cassandra4 DATADIR= ${JAVASHAREDIR}/${PORTNAME} REINPLACE_ARGS= -i '' SUB_LIST= JAVA_HOME=${JAVA_HOME} USERS= cassandra GROUPS= cassandra PLIST_SUB= PORTVERSION=${PORTVERSION} PORTDOCS= * OPTIONS_DEFINE= SIGAR DOCS OPTIONS_DEFAULT= SIGAR OPTIONS_SUB= yes SIGAR_DESC= Use SIGAR to collect system information DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} SIGAR_RUN_DEPENDS= java-sigar>=1.6.4:java/sigar CONFIG_FILES= cassandra-env.sh \ cassandra-jaas.config \ cassandra-rackdc.properties \ cassandra-topology.properties \ cassandra.yaml \ commitlog_archiving.properties \ hotspot_compiler \ jvm.options \ logback-tools.xml \ logback.xml DIST_DIR= ${WRKSRC}/build/dist REPO_DIR= ${WRKDIR}/repository SCRIPT_FILES= cassandra \ cqlsh \ nodetool \ sstableloader \ sstablescrub \ sstableupgrade \ sstableutil \ sstableverify post-patch: @${CHMOD} ug+x ${WRKSRC}/pylib/cassandra-cqlsh-tests.sh do-build: @${DO_NADA} # Do nothing: Prevent USE_ANT from running a default build target. do-build-DOCS-on: @cd ${WRKSRC} && ANT_OPTS="${ANT_OPTS} -Xmx512m" ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} -Dpycmd=${PYTHON_CMD} freebsd-stage-doc do-build-DOCS-off: @cd ${WRKSRC} && ANT_OPTS="${ANT_OPTS} -Xmx512m" ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} freebsd-stage post-build: .for f in ${SCRIPT_FILES} @${REINPLACE_CMD} -e 's|/usr/share/cassandra|${DATADIR}/bin|' ${DIST_DIR}/bin/${f} .endfor @${REINPLACE_CMD} -e 's|`dirname "$$0"`/..|${DATADIR}|' ${DIST_DIR}/bin/cassandra.in.sh @${REINPLACE_CMD} -e 's|$$CASSANDRA_HOME/lib/sigar-bin|${JAVAJARDIR}|' ${DIST_DIR}/bin/cassandra.in.sh @${REINPLACE_CMD} -e 's|$$CASSANDRA_HOME/lib/sigar-bin|${JAVAJARDIR}|' ${DIST_DIR}/conf/cassandra-env.sh @${REINPLACE_CMD} -e 's|$$CASSANDRA_HOME/conf|${ETCDIR}|' ${DIST_DIR}/bin/cassandra.in.sh .for f in ${CONFIG_FILES} @${MV} ${DIST_DIR}/conf/${f} ${DIST_DIR}/conf/${f}.sample .endfor @${RM} ${DIST_DIR}/lib/licenses/sigar* @${RMDIR} ${DIST_DIR}/lib/sigar-bin do-install: ${MKDIR} ${STAGEDIR}${DATADIR} .for f in CHANGES LICENSE NEWS NOTICE cd ${DIST_DIR} && ${INSTALL_DATA} ${f}.txt ${STAGEDIR}${DATADIR}/ .endfor .for d in interface lib pylib tools cd ${DIST_DIR} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}/ "! -path '*/bin/*'" .endfor ${MKDIR} ${STAGEDIR}${ETCDIR} cd ${DIST_DIR}/conf && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/ cd ${DIST_DIR} && ${COPYTREE_BIN} bin ${STAGEDIR}${DATADIR} cd ${DIST_DIR} && ${INSTALL_DATA} bin/cassandra.in.sh ${STAGEDIR}${DATADIR}/bin/ cd ${DIST_DIR} && ${COPYTREE_BIN} tools/bin ${STAGEDIR}${DATADIR}/ cd ${DIST_DIR} && ${INSTALL_DATA} tools/bin/cassandra.in.sh ${STAGEDIR}${DATADIR}/tools/bin/ .for f in ${SCRIPT_FILES} ${RLN} ${STAGEDIR}${DATADIR}/bin/${f} ${STAGEDIR}${PREFIX}/bin/${f} .endfor ${LN} -s ${JAVAJARDIR}/snappy-java.jar ${STAGEDIR}${DATADIR}/lib/snappy-java.jar post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for d in doc javadoc cd ${DIST_DIR} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DOCSDIR}/ .endfor post-install-SIGAR-on: ${LN} -s ${JAVAJARDIR}/sigar.jar ${STAGEDIR}${DATADIR}/lib/sigar.jar do-test: # A bare 'python' must be on PATH for test to succeed. @cd ${WRKSRC} && ${MV} bin/cassandra.in.sh bin/cassandra.in.sh.patched @cd ${WRKSRC} && ${MV} bin/cassandra.in.sh.orig bin/cassandra.in.sh @cd ${WRKSRC} && pylib/cassandra-cqlsh-tests.sh ${WRKSRC} python3 ${JAVA_HOME} ${REPO_DIR} ${PYTHON_CMD} @cd ${WRKSRC} && ${MV} bin/cassandra.in.sh bin/cassandra.in.sh.orig @cd ${WRKSRC} && ${MV} bin/cassandra.in.sh.patched bin/cassandra.in.sh .include Index: head/databases/cassandra3/distinfo =================================================================== --- head/databases/cassandra3/distinfo (revision 564833) +++ head/databases/cassandra3/distinfo (revision 564834) @@ -1,5 +1,5 @@ -TIMESTAMP = 1604733047 -SHA256 (apache-cassandra-3.11.9-repo.tar.gz) = 52182f64422f139db63337d25e3225e4d619f5063849968584d307e63bbada39 -SIZE (apache-cassandra-3.11.9-repo.tar.gz) = 52444450 -SHA256 (polo-language-cassandra-3.11.9-c6f6387_GH0.tar.gz) = 261336776a2be1b40d170fee4e77991922a8bfcb87b90aa42e60f6b7b8bc7e9c -SIZE (polo-language-cassandra-3.11.9-c6f6387_GH0.tar.gz) = 35605838 +TIMESTAMP = 1612608662 +SHA256 (apache-cassandra-3.11.10-repo.tar.gz) = 09e154d4db06007c58193be4869346263e16c4eeb5bc42d9fb5f5165ce5ad4dc +SIZE (apache-cassandra-3.11.10-repo.tar.gz) = 52449193 +SHA256 (polo-language-cassandra-3.11.10-62fe1f7_GH0.tar.gz) = 7c9624aa1287007cc858cb95e96d2e8a88ba7997332a8093ed90688aff4789f6 +SIZE (polo-language-cassandra-3.11.10-62fe1f7_GH0.tar.gz) = 35636492 Index: head/databases/cassandra3/files/cassandra.in =================================================================== --- head/databases/cassandra3/files/cassandra.in (revision 564833) +++ head/databases/cassandra3/files/cassandra.in (revision 564834) @@ -1,42 +1,41 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: cassandra # REQUIRE: LOGIN # KEYWORD: shutdown # # Be sure to configure full settings in %%ETCDIR%% prior to enabling daemon. # # Add the following lines to /etc/rc.conf or /etc/.conf.local to # enable the Cassandra daemon: # cassandra_enable: Set to "YES" to enable the daemon. # cassandra_user: The user under which to run the daemon. # Defaults to "cassandra". . /etc/rc.subr name=cassandra rcvar=cassandra_enable desc="Cassandra daemon" load_rc_config $name : ${cassandra_enable:=NO} : ${cassandra_user:=cassandra} -command=%%PREFIX%%/bin/cassandra -command_args="-p /var/run/cassandra/cassandra.pid >/dev/null 2>/dev/null" -start_precmd="${name}_prestart" - -procname=%%PREFIX%%/openjdk8/bin/java pidfile=/var/run/cassandra/cassandra.pid + +command=/usr/sbin/daemon +command_args="-frP ${pidfile} %%PREFIX%%/bin/cassandra -f" +start_precmd="${name}_prestart" cassandra_prestart() { export JAVA_HOME=%%JAVA_HOME%% install -d -o ${cassandra_user} /var/run/cassandra install -d -o ${cassandra_user} /var/log/cassandra } run_rc_command "$1"