Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 5 Jul 2014 00:22:08 +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: r360709 - in head/java: jboss5 poseidon
Message-ID:  <201407050022.s650M8uf081878@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adamw
Date: Sat Jul  5 00:22:07 2014
New Revision: 360709
URL: http://svnweb.freebsd.org/changeset/ports/360709
QAT: https://qat.redports.org/buildarchive/r360709/

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/java/jboss5/Makefile
  head/java/poseidon/Makefile

Modified: head/java/jboss5/Makefile
==============================================================================
--- head/java/jboss5/Makefile	Sat Jul  5 00:20:38 2014	(r360708)
+++ head/java/jboss5/Makefile	Sat Jul  5 00:22:07 2014	(r360709)
@@ -57,6 +57,8 @@ SUB_LIST=	APP_HOME=${DATADIR} \
 		STOP_TIMEOUT=${STOP_TIMEOUT} \
 		USER=${USER}
 
+OPTIONS_DEFINE=	DOCS
+
 NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
@@ -76,7 +78,7 @@ do-install:
 	(cd ${JBOSSOUTPUT}/client && ${FIND} jboss-remoting.jar jboss-serialization.jar |\
 		${CPIO} -pdmu -R ${USER}:${GROUP} ${DATADIR}/common/lib)
 	${INSTALL} -o ${USER} -g ${GROUP} -m 0640 /dev/null ${PID_FILE}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	cd ${JBOSSOUTPUT}/docs \
 		&& ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \
 		&& ${FIND} . -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;

Modified: head/java/poseidon/Makefile
==============================================================================
--- head/java/poseidon/Makefile	Sat Jul  5 00:20:38 2014	(r360708)
+++ head/java/poseidon/Makefile	Sat Jul  5 00:22:07 2014	(r360709)
@@ -36,7 +36,11 @@ DISTFILES+=	${PORTNAME}CE-${PORTVERSION}
 DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}
 .endif
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	*
 PLIST_FILES+=	%%DATADIR%%/docs %%DATADIR%%/examples
 .endif
@@ -62,7 +66,7 @@ do-install:
 	cd ${WRKSRC}/ \
 	  && ${FIND} ${DATAFILES} -type d -exec ${MKDIR} ${DATADIR}/{} \; \
 	  && ${FIND} ${DATAFILES} -type f -exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${LN} -s ${DOCSDIR} ${DATADIR}/docs
 	cd ${WRKSRC}/docs/ \
@@ -82,7 +86,7 @@ post-install:
 	  | ${SED} -ne 's,^${WRKSRC},@dirrm ${DATADIR:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
 	@${ECHO_CMD} "@dirrm ${DATADIR:S,^${PREFIX}/,,}/bin" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dirrm ${DATADIR:S,^${PREFIX}/,,}" >> ${TMPPLIST}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${FIND} -s ${WRKSRC}/examples -not -type d \
 	  | ${SED} -ne 's,^${WRKSRC}/examples,${EXAMPLESDIR:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
 	@${FIND} -s -d ${WRKSRC}/examples -type d \



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