From owner-svn-ports-all@FreeBSD.ORG  Sat Jul  5 00:03:39 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 84E39554;
 Sat,  5 Jul 2014 00:03:39 +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 5883C20B9;
 Sat,  5 Jul 2014 00:03:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6503dNP071868;
 Sat, 5 Jul 2014 00:03:39 GMT (envelope-from adamw@svn.freebsd.org)
Received: (from adamw@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6503d2D071866;
 Sat, 5 Jul 2014 00:03:39 GMT (envelope-from adamw@svn.freebsd.org)
Message-Id: <201407050003.s6503d2D071866@svn.freebsd.org>
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Sat, 5 Jul 2014 00:03:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r360701 - in head/x11-wm: awesome2 sapphire
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: Sat, 05 Jul 2014 00:03:39 -0000

Author: adamw
Date: Sat Jul  5 00:03:38 2014
New Revision: 360701
URL: http://svnweb.freebsd.org/changeset/ports/360701
QAT: https://qat.redports.org/buildarchive/r360701/

Log:
  Remove NOPORTDOCS and NOPORTEXAMPLES from unstaged ports. Stage a couple while
  we're here. Remove any other references to NOPORT*.
  
  Approved by:	portmgr (blanket for modernization)

Modified:
  head/x11-wm/awesome2/Makefile
  head/x11-wm/sapphire/Makefile

Modified: head/x11-wm/awesome2/Makefile
==============================================================================
--- head/x11-wm/awesome2/Makefile	Sat Jul  5 00:01:29 2014	(r360700)
+++ head/x11-wm/awesome2/Makefile	Sat Jul  5 00:03:38 2014	(r360701)
@@ -34,7 +34,12 @@ MAN5=		awesome2rc.5
 PORTDOCS=	AUTHORS LICENSE README STYLE UPGRADE
 PORTEXAMPLES=	awesomerc
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 NO_STAGE=	yes
+
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's, "$$(DESTDIR)$$(docdir)";,;,g' \
 			  -e 's,\([[:space:]]\)install-docDATA ,\1,g' \
@@ -58,14 +63,14 @@ post-configure:
 		${WRKSRC}/Makefile
 
 post-install:
-.	if !defined(NOPORTDOCS)
+.	if ${PORT_OPTIONS:MDOCS}
 		@${ECHO_MSG} "installing additional documentation to ${DOCSDIR}"
 		@${MKDIR} ${DOCSDIR}
 .		for doc in ${PORTDOCS}
 			${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
 .		endfor
 .	endif
-.	if !defined(NOPORTEXAMPLES)
+.	if ${PORT_OPTIONS:MEXAMPLES}
 		@${ECHO_MSG} "installing example config file to ${EXAMPLESDIR}"
 		@${MKDIR} ${EXAMPLESDIR}
 .		for example in ${PORTEXAMPLES}

Modified: head/x11-wm/sapphire/Makefile
==============================================================================
--- head/x11-wm/sapphire/Makefile	Sat Jul  5 00:01:29 2014	(r360700)
+++ head/x11-wm/sapphire/Makefile	Sat Jul  5 00:03:38 2014	(r360701)
@@ -17,8 +17,11 @@ USES=		gmake
 REINPLACE_ARGS=	-i '' -e
 CC=		${CXX}
 
+OPTIONS_DEFINE=	DOCS
+
 NO_STAGE=	yes
-post-extract:
+
+.include <bsd.port.options.mk>
 
 post-patch:
 	${REINPLACE_CMD} "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/data.inst
@@ -36,7 +39,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/data/menu/default ${PREFIX}/share/sapphire/menu/default.orig
 	@${MKDIR} ${PREFIX}/share/sapphire/themes
 	${INSTALL_DATA} ${WRKSRC}/data/themes/*.theme ${PREFIX}/share/sapphire/themes
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
 .endif