Tue Jul 15 16:52:34 2014 UTC ()
Set PKG_HOME, which is used but not set.
XXX: please check if this is what was intended here.


(wiz)
diff -r1.43 -r1.44 pkgsrc/devel/memcached/Makefile
cvs diff -r1.43 -r1.44 pkgsrc/devel/memcached/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/memcached/Makefile 2014/07/15 14:28:26 1.43
+++ pkgsrc/devel/memcached/Makefile 2014/07/15 16:52:34 1.44
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.43 2014/07/15 14:28:26 fhajny Exp $ 1# $NetBSD: Makefile,v 1.44 2014/07/15 16:52:34 wiz Exp $
2 2
3DISTNAME= memcached-1.4.20 3DISTNAME= memcached-1.4.20
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= http://www.memcached.org/files/ 6MASTER_SITES= http://www.memcached.org/files/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.memcached.org/ 9HOMEPAGE= http://www.memcached.org/
10COMMENT= High-performance distributed memory object caching system 10COMMENT= High-performance distributed memory object caching system
11LICENSE= 2-clause-bsd 11LICENSE= 2-clause-bsd
12 12
13USE_TOOLS+= perl 13USE_TOOLS+= perl
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
@@ -21,26 +21,27 @@ INSTALLATION_DIRS= share/doc/${PKGBASE} @@ -21,26 +21,27 @@ INSTALLATION_DIRS= share/doc/${PKGBASE}
21.include "../../mk/bsd.prefs.mk" 21.include "../../mk/bsd.prefs.mk"
22 22
23.include "options.mk" 23.include "options.mk"
24 24
25BUILD_DEFS+= VARBASE 25BUILD_DEFS+= VARBASE
26 26
27MEMCACHED_USER?= memcached 27MEMCACHED_USER?= memcached
28MEMCACHED_GROUP?= memcached 28MEMCACHED_GROUP?= memcached
29PKG_GROUPS= ${MEMCACHED_GROUP} 29PKG_GROUPS= ${MEMCACHED_GROUP}
30PKG_USERS= ${MEMCACHED_USER}:${MEMCACHED_GROUP} 30PKG_USERS= ${MEMCACHED_USER}:${MEMCACHED_GROUP}
31PKG_GROUPS_VARS+= MEMCACHED_GROUP 31PKG_GROUPS_VARS+= MEMCACHED_GROUP
32PKG_USERS_VARS+= MEMCACHED_USER 32PKG_USERS_VARS+= MEMCACHED_USER
33PKG_HOME.${MEMCACHED_USER}?= ${VARBASE}/chroot/${PKGBASE} 33PKG_HOME.${MEMCACHED_USER}?= ${VARBASE}/chroot/${PKGBASE}
 34PKG_HOME= ${PKG_HOME.${MEMCACHED_USER}}
34PKG_GECOS.${MEMCACHED_USER}= Memcached 35PKG_GECOS.${MEMCACHED_USER}= Memcached
35 36
36OWN_DIRS_PERMS+= ${PKG_HOME} ${MEMCACHED_USER} ${MEMCACHED_GROUP} 0700 37OWN_DIRS_PERMS+= ${PKG_HOME} ${MEMCACHED_USER} ${MEMCACHED_GROUP} 0700
37FILES_SUBST+= MEMCACHED_USER=${MEMCACHED_USER} 38FILES_SUBST+= MEMCACHED_USER=${MEMCACHED_USER}
38FILES_SUBST+= MEMCACHED_GROUP=${MEMCACHED_GROUP} PKG_HOME=${PKG_HOME} 39FILES_SUBST+= MEMCACHED_GROUP=${MEMCACHED_GROUP} PKG_HOME=${PKG_HOME}
39MESSAGE_SUBST+= PKG_HOME=${PKG_HOME} 40MESSAGE_SUBST+= PKG_HOME=${PKG_HOME}
40 41
41TEST_TARGET= test 42TEST_TARGET= test
42 43
43post-install: 44post-install:
44 ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} 45 ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
45 ${INSTALL_SCRIPT} ${WRKSRC}/scripts/memcached-tool ${DESTDIR}${PREFIX}/bin 46 ${INSTALL_SCRIPT} ${WRKSRC}/scripts/memcached-tool ${DESTDIR}${PREFIX}/bin
46 47