From owner-cvs-all@FreeBSD.ORG Sat Mar 27 02:15:54 2010 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1F44E106566B; Sat, 27 Mar 2010 02:15:54 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from mx0.deglitch.com (backbone.deglitch.com [IPv6:2001:16d8:fffb:4::abba]) by mx1.freebsd.org (Postfix) with ESMTP id 6BC908FC08; Sat, 27 Mar 2010 02:15:53 +0000 (UTC) Received: from orion.SpringDaemons.com (adsl-99-48-191-9.dsl.snfc21.sbcglobal.net [99.48.191.9]) by mx0.deglitch.com (Postfix) with ESMTPA id CD57C8FC4E; Sat, 27 Mar 2010 05:15:50 +0300 (MSK) Received: from orion (localhost [127.0.0.1]) by orion.SpringDaemons.com (Postfix) with SMTP id D092B3985D; Fri, 26 Mar 2010 19:15:48 -0700 (PDT) Date: Fri, 26 Mar 2010 19:15:44 -0700 From: Stanislav Sedov To: Martin Wilke , beyert@cs.ucr.edu Message-Id: <20100326191544.d17a11df.stas@FreeBSD.org> In-Reply-To: <201003211256.o2LCur0a025048@repoman.freebsd.org> References: <201003211256.o2LCur0a025048@repoman.freebsd.org> Organization: The FreeBSD Project X-Mailer: carrier-pigeon Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Fri__26_Mar_2010_19_15_44_-0700_c+qr1MN0cW/j/t9W" 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 X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Mar 2010 02:15:54 -0000 --Signature=_Fri__26_Mar_2010_19_15_44_-0700_c+qr1MN0cW/j/t9W Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, 21 Mar 2010 12:56:53 +0000 (UTC) Martin Wilke mentioned: > miwi 2010-03-21 12:56:53 UTC >=20 > FreeBSD ports repository >=20 > Modified files: > textproc Makefile=20 > Added files: > textproc/htmlc Makefile distinfo pkg-descr=20 > Log: > Htmlc is an HTML template files expander that produces regular HTML pag= es from > source files that contain text fragments that require some computation = to be > written. +PORTNAME=3D htmlc +PORTVERSION=3D 2.21.0 +CATEGORIES=3D textproc +MASTER_SITES=3D http://htmlc.inria.fr/ \ + http://caml.inria.fr/distrib/bazar-ocaml/htmlc/ +EXTRACT_SUFX=3D .tgz + +MAINTAINER=3D beyert@cs.ucr.edu +COMMENT=3D A text file generator + +BUILD_DEPENDS=3D ocamlc:${PORTSDIR}/lang/ocaml Do not depend on ocaml directly, this will help you to avoid problems in th= e future. For this we have USE_OCAML knob. + +#MAN1=3D htmlc.1 + +PLIST_FILES=3D bin/htmlc bin/htmlc.byt share/htmlc/env +PLIST_DIRS=3D share/htmlc +PORTDOCS=3D LICENSE INSTALL README JoeCaml.gif rocq.gif copyright-eng= .htm \ + copyright-fra.htm eng.htm fra.htm index.htm + +HAS_CONFIGURE=3D yes +CONFIGURE_ARGS=3D --prefix ${LOCALBASE} This looks weird. Is this port PREFIX safe? +USE_GMAKE=3D yes + +.include 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 --=20 Stanislav Sedov ST4096-RIPE --Signature=_Fri__26_Mar_2010_19_15_44_-0700_c+qr1MN0cW/j/t9W Content-Type: application/pgp-signature -----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----- --Signature=_Fri__26_Mar_2010_19_15_44_-0700_c+qr1MN0cW/j/t9W--