From owner-svn-ports-all@FreeBSD.ORG  Fri Jun 20 15:04:19 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 3068D477;
 Fri, 20 Jun 2014 15:04:19 +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 02CE52A57;
 Fri, 20 Jun 2014 15:04:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5KF4I7o057485;
 Fri, 20 Jun 2014 15:04:18 GMT (envelope-from rakuco@svn.freebsd.org)
Received: (from rakuco@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5KF4Ik9057484;
 Fri, 20 Jun 2014 15:04:18 GMT (envelope-from rakuco@svn.freebsd.org)
Message-Id: <201406201504.s5KF4Ik9057484@svn.freebsd.org>
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Fri, 20 Jun 2014 15:04:18 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r358584 - head/devel/cvsbook
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.18
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, 20 Jun 2014 15:04:19 -0000

Author: rakuco
Date: Fri Jun 20 15:04:18 2014
New Revision: 358584
URL: http://svnweb.freebsd.org/changeset/ports/358584
QAT: https://qat.redports.org/buildarchive/r358584/

Log:
  Add staging support.
  
  PR:		191160
  Submitted by:	joe@thrallingpenguin.com

Modified:
  head/devel/cvsbook/Makefile

Modified: head/devel/cvsbook/Makefile
==============================================================================
--- head/devel/cvsbook/Makefile	Fri Jun 20 15:02:40 2014	(r358583)
+++ head/devel/cvsbook/Makefile	Fri Jun 20 15:04:18 2014	(r358584)
@@ -22,7 +22,6 @@ OPTIONS_DEFAULT=	INFO SINGLE_HTML POSTSC
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSPLIT_HTML}
@@ -39,27 +38,21 @@ INSTALL_INFO?=	install-info
 
 .if ${PORT_OPTIONS:MSINGLE_HTML}
 PLIST_FILES+=	%%DOCSDIR%%/cvsbook.html
-WANT_DOCSDIR=	yes
 .endif
 
 .if ${PORT_OPTIONS:MPOSTSCRIPT}
 PLIST_FILES+=	%%DOCSDIR%%/cvsbook.ps
-WANT_DOCSDIR=	yes
 .endif
 
 .if ${PORT_OPTIONS:MPDF}
 PLIST_FILES+=	%%DOCSDIR%%/cvsbook.pdf
-WANT_DOCSDIR=	yes
 .endif
 
 .if ${PORT_OPTIONS:MSPLIT_HTML}
 PLIST_DIRS+=	%%DOCSDIR%%/cvsbook-shtml
-WANT_DOCSDIR=	yes
 .endif
 
-.if defined(WANT_DOCSDIR)
 PLIST_DIRS+=	%%DOCSDIR%%
-.endif
 
 .if ${PORT_OPTIONS:MSPLIT_HTML}
 post-patch:
@@ -76,25 +69,24 @@ PLIST_FILES+=	`cd ${WRKSRC}/cvsbook && $
 .endif
 
 do-install:
-.if defined(WANT_DOCSDIR)
-	@${MKDIR} ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .if ${PORT_OPTIONS:MSPLIT_HTML}
 	@${MKDIR} ${DOCSDIR}/cvsbook-shtml
-	@cd ${WRKSRC}/cvsbook && ${INSTALL_DATA} -- *.html ${DOCSDIR}/cvsbook-shtml
+	@cd ${WRKSRC}/cvsbook && ${INSTALL_DATA} -- *.html ${STAGEDIR}${DOCSDIR}/cvsbook-shtml
 .endif
 .if ${PORT_OPTIONS:MSINGLE_HTML}
-	@${INSTALL_DATA} ${WRKSRC}/cvsbook.html ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/cvsbook.html ${STAGEDIR}${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MPDF}
-	@${INSTALL_DATA} ${WRKSRC}/cvsbook.pdf ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/cvsbook.pdf ${STAGEDIR}${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MPOSTSCRIPT}
-	@${INSTALL_DATA} ${WRKSRC}/cvsbook.ps ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/cvsbook.ps ${STAGEDIR}${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MINFO}
-	@${INSTALL_DATA} ${WRKSRC}/cvsbook.info* ${INFODIR}
-	@${INSTALL_INFO} ${INFODIR}/cvsbook.info ${INFODIR}/dir
+	@${MKDIR} ${STAGEDIR}${INFODIR}
+	@${INSTALL_DATA} ${WRKSRC}/cvsbook.info* ${STAGEDIR}${INFODIR}
+	@${INSTALL_INFO} ${STAGEDIR}${INFODIR}/cvsbook.info ${STAGEDIR}${INFODIR}/dir
 .endif
 
 .include <bsd.port.mk>