Thu Jul 1 16:08:45 2010 UTC ()
Needs user/group early during installation.
XXX Plays bad games with PKG_SYSCONFDIR


(joerg)
diff -r1.2 -r1.3 pkgsrc/databases/apache-cassandra/Makefile
cvs diff -r1.2 -r1.3 pkgsrc/databases/apache-cassandra/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/apache-cassandra/Makefile 2010/06/11 02:01:43 1.2
+++ pkgsrc/databases/apache-cassandra/Makefile 2010/07/01 16:08:45 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.2 2010/06/11 02:01:43 tonnerre Exp $ 1# $NetBSD: Makefile,v 1.3 2010/07/01 16:08:45 joerg Exp $
2# 2#
3 3
4DISTNAME= apache-cassandra-${CASSANDRA_VER} 4DISTNAME= apache-cassandra-${CASSANDRA_VER}
5CATEGORIES= databases 5CATEGORIES= databases
6MASTER_SITES= ${MASTER_SITE_APACHE:=cassandra/${CASSANDRA_VER}/} 6MASTER_SITES= ${MASTER_SITE_APACHE:=cassandra/${CASSANDRA_VER}/}
7DISTFILES= ${DISTNAME}-bin${EXTRACT_SUFX} 7DISTFILES= ${DISTNAME}-bin${EXTRACT_SUFX}
8 8
9MAINTAINER= tonnerre@NetBSD.org 9MAINTAINER= tonnerre@NetBSD.org
10HOMEPAGE= http://cassandra.apache.org/ 10HOMEPAGE= http://cassandra.apache.org/
11COMMENT= Highly scalable, distributed structured key-value store 11COMMENT= Highly scalable, distributed structured key-value store
12 12
13LICENSE= apache-2.0 13LICENSE= apache-2.0
14NO_BUILD= yes 14NO_BUILD= yes
@@ -19,26 +19,27 @@ USE_TOOLS+= pax @@ -19,26 +19,27 @@ USE_TOOLS+= pax
19 19
20PKG_DESTDIR_SUPPORT= destdir 20PKG_DESTDIR_SUPPORT= destdir
21 21
22.include "../../mk/bsd.prefs.mk" 22.include "../../mk/bsd.prefs.mk"
23 23
24CASSANDRA_VER= 0.6.2 24CASSANDRA_VER= 0.6.2
25CASSANDRA_HOME= ${PREFIX}/share/cassandra 25CASSANDRA_HOME= ${PREFIX}/share/cassandra
26EGDIR= ${PREFIX}/share/examples/cassandra 26EGDIR= ${PREFIX}/share/examples/cassandra
27DOCDIR= ${PREFIX}/share/doc/cassandra 27DOCDIR= ${PREFIX}/share/doc/cassandra
28 28
29RCD_SCRIPTS= cassandra 29RCD_SCRIPTS= cassandra
30CASSANDRA_USER?= cassandra 30CASSANDRA_USER?= cassandra
31CASSANDRA_GROUP?= cassandra 31CASSANDRA_GROUP?= cassandra
 32USERGROUP_PHASE= pre-install
32PKG_GROUPS= ${CASSANDRA_GROUP} 33PKG_GROUPS= ${CASSANDRA_GROUP}
33PKG_USERS= ${CASSANDRA_USER}:${CASSANDRA_GROUP} 34PKG_USERS= ${CASSANDRA_USER}:${CASSANDRA_GROUP}
34PKG_GROUPS_VARS+= CASSANDRA_GROUP 35PKG_GROUPS_VARS+= CASSANDRA_GROUP
35PKG_USERS_VARS= CASSANDRA_USER 36PKG_USERS_VARS= CASSANDRA_USER
36PKG_HOME.cassandra= ${CASSANDRA_HOME} 37PKG_HOME.cassandra= ${CASSANDRA_HOME}
37PKG_SHELL.cassandra= ${SH} 38PKG_SHELL.cassandra= ${SH}
38PKG_SYSCONFDIR.cassandra= ${CASSANDRA_HOME}/conf 39PKG_SYSCONFDIR.cassandra= ${CASSANDRA_HOME}/conf
39OWN_DIRS+= ${PKG_SYSCONFDIR.cassandra} 40OWN_DIRS+= ${PKG_SYSCONFDIR.cassandra}
40FILES_SUBST+= JAVA_HOME=${PKG_JAVA_HOME} \ 41FILES_SUBST+= JAVA_HOME=${PKG_JAVA_HOME} \
41 CASSANDRA_HOME=${CASSANDRA_HOME} \ 42 CASSANDRA_HOME=${CASSANDRA_HOME} \
42 CASSANDRA_USER=${CASSANDRA_USER} \ 43 CASSANDRA_USER=${CASSANDRA_USER} \
43 CASSANDRA_GROUP=${CASSANDRA_GROUP} 44 CASSANDRA_GROUP=${CASSANDRA_GROUP}
44 45