On Thu, 18 Nov 2010, Landry Breuil wrote:
> On Thu, Nov 18, 2010 at 11:10:23AM +0100, David Coppa wrote:
> > Hi,
> >
> > This is my latest effort at updating ocaml and all dependant ports
> > that need to be patched (it has already passed successfully through
> > a bulk build).
> >
> > Major changes:
> >
> > new dependency on devel/libbfd (required by objinfo_helper).
> >
> > removed USE_GROFF since the man pages seem fine with mandoc too.
> >
> > fixed regress stuff.
> >
> > Talking about regress tests... Of the 314 tests included in the
> > testsuite, only one fails (bigints.ml, dunno why).
> >
> > Tested on i386 (native-code arch) and on sparc64 (non native-code).
> >
> > Hunting for comments, OKs, whatever...
>
> ok for me, just remove the :${PKGNAME}: in REGRESS_DEPENDS.
Done.
Also regenerated the diff after my latest changes to devel/cil.
I'd like to hear some words from Anil about what archs support
native dynamic linking, besides i386 and amd64 (powerpc? alpha?
sparc?)
CIAO,
David
Index: lang/ocaml/Makefile
===================================================================
RCS file: /cvs/ports/lang/ocaml/Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile
--- lang/ocaml/Makefile 6 Nov 2010 22:06:59 -0000 1.47
+++ lang/ocaml/Makefile 18 Nov 2010 09:30:13 -0000
@@ -7,8 +7,8 @@ NOT_FOR_ARCHS= hppa
COMMENT= ML language based on complete class-based objective system
-BASENAME= ocaml-3.11
-DISTNAME= ${BASENAME}.2
+BASENAME= ocaml-3.12
+DISTNAME= ${BASENAME}.0
CATEGORIES= lang
MASTER_SITES= http://caml.inria.fr/pub/distrib/${BASENAME}/
DOCFILES= ${BASENAME}-refman.html.tar.gz
@@ -22,7 +22,7 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= X11 c curses m pthread
+WANTLIB= X11 c curses iberty m pthread z
MODULES+= lang/tcl x11/tk
@@ -33,14 +33,15 @@ CONFIGURE_ARGS+=-tklibs -L${LOCALBASE}/l
CONFIGURE_ARGS+=-prefix ${PREFIX}
CONFIGURE_ARGS+=-cc '${CC} ${CFLAGS}'
CONFIGURE_ARGS+=-x11include ${X11BASE}/include -x11lib ${X11BASE}/lib
+CONFIGURE_ENV+=OPENBSD_LOCALBASE="${LOCALBASE}"
# ocaml's configure script is too smart for its own good
FAKE_FLAGS= PREFIX=${WRKINST}${PREFIX}
USE_GMAKE= Yes
-USE_GROFF = Yes
-BUILD_DEPENDS +=${MODTK_BUILD_DEPENDS}
+BUILD_DEPENDS +=${MODTK_BUILD_DEPENDS} \
+ devel/libbfd
RUN_DEPENDS += ${MODTK_RUN_DEPENDS}
LIB_DEPENDS += ${MODTK_LIB_DEPENDS}
WANTLIB += ${MODTK_WANTLIB}
@@ -55,7 +56,8 @@ ALL_TARGET= world bootstrap
PKG_ARGS+=-Dnative=0
.endif
-NO_REGRESS= Yes
+# XXX regress tests only work on archs with native-code compiler
+REGRESS_DEPENDS+= ${BUILD_PKGPATH}
post-extract:
@cp ${WRKSRC}/asmrun/power-elf.S ${WRKSRC}/asmrun/power-bsd.S
@@ -71,5 +73,10 @@ post-install:
# PFRAG.native was generated from PLIST with:
# egrep '(ocamlopt|\.cmx|\.cmxa|\.cmxs|\.opt|opt\.1|opt.cmi|\.native|\.o)$'
+
+# XXX one test in the suite (testsocket.ml) requires an active
+# connection to internet
+do-regress:
+ @cd ${WRKSRC}/testsuite && ulimit -Sn 256 && ${MAKE_PROGRAM} all
.include <bsd.port.mk>
Index: lang/ocaml/distinfo
===================================================================
RCS file: /cvs/ports/lang/ocaml/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- lang/ocaml/distinfo 4 Jun 2010 13:58:18 -0000 1.12
+++ lang/ocaml/distinfo 18 Nov 2010 09:30:13 -0000
@@ -1,10 +1,10 @@
-MD5 (ocaml-3.11-refman.html.tar.gz) = v7Ttlgl0FZ9CJAFKl5uvbQ==
-MD5 (ocaml-3.11.2.tar.gz) = nQYRJFEi/7yCY3Ncrh2n+w==
-RMD160 (ocaml-3.11-refman.html.tar.gz) = jXdjDuDD3Nrh7xQqWeuHYnHxwzU=
-RMD160 (ocaml-3.11.2.tar.gz) = oNM35H62zesoPK/OZG2indujnZc=
-SHA1 (ocaml-3.11-refman.html.tar.gz) = lxWc89TqZNDKA/BJl/38AJgtIrA=
-SHA1 (ocaml-3.11.2.tar.gz) = 59vM6JhvjSEzqHk4Sawxz+ew/yY=
-SHA256 (ocaml-3.11-refman.html.tar.gz) =
HGWzNMyxVa76Hl6TCpH4FthD034msn06A1HFcUkAWlw=
-SHA256 (ocaml-3.11.2.tar.gz) = gwCHRMC6HjRgZRuG0JAJFu2uOIE+uaAwDo6qhhw+kh4=
-SIZE (ocaml-3.11-refman.html.tar.gz) = 536530
-SIZE (ocaml-3.11.2.tar.gz) = 2863932
+MD5 (ocaml-3.12-refman.html.tar.gz) = k82R9SVEHrfpTMSbm2S6sA==
+MD5 (ocaml-3.12.0.tar.gz) = O6fMZRI8NXnxTnxybT7ngg==
+RMD160 (ocaml-3.12-refman.html.tar.gz) = OaCWTQ0/m6cNMSUl/pGda7S/8Y4=
+RMD160 (ocaml-3.12.0.tar.gz) = ziXWwJ8QteDhELi26n1DWhD6IK4=
+SHA1 (ocaml-3.12-refman.html.tar.gz) = OjMquWX2qReVPzDo7gadns+zQqE=
+SHA1 (ocaml-3.12.0.tar.gz) = N6VtkOSWadc7hGgGkoTcaQCFx+4=
+SHA256 (ocaml-3.12-refman.html.tar.gz) =
/FU9HWvpU2RxBGKCLecCsjiiJOfg0vWMZTYOp3trxiM=
+SHA256 (ocaml-3.12.0.tar.gz) = 2WSzheEQwVF8neHGMxR21eejWFzGkra2uJc/Opvn2ks=
+SIZE (ocaml-3.12-refman.html.tar.gz) = 525840
+SIZE (ocaml-3.12.0.tar.gz) = 3271024
Index: lang/ocaml/ocaml.port.mk
===================================================================
RCS file: /cvs/ports/lang/ocaml/ocaml.port.mk,v
retrieving revision 1.13
diff -u -p -r1.13 ocaml.port.mk
--- lang/ocaml/ocaml.port.mk 17 Nov 2010 08:05:18 -0000 1.13
+++ lang/ocaml/ocaml.port.mk 18 Nov 2010 09:30:13 -0000
@@ -9,7 +9,7 @@
# PFRAG.foo-native -- nativecode files for FLAVOR == foo
# PFRAG.no-foo-native -- nativecode files for FLAVOR != foo
-OCAML_VERSION=3.11.2
+OCAML_VERSION=3.12.0
.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "amd64" || \
Index: lang/ocaml/patches/patch-configure
===================================================================
RCS file: /cvs/ports/lang/ocaml/patches/patch-configure,v
retrieving revision 1.12
diff -u -p -r1.12 patch-configure
--- lang/ocaml/patches/patch-configure 4 Jun 2010 13:58:18 -0000 1.12
+++ lang/ocaml/patches/patch-configure 18 Nov 2010 09:30:13 -0000
@@ -1,21 +1,36 @@
$OpenBSD: patch-configure,v 1.12 2010/06/04 13:58:18 avsm Exp $
---- configure.orig Tue Nov 17 14:28:44 2009
-+++ configure Wed Jun 2 20:23:28 2010
-@@ -648,9 +648,12 @@ case "$host" in
- powerpc-*-netbsd*) arch=power; model=ppc; system=elf;;
+--- configure.orig Wed Jul 28 15:18:22 2010
++++ configure Thu Nov 18 10:07:33 2010
+@@ -629,6 +629,8 @@ if test $withsharedlibs = "yes"; then
+ i686-*-kfreebsd*) natdynlink=true;;
+ x86_64-*-kfreebsd*) natdynlink=true;;
+ i386-*-gnu0.3) natdynlink=true;;
++ i[3456]86-*-openbsd*) natdynlink=true;;
++ amd64-*-openbsd*) natdynlink=true;;
+ esac
+ fi
+
+@@ -674,6 +676,7 @@ case "$host" in
+ fi;;
+ i[3456]86-*-gnu*) arch=i386; system=gnu;;
+ mips-*-irix6*) arch=mips; system=irix;;
++ mips*-*-openbsd*) arch=mips; system=openbsd;;
+ hppa1.1-*-hpux*) arch=hppa; system=hpux;;
+ hppa2.0*-*-hpux*) arch=hppa; system=hpux;;
+ hppa*-*-linux*) arch=hppa; system=linux;;
+@@ -683,8 +686,11 @@ case "$host" in
powerpc-*-rhapsody*) arch=power; model=ppc; system=rhapsody;;
powerpc-*-darwin*) arch=power; system=rhapsody
-- if $arch64; then model=ppc64; else model=ppc;
fi;;
-+ if $arch64; then model=ppc64; else
-+ model=ppc; fi;;
+ if $arch64; then model=ppc64; else model=ppc;
fi;;
+ powerpc-*-openbsd*) arch=power; model=ppc; system=bsd;;
arm*-*-linux*) arch=arm; system=linux;;
arm*-*-gnu*) arch=arm; system=gnu;;
++ arm*-*-openbsd*) arch=arm; system=openbsd;;
+ zaurus*-*-openbsd*) arch=arm; system=openbsd;;
ia64-*-linux*) arch=ia64; system=linux;;
ia64-*-gnu*) arch=ia64; system=gnu;;
ia64-*-freebsd*) arch=ia64; system=freebsd;;
-@@ -660,6 +663,7 @@ case "$host" in
+@@ -694,6 +700,7 @@ case "$host" in
x86_64-*-netbsd*) arch=amd64; system=netbsd;;
x86_64-*-openbsd*) arch=amd64; system=openbsd;;
x86_64-*-darwin9.5) arch=amd64; system=macosx;;
@@ -23,7 +38,7 @@ $OpenBSD: patch-configure,v 1.12 2010/06
esac
# Some platforms exist both in 32-bit and 64-bit variants, not distinguished
-@@ -750,11 +754,15 @@ if test -n "$asppoption"; then aspp="$asppoption"; fi
+@@ -784,11 +791,15 @@ if test -n "$asppoption"; then aspp="$asppoption"; fi
cc_profile='-pg'
case "$arch,$model,$system" in
alpha,*,digital) profiling='prof';;
@@ -39,3 +54,18 @@ $OpenBSD: patch-configure,v 1.12 2010/06
sparc,*,solaris)
profiling='prof'
case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
+@@ -1570,11 +1581,11 @@ fi
+
+ # Look for BFD library
+
+-if ./hasgot -i bfd.h && \
+- ./hasgot -lbfd -ldl -liberty -lz bfd_openr; then
++if ./hasgot -I${OPENBSD_LOCALBASE}/include -i bfd.h && \
++ ./hasgot -L${OPENBSD_LOCALBASE}/lib -lbfd -liberty -lz bfd_openr; then
+ echo "BFD library found."
+ echo "#define HAS_LIBBFD" >> s.h
+- echo "LIBBFD_LINK=-lbfd -ldl -liberty -lz" >> Makefile
++ echo "LIBBFD_LINK=-I${OPENBSD_LOCALBASE}/include -L${OPENBSD_LOCALBASE}/lib
-lbfd -liberty -lz" >> Makefile
+ else
+ echo "BFD library not found, 'objinfo' will be unable to display info on
.cmxs files"
+ echo "LIBBFD_LINK=" >> Makefile
Index: lang/ocaml/patches/patch-testsuite_tests_asmcomp_i386_S
===================================================================
RCS file: lang/ocaml/patches/patch-testsuite_tests_asmcomp_i386_S
diff -N lang/ocaml/patches/patch-testsuite_tests_asmcomp_i386_S
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/ocaml/patches/patch-testsuite_tests_asmcomp_i386_S 18 Nov 2010
09:30:13 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- testsuite/tests/asmcomp/i386.S.orig Wed Nov 17 12:39:22 2010
++++ testsuite/tests/asmcomp/i386.S Wed Nov 17 12:43:52 2010
+@@ -15,7 +15,7 @@
+ /* Linux with ELF binaries does not prefix identifiers with _.
+ Linux with a.out binaries, FreeBSD, and NextStep do. */
+
+-#ifdef SYS_linux_elf
++#if defined(SYS_linux_elf) || defined(__OpenBSD__)
+ #define G(x) x
+ #define FUNCTION_ALIGN 16
+ #else
Index: lang/ocaml/patches/patch-tools_checkstack_c
===================================================================
RCS file: lang/ocaml/patches/patch-tools_checkstack_c
diff -N lang/ocaml/patches/patch-tools_checkstack_c
--- lang/ocaml/patches/patch-tools_checkstack_c 28 May 2006 15:28:54 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-tools_checkstack_c,v 1.2 2006/05/28 15:28:54 avsm Exp $
---- tools/checkstack.c.orig Mon Jan 23 17:36:47 2006
-+++ tools/checkstack.c Tue May 2 11:34:56 2006
-@@ -35,7 +35,8 @@ int main(int argc, char ** argv)
- "Under sh, bash, zsh: ulimit -s %lu\n"
- "Under csh, tcsh: limit stacksize %lu\n\n",
- (unsigned long) (limit.rlim_cur / 1024),
-- MINSTACKBYTES / 1024, MINSTACKBYTES / 1024);
-+ (unsigned long) (MINSTACKBYTES / 1024),
-+ (unsigned long) (MINSTACKBYTES / 1024));
- exit (3);
- }
- exit (0);
Index: lang/ocaml/patches/patch-yacc_main_c
===================================================================
RCS file: lang/ocaml/patches/patch-yacc_main_c
diff -N lang/ocaml/patches/patch-yacc_main_c
--- lang/ocaml/patches/patch-yacc_main_c 28 May 2006 15:28:54 -0000
1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,114 +0,0 @@
---- yacc/main.c.orig Mon Jan 23 17:38:43 2006
-+++ yacc/main.c Tue May 2 11:34:56 2006
-@@ -55,6 +55,14 @@ char *text_file_name;
- char *union_file_name;
- char *verbose_file_name;
-
-+#if defined(__OpenBSD__)
-+#define HAVE_MKSTEMP
-+#endif
-+
-+#ifdef HAVE_MKSTEMP
-+int action_fd = -1, entry_fd = -1, text_fd = -1, union_fd = -1;
-+#endif
-+
- FILE *action_file; /* a temp file, used to save actions associated */
- /* with rules until the parser is written */
- FILE *entry_file;
-@@ -93,16 +101,29 @@ char *rassoc;
- short **derives;
- char *nullable;
-
-+#if !defined(HAVE_MKSTEMP)
- extern char *mktemp(char *);
-+#endif
- extern char *getenv(const char *);
-
-
- void done(int k)
- {
-+#ifdef HAVE_MKSTEMP
-+ if (action_fd != -1)
-+ unlink(action_file_name);
-+ if (entry_fd != -1)
-+ unlink(entry_file_name);
-+ if (text_fd != -1)
-+ unlink(text_file_name);
-+ if (union_fd != -1)
-+ unlink(union_file_name);
-+#else
- if (action_file) { fclose(action_file); unlink(action_file_name); }
- if (entry_file) { fclose(entry_file); unlink(entry_file_name); }
- if (text_file) { fclose(text_file); unlink(text_file_name); }
- if (union_file) { fclose(union_file); unlink(union_file_name); }
-+#endif
- if (output_file && k > 0) {
- fclose(output_file); unlink(output_file_name);
- }
-@@ -302,11 +323,26 @@ void create_file_names(void)
- union_file_name[len + 5] = 'u';
-
- #ifndef NO_UNIX
-+#ifdef HAVE_MKSTEMP
-+ action_fd = mkstemp(action_file_name);
-+ if (action_fd == -1)
-+ open_error(action_file_name);
-+ entry_fd = mkstemp(entry_file_name);
-+ if (entry_fd == -1)
-+ open_error(entry_file_name);
-+ text_fd = mkstemp(text_file_name);
-+ if (text_fd == -1)
-+ open_error(text_file_name);
-+ union_fd = mkstemp(union_file_name);
-+ if (union_fd == -1)
-+ open_error(union_file_name);
-+#else
- mktemp(action_file_name);
- mktemp(entry_file_name);
- mktemp(text_file_name);
- mktemp(union_file_name);
- #endif
-+#endif
-
- len = strlen(file_prefix);
-
-@@ -347,15 +383,27 @@ void open_files(void)
- open_error(input_file_name);
- }
-
-+#ifdef HAVE_MKSTEMP
-+ action_file = fdopen(action_fd, "w");
-+#else
- action_file = fopen(action_file_name, "w");
-+#endif
- if (action_file == 0)
- open_error(action_file_name);
-
-+#ifdef HAVE_MKSTEMP
-+ entry_file = fdopen(entry_fd, "w");
-+#else
- entry_file = fopen(entry_file_name, "w");
-+#endif
- if (entry_file == 0)
- open_error(entry_file_name);
-
-+#ifdef HAVE_MKSTEMP
-+ text_file = fdopen(text_fd, "w");
-+#else
- text_file = fopen(text_file_name, "w");
-+#endif
- if (text_file == 0)
- open_error(text_file_name);
-
-@@ -371,7 +419,11 @@ void open_files(void)
- defines_file = fopen(defines_file_name, "w");
- if (defines_file == 0)
- open_error(defines_file_name);
-+#ifdef HAVE_MKSTEMP
-+ union_file = fdopen(union_fd, "w");
-+#else
- union_file = fopen(union_file_name, "w");
-+#endif
- if (union_file == 0)
- open_error(union_file_name);
- }
Index: lang/ocaml/pkg/PFRAG.native
===================================================================
RCS file: /cvs/ports/lang/ocaml/pkg/PFRAG.native,v
retrieving revision 1.10
diff -u -p -r1.10 PFRAG.native
--- lang/ocaml/pkg/PFRAG.native 4 Jun 2010 13:58:18 -0000 1.10
+++ lang/ocaml/pkg/PFRAG.native 18 Nov 2010 09:30:13 -0000
@@ -24,7 +24,7 @@ lib/ocaml/big_int.cmx
lib/ocaml/bigarray.a
lib/ocaml/bigarray.cmx
lib/ocaml/bigarray.cmxa
-lib/ocaml/bigarray.cmxs
+...@bin lib/ocaml/bigarray.cmxs
lib/ocaml/buffer.cmx
lib/ocaml/buffer.p.cmx
lib/ocaml/callback.cmx
@@ -110,7 +110,7 @@ lib/ocaml/complex.p.cmx
lib/ocaml/dbm.a
lib/ocaml/dbm.cmx
lib/ocaml/dbm.cmxa
-lib/ocaml/dbm.cmxs
+...@bin lib/ocaml/dbm.cmxs
lib/ocaml/digest.cmx
lib/ocaml/digest.p.cmx
lib/ocaml/dynlink.a
@@ -127,7 +127,7 @@ lib/ocaml/genlex.p.cmx
lib/ocaml/graphics.a
lib/ocaml/graphics.cmx
lib/ocaml/graphics.cmxa
-lib/ocaml/graphics.cmxs
+...@bin lib/ocaml/graphics.cmxs
lib/ocaml/graphicsX11.cmx
lib/ocaml/hashtbl.cmx
lib/ocaml/hashtbl.p.cmx
@@ -225,8 +225,6 @@ lib/ocaml/labltk/text.cmx
lib/ocaml/labltk/textvariable.cmx
lib/ocaml/labltk/timer.cmx
lib/ocaml/labltk/tk.cmx
-lib/ocaml/labltk/tkanim.a
-lib/ocaml/labltk/tkanim.cmxa
lib/ocaml/labltk/tkthread.cmx
lib/ocaml/labltk/tkthread.o
lib/ocaml/labltk/tkvars.cmx
@@ -258,9 +256,10 @@ lib/ocaml/nativeint.p.cmx
lib/ocaml/num.cmx
lib/ocaml/nums.a
lib/ocaml/nums.cmxa
-lib/ocaml/nums.cmxs
+...@bin lib/ocaml/nums.cmxs
lib/ocaml/obj.cmx
lib/ocaml/obj.p.cmx
+...@bin lib/ocaml/objinfo_helper
lib/ocaml/ocamlbuild/ocamlbuild.cmx
lib/ocaml/ocamlbuild/ocamlbuild.o
lib/ocaml/ocamlbuild/ocamlbuild_executor.cmx
@@ -307,7 +306,7 @@ lib/ocaml/stdlib.p.cmxa
lib/ocaml/str.a
lib/ocaml/str.cmx
lib/ocaml/str.cmxa
-lib/ocaml/str.cmxs
+...@bin lib/ocaml/str.cmxs
lib/ocaml/stream.cmx
lib/ocaml/stream.p.cmx
lib/ocaml/string.cmx
@@ -326,7 +325,7 @@ lib/ocaml/threads/threads.cmxa
lib/ocaml/unix.a
lib/ocaml/unix.cmx
lib/ocaml/unix.cmxa
-lib/ocaml/unix.cmxs
+...@bin lib/ocaml/unix.cmxs
lib/ocaml/unixLabels.cmx
lib/ocaml/weak.cmx
lib/ocaml/weak.p.cmx
Index: lang/ocaml/pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/lang/ocaml/pkg/PFRAG.shared,v
retrieving revision 1.2
diff -u -p -r1.2 PFRAG.shared
--- lang/ocaml/pkg/PFRAG.shared 11 Mar 2009 21:19:49 -0000 1.2
+++ lang/ocaml/pkg/PFRAG.shared 18 Nov 2010 09:30:13 -0000
@@ -1,12 +1,11 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2009/03/11 21:19:49 avsm Exp $
lib/ocaml/libcamlrun_shared.so
lib/ocaml/stublibs/dllbigarray.so
+lib/ocaml/stublibs/dllcamlstr.so
lib/ocaml/stublibs/dllgraphics.so
lib/ocaml/stublibs/dlllabltk.so
lib/ocaml/stublibs/dllmldbm.so
lib/ocaml/stublibs/dllnums.so
-lib/ocaml/stublibs/dllstr.so
lib/ocaml/stublibs/dllthreads.so
-lib/ocaml/stublibs/dlltkanim.so
lib/ocaml/stublibs/dllunix.so
lib/ocaml/stublibs/dllvmthreads.so
Index: lang/ocaml/pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/ocaml/pkg/PLIST,v
retrieving revision 1.19
diff -u -p -r1.19 PLIST
--- lang/ocaml/pkg/PLIST 11 Mar 2009 21:19:49 -0000 1.19
+++ lang/ocaml/pkg/PLIST 18 Nov 2010 09:30:13 -0000
@@ -23,12 +23,12 @@ bin/ocamldoc
bin/ocamllex
bin/ocamlmklib
bin/ocamlmktop
+bin/ocamlobjinfo
bin/ocamlprof
@bin bin/ocamlrun
@bin bin/ocamlyacc
lib/ocaml/
lib/ocaml/Makefile.config
-lib/ocaml/addlabels
lib/ocaml/arg.cmi
lib/ocaml/arg.ml
lib/ocaml/arg.mli
@@ -65,6 +65,8 @@ lib/ocaml/caml/misc.h
lib/ocaml/caml/mlvalues.h
lib/ocaml/caml/printexc.h
lib/ocaml/caml/signals.h
+lib/ocaml/caml/socketaddr.h
+lib/ocaml/caml/threads.h
lib/ocaml/caml/unixsupport.h
lib/ocaml/camlheader
lib/ocaml/camlheader_ur
@@ -369,7 +371,6 @@ lib/ocaml/labltk/labltk.cma
lib/ocaml/labltk/labltk.cmi
lib/ocaml/labltk/labltktop
lib/ocaml/labltk/liblabltk.a
-lib/ocaml/labltk/libtkanim.a
lib/ocaml/labltk/listbox.cmi
lib/ocaml/labltk/listbox.mli
lib/ocaml/labltk/menu.cmi
@@ -412,9 +413,6 @@ lib/ocaml/labltk/textvariable.mli
lib/ocaml/labltk/timer.cmi
lib/ocaml/labltk/timer.mli
lib/ocaml/labltk/tk.cmi
-lib/ocaml/labltk/tkanim.cma
-lib/ocaml/labltk/tkanim.cmi
-lib/ocaml/labltk/tkanim.mli
lib/ocaml/labltk/tkcompiler
lib/ocaml/labltk/tkthread.cmi
lib/ocaml/labltk/tkthread.cmo
@@ -440,10 +438,10 @@ lib/ocaml/lexing.ml
lib/ocaml/lexing.mli
lib/ocaml/libbigarray.a
lib/ocaml/libcamlrun.a
+lib/ocaml/libcamlstr.a
lib/ocaml/libgraphics.a
lib/ocaml/libmldbm.a
lib/ocaml/libnums.a
-lib/ocaml/libstr.a
lib/ocaml/libthreads.a
lib/ocaml/libunix.a
lib/ocaml/list.cmi
@@ -563,7 +561,6 @@ lib/ocaml/ratio.mli
lib/ocaml/scanf.cmi
lib/ocaml/scanf.ml
lib/ocaml/scanf.mli
-lib/ocaml/scrapelabels
lib/ocaml/set.cmi
lib/ocaml/set.ml
lib/ocaml/set.mli
@@ -865,10 +862,8 @@ share/doc/ocaml/html/manual004.html
share/doc/ocaml/html/manual005.html
share/doc/ocaml/html/manual006.html
share/doc/ocaml/html/manual007.html
-share/doc/ocaml/html/manual008.html
share/doc/ocaml/html/manual010.html
share/doc/ocaml/html/manual011.html
-share/doc/ocaml/html/manual012.html
share/doc/ocaml/html/manual013.html
share/doc/ocaml/html/manual016.html
share/doc/ocaml/html/manual017.html
Index: devel/cil/Makefile
===================================================================
RCS file: /cvs/ports/devel/cil/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- devel/cil/Makefile 20 Jun 2009 22:05:11 -0000 1.18
+++ devel/cil/Makefile 10 Nov 2010 17:01:22 -0000
@@ -6,12 +6,10 @@ ONLY_FOR_ARCHS= i386 amd64 powerpc
COMMENT= framework for analysis and transformation of C
DISTNAME= cil-1.3.6
-REVISION= 2
+REVISION= 3
CATEGORIES= devel lang
HOMEPAGE= http://www.eecs.berkeley.edu/~necula/cil/
MASTER_SITES= ${HOMEPAGE}/distrib/
-
-MAINTAINER= Anil Madhavapeddy <[email protected]>
# BSD license
PERMIT_PACKAGE_CDROM= Yes
Index: devel/cil/patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/devel/cil/patches/patch-Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Makefile_in
--- devel/cil/patches/patch-Makefile_in 11 Mar 2009 21:20:27 -0000 1.1
+++ devel/cil/patches/patch-Makefile_in 10 Nov 2010 17:01:24 -0000
@@ -1,6 +1,15 @@
$OpenBSD: patch-Makefile_in,v 1.1 2009/03/11 21:20:27 avsm Exp $
---- Makefile.in.orig Thu Nov 27 12:50:50 2008
-+++ Makefile.in Thu Nov 27 12:51:41 2008
+--- Makefile.in.orig Mon Feb 5 22:10:29 2007
++++ Makefile.in Wed Nov 10 17:15:22 2010
+@@ -115,7 +115,7 @@ $(OBJDIR)/cilly$(EXE) : $(CILLY_MODULES:%=$(OBJDIR)/%.
+ @$(NARRATIVE) "Linking $(COMPILETOWHAT) $@ $(LINKMSG)"
+ $(AT)$(CAMLLINK) -verbose -o $@ \
+ $(CILLY_LIBS:%=%.$(CMXA)) \
+- $(CILLY_LIBS:%=-cclib -l%) \
++ $(unix camlstr -l%) \
+ $^
+
+
@@ -273,7 +273,10 @@ $(OBJDIR)/libperfcount.a: %: %($(OBJDIR)/perfcount.$(C
ifeq ($(NATIVECAML),1)
$(OBJDIR)/libcil.a: $(OCAML_CIL_LIB_CMODULES:%=$(OBJDIR)/lib%.a) \
Index: devel/omake/Makefile
===================================================================
RCS file: /cvs/ports/devel/omake/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- devel/omake/Makefile 20 Jun 2009 22:05:11 -0000 1.8
+++ devel/omake/Makefile 10 Nov 2010 17:01:35 -0000
@@ -6,7 +6,7 @@ CATEGORIES= devel
V= 0.9.8.5
VEXTRA= 3
DISTNAME= omake-${V}-${VEXTRA}
-PKGNAME= omake-${V}pl${VEXTRA}p1
+REVISION= 2
WRKDIST= ${WRKDIR}/omake-${V}
MASTER_SITES= http://omake.metaprl.org/downloads/ \
http://www.ocaml-programming.de/godi-backup/
Index: devel/omake/patches/patch-OMakefile
===================================================================
RCS file: devel/omake/patches/patch-OMakefile
diff -N devel/omake/patches/patch-OMakefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/omake/patches/patch-OMakefile 10 Nov 2010 17:01:35 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Make omake compile with Ocaml 3.12
+
+--- OMakefile.orig Fri Jun 22 21:03:37 2007
++++ OMakefile Wed Nov 10 15:30:25 2010
+@@ -57,7 +57,7 @@ if $(not $(defined CAMLLIB))
+ #
+ # OCaml options
+ #
+-OCAMLFLAGS[] += -w Ae$(if $(OCAML_ACCEPTS_Z_WARNING), z)
++OCAMLFLAGS[] += -w Aer-29$(if $(OCAML_ACCEPTS_Z_WARNING), z)
+ if $(THREADS_ENABLED)
+ OCAMLFLAGS += -thread
+ export
Index: devel/omake/patches/patch-src_build_omake_rule_ml
===================================================================
RCS file: devel/omake/patches/patch-src_build_omake_rule_ml
diff -N devel/omake/patches/patch-src_build_omake_rule_ml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/omake/patches/patch-src_build_omake_rule_ml 10 Nov 2010 17:01:35
-0000
@@ -0,0 +1,22 @@
+$OpenBSD$
+
+Patch from upstream: stdin <-> stdout fix (upstream r12115)
+
+--- src/build/omake_rule.ml.orig Mon Jul 2 20:20:23 2007
++++ src/build/omake_rule.ml Wed Nov 10 15:29:58 2010
+@@ -1040,12 +1040,12 @@ and eval_include_rule venv pos loc sources deps values
+ * Evaluate the commands NOW.
+ *)
+ and exec_commands venv pos loc commands =
+- let stdin = channel_of_var venv pos loc stdin_var in
+ let stdout = channel_of_var venv pos loc stdout_var in
+- let stdin = Lm_channel.descr stdin in
++ let stderr = channel_of_var venv pos loc stderr_var in
+ let stdout = Lm_channel.descr stdout in
++ let stderr = Lm_channel.descr stderr in
+ List.iter (fun command ->
+- let pid = eval_shell_internal stdin stdout command in
++ let pid = eval_shell_internal stdout stderr command in
+ let status, _ = eval_shell_wait venv pos pid in
+ let code =
+ match status with
Index: devel/omake/patches/patch-src_libmojave-external_cutil_lm_printf_c
===================================================================
RCS file: devel/omake/patches/patch-src_libmojave-external_cutil_lm_printf_c
diff -N devel/omake/patches/patch-src_libmojave-external_cutil_lm_printf_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/omake/patches/patch-src_libmojave-external_cutil_lm_printf_c 10 Nov
2010 17:01:35 -0000
@@ -0,0 +1,36 @@
+$OpenBSD$
+
+Patch from upstream: fix attempt to free a non-heap object
+
+--- src/libmojave-external/cutil/lm_printf.c.orig Sun Jul 15 19:55:23 2007
++++ src/libmojave-external/cutil/lm_printf.c Wed Nov 10 15:30:18 2010
+@@ -142,12 +142,12 @@ value ml_print_string(value v_fmt, value v_string)
+ #endif
+ if(code < 0) {
+ if(bufp != buffer)
+- free(buffer);
++ free(bufp);
+ failwith("ml_print_string");
+ }
+ v_result = copy_string(bufp);
+ if(bufp != buffer)
+- free(buffer);
++ free(bufp);
+ return v_result;
+ }
+
+@@ -190,12 +190,12 @@ value ml_print_string2(value v_width, value v_fmt, val
+ #endif
+ if(code < 0) {
+ if(bufp != buffer)
+- free(buffer);
++ free(bufp);
+ failwith("ml_print_string");
+ }
+ v_result = copy_string(bufp);
+ if(bufp != buffer)
+- free(buffer);
++ free(bufp);
+ return v_result;
+ }
+
Index: net/unison/stable/Makefile
===================================================================
RCS file: /cvs/ports/net/unison/stable/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- net/unison/stable/Makefile 11 Oct 2010 08:16:52 -0000 1.14
+++ net/unison/stable/Makefile 10 Nov 2010 17:02:41 -0000
@@ -3,7 +3,7 @@
COMMENT= multi-platform file synchronization tool
V= 2.32.52
-REVISION= 3
+REVISION= 4
MASTER_SITES= ${HOMEPAGE}download/releases/stable/
Index: net/unison/stable/patches/patch-update_mli
===================================================================
RCS file: net/unison/stable/patches/patch-update_mli
diff -N net/unison/stable/patches/patch-update_mli
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ net/unison/stable/patches/patch-update_mli 10 Nov 2010 17:02:41 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Make Unison compile with Ocaml 3.12
+
+--- update.mli.orig Wed Nov 10 15:06:41 2010
++++ update.mli Wed Nov 10 15:07:12 2010
+@@ -1,7 +1,7 @@
+ (* Unison file synchronizer: src/update.mli *)
+ (* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
+
+-module NameMap : Map.S with type key = Name.t
++module NameMap : MyMap.S with type key = Name.t
+
+ type archive =
+ ArchiveDir of Props.t * archive NameMap.t
