From owner-svn-ports-all@FreeBSD.ORG Mon Apr 21 13:05:14 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 06F301EA; Mon, 21 Apr 2014 13:05:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E724515C6; Mon, 21 Apr 2014 13:05:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3LD5Dhj033331; Mon, 21 Apr 2014 13:05:13 GMT (envelope-from johans@svn.freebsd.org) Received: (from johans@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3LD5D3s033328; Mon, 21 Apr 2014 13:05:13 GMT (envelope-from johans@svn.freebsd.org) Message-Id: <201404211305.s3LD5D3s033328@svn.freebsd.org> From: Johan van Selst Date: Mon, 21 Apr 2014 13:05:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351679 - in head/lang/cduce: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Apr 2014 13:05:14 -0000 Author: johans Date: Mon Apr 21 13:05:13 2014 New Revision: 351679 URL: http://svnweb.freebsd.org/changeset/ports/351679 QAT: https://qat.redports.org/buildarchive/r351679/ Log: - Update to CDuce 0.6.0 (works with modern ocaml) - Minor cleanups Added: head/lang/cduce/files/ head/lang/cduce/files/patch-Makefile.distrib (contents, props changed) Modified: head/lang/cduce/Makefile head/lang/cduce/distinfo Modified: head/lang/cduce/Makefile ============================================================================== --- head/lang/cduce/Makefile Mon Apr 21 12:34:46 2014 (r351678) +++ head/lang/cduce/Makefile Mon Apr 21 13:05:13 2014 (r351679) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= cduce -PORTVERSION= 0.5.5 -PORTREVISION= 1 +PORTVERSION= 0.6.0 CATEGORIES= lang MASTER_SITES= http://www.cduce.org/download/ \ ftp://ftp.stack.nl/pub/users/johans/cduce/ @@ -11,81 +10,47 @@ MASTER_SITES= http://www.cduce.org/downl MAINTAINER= johans@FreeBSD.org COMMENT= Efficient XML centric functional programming language -BROKEN= Fails to build - -LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre +LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre BUILD_DEPENDS= ${SITELIBDIR}/ulex/ulexing.a:${PORTSDIR}/devel/ocaml-ulex \ ${SITELIBDIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre \ ${SITELIBDIR}/netstring/netstring.a:${PORTSDIR}/www/ocaml-net -USE_OCAML= true +USE_OCAML= true USE_OCAML_FINDLIB= true USE_OCAML_LDCONFIG= true -OPTIONS_DEFINE= OCURL OCAML_EXPAT MLIFACE -OPTIONS_DEFAULT=MLIFACE +OPTIONS_DEFINE= OCURL MLIFACE +OPTIONS_DEFAULT= MLIFACE PXP +OPTIONS_SINGLE= XML +OPTIONS_SINGLE_XML= EXPAT PXP +OPTIONS_SUB= yes OCURL_DESC= Enable url support via ftp/ocaml-ocurl -OCAML_EXPAT_DESC= Enable support for the Expat XML parser +OCURL_BUILD_DEPENDS= ${SITELIBDIR}/curl/curl.cmi:${PORTSDIR}/ftp/ocaml-ocurl +OCURL_CONFIGURE_WITH= curl +EXPAT_DESC= Enable support for the Expat XML parser +EXPAT_CONFIGURE_WITH= expat +EXPAT_BUILD_DEPENDS= ${SITELIBDIR}/expat/expat.cmi:${PORTSDIR}/textproc/ocaml-expat +PXP_DESC= Enable support for the PXP XML parser +PXP_CONFIGURE_WITH= pxp +PXP_BUILD_DEPENDS= ${SITELIBDIR}/pxp-engine/pxp_engine.cma:${PORTSDIR}/textproc/ocaml-pxp MLIFACE_DESC= Enable building OCaml/CDuce interface +MLIFACE_BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/lang/ocaml:patch +MLIFACE_CONFIGURE_ON= --mliface=`cd ${PORTSDIR}/lang/ocaml; ${MAKE} -V WRKSRC` -USE_GMAKE= yes -ALL_TARGET= all -INSTALL_TARGET= install_bin install_lib +USES= gmake +ALL_TARGET= all doc +INSTALL_TARGET= install_bin install_lib install_doc HAS_CONFIGURE= yes -CONFIGURE_ARGS= --prefix=${PREFIX} --with-ocamlopt --without-cgi --without-netclient --without-pxp_wlex --docdir=${DOCSDIR} +CONFIGURE_ARGS= --prefix=${PREFIX} --with-ocamlopt --without-cgi --without-netclient --with-curl --without-pxp_wlex --docdir=${DOCSDIR} SITELIBDIR= ${LOCALBASE}/${OCAML_SITELIBDIR} - -MAN1= cduce.1 cduce_mktop.1 dtd2cduce.1 - -PLIST_FILES= bin/cduce - -NO_STAGE= yes -.include - -# Support for url via ftp/ocaml-ocurl -.if ${PORT_OPTIONS:MOCURL} -BUILD_DEPENDS+= ${SITELIBDIR}/curl/curl.cmi:${PORTSDIR}/ftp/ocaml-ocurl -.else -CONFIGURE_ARGS+= --without-curl -.endif - -# Support for the PXP XML parser -.if ${PORT_OPTIONS:MOCAML_EXPAT} -CONFIGURE_ARGS+= --with-expat --without-pxp -BUILD_DEPENDS+= ${SITELIBDIR}/expat/expat.cmi:${PORTSDIR}/textproc/ocaml-expat -.else -CONFIGURE_ARGS+= --without-expat --with-pxp -BUILD_DEPENDS+= ${SITELIBDIR}/pxp-engine/pxp_engine.cma:${PORTSDIR}/textproc/ocaml-pxp -.endif - -# Support for OCaml/CDuce interface -.if ${PORT_OPTIONS:MMLIFACE} -PLIST_FILES+= bin/cduce_mktop -BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/lang/ocaml:patch -CONFIGURE_ARGS+= --mliface=`cd ${PORTSDIR}/lang/ocaml; ${MAKE} -V WRKSRC` -.endif - -.if ${PORT_OPTIONS:MDOCS} -ALL_TARGET+= doc -INSTALL_TARGET+= install_doc -PORTDOCS= * -.endif +MAKE_JOBS_UNSAFE=yes post-patch: ${REINPLACE_CMD} 's/-linkpkg/& -thread/' \ ${WRKSRC}/Makefile ${WRKSRC}/configure.ml post-install: -.if ${PORT_OPTIONS:MOCAML_EXPAT} - @${ECHO_CMD} "****************************************************************" - @${ECHO_CMD} "* You choose Expat as XML parser, you may encounter some error *" - @${ECHO_CMD} "* when loading XML files with external DTD. *" - @${ECHO_CMD} "****************************************************************" -.endif -.if empty(PORT_OPTIONS:MDOCS) -. for i in ${MAN1} - ${INSTALL_MAN} ${WRKSRC}/doc/${i} ${MANPREFIX}/man/man${i:E}/ -. endfor -.endif + ${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${MANPREFIX}/man/man1/ + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cduce .include Modified: head/lang/cduce/distinfo ============================================================================== --- head/lang/cduce/distinfo Mon Apr 21 12:34:46 2014 (r351678) +++ head/lang/cduce/distinfo Mon Apr 21 13:05:13 2014 (r351679) @@ -1,2 +1,2 @@ -SHA256 (cduce-0.5.5.tar.gz) = 4ed53a0ff196f490729d0146b474546f5115fd3cff2627f52670cfcc619b0157 -SIZE (cduce-0.5.5.tar.gz) = 596666 +SHA256 (cduce-0.6.0.tar.gz) = 28291cceaa219782f0f4cd4c9634a25bc4238e09bdb0e193b8b207ed7eb650bc +SIZE (cduce-0.6.0.tar.gz) = 815440 Added: head/lang/cduce/files/patch-Makefile.distrib ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/cduce/files/patch-Makefile.distrib Mon Apr 21 13:05:13 2014 (r351679) @@ -0,0 +1,32 @@ +--- Makefile.distrib.orig 2014-04-21 14:44:45.000000000 +0200 ++++ Makefile.distrib 2014-04-21 14:45:32.000000000 +0200 +@@ -106,8 +106,8 @@ install: all install_bin install_lib ins + + install_bin: + @echo "Install binaries" +- $(HIDE)mkdir -p $(BINDIR) +- $(HIDE)$(INSTALL) -m755 $(INSTALL_BINARIES) $(BINDIR)/ ++ $(HIDE)mkdir -p $(DESTDIR)$(BINDIR) ++ $(HIDE)$(INSTALL) -m755 $(INSTALL_BINARIES) $(DESTDIR)$(BINDIR)/ + + + install_lib: +@@ -339,12 +339,12 @@ web/xhtml.cdo: cduce web/xhtml.cd + ./cduce -I web/ --compile web/xhtml.cd + + install_doc: doc +- $(HIDE)mkdir -p $(MANDIR)/man1 +- $(HIDE)(cd doc; $(MAKE) install INSTALL="$(INSTALL)" MANDIR=$(MANDIR) HIDE=$(HIDE)) +- mkdir -p $(DOCDIR)/img +- cp web/doc/*.html $(DOCDIR)/ +- cp CHANGES INSTALL INSTALL.WIN32 README AUTHORS LICENSE $(DOCDIR)/ +- cp web/img/left.gif web/img/right.gif $(DOCDIR)/img ++ $(HIDE)mkdir -p $(DESTDIR)$(MANDIR)/man1 ++ $(HIDE)(cd doc; $(MAKE) install INSTALL="$(INSTALL)" MANDIR=$(DESTDIR)$(MANDIR) HIDE=$(HIDE)) ++ mkdir -p $(DESTDIR)$(DOCDIR)/img ++ cp web/doc/*.html $(DESTDIR)$(DOCDIR)/ ++ cp CHANGES INSTALL INSTALL.WIN32 README AUTHORS LICENSE $(DESTDIR)$(DOCDIR)/ ++ cp web/img/left.gif web/img/right.gif $(DESTDIR)$(DOCDIR)/img + + + ### Pack OCaml modules for the CDuce/OCaml interface