From owner-svn-ports-all@FreeBSD.ORG  Fri Apr 11 21:38:14 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 AD1537AE;
 Fri, 11 Apr 2014 21:38:14 +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 9A1371127;
 Fri, 11 Apr 2014 21:38:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3BLcEju059750;
 Fri, 11 Apr 2014 21:38:14 GMT (envelope-from ehaupt@svn.freebsd.org)
Received: (from ehaupt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3BLcEQw059749;
 Fri, 11 Apr 2014 21:38:14 GMT (envelope-from ehaupt@svn.freebsd.org)
Message-Id: <201404112138.s3BLcEQw059749@svn.freebsd.org>
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Fri, 11 Apr 2014 21:38:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r351047 - head/security/portsentry
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: Fri, 11 Apr 2014 21:38:14 -0000

Author: ehaupt
Date: Fri Apr 11 21:38:14 2014
New Revision: 351047
URL: http://svnweb.freebsd.org/changeset/ports/351047
QAT: https://qat.redports.org/buildarchive/r351047/

Log:
  - Support staging
  - Define DOCS option

Modified:
  head/security/portsentry/Makefile

Modified: head/security/portsentry/Makefile
==============================================================================
--- head/security/portsentry/Makefile	Fri Apr 11 21:36:04 2014	(r351046)
+++ head/security/portsentry/Makefile	Fri Apr 11 21:38:14 2014	(r351047)
@@ -15,21 +15,22 @@ CFLAGS+=	-DPREFIX=\"${PREFIX}\"
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
 WRKSRC=		${WRKDIR}/portsentry_beta
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/local/psionic/portsentry,${PREFIX}/etc,g' \
 		${WRKSRC}/portsentry.conf ${WRKSRC}/portsentry_config.h
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/portsentry.conf ${PREFIX}/etc/portsentry.conf.default
-	${INSTALL_DATA} ${WRKSRC}/portsentry.ignore ${PREFIX}/etc/portsentry.ignore.default
-	${INSTALL_PROGRAM} ${WRKSRC}/portsentry ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKDIR}/portsentry.sh ${PREFIX}/etc/rc.d/
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.install ${WRKSRC}/README.methods ${WRKSRC}/README.stealth \
-	  ${DOCSDIR}
-.endif
-	@${CAT} ${PKGMESSAGE}
+	${INSTALL_DATA} ${WRKSRC}/portsentry.conf \
+		${STAGEDIR}${PREFIX}/etc/portsentry.conf.default
+	${INSTALL_DATA} ${WRKSRC}/portsentry.ignore \
+		${STAGEDIR}${PREFIX}/etc/portsentry.ignore.default
+	${INSTALL_PROGRAM} ${WRKSRC}/portsentry \
+		${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/portsentry.sh ${STAGEDIR}${PREFIX}/etc/rc.d/
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.install ${WRKSRC}/README.methods \
+		${WRKSRC}/README.stealth ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>