Date: Fri, 26 Mar 2010 19:15:44 -0700 From: Stanislav Sedov <stas@FreeBSD.org> To: Martin Wilke <miwi@FreeBSD.org>, beyert@cs.ucr.edu Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/textproc Makefile ports/textproc/htmlc Makefile distinfo pkg-descr Message-ID: <20100326191544.d17a11df.stas@FreeBSD.org> In-Reply-To: <201003211256.o2LCur0a025048@repoman.freebsd.org> References: <201003211256.o2LCur0a025048@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Sun, 21 Mar 2010 12:56:53 +0000 (UTC) Martin Wilke <miwi@FreeBSD.org> mentioned: > miwi 2010-03-21 12:56:53 UTC > > FreeBSD ports repository > > Modified files: > textproc Makefile > Added files: > textproc/htmlc Makefile distinfo pkg-descr > Log: > Htmlc is an HTML template files expander that produces regular HTML pages from > source files that contain text fragments that require some computation to be > written. +PORTNAME= htmlc +PORTVERSION= 2.21.0 +CATEGORIES= textproc +MASTER_SITES= http://htmlc.inria.fr/ \ + http://caml.inria.fr/distrib/bazar-ocaml/htmlc/ +EXTRACT_SUFX= .tgz + +MAINTAINER= beyert@cs.ucr.edu +COMMENT= A text file generator + +BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml Do not depend on ocaml directly, this will help you to avoid problems in the future. For this we have USE_OCAML knob. + +#MAN1= htmlc.1 + +PLIST_FILES= bin/htmlc bin/htmlc.byt share/htmlc/env +PLIST_DIRS= share/htmlc +PORTDOCS= LICENSE INSTALL README JoeCaml.gif rocq.gif copyright-eng.htm \ + copyright-fra.htm eng.htm fra.htm index.htm + +HAS_CONFIGURE= yes +CONFIGURE_ARGS= --prefix ${LOCALBASE} This looks weird. Is this port PREFIX safe? +USE_GMAKE= yes + +.include <bsd.port.pre.mk> Why do you include pre.mk here? I don't see anything of it used later. + +post-patch: + ${RM} -f ${WRKSRC}/doc/Makefile + ${TOUCH} ${WRKSRC}/doc/Makefile + ${ECHO} "all:" > ${WRKSRC}/doc/Makefile If you just don't want to install documentation, it would be better to just strip "doc" from include dirs in the top-level Makefile. It'll be much less error prone and wouldn't involve removing/creating files which could be dangerous. + +do-install: + @${INSTALL_PROGRAM} ${WRKSRC}/compiler/htmlc ${PREFIX}/bin + @${INSTALL_PROGRAM} ${WRKSRC}/compiler/htmlc.byt ${PREFIX}/bin + @${MKDIR} ${DATADIR} + @${INSTALL_DATA} ${WRKSRC}/config/env ${DATADIR} + +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/LICENSE ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/INSTALL ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/README ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/JoeCaml.gif ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/rocq.gif ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/copyright-eng.htm ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/copyright-fra.htm ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/eng.htm ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/fra.htm ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/index.htm ${DOCSDIR} +.endif This can be an one-liner as you have all of this in the PORTDOCS variable. Something like this will do the trick: @${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,g} ${DOCSDIR}/ This will also work faster and much easier to maintain. Just a suggestion though. + +.include <bsd.port.post.mk> -- Stanislav Sedov ST4096-RIPE [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- iQIcBAEBAgAGBQJLrWpUAAoJEL8lojEJL9nwhMAQAI8qQcP7i15NII671KHjXphY JVol5LzWYpvEin7CtAxQJlB5ZFQGD0XbFNQXyOdUdnRTReP+8CSULz7oz5mwx0oN FJSVsmeChw8xi1AWqOJWOfw3KzIsn5UfCPZct5OQuvR3UE7g3Hfh3zoFso1dnEty c54lNVfbjW3UiaKY8nfI17o5tX1sPh7fHdBrF/xosHfZkWGGZftTCYIzh5icCIp8 qaZ4t7EaJLcNM12mcdTsoLJ0PdAbROOk6AEmMFF4PiLgWnGOnmZThXr6H9Afqc46 yDFIxyYtd/2YUFnIONqS4brDMa/u5JxcGBZun4CwckXghg3DcQAOUCj7OqEf7w09 +XbjsSkJlLBFxkXE1Buv/0jcQufEf+lgNnvtiA7DFB+cipy+aSTzJiL6dijkfqS9 db3tziC0VCr5cJ2UHTOVgM/uJuKb1vvpOM18f4ju3F/LL8PqIRQ1E5KA0d0iVON7 C9GjfrNRNMizi2/lP/5SODmiVOmmhn5KV5+2z7UE1Ik5cpuXmgxlUbrUK1uLAGXM tzy7uHJR+HeYuNC6QAPnGxHeAbLswY8qeXL1fcCbjjADiTjsc4UKQsvELpo2K0MZ LtBJ0hazb31zl10/bKOGodGwG9yy6F2ougBcEl3OY6YnUciXL7lyIxeu2NecNL26 O+uElhGBocGLIgAKlnDA =gLbu -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100326191544.d17a11df.stas>