On Wed, 9 Jan 2013 17:45:27 +0000 Stuart Henderson <s...@spacehopper.org> wrote:
> On 2013/01/09 18:03, Christopher Zimmermann wrote: > > On Wed, 9 Jan 2013 17:50:10 +0100 > > Marc Espie <es...@nerim.net> wrote: > > > > > On Wed, Jan 09, 2013 at 04:50:35PM +0100, Christopher Zimmermann > > > wrote: > > > > Hi, > > > > > > > > I'd like to commit this. ok? > > > > I don't see how this indirection could make any sense otherwise. > > > > > > > > Christopher > > > > > > > > > > > > Index: libiconv.port.mk > > > > =================================================================== > > > > RCS file: /cvs/ports/converters/libiconv/libiconv.port.mk,v > > > > retrieving revision 1.6 > > > > diff -u -p -r1.6 libiconv.port.mk > > > > --- libiconv.port.mk 15 Nov 2010 00:22:50 -0000 1.6 > > > > +++ libiconv.port.mk 9 Jan 2013 15:48:06 -0000 > > > > @@ -3,10 +3,10 @@ > > > > # The RUN_DEPENDS entry is to ensure libiconv is installed. > > > > # This is necessary so that we have charset.alias installed on > > > > # static archs. Typically installed in PREFIX/lib. > > > > -MODLIBICONV_LIB_DEPENDS = converters/libiconv > > > > -MODLIBICONV_RUN_DEPENDS = converters/libiconv > > > > +MODLIBICONV_LIB_DEPENDS ?= converters/libiconv > > > > +MODLIBICONV_RUN_DEPENDS ?= converters/libiconv > > > > > > > > -MODLIBICONV_WANTLIB = iconv>=2 > > > > +MODLIBICONV_WANTLIB ?= iconv>=2 > > > > > > > > LIB_DEPENDS += ${MODLIBICONV_LIB_DEPENDS} > > > > RUN_DEPENDS += ${MODLIBICONV_RUN_DEPENDS} > > > > > > You're lacking imagination. > > > This indirection still makes sense, in the context of > > > MULTI_PACKAGES. > > > > > > > Ah, I get it. But I'd still like to commit the diff. OK? > > What is your use case? this: Index: Makefile =================================================================== RCS file: /cvs/ports/devel/ocaml-lambda-term/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- Makefile 4 Dec 2012 06:56:39 -0000 1.6 +++ Makefile 9 Jan 2013 20:18:47 -0000 @@ -5,6 +5,7 @@ CATEGORIES = devel # also adapt MASTER_SITES when changing the version! DISTNAME = lambda-term-1.3 +REVISION = 0 PKGNAME = ocaml-${DISTNAME} MASTER_SITES = http://forge.ocamlcore.org/frs/download.php/1034/ @@ -18,14 +19,19 @@ PERMIT_DISTFILES_FTP = Yes PERMIT_DISTFILES_CDROM = Yes WANTLIB = c ev m pthread +MODLIBICONV_WANTLIB = charset -MODULES = lang/ocaml +MODULES = lang/ocaml converters/libiconv BUILD_DEPENDS = devel/ocaml-lwt devel/ocaml-zed RUN_DEPENDS = devel/ocaml-lwt devel/ocaml-zed LIB_DEPENDS = devel/libev CONFIGURE_STYLE = oasis + + +pre-configure: + ${SUBST_CMD} ${WRKSRC}/{_oasis,myocamlbuild.ml,setup.ml} post-install: ${INSTALL_DATA} \