diff options
| author | fhajny <fhajny@pkgsrc.org> | 2014-07-15 17:30:26 +0000 |
|---|---|---|
| committer | fhajny <fhajny@pkgsrc.org> | 2014-07-15 17:30:26 +0000 |
| commit | 6ce5e574bec71a6a985b4f402d2c1d35ed08c4ab (patch) | |
| tree | 7d26890c921212e8602d7f625e60c2bf832a36fb /devel/memcached | |
| parent | 6db7e16cd4866cd75afe23aa3554aedf14d900f1 (diff) | |
| download | pkgsrc-6ce5e574bec71a6a985b4f402d2c1d35ed08c4ab.tar.gz | |
Fix my previous commit, use user/group vars properly.
Diffstat (limited to 'devel/memcached')
| -rw-r--r-- | devel/memcached/MESSAGE | 4 | ||||
| -rw-r--r-- | devel/memcached/Makefile | 13 | ||||
| -rw-r--r-- | devel/memcached/files/memcached.sh | 4 |
3 files changed, 11 insertions, 10 deletions
diff --git a/devel/memcached/MESSAGE b/devel/memcached/MESSAGE index 7d36b60db38..ed0e6629e17 100644 --- a/devel/memcached/MESSAGE +++ b/devel/memcached/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.1 2014/04/30 05:39:19 rodent Exp $ +$NetBSD: MESSAGE,v 1.2 2014/07/15 17:30:26 fhajny Exp $ If using the rc.d init system, set the following variables in rc.conf: @@ -12,7 +12,7 @@ memcached_jobN_args="-p 1121N -m 64 -c 1024" to start as many memcached instances as desired with the required options. PID files for each instance will be created in: -${PKG_HOME} named as: +${MEMCACHED_HOME} named as: ${PKGBASE}-job0.pid ... ${PKGBASE}-jobN.pid. diff --git a/devel/memcached/Makefile b/devel/memcached/Makefile index cd344f5d51a..4c16ed43afd 100644 --- a/devel/memcached/Makefile +++ b/devel/memcached/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2014/07/15 16:52:34 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2014/07/15 17:30:26 fhajny Exp $ DISTNAME= memcached-1.4.20 PKGREVISION= 2 @@ -26,18 +26,19 @@ BUILD_DEFS+= VARBASE MEMCACHED_USER?= memcached MEMCACHED_GROUP?= memcached +MEMCACHED_HOME?= ${VARBASE}/chroot/${PKGBASE} + PKG_GROUPS= ${MEMCACHED_GROUP} PKG_USERS= ${MEMCACHED_USER}:${MEMCACHED_GROUP} PKG_GROUPS_VARS+= MEMCACHED_GROUP PKG_USERS_VARS+= MEMCACHED_USER -PKG_HOME.${MEMCACHED_USER}?= ${VARBASE}/chroot/${PKGBASE} -PKG_HOME= ${PKG_HOME.${MEMCACHED_USER}} +PKG_HOME.${MEMCACHED_USER}= ${MEMCACHED_HOME} PKG_GECOS.${MEMCACHED_USER}= Memcached -OWN_DIRS_PERMS+= ${PKG_HOME} ${MEMCACHED_USER} ${MEMCACHED_GROUP} 0700 +OWN_DIRS_PERMS+= ${MEMCACHED_HOME} ${MEMCACHED_USER} ${MEMCACHED_GROUP} 0700 FILES_SUBST+= MEMCACHED_USER=${MEMCACHED_USER} -FILES_SUBST+= MEMCACHED_GROUP=${MEMCACHED_GROUP} PKG_HOME=${PKG_HOME} -MESSAGE_SUBST+= PKG_HOME=${PKG_HOME} +FILES_SUBST+= MEMCACHED_GROUP=${MEMCACHED_GROUP} MEMCACHED_HOME=${MEMCACHED_HOME} +MESSAGE_SUBST+= MEMCACHED_HOME=${MEMCACHED_HOME} TEST_TARGET= test diff --git a/devel/memcached/files/memcached.sh b/devel/memcached/files/memcached.sh index 35811931a6c..0bd82de25fc 100644 --- a/devel/memcached/files/memcached.sh +++ b/devel/memcached/files/memcached.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: memcached.sh,v 1.2 2014/04/30 05:39:19 rodent Exp $ +# $NetBSD: memcached.sh,v 1.3 2014/07/15 17:30:26 fhajny Exp $ # # PROVIDE: memcached @@ -15,7 +15,7 @@ command_args="-d" start_cmd="memcached_start" stop_cmd="memcached_stop" status_cmd="memcached_status" -pidfile_base="@PKG_HOME@/memcached-" +pidfile_base="@MEMCACHED_HOME@/memcached-" memcached_pid() { |