From d6dbd5803f706ee2d685d6fdcafc5855bee66b86 Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Sat, 17 May 2014 13:45:03 +0000 Subject: [PATCH] - Update to version 4.00 - Stage support PR: 188354 Submitted by: Ports Fury --- devel/ocaml-classes/Makefile | 12 +++++------- devel/ocaml-classes/distinfo | 4 ++-- devel/ocaml-classes/files/META | 6 ------ devel/ocaml-classes/files/patch-Makefile | 20 +++++++++----------- 4 files changed, 16 insertions(+), 26 deletions(-) delete mode 100644 devel/ocaml-classes/files/META diff --git a/devel/ocaml-classes/Makefile b/devel/ocaml-classes/Makefile index 22b46a968eab..dbefb34b2433 100644 --- a/devel/ocaml-classes/Makefile +++ b/devel/ocaml-classes/Makefile @@ -2,22 +2,20 @@ # $FreeBSD$ PORTNAME= classes -PORTVERSION= 3.05 -PORTREVISION= 3 +PORTVERSION= 4.00 CATEGORIES= devel -MASTER_SITES= http://caml.inria.fr/pub/distrib/bazar-ocaml/ \ - http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/ +MASTER_SITES= http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/ PKGNAMEPREFIX= ocaml- DISTNAME= ocaml-${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Ocaml Object interface for ocaml's standard library modules +LICENSE= LGPL21 + BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml RUN_DEPENDS:= ${BUILD_DEPENDS} -NO_STAGE= yes -post-extract: - @${CP} ${FILESDIR}/META ${WRKSRC} +MAKE_ENV= INSTALL="${INSTALL_DATA}" .include diff --git a/devel/ocaml-classes/distinfo b/devel/ocaml-classes/distinfo index 92e9f25ccc9a..d74cad5b776e 100644 --- a/devel/ocaml-classes/distinfo +++ b/devel/ocaml-classes/distinfo @@ -1,2 +1,2 @@ -SHA256 (ocaml-classes-3.05.tar.gz) = 103cbb4113c673a383b9ec33d3aecf5383808dfddfec60901ec84c6e77902ab7 -SIZE (ocaml-classes-3.05.tar.gz) = 10205 +SHA256 (ocaml-classes-4.00.tar.gz) = e62d37e11e608f9340d5477dae68b110b475242d7ea2fdb8c0330ad76f95b5f0 +SIZE (ocaml-classes-4.00.tar.gz) = 20269 diff --git a/devel/ocaml-classes/files/META b/devel/ocaml-classes/files/META deleted file mode 100644 index 97e7675576e5..000000000000 --- a/devel/ocaml-classes/files/META +++ /dev/null @@ -1,6 +0,0 @@ -name="classes" -version="3.05" -description="Object interface for standard library modules" -requires="" -archive(byte)="stdclass.cma" -archive(native)="stdclass.cmxa" diff --git a/devel/ocaml-classes/files/patch-Makefile b/devel/ocaml-classes/files/patch-Makefile index 47ffdf4e1d0f..148db7bdc0a0 100644 --- a/devel/ocaml-classes/files/patch-Makefile +++ b/devel/ocaml-classes/files/patch-Makefile @@ -1,21 +1,19 @@ --- Makefile.orig Thu Apr 18 16:39:26 2002 +++ Makefile Tue Aug 1 12:53:14 2006 -@@ -1,10 +1,12 @@ +@@ -1,10 +1,10 @@ #Adjust this directory for installation -LIBDIR=`ocamlc -where` -+LIBDIR=$(LOCALBASE)/lib/ocaml/site-lib/classes -+DISTDIR=$(PREFIX)/lib/ocaml/site-lib/classes ++LIBDIR=$(PREFIX)/lib/ocaml/site-lib/classes COMPILER=ocamlc -c LIBRARIAN=ocamlc -a OPTCOMP=ocamlopt -c OPTLIB=ocamlopt -a -INSTALL=cp -+INSTALL=install -o root -g wheel -m 644 -+INSTALLDIR=install -d -o root -g wheel -m 755 ++INSTALL?=install -o root -g wheel -m 644 OBJECTS=obuffer.cmo ohashtbl.cmo oqueue.cmo ostack.cmo \ omap.cmo oset.cmo ostream.cmo omapping.cmo -@@ -16,13 +18,13 @@ +@@ -16,13 +16,13 @@ .SUFFIXES: .ml .mli .cmo .cmi .cmx .ml.cmo: @@ -32,18 +30,18 @@ all: stdclass.cma opt: stdclass.cmxa -@@ -43,12 +45,15 @@ +@@ -43,12 +43,15 @@ @$(MAKE) real-install LIBDIR=$(LIBDIR) real-install: - $(INSTALL) stdclass.cma *.cmi *.mli $(LIBDIR) -+ $(INSTALLDIR) $(DISTDIR) -+ $(INSTALL) stdclass.cma *.cmi *.mli $(DISTDIR) ++ mkdir -p $(DESTDIR)$(LIBDIR) ++ $(INSTALL) stdclass.cma *.cmi *.mli $(DESTDIR)$(LIBDIR) if test -f stdclass.cmxa; \ - then $(INSTALL) stdclass.cmxa stdclass.a *.cmx $(LIBDIR); fi -+ then $(INSTALL) stdclass.cmxa stdclass.a *.cmx $(DISTDIR); fi ++ then $(INSTALL) stdclass.cmxa stdclass.a *.cmx $(DESTDIR)$(LIBDIR); fi + if test -f META; \ -+ then $(INSTALL) META $(DISTDIR); fi ++ then $(INSTALL) META $(DESTDIR)$(LIBDIR); fi clean: - rm -f *.cm* *.o *.a *~ #*