From owner-svn-ports-head@FreeBSD.ORG Thu Mar 27 00:51:35 2014 Return-Path: Delivered-To: svn-ports-head@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 0799C7A2; Thu, 27 Mar 2014 00:51:35 +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 DD2743DD; Thu, 27 Mar 2014 00:51:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2R0pY7p082472; Thu, 27 Mar 2014 00:51:34 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2R0pYgB082468; Thu, 27 Mar 2014 00:51:34 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201403270051.s2R0pYgB082468@svn.freebsd.org> From: John Marino Date: Thu, 27 Mar 2014 00:51:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349310 - in head/textproc/ocaml-tyxml: . 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-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Mar 2014 00:51:35 -0000 Author: marino Date: Thu Mar 27 00:51:33 2014 New Revision: 349310 URL: http://svnweb.freebsd.org/changeset/ports/349310 QAT: https://qat.redports.org/buildarchive/r349310/ Log: textproc/ocaml-tyxml: Upgrade 2.0.1 -> 2.2.0 and support stage The implements the referenced PR and then stage support was added. The latter largely came from the pkgsrc version of this port which has the same maintainer. The modified LGPL license (with an OpenSSL exception) was annotated as well. PR: ports/176065 Submitted by: maintainer (Jaap Boender) Stage support: Taken from pkgsrc Added: head/textproc/ocaml-tyxml/files/patch-Makefile (contents, props changed) head/textproc/ocaml-tyxml/files/patch-lib_Makefile (contents, props changed) Deleted: head/textproc/ocaml-tyxml/files/patch-Makefile.config Modified: head/textproc/ocaml-tyxml/Makefile head/textproc/ocaml-tyxml/distinfo Modified: head/textproc/ocaml-tyxml/Makefile ============================================================================== --- head/textproc/ocaml-tyxml/Makefile Thu Mar 27 00:30:34 2014 (r349309) +++ head/textproc/ocaml-tyxml/Makefile Thu Mar 27 00:51:33 2014 (r349310) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tyxml -PORTVERSION= 2.0.1 +PORTVERSION= 2.2.0 CATEGORIES= textproc MASTER_SITES= http://ocsigen.org/download/ PKGNAMEPREFIX= ocaml- @@ -10,28 +10,21 @@ PKGNAMEPREFIX= ocaml- MAINTAINER= jaapb@kerguelen.org COMMENT= OCaml XML typing library -USE_GMAKE= yes +LICENSE= LGPL21_SSLEX +LICENSE_NAME= Lesser GPL 2.1 with a special OpenSSL exception clause +LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +BUILD_DEPENDS= ${SA_DIR}/netstring/netstring.a:${PORTSDIR}/www/ocaml-net +RUN_DEPENDS= ${SA_DIR}/netstring/netstring.a:${PORTSDIR}/www/ocaml-net + +USES= gmake USE_OCAML= yes USE_OCAML_FINDLIB= yes USE_OCAML_LDCONFIG= yes USE_OCAMLFIND_PLIST= yes SA_DIR= ${LOCALBASE}/${OCAML_SITELIBDIR} +MAKE_ENV+= INSTALLDIR="${STAGEDIR}${SA_DIR}" -BUILD_DEPENDS+= ${SA_DIR}/netstring/netstring.a:${PORTSDIR}/www/ocaml-net -RUN_DEPENDS+= ${SA_DIR}/netstring/netstring.a:${PORTSDIR}/www/ocaml-net - -NO_STAGE= yes -.include - -post-extract: -# For nonstandard prefixes -.if !exists(${OCAMLFIND_DESTDIR}) - ${MKDIR} ${OCAMLFIND_DESTDIR} -.endif -.if !exists(${OCAMLFIND_LDCONF}) - ${TOUCH} ${OCAMLFIND_LDCONF} -.endif - -.include +.include Modified: head/textproc/ocaml-tyxml/distinfo ============================================================================== --- head/textproc/ocaml-tyxml/distinfo Thu Mar 27 00:30:34 2014 (r349309) +++ head/textproc/ocaml-tyxml/distinfo Thu Mar 27 00:51:33 2014 (r349310) @@ -1,2 +1,2 @@ -SHA256 (tyxml-2.0.1.tar.gz) = ad6bc8751d87f414d5c12962e8b94f064e3ccfb5af18367a031eabf540ceffb4 -SIZE (tyxml-2.0.1.tar.gz) = 104721 +SHA256 (tyxml-2.2.0.tar.gz) = 8eab54f5fd7e9f5df3ac894123bd5abb124d741411a0ad5333e5058e44325f84 +SIZE (tyxml-2.2.0.tar.gz) = 105748 Added: head/textproc/ocaml-tyxml/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/ocaml-tyxml/files/patch-Makefile Thu Mar 27 00:51:33 2014 (r349310) @@ -0,0 +1,28 @@ +$NetBSD: patch-Makefile,v 1.2 2013/06/11 14:52:40 jaapb Exp $ + +--- Makefile.orig 2012-12-07 15:15:22.000000000 +0000 ++++ Makefile +@@ -52,19 +52,20 @@ files/META.tyxml: files/META.in Makefile + $< > $@ + + install: ++ mkdir -p ${INSTALLDIR} + $(OCAMLFIND) install ${PACKAGENAME} \ +- -patch-version ${VERSION} \ ++ -patch-version ${VERSION} -destdir ${INSTALLDIR} \ + files/META ${INTF} ${IMPL} ${NATIMPL} \ + ${MLI_TO_INSTALL} + + install-byte: + $(OCAMLFIND) install ${PACKAGENAME} \ +- -patch-version ${VERSION} \ ++ -patch-version ${VERSION} -destdir ${INSTALLDIR} \ + files/META ${INTF} ${IMPL} ${MLI_TO_INSTALL} + + install-opt: + $(OCAMLFIND) install ${PACKAGENAME} \ +- -patch-version ${VERSION} \ ++ -patch-version ${VERSION} -destdir ${INSTALLDIR} \ + files/META ${INTF} ${NATIMPL} ${MLI_TO_INSTALL} + + uninstall: Added: head/textproc/ocaml-tyxml/files/patch-lib_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/ocaml-tyxml/files/patch-lib_Makefile Thu Mar 27 00:51:33 2014 (r349310) @@ -0,0 +1,13 @@ +$NetBSD: patch-lib_Makefile,v 1.1 2013/06/11 14:52:40 jaapb Exp $ + +--- lib/Makefile.orig 2012-12-07 15:15:22.000000000 +0000 ++++ lib/Makefile +@@ -13,7 +13,7 @@ DUCE_INTF := xml_sigs_duce.mli xhtml_ty + + DUCE_FILES := xml_print_duce.ml xhtml_duce.ml + +-LIBS := -package netstring ++LIBS := -package netstring,netstring-pcre + + # SYNTAX := -ppopt ../syntax/pa_include.cmo -package camlp4 -syntax camlp4o +