diff options
| author | tonnerre <tonnerre@pkgsrc.org> | 2010-10-17 23:41:11 +0000 |
|---|---|---|
| committer | tonnerre <tonnerre@pkgsrc.org> | 2010-10-17 23:41:11 +0000 |
| commit | 77f6be772fe4056ef3218c292a19a563833a2996 (patch) | |
| tree | fb30f15e5921f9540234befbbcd0bf09c5436c09 /databases/apache-cassandra | |
| parent | 8db0cb351780dd777e41a4da64be495c132b0bd8 (diff) | |
| download | pkgsrc-77f6be772fe4056ef3218c292a19a563833a2996.tar.gz | |
Set CASSANDRA_CONF to something sensible in the startup script.
Diffstat (limited to 'databases/apache-cassandra')
| -rw-r--r-- | databases/apache-cassandra/Makefile | 3 | ||||
| -rw-r--r-- | databases/apache-cassandra/files/cassandra.sh | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/databases/apache-cassandra/Makefile b/databases/apache-cassandra/Makefile index b3ca853f7a8..96f63f46933 100644 --- a/databases/apache-cassandra/Makefile +++ b/databases/apache-cassandra/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.4 2010/10/16 11:52:43 tonnerre Exp $ +# $NetBSD: Makefile,v 1.5 2010/10/17 23:41:11 tonnerre Exp $ # DISTNAME= apache-cassandra-${CASSANDRA_VER} PKGNAME= apache-cassandra-${CASSANDRA_VER:S/-//} +PKGREVISION= 1 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_APACHE:=cassandra/${CASSANDRA_VER:C/-.*//}/} DISTFILES= ${DISTNAME}-bin${EXTRACT_SUFX} diff --git a/databases/apache-cassandra/files/cassandra.sh b/databases/apache-cassandra/files/cassandra.sh index 4bba4ef4da4..80042b378b9 100644 --- a/databases/apache-cassandra/files/cassandra.sh +++ b/databases/apache-cassandra/files/cassandra.sh @@ -1,6 +1,6 @@ #! @RCD_SCRIPTS_SHELL@ # -# $NetBSD: cassandra.sh,v 1.1.1.1 2010/04/27 23:12:59 tonnerre Exp $ +# $NetBSD: cassandra.sh,v 1.2 2010/10/17 23:41:12 tonnerre Exp $ # # PROVIDE: cassandra # REQUIRE: DAEMON @@ -36,9 +36,11 @@ fi CATALINA_HOME=@CASSANDRA_HOME@ CASSANDRA_HOME=@CASSANDRA_HOME@ +CASSANDRA_CONF=@PKG_SYSCONFBASE@/cassandra CATALINA_PID=${pidfile} export CATALINA_HOME export CASSANDRA_HOME +export CASSANDRA_CONF export CATALINA_PID find ${PREFIX}/lib -type f -name \*.jar -print | while read jar |