svn commit: r349963 - head/mail/qmail-conf

[Bryan Drewery]

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 at 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
- at dirrmtry bin
 @dirrmtry service