Date: Sat, 18 Jan 2003 17:50:05 -0500 From: Tim Vanderhoek <vanderh@ecf.utoronto.ca> To: Gunnar Flygt <gunnar.flygt@sr.se>, Richard <richard@unixguru.nl>, Eugene <eugene@emetex.ru>, freebsd-stable@FreeBSD.org, kris@FreeBSD.org, portmgr@FreeBSD.org Subject: Re: readmes Message-ID: <20030118175005.A25165@p23.ecf> In-Reply-To: <20030118213827.GA94870@sr.se>; from gunnar.flygt@sr.se on Sat, Jan 18, 2003 at 10:38:27PM %2B0100 References: <20030116123702.GA98828@emetex.ru> <20030116164448.C28170@mail.unixguru.nl> <20030118205428.GA57840@turquoise> <20030118213827.GA94870@sr.se>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, Jan 18, 2003 at 10:38:27PM +0100, Gunnar Flygt wrote:
>
> Actually it seems more that some of the pors have huge "include's"
> as /usr/ports/devel/cdk as it includes the big maninfo.mk, or
It seems that I had a stale /usr/ports/ directory and that's why
I didn't get the error when I tried 'make readmes'.
Okay, here's the fix for bsd.port.mk. This is the same fix that I
used about 3 years ago for the do-package: target.
Here's another patch for portmgr to review _in addition to_ the one
in the previous email for bsd.port.subdir.mk.
Please let me know if you see any more problems. Thanks,
--- /usr/ports/Mk/~bsd.port.mk Sat Jan 18 17:38:53 2003
+++ /usr/ports/Mk/bsd.port.mk Sat Jan 18 17:43:34 2003
@@ -3607,24 +3607,25 @@
.if !target(readme)
readme:
@rm -f ${.CURDIR}/README.html
@cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} ${.CURDIR}/README.html
.endif
${.CURDIR}/README.html:
@${ECHO_MSG} "===> Creating README.html for ${PKGNAME}"
- @${CAT} ${TEMPLATES}/README.port | \
+ @__softMAKEFLAGS='${__softMAKEFLAGS:S/'/'\''/g}'; \
+ ${CAT} ${TEMPLATES}/README.port | \
${SED} -e 's%%PORT%%'`${ECHO_CMD} ${.CURDIR} | ${SED} -e 's.*/\([^/]*/[^/]*\)$$\1'`'g' \
-e 's%%PKG%%${PKGNAME}g' \
-e '/%%COMMENT%%/r${COMMENT}' \
-e '/%%COMMENT%%/d' \
-e 's%%DESCR%%'"`${ECHO_CMD} ${DESCR} | ${SED} -e 's${.CURDIR}/'`"'' \
- -e 's%%BUILD_DEPENDS%%'"`cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} pretty-print-build-depends-list`"'' \
- -e 's%%RUN_DEPENDS%%'"`cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} pretty-print-run-depends-list`"'' \
+ -e 's%%BUILD_DEPENDS%%'"`cd ${.CURDIR} && eval ${MAKE} $${__softMAKEFLAGS} pretty-print-build-depends-list`"'' \
+ -e 's%%RUN_DEPENDS%%'"`cd ${.CURDIR} && eval ${MAKE} $${__softMAKEFLAGS} pretty-print-run-depends-list`"'' \
-e 's%%TOP%%'"`${ECHO_CMD} ${CATEGORIES} | ${SED} -e 'sa .*aa' -e 'sa[^/]*a..ag'`"'/..' \
>> $@
# The following two targets require an up-to-date INDEX in ${PORTSDIR}
.if !target(pretty-print-build-depends-list)
pretty-print-build-depends-list:
.if defined(FETCH_DEPENDS) || defined(BUILD_DEPENDS) || \
--
If I could think of a two-line witty aphorism for you to remember
me by, this would definitely be it.
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030118175005.A25165>