diff options
Diffstat (limited to 'devel/distcc')
| -rw-r--r-- | devel/distcc/Makefile | 10 | ||||
| -rw-r--r-- | devel/distcc/Makefile.common | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile index 4ab61c4c35b..1d02816b0ce 100644 --- a/devel/distcc/Makefile +++ b/devel/distcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2006/02/05 23:08:41 joerg Exp $ +# $NetBSD: Makefile,v 1.28 2006/02/17 07:38:45 martti Exp $ PKGNAME= ${DISTNAME} PKGREVISION= 2 @@ -9,19 +9,21 @@ COMMENT= Tool for distributed C/C++ compiling PKG_SYSCONFSUBDIR= distcc RCD_SCRIPTS= distccd +.include "../../mk/bsd.prefs.mk" + DISTCC_USER?= distcc DISTCC_GROUP?= distcc PKG_GROUPS= ${DISTCC_GROUP} -PKG_USERS= ${DISTCC_USER}:${DISTCC_GROUP}::Distccd\ user +PKG_USERS= ${DISTCC_USER:Q}:${DISTCC_GROUP:Q}::Distccd\ user DISTCC_PIDDIR?= ${VARBASE}/run/distccd -OWN_DIRS_PERMS= ${DISTCC_PIDDIR} ${DISTCC_USER} ${DISTCC_GROUP} 0750 +OWN_DIRS_PERMS= ${DISTCC_PIDDIR} ${DISTCC_USER:Q} ${DISTCC_GROUP:Q} 0750 FILES_SUBST+= DISTCC_PIDDIR=${DISTCC_PIDDIR:Q} FILES_SUBST+= DISTCC_USER=${DISTCC_USER:Q} FILES_SUBST+= DISTCC_GROUP=${DISTCC_GROUP:Q} post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/distcc + ${INSTALL_DATA_DIR} ${PREFIX:Q}/share/distcc .include "../../mk/bsd.pkg.mk" diff --git a/devel/distcc/Makefile.common b/devel/distcc/Makefile.common index 3c55ff9486c..60db30eb1df 100644 --- a/devel/distcc/Makefile.common +++ b/devel/distcc/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2005/12/29 06:21:37 jlam Exp $ +# $NetBSD: Makefile.common,v 1.4 2006/02/17 07:38:45 martti Exp $ # ### XXX: See the other 'XXX' comment below when updating this package. @@ -25,7 +25,7 @@ SUBST_CLASSES+= doc SUBST_STAGE.doc= post-patch SUBST_FILES.doc= src/distcc.c src/hosts.c SUBST_SED.doc= -e "s|%s/distcc/hosts|%s/hosts|g" -SUBST_MESSAGE.doc= "Fixing paths." +SUBST_MESSAGE.doc= Fixing paths. .if empty(PKGNAME:Mdistcc-[0-9]*) ### XXX: Remove 'nb1' from the line below during the next update. |