Date: Fri, 4 Jul 2014 21:57:09 +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: r360668 - in head/news: newsx rawdog Message-ID: <201407042157.s64Lv9YT003489@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Fri Jul 4 21:57:08 2014 New Revision: 360668 URL: http://svnweb.freebsd.org/changeset/ports/360668 QAT: https://qat.redports.org/buildarchive/r360668/ Log: Remove NOPORTDOCS and NOPORTEXAMPLES. Modified: head/news/newsx/Makefile head/news/rawdog/Makefile Modified: head/news/newsx/Makefile ============================================================================== --- head/news/newsx/Makefile Fri Jul 4 21:55:07 2014 (r360667) +++ head/news/newsx/Makefile Fri Jul 4 21:57:08 2014 (r360668) @@ -22,6 +22,8 @@ GNU_CONFIGURE= yes CONFLICTS= leafnode-1.* +OPTIONS_DEFINE= DOCS + .if !defined(WITH_CNEWS) .if !defined(WITHOUT_INN_2-X) CPPFLAGS+= -I${LOCALBASE}/news/include @@ -34,6 +36,8 @@ CONFIGURE_ARGS+= --without-history DOCS= AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO +.include <bsd.port.options.mk> + pre-configure: ${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:g" ${WRKSRC}/configure @${ECHO} "*********************************************************" @@ -50,12 +54,10 @@ post-build: post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/news/spool/inhosts -.if !defined(NOPORTDOCS) ${MKDIR} ${STAGEDIR}${DOCSDIR} .for FILE in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR} .endfor @${ECHO} "Documentation installed in ${DOCSDIR}." -.endif .include <bsd.port.mk> Modified: head/news/rawdog/Makefile ============================================================================== --- head/news/rawdog/Makefile Fri Jul 4 21:55:07 2014 (r360667) +++ head/news/rawdog/Makefile Fri Jul 4 21:57:08 2014 (r360668) @@ -22,26 +22,30 @@ PORTDOCS= README PKGMESSAGE= ${WRKDIR}/pkg-message +OPTIONS_DEFINE= DOCS EXAMPLES + +.include <bsd.port.options.mk> + post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/config ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/style.css ${STAGEDIR}${EXAMPLESDIR} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} -.if !defined(NOPORTEXAMPLES) || !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MEXAMPLES} @${ECHO_MSG} " ---------------------------------------------" \ >>${PKGMESSAGE} .endif -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} @${ECHO_MSG} " Sample config and stylesheet installed in:" \ >>${PKGMESSAGE} @${ECHO_MSG} " ${EXAMPLESDIR}" >>${PKGMESSAGE} .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${ECHO_MSG} " Please read the README:" >>${PKGMESSAGE} @${ECHO_MSG} " ${DOCSDIR}/README" >>${PKGMESSAGE} .endif -.if !defined(NOPORTEXAMPLES) || !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MEXAMPLES} @${ECHO_MSG} " ---------------------------------------------" \ >>${PKGMESSAGE} .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407042157.s64Lv9YT003489>