Completely nuke the concept of PKG_PHASE from pkgsrc except for the

purposes of caching MAKEVARS within bsd.pkg.mk and bsd.makevars.mk.

3 files changed, 28 insertions, 22 deletions

diff --git a/mail/mailfront/Makefile b/mail/mailfront/Makefile
index 86542ee55d4..2704702ad84 100644
--- a/mail/mailfront/Makefile
+++ b/mail/mailfront/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/12/29 06:21:50 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/07/10 22:59:26 jlam Exp $
 #
 
 DISTNAME=		mailfront-0.98
@@ -23,12 +23,14 @@ RCD_SCRIPTS=		smtpfront
 
 # Detect the PKG_SYSCONFDIR of the installed qmail, so we can create
 # config files there and refer to them from rc.d scripts.
-.if !empty(PHASES_AFTER_EXTRACT:M${PKG_PHASE})
-INSTALLED_QMAIL!= ${PKG_BEST_EXISTS} ${DEPENDS_QMAIL:C/:.*$//:Q:S/\ / /g}
-.  if empty(INSTALLED_QMAIL:M*_not_found_)
-.    if !defined(PKG_SYSCONFDIR.mailfront)
-PKG_SYSCONFDIR.mailfront!= ${PKG_INFO} -Q PKG_SYSCONFDIR ${INSTALLED_QMAIL}
-.    endif
+#
+.if !defined(PKG_SYSCONFDIR.mailfront)
+PKG_SYSCONFDIR.mailfront!=						\
+	${PKG_INFO} -Q PKG_SYSCONFDIR					\
+		${DEPENDS_QMAIL:C/:.*$//:Q} 2>/dev/null ||		\
+	${ECHO} "PKG_SYSCONFDIR.mailfront_not_set"
+.  if empty(PKG_SYSCONFDIR.mailfront:M*not_set)
+MAKEVARS+=	PKG_SYSCONFDIR.mailfront
 .  endif
 .endif
 
diff --git a/mail/qgreylist/Makefile b/mail/qgreylist/Makefile
index 2588258a867..e201001ada4 100644
--- a/mail/qgreylist/Makefile
+++ b/mail/qgreylist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/12/29 06:21:53 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2006/07/10 22:59:26 jlam Exp $
 #
 
 DISTNAME=		qgreylist-0.3
@@ -24,13 +24,15 @@ REPLACE_PERL=		greylist
 .include "../../mk/bsd.prefs.mk"
 
 # Detect the PKG_SYSCONFDIR of the installed qmail, so we can create
-# config files there.
-.if !empty(PHASES_AFTER_EXTRACT:M${PKG_PHASE})
-INSTALLED_QMAIL!= ${PKG_BEST_EXISTS} ${DEPENDS_QMAIL:C/:.*$//:Q:S/\ / /g}
-.  if empty(INSTALLED_QMAIL:M*_not_found_)
-.    if !defined(PKG_SYSCONFDIR.qgreylist)
-PKG_SYSCONFDIR.qgreylist!=	${PKG_INFO} -Q PKG_SYSCONFDIR ${INSTALLED_QMAIL}
-.    endif
+# config files there and refer to them from rc.d scripts.
+#
+.if !defined(PKG_SYSCONFDIR.qgreylist)
+PKG_SYSCONFDIR.qgreylist!=						\
+	${PKG_INFO} -Q PKG_SYSCONFDIR					\
+		${DEPENDS_QMAIL:C/:.*$//:Q} 2>/dev/null ||		\
+	${ECHO} "PKG_SYSCONFDIR.qgreylist_not_set"
+.  if empty(PKG_SYSCONFDIR.qgreylist:M*not_set)
+MAKEVARS+=	PKG_SYSCONFDIR.qgreylist
 .  endif
 .endif
 
diff --git a/mail/qmail-run/Makefile b/mail/qmail-run/Makefile
index f0547ef7189..dbe799a4acc 100644
--- a/mail/qmail-run/Makefile
+++ b/mail/qmail-run/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/06/04 15:23:25 schmonz Exp $
+# $NetBSD: Makefile,v 1.19 2006/07/10 22:59:26 jlam Exp $
 #
 
 DISTNAME=		qmail-run-20060604
@@ -30,12 +30,14 @@ INSTALLATION_DIRS=	bin share/doc/qmail-run share/examples/qmail-run
 
 # Detect the PKG_SYSCONFDIR of the installed qmail, so we can create
 # config files there and refer to them from rc.d scripts.
-.if !empty(PHASES_AFTER_EXTRACT:M${PKG_PHASE})
-INSTALLED_QMAIL!= ${PKG_BEST_EXISTS} ${DEPENDS_QMAIL:C/:.*$//:Q:S/\ / /g}
-.  if empty(INSTALLED_QMAIL:M*_not_found_)
-.    if !defined(PKG_SYSCONFDIR.qmail-run)
-PKG_SYSCONFDIR.qmail-run!= ${PKG_INFO} -Q PKG_SYSCONFDIR ${INSTALLED_QMAIL}
-.    endif
+#
+.if !defined(PKG_SYSCONFDIR.qmail-run)
+PKG_SYSCONFDIR.qmail-run!=						\
+	${PKG_INFO} -Q PKG_SYSCONFDIR					\
+		${DEPENDS_QMAIL:C/:.*$//:Q} 2>/dev/null ||		\
+	${ECHO} "PKG_SYSCONFDIR.qmail-run_not_set"
+.  if empty(PKG_SYSCONFDIR.qmail-run:M*not_set)
+MAKEVARS+=	PKG_SYSCONFDIR.qmail-run
 .  endif
 .endif