From owner-svn-ports-head@FreeBSD.ORG  Thu Apr  3 01:36:02 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B1B74615;
 Thu,  3 Apr 2014 01:36:02 +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 849595F8;
 Thu,  3 Apr 2014 01:36:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s331a2MW087739;
 Thu, 3 Apr 2014 01:36:02 GMT (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s331a2gi087736;
 Thu, 3 Apr 2014 01:36:02 GMT (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201404030136.s331a2gi087736@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 3 Apr 2014 01:36:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r349962 - head/mail/qmailanalog
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Apr 2014 01:36:02 -0000

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

Log:
  - Support staging
    This uses similar methods as dns/djbdns from r346769 and r349241

Modified:
  head/mail/qmailanalog/Makefile
  head/mail/qmailanalog/pkg-plist

Modified: head/mail/qmailanalog/Makefile
==============================================================================
--- head/mail/qmailanalog/Makefile	Thu Apr  3 01:32:44 2014	(r349961)
+++ head/mail/qmailanalog/Makefile	Thu Apr  3 01:36:01 2014	(r349962)
@@ -9,16 +9,14 @@ MASTER_SITES=	http://cr.yp.to/software/ 
 		http://www.emaillab.org/djb/qmailanalog/
 
 MAINTAINER=	bdrewery@FreeBSD.org
-COMMENT=	Tools to analyze qmail-send's activity
+COMMENT=	Tools to analyze qmail-send activity
 
 USES=		qmail:run
-NO_STAGE=	yes
 
-ALL_TARGET=	it
+ALL_TARGET=	prog
 INSTALL_TARGET=	setup
 
 MANPREFIX=	${QMPREFIX}
-MAN1=		matchup.1 xqp.1 xsender.1 xrecipient.1 columnt.1
 
 PLIST_SUB+=	MYSUBDIR=${MYSUBDIR}
 
@@ -29,6 +27,7 @@ MYSUBDIR?=
 .endif
 
 PREFIX?=	${QMAIL_PREFIX}
+NO_PREFIX_RMDIR=yes
 QMPREFIX?=	${PREFIX}/${MYSUBDIR}
 
 NO_MTREE=	yes
@@ -40,12 +39,23 @@ BROKEN=	Cannot Make and Install with dif
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} "s|.usr.local.qmailanalog|${QMPREFIX}|" ${WRKSRC}/conf-home
-	@${REINPLACE_CMD} "s|-O2|${CFLAGS}|" ${WRKSRC}/conf-cc
+	@${ECHO_CMD} "${QMPREFIX}" > ${WRKSRC}/conf-home
+	@${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
+	@${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${WRKSRC}/conf-ld
 	@${REINPLACE_CMD} 's|02755|0755|g; /cat/d' ${WRKSRC}/hier.c
 	@${REINPLACE_CMD} 's|^man prog|prog|g' ${WRKSRC}/Makefile
 
+# Do a dance to stage and keep out of resulting binaries (see r346769
+# and r349241)
 pre-install:
-	@${MKDIR} ${QMPREFIX}
+	@${MKDIR} ${STAGEDIR}${QMPREFIX}
+	@${MV} -f ${WRKSRC}/conf-home ${WRKSRC}/conf-home.sav
+	@${ECHO_CMD} "${STAGEDIR}${QMPREFIX}" > ${WRKSRC}/conf-home
+	@cd ${WRKSRC} ; ${RM} -f install instcheck install.o instcheck.o hier.o auto_home.o
+	@cd ${WRKSRC} ; ${MAKE_CMD} install instcheck
+	@${MV} -f ${WRKSRC}/conf-home.sav ${WRKSRC}/conf-home
+
+post-install:
+	${INSTALL_MAN} ${WRKSRC}/*.1 ${STAGEDIR}${MANPREFIX}/man/man1/
 
 .include <bsd.port.post.mk>

Modified: head/mail/qmailanalog/pkg-plist
==============================================================================
--- head/mail/qmailanalog/pkg-plist	Thu Apr  3 01:32:44 2014	(r349961)
+++ head/mail/qmailanalog/pkg-plist	Thu Apr  3 01:36:01 2014	(r349962)
@@ -25,6 +25,11 @@
 %%MYSUBDIR%%bin/zsuids
 %%MYSUBDIR%%doc/ACCOUNTING
 %%MYSUBDIR%%doc/MATCHUP
+%%MYSUBDIR%%man/man1/columnt.1.gz
+%%MYSUBDIR%%man/man1/matchup.1.gz
+%%MYSUBDIR%%man/man1/xqp.1.gz
+%%MYSUBDIR%%man/man1/xrecipient.1.gz
+%%MYSUBDIR%%man/man1/xsender.1.gz
 @dirrm %%MYSUBDIR%%man/man1
 @dirrm %%MYSUBDIR%%man
 @dirrm %%MYSUBDIR%%doc