svn commit: r353183 - head/devel/ocaml-camlp5

[John Marino]

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 <options> 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 at 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 <bsd.port.options.mk>
+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 <bsd.port.options.mk>
 
 .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 <bsd.port.mk>

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