summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail/courier-mta/options.mk4
-rw-r--r--mk/defaults/mk.conf12
-rw-r--r--net/uucp/Makefile4
3 files changed, 13 insertions, 7 deletions
diff --git a/mail/courier-mta/options.mk b/mail/courier-mta/options.mk
index 642e2f99827..116e2f12894 100644
--- a/mail/courier-mta/options.mk
+++ b/mail/courier-mta/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2007/06/15 21:59:23 jlam Exp $
+# $NetBSD: options.mk,v 1.4 2007/06/19 21:29:10 jlam Exp $
# Global and legacy options
@@ -97,8 +97,6 @@ CONF_FILES_PERMS+= ${EGDIR}/module.local \
###
.if !empty(PKG_OPTIONS:Mcourier-uucp)
COURIER_TRANSPORTS+= uucp
-UUCP_USER?= uucp
-UUCP_GROUP?= daemon
PKG_GROUPS+= ${UUCP_GROUP}
PKG_USERS+= ${UUCP_USER}:${UUCP_GROUP}
PLIST_SRC+= ${PKGDIR}/PLIST.uucp
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 958d8bee163..c589543b8d4 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.153 2007/03/01 18:03:02 wiz Exp $
+# $NetBSD: mk.conf,v 1.154 2007/06/19 21:29:09 jlam Exp $
#
# This file provides default values for variables that may be overridden
@@ -1737,6 +1737,16 @@ USERPPP_GROUP?= network
# Possible: any group name
# Default: network
+UUCP_GROUP?= daemon
+# System group for uucp-related programs.
+# Possible: any group name
+# Default: daemon
+
+UUCP_USER?= uucp
+# System user for uucp-related programs.
+# Possible: any user name
+# Default: uucp
+
#VIM_EXTRA_OPTS=
# Used in vim package to build with non-gui extra options
# Possible: not defined, see "configure --help"
diff --git a/net/uucp/Makefile b/net/uucp/Makefile
index e36c9db411f..a54ce5aa78f 100644
--- a/net/uucp/Makefile
+++ b/net/uucp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/06/18 14:45:28 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2007/06/19 21:29:11 jlam Exp $
DISTNAME= uucp-1.07
PKGREVISION= 4
@@ -22,8 +22,6 @@ CONFIGURE_ENV+= MKDIR_PROGRAM=${TOOLS_MKDIR:Q}
CONFIGURE_ENV+= PWD_PROGRAM=${TOOLS_PWD_CMD:Q}
CONFIGURE_ENV+= RMDIR_PROGRAM=${TOOLS_RMDIR:Q}
-UUCP_GROUP?= daemon
-UUCP_USER?= uucp
PKG_GROUPS= ${UUCP_GROUP}
PKG_USERS= ${UUCP_USER}:${UUCP_GROUP}