From 3feaa2e203d27331bb2bb777404522b290485f5a Mon Sep 17 00:00:00 2001
From: jmmv <jmmv>
Date: Tue, 15 Jul 2003 17:32:32 +0000
Subject: Use ROOT_USER and ROOT_GROUP in patch file, instead of root and
 wheel.

---
 mail/cucipop/Makefile         | 5 ++++-
 mail/cucipop/distinfo         | 4 ++--
 mail/cucipop/patches/patch-ad | 6 +++---
 3 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'mail/cucipop')

diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile
index 9a7b771a5af..7d079bffbf1 100644
--- a/mail/cucipop/Makefile
+++ b/mail/cucipop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/06/07 17:48:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2003/07/15 17:32:32 jmmv Exp $
 #
 
 DISTNAME=       cucipop-1.31
@@ -16,6 +16,9 @@ LICENSE=	shareware
 
 BUILD_DEFS+=	USE_INET6
 
+MAKE_ENV+=	ROOT_USER="${ROOT_USER}"
+MAKE_ENV+=	ROOT_GROUP="${ROOT_GROUP}"
+
 .include "../../mk/bsd.prefs.mk"
 
 # to be friendly with pre-1.5 systems
diff --git a/mail/cucipop/distinfo b/mail/cucipop/distinfo
index 1b4e57092a6..4f70e2fca58 100644
--- a/mail/cucipop/distinfo
+++ b/mail/cucipop/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2003/06/07 17:48:34 jmmv Exp $
+$NetBSD: distinfo,v 1.5 2003/07/15 17:32:33 jmmv Exp $
 
 SHA1 (cucipop-1.31.tar.gz) = d9b5dc2960e96ad1ee63f0a6f8879165f4477434
 Size (cucipop-1.31.tar.gz) = 35508 bytes
@@ -7,5 +7,5 @@ Size (cucipop-1.31-v6-20010223.diff.gz) = 1713 bytes
 SHA1 (patch-aa) = baf7a7a262d8d50d404bcc1eed9fe8da72a7b927
 SHA1 (patch-ab) = 2f021113d2634065034065aba0afd06b7a403cb1
 SHA1 (patch-ac) = 5d768b6b0badf8357bdb6668efb144bc14f98318
-SHA1 (patch-ad) = 5cc45c1f41f41fcf9da0c07d65c3ed3489c0cfe8
+SHA1 (patch-ad) = 2acb395d031e5919cacbcf178d58fe8ec4a75e0b
 SHA1 (patch-ae) = 30715d0e00ed4862601ea0cb69fdb797a9eb234a
diff --git a/mail/cucipop/patches/patch-ad b/mail/cucipop/patches/patch-ad
index a9b507c84c3..208631d2ced 100644
--- a/mail/cucipop/patches/patch-ad
+++ b/mail/cucipop/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.4 2001/05/01 06:55:52 jlam Exp $
+$NetBSD: patch-ad,v 1.5 2003/07/15 17:32:33 jmmv Exp $
 
 --- Makefile.orig	Tue May 12 17:09:14 1998
 +++ Makefile
@@ -22,6 +22,6 @@ $NetBSD: patch-ad,v 1.4 2001/05/01 06:55:52 jlam Exp $
  
 -INSTALL=install -o root -m
 -BINPERM=02755 -s -g mail
-+INSTALL=install -c -o root -m
-+BINPERM=02755 -s -g wheel
++INSTALL=install -c -o ${ROOT_USER} -m
++BINPERM=02755 -s -g ${ROOT_GROUP}
  REGPERM=0644
-- 
cgit v1.2.3