From owner-svn-ports-head@FreeBSD.ORG Wed May 7 17:41:17 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 6E8DD405; Wed, 7 May 2014 17:41:17 +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 4F3897E5; Wed, 7 May 2014 17:41:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s47HfHCb096242; Wed, 7 May 2014 17:41:17 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s47HfGOV096238; Wed, 7 May 2014 17:41:16 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201405071741.s47HfGOV096238@svn.freebsd.org> From: John Marino Date: Wed, 7 May 2014 17:41:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353183 - head/devel/ocaml-camlp5 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.18 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: Wed, 07 May 2014 17:41:17 -0000 Author: marino Date: Wed May 7 17:41:16 2014 New Revision: 353183 URL: http://svnweb.freebsd.org/changeset/ports/353183 QAT: https://qat.redports.org/buildarchive/r353183/ Log: devel/ocaml-camlp5: Upgrade from 6.08p1 => 6.11 to unbreak and stage This port broke after Ocaml moved to version 4.01, so bring in the latest version to fix it. Stage support was added. Other changes: * The license wasn't exactly BSD. Use the license it provided. * Remove PATCHLEVEL code, not needed currently * convert to USES+=tar * Move definition above inclusion Modified: head/devel/ocaml-camlp5/Makefile head/devel/ocaml-camlp5/distinfo head/devel/ocaml-camlp5/pkg-plist Modified: head/devel/ocaml-camlp5/Makefile ============================================================================== --- head/devel/ocaml-camlp5/Makefile Wed May 7 17:31:01 2014 (r353182) +++ head/devel/ocaml-camlp5/Makefile Wed May 7 17:41:16 2014 (r353183) @@ -2,21 +2,27 @@ # $FreeBSD$ PORTNAME= camlp5 -PORTVERSION= 6.08.p${PATCHLEVEL} +PORTVERSION= 6.11 CATEGORIES= devel MASTER_SITES= http://cristal.inria.fr/~ddr/camlp5/distrib/src/ \ http://pauillac.inria.fr/~ddr/camlp5/distrib/src/ PKGNAMEPREFIX= ocaml- -DISTNAME= ${PORTNAME}-${PORTVERSION:R} -EXTRACT_SUFX= .tgz DIST_SUBDIR= ${UNIQUENAME} PATCH_SITES= ${MASTER_SITES} MAINTAINER= umq@ueo.co.jp -COMMENT= preprocessor-pretty-printer of OCaml +COMMENT= Preprocessor-pretty-printer of OCaml -LICENSE= BSD +LICENSE= INRIA +LICENSE_NAME= INRIA permissive license with copyright notice requirements +LICENSE_FILE= ${WRKSRC}/LICENSE +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept + +USES= tar:tgz +USE_OCAML= yes +HAS_CONFIGURE= yes +CONFIGURE_ARGS= --prefix ${PREFIX} OPTIONS_SINGLE= MODE OPTIONS_SINGLE_MODE= TRANSITIONAL STRICT @@ -24,21 +30,13 @@ OPTIONS_DEFAULT= STRICT TRANSITIONAL_DESC= Compatible syntax tree with old versions STRICT_DESC= New syntax tree quotations kit -NO_STAGE= yes - OPTIONS_DEFINE= DOCS -.include +PORTDOCS= CHANGES DEVEL ICHANGES INSTALL MODE README UPGRADING -PATCHLEVEL= 1 -PATCHFILES!= ${JOT} -s " " -w \ - patch-${PORTVERSION:R}-%d \ - ${PATCHLEVEL} 1 ${PATCHLEVEL} - -USE_OCAML= yes -HAS_CONFIGURE= yes -MAKE_JOBS_UNSAFE= yes -CONFIGURE_ARGS= --prefix ${PREFIX} +MAKE_JOBS_UNSAFE= yes + +.include .if ${PORT_OPTIONS:MTRANSITIONAL} CONFIGURE_ARGS+= --transitional @@ -47,20 +45,23 @@ CONFIGURE_ARGS+= --strict .endif ALL_TARGET= world.opt -MAN1= camlp5.1 -MANCOMPRESSED= no -MLINKS= camlp5.1 camlp5o.1 camlp5.1 camlp5o.opt.1 camlp5.1 camlp5r.1 \ - camlp5.1 camlp5r.opt.1 camlp5.1 camlp5sch.1 camlp5.1 mkcamlp5.1 \ - camlp5.1 mkcamlp5.opt.1 camlp5.1 ocpp5.1 -PORTDOCS= CHANGES DEVEL ICHANGES INSTALL MODE README UPGRADING +MLINKS= camlp5.1 camlp5o.1 \ + camlp5.1 camlp5o.opt.1 \ + camlp5.1 camlp5r.1 \ + camlp5.1 camlp5r.opt.1 \ + camlp5.1 camlp5sch.1 \ + camlp5.1 mkcamlp5.1 \ + camlp5.1 mkcamlp5.opt.1 \ + camlp5.1 ocpp5.1 post-install: .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor .endif - ${INSTALL_DATA} ${WRKSRC}/etc/META ${PREFIX}/lib/ocaml/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/etc/META \ + ${STAGEDIR}${PREFIX}/lib/ocaml/camlp5 .include Modified: head/devel/ocaml-camlp5/distinfo ============================================================================== --- head/devel/ocaml-camlp5/distinfo Wed May 7 17:31:01 2014 (r353182) +++ head/devel/ocaml-camlp5/distinfo Wed May 7 17:41:16 2014 (r353183) @@ -1,4 +1,2 @@ -SHA256 (ocaml-camlp5/camlp5-6.08.tgz) = ebc39e2aa193ce76f967cae30d5c6682f3274be11c68d36224d55d94d172d375 -SIZE (ocaml-camlp5/camlp5-6.08.tgz) = 683400 -SHA256 (ocaml-camlp5/patch-6.08-1) = 9c53bb21404632897ec17e188661417705e5543b38ecc624bf4f604a6c1265b8 -SIZE (ocaml-camlp5/patch-6.08-1) = 10719 +SHA256 (ocaml-camlp5/camlp5-6.11.tgz) = 65521c1d316ea6c0e794d07bd331bdb091840d3ab41c16b50005d7685a2cab37 +SIZE (ocaml-camlp5/camlp5-6.11.tgz) = 686711 Modified: head/devel/ocaml-camlp5/pkg-plist ============================================================================== --- head/devel/ocaml-camlp5/pkg-plist Wed May 7 17:31:01 2014 (r353182) +++ head/devel/ocaml-camlp5/pkg-plist Wed May 7 17:41:16 2014 (r353183) @@ -198,4 +198,13 @@ lib/ocaml/camlp5/token.cmx lib/ocaml/camlp5/token.mli lib/ocaml/camlp5/versdep.cmi lib/ocaml/camlp5/versdep.cmx +man/man1/camlp5.1.gz +man/man1/camlp5o.1.gz +man/man1/camlp5o.opt.1.gz +man/man1/camlp5r.1.gz +man/man1/camlp5r.opt.1.gz +man/man1/camlp5sch.1.gz +man/man1/mkcamlp5.1.gz +man/man1/mkcamlp5.opt.1.gz +man/man1/ocpp5.1.gz @dirrm lib/ocaml/camlp5