Date: Mon, 31 Mar 2014 16:01:33 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349766 - head/www/tidy-devel Message-ID: <201403311601.s2VG1XTo061106@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Mon Mar 31 16:01:33 2014 New Revision: 349766 URL: http://svnweb.freebsd.org/changeset/ports/349766 QAT: https://qat.redports.org/buildarchive/r349766/ Log: - Add stage support by modifying MAKE_ARGS - Convert NOPORTDOCS to PORT_OPTIONS:MDOCS Approved by: portmgr (blanket infrastructure) Modified: head/www/tidy-devel/Makefile head/www/tidy-devel/pkg-plist Modified: head/www/tidy-devel/Makefile ============================================================================== --- head/www/tidy-devel/Makefile Mon Mar 31 15:35:31 2014 (r349765) +++ head/www/tidy-devel/Makefile Mon Mar 31 16:01:33 2014 (r349766) @@ -18,7 +18,6 @@ COMMENT?= Utility to clean up and pretty BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt USES= tar:bzip2 -NO_STAGE= yes SLAVEDIRS= www/tidy-lib WRKSRC= ${WRKDIR}/${PORTNAME} @@ -27,6 +26,7 @@ MAKE_JOBS_UNSAFE= yes .if !defined(WITH_SHLIB) USES+= gmake PLIST_SUB= SHLIB="@comment " NSHLIB="" +MAKE_ARGS+= PREFIX=${STAGEDIR}${PREFIX} CONFLICTS= tidy-20000804* tidy-lib-[0-9]* .else USE_AUTOTOOLS= automake autoconf libtool @@ -40,11 +40,9 @@ DESCR= ${.CURDIR}/pkg-descr BIN2STRIP= tidy tab2space -.if !defined(WITH_SHLIB) -MAN1= tidy.1 -.endif +.include <bsd.port.options.mk> -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} . if !defined(WITH_SHLIB) ALL_TARGET= all doc DOCFILES= quickref.html @@ -101,15 +99,15 @@ patch-autotools-libtool:: post-install: .for pgm in ${BIN2STRIP} - ${STRIP_CMD} ${PREFIX}/bin/${pgm} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${pgm} .endfor .if defined(WITH_SHLIB) - ${STRIP_CMD} ${PREFIX}/lib/libtidy-0.99.so.0 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtidy-0.99.so.0 .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${ECHO_MSG} "===> Installing documentation for ${PKGNAME}" - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${DOCFILES:S|^|${WRKSRC}/htmldoc/|} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${DOCFILES:S|^|${WRKSRC}/htmldoc/|} ${STAGEDIR}${DOCSDIR} @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." .endif Modified: head/www/tidy-devel/pkg-plist ============================================================================== --- head/www/tidy-devel/pkg-plist Mon Mar 31 15:35:31 2014 (r349765) +++ head/www/tidy-devel/pkg-plist Mon Mar 31 16:01:33 2014 (r349766) @@ -9,6 +9,7 @@ include/tidy/tidyenum.h %%SHLIB%%lib/libtidy.la %%SHLIB%%lib/libtidy.so lib/libtidy.a +%%NSHLIB%%man/man1/tidy.1.gz %%PORTDOCS%%%%DOCSDIR%%/Overview.html %%PORTDOCS%%%%DOCSDIR%%/checked_by_tidy.gif %%PORTDOCS%%%%DOCSDIR%%/faq.html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403311601.s2VG1XTo061106>