ports/141372: [maintainer update] lang/ocamlduce to 3.11.1.0
Jaap Boender
jaapb at kerguelen.org
Fri Dec 11 14:00:12 UTC 2009
>Number: 141372
>Category: ports
>Synopsis: [maintainer update] lang/ocamlduce to 3.11.1.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Dec 11 14:00:06 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Jaap Boender
>Release: 8.0-STABLE
>Organization:
>Environment:
FreeBSD marion-dufresne.pps.jussieu.fr 8.0-STABLE FreeBSD 8.0-STABLE #12: Tue Dec 1 09:54:46 CET 2009 root at marion-dufresne.pps.jussieu.fr:/usr/obj/usr/src/sys/MARION-DUFRESNE i386
>Description:
This version of ocamlduce works with ocaml 3.11, which is in ports. My apologies for the long delay.
>How-To-Repeat:
n/a
>Fix:
diff included.
Patch attached with submission follows:
diff -Naur ocamlduce/Makefile ocamlduce-3.11/Makefile
--- ocamlduce/Makefile 2009-12-01 11:49:25.000000000 +0100
+++ ocamlduce-3.11/Makefile 2009-12-07 14:33:13.000000000 +0100
@@ -6,33 +6,25 @@
#
PORTNAME= ocamlduce
-PORTVERSION= 3.10.0.1
+PORTVERSION= 3.11.1.0
CATEGORIES= lang
-MASTER_SITES= http://gallium.inria.fr/~frisch/ocamlcduce/download/
-DISTNAME= ${PORTNAME}-${PORTVERSION}${PKGNAMESUFFIX}
+MASTER_SITES= https://forge.ocamlcore.org/frs/download.php/225/
+#DISTNAME= ${PORTNAME}-${PORTVERSION}${PKGNAMESUFFIX}
MAINTAINER= jaapb at kerguelen.org
COMMENT= Library to integrate XML features into OCaml
+ALL_TARGET= prepare config/Makefile world world.opt
+INSTALL_TARGET= installbyte installopt
+
USE_GMAKE= yes
USE_OCAML= yes
-OCAMLC_DEPEND= ocaml>=3.10.0:${OCAMLC_PORT}
+MAKE_ENV+= PORTSDIR="${PORTSDIR}" BINDIR="${LOCALBASE}/bin" SA_DIR="${LOCALBASE}/lib/ocaml/site-lib"
+OCAMLC_DEPEND= ocaml>=3.11.0:${OCAMLC_PORT}
USE_OCAML_FINDLIB= yes
USE_OCAML_LDCONFIG= yes
USE_OCAML_PLIST= yes
-ALL_TARGET= all opt
-BROKEN= does not build with current version of lang/ocaml
-
-.include <bsd.port.pre.mk>
-
-post-extract:
-# For nonstandard prefixes
-.if !exists(${OCAMLFIND_DESTDIR})
- ${MKDIR} ${OCAMLFIND_DESTDIR}
-.endif
-.if !exists(${OCAMLFIND_LDCONF})
- ${TOUCH} ${OCAMLFIND_LDCONF}
-.endif
+#BROKEN= does not build with current version of lang/ocaml
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -Naur ocamlduce/distinfo ocamlduce-3.11/distinfo
--- ocamlduce/distinfo 2008-04-15 17:20:50.000000000 +0200
+++ ocamlduce-3.11/distinfo 2009-12-07 13:26:28.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (ocamlduce-3.10.0.1.tar.gz) = bb137a5a653197f1d345483e3e7beb52
-SHA256 (ocamlduce-3.10.0.1.tar.gz) = 0b6d68a499a30269939fc88953abe423006847c0e224c5b7bfabb0944b6875c0
-SIZE (ocamlduce-3.10.0.1.tar.gz) = 1008267
+MD5 (ocamlduce-3.11.1.0.tar.gz) = 5ef11249b590ab038c45583369936baa
+SHA256 (ocamlduce-3.11.1.0.tar.gz) = fd1f92e80b36b1fae028c4d1119dd2ff567001ed09e0ce5634a3497027827d4e
+SIZE (ocamlduce-3.11.1.0.tar.gz) = 138926
diff -Naur ocamlduce/files/patch-Makefile ocamlduce-3.11/files/patch-Makefile
--- ocamlduce/files/patch-Makefile 1970-01-01 01:00:00.000000000 +0100
+++ ocamlduce-3.11/files/patch-Makefile 2009-12-07 14:51:19.000000000 +0100
@@ -0,0 +1,64 @@
+--- Makefile.orig 2009-06-13 01:49:38.000000000 +0200
++++ Makefile 2009-12-07 14:51:18.000000000 +0100
+@@ -1,13 +1,13 @@
+ #-include config/Makefile
+
+ OCAML_VERSION := $(shell ocamlc -version)
+-OCAML_SOURCE := /usr/src/ocaml-source-$(OCAML_VERSION).tar.bz2
++OCAML_SOURCE := ${PORTSDIR}/distfiles/ocaml-$(OCAML_VERSION).tar.bz2
+ OCAML_SRCDIR := ocaml-$(OCAML_VERSION)
+
+ DUCE_VERSION := $(shell head -n1 VERSION)
+ DUCE_SRCDIR := ocamlduce-$(DUCE_VERSION)
+
+-DUCE_LIBDIR := $(LIBDIR)/ocamlduce
++DUCE_LIBDIR := $(SA_DIR)/ocamlduce
+
+ BASE_BYT := ocamlc ocamldoc/ocamldoc tools/ocamldep
+ BYT := ocaml $(BASE_BYT)
+@@ -46,13 +46,13 @@
+
+ config/Makefile:
+ @echo "===> You should probably run ./configure yourself, trying on my own... <==="
+- $(shell sed -ne '1s@^.*\(./configure.*\)$$@\1 at p' $(shell ocamlc -where)/Makefile.config)
++ cd $(OCAML_SRCDIR) && $(shell sed -ne '1s@^.*\(./configure.*\)$$@\1 at p' $(shell ocamlc -where)/Makefile.config)
+
+ world: config/Makefile
+- MAKE="$(MAKE)" CFLAGS="$(CFLAGS)" ./mkocamlduce.sh
++ cd $(OCAML_SRCDIR) && MAKE="$(MAKE)" CFLAGS="$(CFLAGS)" ./mkocamlduce.sh
+
+ world.opt: config/Makefile
+- MAKE="$(MAKE)" CFLAGS="$(CFLAGS)" HAS_NATIVE=y ./mkocamlduce.sh
++ cd $(OCAML_SRCDIR) && MAKE="$(MAKE)" CFLAGS="$(CFLAGS)" HAS_NATIVE=y ./mkocamlduce.sh
+
+ META: META.in
+ sed 's/%VER%/$(DUCE_VERSION)/' $< > $@
+@@ -63,20 +63,20 @@
+ install -m 755 -d $(DUCE_LIBDIR)
+ install -m 755 ocamlducefind $(BINDIR)
+ install -m 644 META $(DUCE_LIBDIR)
+- install -m 644 $(addprefix _build/,$(MLI)) $(DUCE_LIBDIR)
+- install -m 644 $(addprefix _build/,$(CMI)) $(DUCE_LIBDIR)
++ install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(MLI)) $(DUCE_LIBDIR)
++ install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(CMI)) $(DUCE_LIBDIR)
+
+ installbyte: installcommon-stamp
+ @echo "===> Installing non-native files... <==="
+- for X in $(BYT); do Y=$${X##*/}; Y=$${Y#ocaml}; install -m 755 _build/$$X $(BINDIR)/ocamlduce$$Y; done
+- install -m 644 $(addprefix _build/,$(TOPCMO)) $(DUCE_LIBDIR)
+- install -m 644 $(addprefix _build/,$(TOPCMA)) $(DUCE_LIBDIR)
+- install -m 644 $(addprefix _build/,$(CMA)) $(DUCE_LIBDIR)
++ for X in $(BYT); do Y=$${X##*/}; Y=$${Y#ocaml}; install -m 755 $(OCAML_SRCDIR)/_build/$$X $(BINDIR)/ocamlduce$$Y; done
++ install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(TOPCMO)) $(DUCE_LIBDIR)
++ install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(TOPCMA)) $(DUCE_LIBDIR)
++ install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(CMA)) $(DUCE_LIBDIR)
+
+ installopt: installcommon-stamp
+ @echo "===> Installing native files... <==="
+- for X in $(OPT); do Y=$${X##*/}; Y=$${Y#ocaml}; install -m 755 _build/$$X $(BINDIR)/ocamlduce$$Y; done
+- install -m 644 $(addprefix _build/,$(CMXA)) $(DUCE_LIBDIR)
++ for X in $(OPT); do Y=$${X##*/}; Y=$${Y#ocaml}; install -m 755 $(OCAML_SRCDIR)/_build/$$X $(BINDIR)/ocamlduce$$Y; done
++ install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(CMXA)) $(DUCE_LIBDIR)
+
+ clean:
+ build/distclean.sh
diff -Naur ocamlduce/pkg-plist ocamlduce-3.11/pkg-plist
--- ocamlduce/pkg-plist 2007-02-26 21:17:52.000000000 +0100
+++ ocamlduce-3.11/pkg-plist 2009-12-07 14:54:35.000000000 +0100
@@ -1,22 +1,24 @@
%%OCAML_SITELIBDIR%%/ocamlduce/META
%%OCAML_SITELIBDIR%%/ocamlduce/cduce_types.cmi
-%%OCAML_SITELIBDIR%%/ocamlduce/cduce_types.o
%%OCAML_SITELIBDIR%%/ocamlduce/ocamlduce.a
%%OCAML_SITELIBDIR%%/ocamlduce/ocamlduce.cma
%%OCAML_SITELIBDIR%%/ocamlduce/ocamlduce.cmi
%%OCAML_SITELIBDIR%%/ocamlduce/ocamlduce.cmxa
%%OCAML_SITELIBDIR%%/ocamlduce/ocamlduce.mli
-%%OCAML_SITELIBDIR%%/ocamlduce/ocamlduce.o
%%OCAML_SITELIBDIR%%/ocamlduce/topdirs.cmi
-%%OCAML_SITELIBDIR%%/ocamlduce/toplevelducelib.cma
+%%OCAML_SITELIBDIR%%/ocamlduce/topdirs.cmo
+%%OCAML_SITELIBDIR%%/ocamlduce/topdirs.mli
+%%OCAML_SITELIBDIR%%/ocamlduce/toplevellib.cma
%%OCAML_SITELIBDIR%%/ocamlduce/toploop.cmi
+%%OCAML_SITELIBDIR%%/ocamlduce/toploop.cmo
+%%OCAML_SITELIBDIR%%/ocamlduce/toploop.mli
%%OCAML_SITELIBDIR%%/ocamlduce/topmain.cmi
+%%OCAML_SITELIBDIR%%/ocamlduce/topmain.cmo
+%%OCAML_SITELIBDIR%%/ocamlduce/topmain.mli
%%OCAML_SITELIBDIR%%/ocamlduce/topstart.cmo
bin/ocamlducec
bin/ocamlduce
bin/ocamlducedep
bin/ocamlducedoc
bin/ocamlduceopt
-bin/ocamlducemktop
-bin/expungeduce
bin/ocamlducefind
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list