From owner-svn-ports-all@FreeBSD.ORG  Tue Apr 15 09:05:48 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 A845B87B;
 Tue, 15 Apr 2014 09:05:48 +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 7AE8C1FB9;
 Tue, 15 Apr 2014 09:05:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3F95mib036215;
 Tue, 15 Apr 2014 09:05:48 GMT (envelope-from dinoex@svn.freebsd.org)
Received: (from dinoex@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3F95mCI036214;
 Tue, 15 Apr 2014 09:05:48 GMT (envelope-from dinoex@svn.freebsd.org)
Message-Id: <201404150905.s3F95mCI036214@svn.freebsd.org>
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Tue, 15 Apr 2014 09:05:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r351315 - head/mail/milter-bogom
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: Tue, 15 Apr 2014 09:05:48 -0000

Author: dinoex
Date: Tue Apr 15 09:05:47 2014
New Revision: 351315
URL: http://svnweb.freebsd.org/changeset/ports/351315
QAT: https://qat.redports.org/buildarchive/r351315/

Log:
  - use STAGEDIR
  - drop MAN8PREFIX
  - undo silent install
  - robust INSTALL
  PR:		188068
  Approved by:	(Maintainer Timeout)

Modified:
  head/mail/milter-bogom/Makefile

Modified: head/mail/milter-bogom/Makefile
==============================================================================
--- head/mail/milter-bogom/Makefile	Tue Apr 15 08:55:52 2014	(r351314)
+++ head/mail/milter-bogom/Makefile	Tue Apr 15 09:05:47 2014	(r351315)
@@ -14,8 +14,6 @@ COMMENT=	Simple sendmail milter to inter
 
 RUN_DEPENDS=	bogofilter:${PORTSDIR}/mail/bogofilter
 
-MAN8=		bogom.8
-
 MAKE_ARGS=	CPPFLAGS="-DDEF_CONF=\\\"${PREFIX}/etc/bogom.conf\\\" ${PTHREAD_CFLAGS}" \
 		LIBS="-lmilter ${PTHREAD_LIBS}"
 
@@ -23,31 +21,30 @@ USE_RC_SUBR=	milter-bogom
 SUB_FILES=	pkg-message
 
 PLIST_FILES=	sbin/bogom \
+		man/man8/bogom.8.gz \
 		etc/bogom.conf-example
 
 PORTDOCS=	README CHANGELOG
 
-NO_STAGE=	yes
+.include <bsd.port.options.mk>
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' ${WRKSRC}/bogom.8
-	@${REINPLACE_CMD} -e \
+	${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' ${WRKSRC}/bogom.8
+	${REINPLACE_CMD} -e \
 		's|/usr/local/bin/bogofilter|${LOCALBASE}/bin/bogofilter|g' \
 		${WRKSRC}/bogom.8 \
 		${WRKSRC}/bogom.conf-example \
 		${WRKSRC}/milter.c
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/bogom ${PREFIX}/sbin
-	@${INSTALL_MAN} ${WRKSRC}/bogom.8 ${MAN8PREFIX}/man/man8
-	@${INSTALL_DATA} ${WRKSRC}/bogom.conf-example ${PREFIX}/etc
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/bogom ${STAGEDIR}${PREFIX}/sbin/
+	${INSTALL_MAN} ${WRKSRC}/bogom.8 ${STAGEDIR}${PREFIX}/man/man8/
+	${INSTALL_DATA} ${WRKSRC}/bogom.conf-example ${STAGEDIR}${PREFIX}/etc/
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
 .endfor
 .endif
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>