svn commit: r349962 - head/mail/qmailanalog

[Bryan Drewery]

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 at 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