From owner-svn-ports-all@FreeBSD.ORG  Thu Apr  3 01:36:16 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 693A26EF;
 Thu,  3 Apr 2014 01:36:16 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3C7475FB;
 Thu,  3 Apr 2014 01:36:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s331aGdi087856;
 Thu, 3 Apr 2014 01:36:16 GMT (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s331aFTc087854;
 Thu, 3 Apr 2014 01:36:15 GMT (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201404030136.s331aFTc087854@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 3 Apr 2014 01:36:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r349963 - head/mail/qmail-conf
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Apr 2014 01:36:16 -0000

Author: bdrewery
Date: Thu Apr  3 01:36:15 2014
New Revision: 349963
URL: http://svnweb.freebsd.org/changeset/ports/349963
QAT: https://qat.redports.org/buildarchive/r349963/

Log:
  - Support staging
    This uses similar methods as dns/djbdns from r346769 and r349241
  - Add qmail as a RUN_DEPENDS so that it properly owns the /var/qmail
    and /var/qmail/bin directories.

Modified:
  head/mail/qmail-conf/Makefile
  head/mail/qmail-conf/pkg-plist

Modified: head/mail/qmail-conf/Makefile
==============================================================================
--- head/mail/qmail-conf/Makefile	Thu Apr  3 01:36:01 2014	(r349962)
+++ head/mail/qmail-conf/Makefile	Thu Apr  3 01:36:15 2014	(r349963)
@@ -3,7 +3,7 @@
 
 PORTNAME=	qmail-conf
 PORTVERSION=	0.60
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.din.or.jp/~ushijima/qmail-conf/ \
 		http://cr.yp.to/djbdns/
@@ -14,15 +14,15 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	Configure various qmail services to run under daemontools
 
-USES=		qmail:vars
-NO_STAGE=	yes
+USES=		qmail:run
 
-ALL_TARGET=	it
+ALL_TARGET=	prog
 INSTALL_TARGET=	setup check
 
 RESTRICTED=	borrows code from djbdns, thus falls under the same restrictions as dns/djbdns
 
 PREFIX?=	${QMAIL_PREFIX}
+NO_PREFIX_RMDIR=yes
 
 NO_MTREE=	yes
 
@@ -42,4 +42,14 @@ post-patch:
 pre-build:
 		@(cd ${WRKSRC} && ${MAKE} djbdns=${DJBDNS_NAME} -f Makefile.ini)
 
+# Do a dance to stage and keep out of resulting binaries (see r346769
+# and r349241)
+pre-install:
+	@${MV} -f ${WRKSRC}/conf-qmail ${WRKSRC}/conf-qmail.sav
+	@${ECHO_CMD} "${STAGEDIR}${QMAIL_PREFIX}" > ${WRKSRC}/conf-qmail
+	@cd ${WRKSRC} ; ${RM} -f install instcheck install.o instcheck.o hier.o auto_home.o
+	@cd ${WRKSRC} ; ${MAKE_CMD} install instcheck
+	@${TOUCH} ${WRKSRC}/*-conf
+	@${MV} -f ${WRKSRC}/conf-qmail.sav ${WRKSRC}/conf-qmail
+
 .include <bsd.port.mk>

Modified: head/mail/qmail-conf/pkg-plist
==============================================================================
--- head/mail/qmail-conf/pkg-plist	Thu Apr  3 01:36:01 2014	(r349962)
+++ head/mail/qmail-conf/pkg-plist	Thu Apr  3 01:36:15 2014	(r349963)
@@ -3,5 +3,4 @@ bin/qmail-pop3d-conf
 bin/qmail-qmqpd-conf
 bin/qmail-qmtpd-conf
 bin/qmail-smtpd-conf
-@dirrmtry bin
 @dirrmtry service