Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 5 Jul 2014 00:03:39 +0000 (UTC)
From:      Adam Weinberger <adamw@FreeBSD.org>
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
Message-ID:  <201407050003.s6503d2D071866@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407050003.s6503d2D071866>