Date: Fri, 4 Jul 2014 23:50:21 +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: r360692 - in head/deskutils: fengoffice org-mode.el Message-ID: <201407042350.s64NoLR0062179@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Fri Jul 4 23:50:21 2014 New Revision: 360692 URL: http://svnweb.freebsd.org/changeset/ports/360692 QAT: https://qat.redports.org/buildarchive/r360692/ 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/deskutils/fengoffice/Makefile head/deskutils/org-mode.el/Makefile Modified: head/deskutils/fengoffice/Makefile ============================================================================== --- head/deskutils/fengoffice/Makefile Fri Jul 4 23:48:56 2014 (r360691) +++ head/deskutils/fengoffice/Makefile Fri Jul 4 23:50:21 2014 (r360692) @@ -24,7 +24,8 @@ EXTRACT_AFTER_ARGS= -d ${WRKSRC} FENGOFFICE_DIR= www/${PORTNAME} FENGOFFICE_WWWDIR= ${PREFIX}/${FENGOFFICE_DIR} -NO_STAGE= yes +OPTIONS_DEFINE= DOCS + pre-extract: @${MKDIR} ${WRKDIR}/${PORTNAME} @@ -39,19 +40,15 @@ pre-install: ${FIND} . -type f | ${SORT} | ${SED} -e 's|^|www/fengoffice/|' -e 's|\./||g' >> ${PLIST} && \ ${FIND} . -type d | ${SORT} -r | ${SED} -e 's|^|@dirrm www/fengoffice|' -e 's|\.||g' >> ${PLIST} -. if !defined(NOPORTDOCS) - @${ECHO_CMD} "%%PORTDOCS%%%%DOCSDIR%%/README" >> ${PLIST} - @${ECHO_CMD} "%%PORTDOCS%%@dirrm %%DOCSDIR%%" >> ${PLIST} -. endif + @${ECHO_CMD} "%%PORTDOCS%%%%DOCSDIR%%/README" >> ${PLIST} + @${ECHO_CMD} "%%PORTDOCS%%@dirrm %%DOCSDIR%%" >> ${PLIST} do-install: - @${MKDIR} ${FENGOFFICE_WWWDIR} - @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${FENGOFFICE_WWWDIR} - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${FENGOFFICE_WWWDIR} -.if !defined (NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-docs/README ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${FENGOFFICE_WWWDIR} + cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${FENGOFFICE_WWWDIR} + ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${FENGOFFICE_WWWDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-docs/README ${STAGEDIR}${DOCSDIR} post-install: @${CAT} ${PKGMESSAGE} Modified: head/deskutils/org-mode.el/Makefile ============================================================================== --- head/deskutils/org-mode.el/Makefile Fri Jul 4 23:48:56 2014 (r360691) +++ head/deskutils/org-mode.el/Makefile Fri Jul 4 23:50:21 2014 (r360692) @@ -88,6 +88,8 @@ CONTRIBS= \ scripts/staticmathjax/README.org \ scripts/staticmathjax/README.txt \ +OPTIONS_DEFINE= DOCS + NO_STAGE= yes post-patch: @${REINPLACE_CMD} -i .pv 's|%%PORTVERSION%%|${PORTVERSION}|' ${WRKSRC}/Makefile @@ -107,10 +109,8 @@ post-install: .for i in ${CONTRIBS} ${INSTALL_DATA} ${WRKSRC}/contrib/${i} ${DOCSDIR}/contrib/$$(dirname ${i}) .endfor -.if !defined(NOPORTDOCS) .for i in org.pdf orgcard.pdf orgguide.pdf ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR} .endfor -.endif .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407042350.s64NoLR0062179>