From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jul 31 20:40:22 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C8A8016A4E0 for ; Mon, 31 Jul 2006 20:40:22 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 56E9243D49 for ; Mon, 31 Jul 2006 20:40:21 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k6VKeLhS007990 for ; Mon, 31 Jul 2006 20:40:21 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k6VKeL6V007989; Mon, 31 Jul 2006 20:40:21 GMT (envelope-from gnats) Resent-Date: Mon, 31 Jul 2006 20:40:21 GMT Resent-Message-Id: <200607312040.k6VKeL6V007989@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Stanislav Sedov Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7B6B616A510 for ; Mon, 31 Jul 2006 20:32:23 +0000 (UTC) (envelope-from ssedov@mbsd.msk.ru) Received: from com1.ht-systems.ru (com1.ht-systems.ru [83.97.104.204]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6E2DA43D46 for ; Mon, 31 Jul 2006 20:32:21 +0000 (GMT) (envelope-from ssedov@mbsd.msk.ru) Received: from [217.118.83.1] (helo=fonon.realnet) by com1.ht-systems.ru with esmtpa (Exim 4.62) (envelope-from ) id 1G7eYY-0004Vj-SI for FreeBSD-gnats-submit@freebsd.org; Tue, 01 Aug 2006 00:40:22 +0400 Received: by fonon.realnet (Postfix, from userid 1001) id 775B811F64; Tue, 1 Aug 2006 00:31:46 +0400 (MSD) Message-Id: <20060731203146.775B811F64@fonon.realnet> Date: Tue, 1 Aug 2006 00:31:46 +0400 (MSD) From: Stanislav Sedov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/101122: [PATCH] lang/ocaml: add support for threaded tk, lot of fixes, take maintainership X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2006 20:40:23 -0000 >Number: 101122 >Category: ports >Synopsis: [PATCH] lang/ocaml: add support for threaded tk, lot of fixes, take maintainership >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Jul 31 20:40:20 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Stanislav Sedov >Release: FreeBSD 7.0-CURRENT i386 >Organization: MBSD labs, Inc. >Environment: System: FreeBSD fonon.realnet 7.0-CURRENT FreeBSD 7.0-CURRENT #7: Sun Jun 18 20:51:36 MSD 2006 >Description: - Add support for threaded Tk by passing PTHREAD_LIBS to configure in -tklibs swith. This allows build with threaded Tk (otherwise configure fails to use Tk). Also depend on threaded Tk by default in case of THREADS support - with non-pthread tk library it will not be stable enough - Add OPTIONS - Enable builds of non-threaded targets - Depend on X in case if X is installed, since configure does this by default. - Rename patchfiles to make portlint happy - Eliminate the number of reinplace patterns (remove duplicates, optimize) - Move manpage list in the separate files - Pass pthread flags to compiler (PTHREAD_CFLAGS/LIBS safety) - Remove some ugly hacks on setting permissions etc (eliminated by setting correct permission in COPY_TREE macros) - Eliminate duplicate entries in PLIST in case of unstalling optimized binaries, also optimize this part - Remove unused PLIST_SUB variable - Miscelanios cleanups in Makefile - Take maintainership The following files was added: - files/man1 - files/manlinks - files/mann - files/patch-camlp4-man_Makefile - files/patch-camlp4_lib_Makefile - files/patch-ocamldoc_Makefile - files/patch-stdlib_Makefile I removed the following files: - files/patch-camlp4-man::Makefile - files/patch-camlp4::lib::Makefile - files/patch-ocamldoc::Makefile - files/patch-stdlib::Makefile >How-To-Repeat: >Fix: --- ocaml-3.09.2_1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/lang/ocaml/Makefile /var/tmp/ocaml/Makefile --- /usr/ports/lang/ocaml/Makefile Thu Jun 15 01:46:40 2006 +++ /var/tmp/ocaml/Makefile Tue Aug 1 00:18:34 2006 @@ -7,6 +7,7 @@ PORTNAME= ocaml PORTVERSION= 3.09.2 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= http://caml.inria.fr/distrib/${DISTNAME:R}/ \ ftp://ftp.inria.fr/INRIA/caml-light/${DISTNAME:R}/ \ @@ -15,152 +16,138 @@ MASTER_SITE_SUBDIR= distfiles PKGNAMESUFFIX= ${SFX} -MAINTAINER?= ports@FreeBSD.org +MAINTAINER?= ssedov@mbsd.msk.ru COMMENT?= The Objective Caml compiler and programming environment -.if defined(WITHOUT_X11) -PLIST_SUB+= X11="@comment " TK="@comment " -WITHOUT_TK= yes -SFX= -nox11 -CONFLICTS+= ocaml-[0-9]* ocaml-notk-[0-9]* +USE_BZIP2= yes +REINPLACE_ARGS= -i "" +HAS_CONFIGURE= yes +ALL_TARGET= world.opt +STRIP= + +CONFIGURE_ARGS= -prefix ${PREFIX} +OPTIONS= X11 "Build with X11 support" on \ + TK "Build LablTk library (requires X11 support)" on \ + THREADS "Build with Posix threads support" on \ + CMP_LIB "Install compiler's libraries" off \ + OPT_DEF "Use system-optimized binaries by default" off + +MODOPT= camlp4o camlp4r ocamlc ocamldep ocamldoc ocamllex ocamlopt +PATTERN= [[:space:]]*(do|then)?[[:space:]]*)(\$$\(CP\)|cp)([[:space:]] + +# XXX: exists untill it will be committed to bsd.port.mk +COPYTREE_SHARE= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \ + 2>&1) && \ + ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} $$1 && \ + ${FIND} $$1/ -type d -exec ${CHMOD} 755 {} \; && \ + ${FIND} $$1/ -type f -exec ${CHMOD} ${SHAREMODE} {} \;' -- + +.include + +MAN1!= ${CAT} ${FILESDIR}/man1 +MANN!= ${CAT} ${FILESDIR}/mann +MLINKS!=${CAT} ${FILESDIR}/manlinks + +.if !defined(WITHOUT_THREADS) +DEPENDS_ARGS+= WITH_THREADS=yes +CONFIGURE_ARGS+=-with-pthread +THR_CPP= ${PTHREAD_CFLAGS} +THR_LD= ${PTHREAD_LIBS} .else +THR_CPP= #empty +THR_LD= #empty +CONFIGURE_ARGS+=-no-pthread +.endif + +.if !defined(WITHOUT_X11) || exists(${X11BASE}/lib/libX11.a) PLIST_SUB+= X11="" USE_XLIB= yes +CONFIGURE_ARGS+=-x11include ${X11BASE}/include -x11lib ${X11BASE}/lib +.else +PLIST_SUB+= X11="@comment " +WITHOUT_TK= yes +SFX= -nox11 +CONFLICTS+= ocaml-[0-9]* ocaml-notk-[0-9]* +.endif + .if defined(WITHOUT_TK) PLIST_SUB+= TK="@comment " SFX= -notk CONFLICTS+= ocaml-[0-9]* ocaml-nox11-[0-9]* +CONFIGURE_ARGS+=-no-tk .else PLIST_SUB+= TK="" CONFLICTS+= ocaml-nox11-[0-9]* ocaml-notk-[0-9]* - +CONFIGURE_ARGS+=-tkdefs \ + "-I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 ${THR_CPP}"\ + -tklibs "-L${LOCALBASE}/lib ${THR_LD}" BUILD_DEPENDS+= ${LOCALBASE}/include/tcl8.4:${PORTSDIR}/lang/tcl84 \ ${LOCALBASE}/include/tk8.4:${PORTSDIR}/x11-toolkits/tk84 LIB_DEPENDS+= tk84.1:${PORTSDIR}/x11-toolkits/tk84 .endif -.endif - -USE_BZIP2= yes -REINPLACE_ARGS= -i "" -HAS_CONFIGURE= yes -ALL_TARGET= world.opt -STRIP= - -MAN1= ocamlcp.1 ocamldep.1 ocamldebug.1 ocamldoc.1 ocamlopt.1 \ - ocamlrun.1 ocamlyacc.1 ocamlmktop.1 ocaml.1 ocamlc.1 \ - ocamllex.1 ocamlprof.1 camlp4.1 -MANN= Arg.n Array.n ArrayLabels.n Bigarray.Array1.n \ - Bigarray.Array2.n Bigarray.Array3.n Bigarray.Genarray.n \ - Bigarray.n Buffer.n Callback.n CamlinternalOO.n Char.n \ - Complex.n Digest.n Filename.n Format.n Gc.n Genlex.n \ - Hashtbl.HashedType.n Hashtbl.Make.n Hashtbl.S.n Hashtbl.n \ - Int32.n Int64.n Lazy.n Lexing.n List.n ListLabels.n \ - Map.Make.n Map.OrderedType.n Map.S.n Map.n Marshal.n \ - MoreLabels.Hashtbl.HashedType.n MoreLabels.Hashtbl.Make.n \ - MoreLabels.Hashtbl.S.n MoreLabels.Hashtbl.n \ - MoreLabels.Map.Make.n MoreLabels.Map.OrderedType.n \ - MoreLabels.Map.S.n MoreLabels.Map.n MoreLabels.Set.Make.n \ - MoreLabels.Set.OrderedType.n MoreLabels.Set.S.n \ - MoreLabels.Set.n MoreLabels.n Nativeint.n Num.n Obj.n Oo.n \ - Parsing.n Pervasives.LargeFile.n Pervasives.n Printexc.n \ - Printf.n Queue.n Random.n Random.State.n Scanf.Scanning.n \ - Scanf.n Set.Make.n Set.OrderedType.n Set.S.n Set.n Sort.n \ - Stack.n StdLabels.Array.n StdLabels.List.n StdLabels.String.n \ - StdLabels.n Str.n Stream.n String.n StringLabels.n Sys.n \ - Unix.LargeFile.n Unix.n Weak.Make.n Weak.S.n Weak.n \ - CamlinternalMod.n -MLINKS= ocamlc.1 ocamlc.opt.1 ocamlopt.1 ocamlopt.opt.1 \ - camlp4.1 camlp4o.1 camlp4.1 camlp4r.1 camlp4.1 mkcamlp4.1 \ - camlp4.1 camlp4o.opt.1 camlp4.1 camlp4r.opt.1 \ - camlp4.1 ocpp.1 - -CONFIGURE_ARGS= -prefix ${PREFIX} -with-pthread - -.if !defined(WITHOUT_X11) -CONFIGURE_ARGS+= -x11include ${X11BASE}/include -x11lib ${X11BASE}/lib -.if defined(WITHOUT_TK) -CONFIGURE_ARGS+= -no-tk -.else -CONFIGURE_ARGS+= -tkdefs "-I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4" -.endif -.endif - -MODOPT= camlp4o camlp4r ocamlc ocamldep ocamldoc ocamllex ocamlopt - -.include .if ${ARCH} == sparc64 || ${ARCH} == ia64 BROKEN= ocamlc.opt seg-faults on ${ARCH}, please try to fix .endif -PLIST_SUB+= PROF="" post-configure: # CFLAGS safeness @${REINPLACE_CMD} -E \ - -e 's|(BYTECCCOMPOPTS[[:space:]]*=.*)|\1 ${CFLAGS}|' \ - -e 's|(NATIVECCCOMPOPTS[[:space:]]*=.*)|\1 ${CFLAGS}|' \ + -e 's|(BYTECCCOMPOPTS[ \t]*=.*)|\1 ${CFLAGS} ${THR_CPP}|' \ + -e 's|(NATIVECCCOMPOPTS[ \t]*=.*)|\1 ${CFLAGS} ${THR_CPP}|' \ + -e 's|(PTHREAD_LINK[ \t]*=).*|\1 ${THR_LD}|' \ -e 's|gcc|${CC}|g' \ ${WRKSRC}/config/Makefile + # INSTALL* safeness (which preserves the correct permissions despite # user's umask(1) @${FIND} ${WRKDIR} -type f -name Makefile -print0 | \ - ${XARGS} -0 -n 5 -x \ - ${REINPLACE_CMD} -E \ + ${XARGS} -0 -n 5 -x ${REINPLACE_CMD} -E \ -e 's,\$$\(ARCH\),${ARCH:sparc64=sparc},g' \ - -e 's,^([[:space:]]*(then)?[[:space:]]*)cp([[:space:]]+.*BINDIR),\1\$${BSD_INSTALL_PROGRAM} \3,' \ - -e 's,^([[:space:]]*(then)?[[:space:]]*)cp([[:space:]]+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \3,' \ - -e 's,^([[:space:]]*(then)?[[:space:]]*)cp([[:space:]]+.*INSTALLDIR),\1\$${BSD_INSTALL_DATA} \3,' \ - -e 's,^([[:space:]]*(then)?[[:space:]]*)\$$\(CP\)([[:space:]]+.*BINDIR),\1\$${BSD_INSTALL_PROGRAM} \3,' \ - -e 's,^([[:space:]]*(then)?[[:space:]]*)\$$\(CP\)([[:space:]]+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \3,' \ - -e 's,^([[:space:]]*(then)?[[:space:]]*)(\$$\(CP\)|cp)([[:space:]]+.*(MANDIR|MANODIR|MANEXT)),\1\$${BSD_INSTALL_MAN} \4,' \ - -e 's,([[:space:]]*then[[:space:]]*)cp([[:space:]]+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \2,' \ - -e 's,([[:space:]]*then[[:space:]]*)cp([[:space:]]+.*BINDIR),\1\$${BSD_INSTALL_PROGRAM} \2,' \ - -e 's,([[:space:]]*(do|then)[[:space:]]*)(\$$\(CP\)|cp)([[:space:]]+.*(MANDIR|MANODIR|MANEXT)),\1\$${BSD_INSTALL_MAN} \4,' + -e 's,^(${PATTERN}+.*INSTALLDIR),\1\$${BSD_INSTALL_DATA} \4,' \ + -e 's,^(${PATTERN}+.*BINDIR),\1\$${BSD_INSTALL_PROGRAM} \4,' \ + -e 's,^(${PATTERN}+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \4,' \ + -e 's,(${PATTERN}+.*(MANDIR|MANODIR|MANEXT)),\1\$${BSD_INSTALL_MAN} \4,' post-install: @${TOUCH} ${PREFIX}/lib/ocaml/ocamldoc/custom/.keep .if !defined(WITHOUT_TK) @${MKDIR} ${EXAMPLESDIR} - @${MKDIR} ${EXAMPLESDIR}/labltk - @${MKDIR} ${EXAMPLESDIR}/camltk - @${MKDIR} ${EXAMPLESDIR}/camltk/images - @cd ${WRKSRC}/otherlibs/labltk/examples_labltk; \ - ${INSTALL_DATA} * ${EXAMPLESDIR}/labltk - @${CP} -r ${WRKSRC}/otherlibs/labltk/examples_camltk/* \ - ${EXAMPLESDIR}/camltk + @(cd ${WRKSRC}/otherlibs/labltk && \ + ${COPYTREE_SHARE} examples_labltk ${EXAMPLESDIR} \ + "! -name .cvsignore" && \ + ${COPYTREE_SHARE} examples_camltk ${EXAMPLESDIR} \ + "! -name .cvsignore") .endif + .for prog in camlp4o.opt camlp4r.opt ocamlc.opt ocamldep.opt ocamldoc.opt \ ocamllex.opt ocamlopt.opt ocamlrun ocamlyacc @${STRIP_CMD} ${PREFIX}/bin/${prog} .endfor -# XXX ugly hack to fix permissions. - @${FIND} ${EXAMPLESDIR} -type f -print0 | \ - ${XARGS} -0 -n 5 -x \ - ${CHMOD} ${SHAREMODE} - @${CHMOD} u+w ${PREFIX}/lib/ocaml/ld.conf + +# Fix permissions for ld.conf + @${CHMOD} 644 ${PREFIX}/lib/ocaml/ld.conf + # Do we want .opt version of tools to be the default ? -.if defined(WITH_OPT_DEFAULT) +.if defined(WITH_OPT_DEF) . for module in ${MODOPT} -# First, we save bytecode version +# First, we save bytecode version @${MV} ${PREFIX}/bin/${module} ${PREFIX}/bin/${module}.byte -# Next make .opt version be the default one (as link) + +# Next make .opt version be the default one (via link) @${LN} ${PREFIX}/bin/${module}.opt ${PREFIX}/bin/${module} - @${ECHO_CMD} "bin/${module}.opt" >> ${TMPPLIST} - @${ECHO_CMD} "@exec ln %D/%F %B/${module}" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec rm %B/${module}" >> ${TMPPLIST} + @${ECHO_CMD} "bin/${module}.byte" >> ${TMPPLIST} + @${ECHO_CMD} "@exec ${LN} %D/${module}.opt %D/${module}" >> ${TMPPLIST} . endfor -# Add files to the PLIST - @${FIND} ${PREFIX}/bin/ -type f -name \?caml\*.byte -or -name camlp4\?.byte \ - | ${SED} "s,^${PREFIX}/,," >> ${TMPPLIST} -.else -. for module in ${MODOPT} - @${ECHO_CMD} ${module:S|^|bin/|} >> ${TMPPLIST} -. endfor - @${FIND} ${PREFIX}/bin/ -type f -name \?caml\*.opt -or -name camlp4\?.opt \ - | ${SED} "s,^${PREFIX}/,," >> ${TMPPLIST} .endif + +.for module in ${MODOPT} + @${ECHO_CMD} "${module:S|^|bin/|}" >> ${TMPPLIST} + @${ECHO_CMD} "${module:S|^|bin/|}.opt" >> ${TMPPLIST} +.endfor + # Add compiler's libs if required -.if !defined(WITHOUT_COMPILER_LIB) +.if defined(WITH_CMP_LIB) @${MKDIR} ${PREFIX}/lib/ocaml/compiler-lib @${INSTALL_DATA} ${WRKSRC}/utils/*.cm* ${PREFIX}/lib/ocaml/compiler-lib @${INSTALL_DATA} ${WRKSRC}/utils/*.o ${PREFIX}/lib/ocaml/compiler-lib diff -ruN --exclude=CVS /usr/ports/lang/ocaml/files/man1 /var/tmp/ocaml/files/man1 --- /usr/ports/lang/ocaml/files/man1 Thu Jan 1 03:00:00 1970 +++ /var/tmp/ocaml/files/man1 Mon Jul 31 23:25:31 2006 @@ -0,0 +1,13 @@ +ocamlcp.1 +ocamldep.1 +ocamldebug.1 +ocamldoc.1 +ocamlopt.1 +ocamlrun.1 +ocamlyacc.1 +ocamlmktop.1 +ocaml.1 +ocamlc.1 +ocamllex.1 +ocamlprof.1 +camlp4.1 diff -ruN --exclude=CVS /usr/ports/lang/ocaml/files/manlinks /var/tmp/ocaml/files/manlinks --- /usr/ports/lang/ocaml/files/manlinks Thu Jan 1 03:00:00 1970 +++ /var/tmp/ocaml/files/manlinks Mon Jul 31 23:31:01 2006 @@ -0,0 +1,16 @@ +ocamlc.1 +ocamlc.opt.1 +ocamlopt.1 +ocamlopt.opt.1 +camlp4.1 +camlp4o.1 +camlp4.1 +camlp4r.1 +camlp4.1 +mkcamlp4.1 +camlp4.1 +camlp4o.opt.1 +camlp4.1 +camlp4r.opt.1 +camlp4.1 +ocpp.1 diff -ruN --exclude=CVS /usr/ports/lang/ocaml/files/mann /var/tmp/ocaml/files/mann --- /usr/ports/lang/ocaml/files/mann Thu Jan 1 03:00:00 1970 +++ /var/tmp/ocaml/files/mann Mon Jul 31 23:30:09 2006 @@ -0,0 +1,81 @@ +Arg.n +Array.n +ArrayLabels.n +Bigarray.Array1.n +Bigarray.Array2.n +Bigarray.Array3.n +Bigarray.Genarray.n +Bigarray.n +Buffer.n +Callback.n +CamlinternalOO.n +Char.n +Complex.n +Digest.n +Filename.n +Format.n +Gc.n +Genlex.n +Hashtbl.HashedType.n +Hashtbl.Make.n +Hashtbl.S.n +Hashtbl.n +Int32.n +Int64.n +Lazy.n +Lexing.n +List.n +ListLabels.n +Map.Make.n +Map.OrderedType.n +Map.S.n +Map.n +Marshal.n +MoreLabels.Hashtbl.HashedType.n +MoreLabels.Hashtbl.Make.n +MoreLabels.Hashtbl.S.n +MoreLabels.Hashtbl.n +MoreLabels.Map.Make.n +MoreLabels.Map.OrderedType.n +MoreLabels.Map.S.n +MoreLabels.Map.n +MoreLabels.Set.Make.n +MoreLabels.Set.OrderedType.n +MoreLabels.Set.S.n +MoreLabels.Set.n +MoreLabels.n +Nativeint.n +Num.n +Obj.n +Oo.n +Parsing.n +Pervasives.LargeFile.n +Pervasives.n +Printexc.n +Printf.n +Queue.n +Random.n +Random.State.n +Scanf.Scanning.n +Scanf.n +Set.Make.n +Set.OrderedType.n +Set.S.n +Set.n +Sort.n +Stack.n +StdLabels.Array.n +StdLabels.List.n +StdLabels.String.n +StdLabels.n +Str.n +Stream.n +String.n +StringLabels.n +Sys.n +Unix.LargeFile.n +Unix.n +Weak.Make.n +Weak.S.n +Weak.n +CamlinternalMod.n diff -ruN --exclude=CVS /usr/ports/lang/ocaml/files/patch-camlp4-man::Makefile /var/tmp/ocaml/files/patch-camlp4-man::Makefile --- /usr/ports/lang/ocaml/files/patch-camlp4-man::Makefile Thu Jun 15 01:46:40 2006 +++ /var/tmp/ocaml/files/patch-camlp4-man::Makefile Thu Jan 1 03:00:00 1970 @@ -1,21 +0,0 @@ ---- ./camlp4/man/Makefile.orig Thu Jul 3 20:14:49 2003 -+++ ./camlp4/man/Makefile Sun May 21 14:02:41 2006 -@@ -3,7 +3,6 @@ - include ../config/Makefile - - TARGET=camlp4.1 --ALIASES=camlp4o.1 camlp4r.1 mkcamlp4.1 ocpp.1 camlp4o.opt.1 camlp4r.opt.1 - - all: $(TARGET) - -@@ -18,10 +17,6 @@ - if test -n '$(MANDIR)'; then \ - $(MKDIR) $(MANDIR)/man1 ; \ - cp $(TARGET) $(MANDIR)/man1/. ; \ -- for i in $(ALIASES); do \ -- rm -f $(MANDIR)/man1/$$i; \ -- echo '.so man1/$(TARGET)' > $(MANDIR)/man1/$$i; \ -- done; \ - fi - - camlp4.1: camlp4.1.tpl diff -ruN --exclude=CVS /usr/ports/lang/ocaml/files/patch-camlp4-man_Makefile /var/tmp/ocaml/files/patch-camlp4-man_Makefile --- /usr/ports/lang/ocaml/files/patch-camlp4-man_Makefile Thu Jan 1 03:00:00 1970 +++ /var/tmp/ocaml/files/patch-camlp4-man_Makefile Mon Jul 31 21:24:27 2006 @@ -0,0 +1,21 @@ +--- ./camlp4/man/Makefile.orig Thu Jul 3 20:14:49 2003 ++++ ./camlp4/man/Makefile Sun May 21 14:02:41 2006 +@@ -3,7 +3,6 @@ + include ../config/Makefile + + TARGET=camlp4.1 +-ALIASES=camlp4o.1 camlp4r.1 mkcamlp4.1 ocpp.1 camlp4o.opt.1 camlp4r.opt.1 + + all: $(TARGET) + +@@ -18,10 +17,6 @@ + if test -n '$(MANDIR)'; then \ + $(MKDIR) $(MANDIR)/man1 ; \ + cp $(TARGET) $(MANDIR)/man1/. ; \ +- for i in $(ALIASES); do \ +- rm -f $(MANDIR)/man1/$$i; \ +- echo '.so man1/$(TARGET)' > $(MANDIR)/man1/$$i; \ +- done; \ + fi + + camlp4.1: camlp4.1.tpl diff -ruN --exclude=CVS /usr/ports/lang/ocaml/files/patch-camlp4::lib::Makefile /var/tmp/ocaml/files/patch-camlp4::lib::Makefile --- /usr/ports/lang/ocaml/files/patch-camlp4::lib::Makefile Thu Jun 15 01:46:40 2006 +++ /var/tmp/ocaml/files/patch-camlp4::lib::Makefile Thu Jan 1 03:00:00 1970 @@ -1,12 +0,0 @@ ---- ./camlp4/lib/Makefile.orig Tue Nov 30 21:57:03 2004 -+++ ./camlp4/lib/Makefile Sun May 21 14:02:41 2006 -@@ -51,7 +51,8 @@ - - installopt: - for f in $(TARGET:.cma=.cmxa) $(TARGET:.cma=.p.cmxa) *.cmx ; do \ -- test -f $$f && cp $$f "$(LIBDIR)/camlp4/." || true ; \ -+ test -f $$f && \ -+ cp $$f "$(LIBDIR)/camlp4/." || true ; \ - done - # Special treatment for this one: some versions of make don't like $(A) in $(TARGET:.cma=.$(A)) - target="`echo $(TARGET) | sed -e 's/\.cma$$/.$(A)/'`" ; \ diff -ruN --exclude=CVS /usr/ports/lang/ocaml/files/patch-camlp4_lib_Makefile /var/tmp/ocaml/files/patch-camlp4_lib_Makefile --- /usr/ports/lang/ocaml/files/patch-camlp4_lib_Makefile Thu Jan 1 03:00:00 1970 +++ /var/tmp/ocaml/files/patch-camlp4_lib_Makefile Mon Jul 31 21:24:27 2006 @@ -0,0 +1,12 @@ +--- ./camlp4/lib/Makefile.orig Tue Nov 30 21:57:03 2004 ++++ ./camlp4/lib/Makefile Sun May 21 14:02:41 2006 +@@ -51,7 +51,8 @@ + + installopt: + for f in $(TARGET:.cma=.cmxa) $(TARGET:.cma=.p.cmxa) *.cmx ; do \ +- test -f $$f && cp $$f "$(LIBDIR)/camlp4/." || true ; \ ++ test -f $$f && \ ++ cp $$f "$(LIBDIR)/camlp4/." || true ; \ + done + # Special treatment for this one: some versions of make don't like $(A) in $(TARGET:.cma=.$(A)) + target="`echo $(TARGET) | sed -e 's/\.cma$$/.$(A)/'`" ; \ diff -ruN --exclude=CVS /usr/ports/lang/ocaml/files/patch-ocamldoc::Makefile /var/tmp/ocaml/files/patch-ocamldoc::Makefile --- /usr/ports/lang/ocaml/files/patch-ocamldoc::Makefile Thu Jun 15 01:46:40 2006 +++ /var/tmp/ocaml/files/patch-ocamldoc::Makefile Thu Jan 1 03:00:00 1970 @@ -1,22 +0,0 @@ ---- ./ocamldoc/Makefile.orig Thu Nov 10 17:44:36 2005 -+++ ./ocamldoc/Makefile Sun May 21 14:02:41 2006 -@@ -40,7 +40,7 @@ - INSTALL_LIBDIR=$(OCAMLLIB)/ocamldoc - INSTALL_CUSTOMDIR=$(INSTALL_LIBDIR)/custom - INSTALL_BINDIR=$(OCAMLBIN) --INSTALL_MANODIR=$(MANDIR)/man3 -+INSTALL_MANODIR=$(MANDIR)/mann - - INSTALL_MLIS=odoc_info.mli - INSTALL_CMIS=$(INSTALL_MLIS:.mli=.cmi) -@@ -261,7 +261,9 @@ - $(CP) ocamldoc.hva *.cmi $(OCAMLDOC_LIBCMA) $(INSTALL_LIBDIR) - $(CP) $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR) - if test -d $(INSTALL_MANODIR); then : ; else $(MKDIR) $(INSTALL_MANODIR); fi -- $(CP) stdlib_man/* $(INSTALL_MANODIR) -+ for f in stdlib_man/*; do \ -+ $(CP) $$f $(INSTALL_MANODIR)/`basename $$f .3o`.n; \ -+ done - - installopt: - if test -f $(OCAMLDOC_OPT) ; then $(MAKE) installopt_really ; fi diff -ruN --exclude=CVS /usr/ports/lang/ocaml/files/patch-ocamldoc_Makefile /var/tmp/ocaml/files/patch-ocamldoc_Makefile --- /usr/ports/lang/ocaml/files/patch-ocamldoc_Makefile Thu Jan 1 03:00:00 1970 +++ /var/tmp/ocaml/files/patch-ocamldoc_Makefile Mon Jul 31 21:24:27 2006 @@ -0,0 +1,22 @@ +--- ./ocamldoc/Makefile.orig Thu Nov 10 17:44:36 2005 ++++ ./ocamldoc/Makefile Sun May 21 14:02:41 2006 +@@ -40,7 +40,7 @@ + INSTALL_LIBDIR=$(OCAMLLIB)/ocamldoc + INSTALL_CUSTOMDIR=$(INSTALL_LIBDIR)/custom + INSTALL_BINDIR=$(OCAMLBIN) +-INSTALL_MANODIR=$(MANDIR)/man3 ++INSTALL_MANODIR=$(MANDIR)/mann + + INSTALL_MLIS=odoc_info.mli + INSTALL_CMIS=$(INSTALL_MLIS:.mli=.cmi) +@@ -261,7 +261,9 @@ + $(CP) ocamldoc.hva *.cmi $(OCAMLDOC_LIBCMA) $(INSTALL_LIBDIR) + $(CP) $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR) + if test -d $(INSTALL_MANODIR); then : ; else $(MKDIR) $(INSTALL_MANODIR); fi +- $(CP) stdlib_man/* $(INSTALL_MANODIR) ++ for f in stdlib_man/*; do \ ++ $(CP) $$f $(INSTALL_MANODIR)/`basename $$f .3o`.n; \ ++ done + + installopt: + if test -f $(OCAMLDOC_OPT) ; then $(MAKE) installopt_really ; fi diff -ruN --exclude=CVS /usr/ports/lang/ocaml/files/patch-stdlib::Makefile /var/tmp/ocaml/files/patch-stdlib::Makefile --- /usr/ports/lang/ocaml/files/patch-stdlib::Makefile Thu Jun 15 01:46:40 2006 +++ /var/tmp/ocaml/files/patch-stdlib::Makefile Thu Jan 1 03:00:00 1970 @@ -1,12 +0,0 @@ ---- ./stdlib/Makefile.orig Mon Nov 29 17:53:30 2004 -+++ ./stdlib/Makefile Sun May 21 14:02:41 2006 -@@ -48,8 +48,7 @@ - rm -f std_exit.p.cmi - - install: -- cp stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur \ -- $(LIBDIR) -+ cp stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur $(LIBDIR) - - installopt: installopt-default installopt-$(PROFILING) - diff -ruN --exclude=CVS /usr/ports/lang/ocaml/files/patch-stdlib_Makefile /var/tmp/ocaml/files/patch-stdlib_Makefile --- /usr/ports/lang/ocaml/files/patch-stdlib_Makefile Thu Jan 1 03:00:00 1970 +++ /var/tmp/ocaml/files/patch-stdlib_Makefile Mon Jul 31 21:24:27 2006 @@ -0,0 +1,12 @@ +--- ./stdlib/Makefile.orig Mon Nov 29 17:53:30 2004 ++++ ./stdlib/Makefile Sun May 21 14:02:41 2006 +@@ -48,8 +48,7 @@ + rm -f std_exit.p.cmi + + install: +- cp stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur \ +- $(LIBDIR) ++ cp stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur $(LIBDIR) + + installopt: installopt-default installopt-$(PROFILING) + diff -ruN --exclude=CVS /usr/ports/lang/ocaml/pkg-plist /var/tmp/ocaml/pkg-plist --- /usr/ports/lang/ocaml/pkg-plist Thu Dec 1 18:46:34 2005 +++ /var/tmp/ocaml/pkg-plist Mon Jul 31 23:46:03 2006 @@ -17,7 +17,7 @@ lib/ocaml/arg.cmx lib/ocaml/arg.ml lib/ocaml/arg.mli -%%PROF%%lib/ocaml/arg.p.cmx +lib/ocaml/arg.p.cmx lib/ocaml/arith_flags.cmx lib/ocaml/arith_status.cmi lib/ocaml/arith_status.cmx @@ -26,12 +26,12 @@ lib/ocaml/array.cmx lib/ocaml/array.ml lib/ocaml/array.mli -%%PROF%%lib/ocaml/array.p.cmx +lib/ocaml/array.p.cmx lib/ocaml/arrayLabels.cmi lib/ocaml/arrayLabels.cmx lib/ocaml/arrayLabels.ml lib/ocaml/arrayLabels.mli -%%PROF%%lib/ocaml/arrayLabels.p.cmx +lib/ocaml/arrayLabels.p.cmx lib/ocaml/big_int.cmi lib/ocaml/big_int.cmx lib/ocaml/big_int.mli @@ -45,12 +45,12 @@ lib/ocaml/buffer.cmx lib/ocaml/buffer.ml lib/ocaml/buffer.mli -%%PROF%%lib/ocaml/buffer.p.cmx +lib/ocaml/buffer.p.cmx lib/ocaml/callback.cmi lib/ocaml/callback.cmx lib/ocaml/callback.ml lib/ocaml/callback.mli -%%PROF%%lib/ocaml/callback.p.cmx +lib/ocaml/callback.p.cmx lib/ocaml/caml/alloc.h lib/ocaml/caml/bigarray.h lib/ocaml/caml/callback.h @@ -75,7 +75,7 @@ lib/ocaml/camlinternalOO.cmx lib/ocaml/camlinternalOO.ml lib/ocaml/camlinternalOO.mli -%%PROF%%lib/ocaml/camlinternalOO.p.cmx +lib/ocaml/camlinternalOO.p.cmx lib/ocaml/camlp4/argl.cmi lib/ocaml/camlp4/argl.cmo lib/ocaml/camlp4/argl.cmx @@ -212,12 +212,12 @@ lib/ocaml/char.cmx lib/ocaml/char.ml lib/ocaml/char.mli -%%PROF%%lib/ocaml/char.p.cmx +lib/ocaml/char.p.cmx lib/ocaml/complex.cmi lib/ocaml/complex.cmx lib/ocaml/complex.ml lib/ocaml/complex.mli -%%PROF%%lib/ocaml/complex.p.cmx +lib/ocaml/complex.p.cmx lib/ocaml/condition.mli lib/ocaml/dbm.a lib/ocaml/dbm.cma @@ -229,7 +229,7 @@ lib/ocaml/digest.cmx lib/ocaml/digest.ml lib/ocaml/digest.mli -%%PROF%%lib/ocaml/digest.p.cmx +lib/ocaml/digest.p.cmx lib/ocaml/dynlink.cma lib/ocaml/dynlink.cmi lib/ocaml/dynlink.mli @@ -240,22 +240,22 @@ lib/ocaml/filename.cmx lib/ocaml/filename.ml lib/ocaml/filename.mli -%%PROF%%lib/ocaml/filename.p.cmx +lib/ocaml/filename.p.cmx lib/ocaml/format.cmi lib/ocaml/format.cmx lib/ocaml/format.ml lib/ocaml/format.mli -%%PROF%%lib/ocaml/format.p.cmx +lib/ocaml/format.p.cmx lib/ocaml/gc.cmi lib/ocaml/gc.cmx lib/ocaml/gc.ml lib/ocaml/gc.mli -%%PROF%%lib/ocaml/gc.p.cmx +lib/ocaml/gc.p.cmx lib/ocaml/genlex.cmi lib/ocaml/genlex.cmx lib/ocaml/genlex.ml lib/ocaml/genlex.mli -%%PROF%%lib/ocaml/genlex.p.cmx +lib/ocaml/genlex.p.cmx %%X11%%lib/ocaml/graphics.a %%X11%%lib/ocaml/graphics.cma %%X11%%lib/ocaml/graphics.cmi @@ -268,17 +268,17 @@ lib/ocaml/hashtbl.cmx lib/ocaml/hashtbl.ml lib/ocaml/hashtbl.mli -%%PROF%%lib/ocaml/hashtbl.p.cmx +lib/ocaml/hashtbl.p.cmx lib/ocaml/int32.cmi lib/ocaml/int32.cmx lib/ocaml/int32.ml lib/ocaml/int32.mli -%%PROF%%lib/ocaml/int32.p.cmx +lib/ocaml/int32.p.cmx lib/ocaml/int64.cmi lib/ocaml/int64.cmx lib/ocaml/int64.ml lib/ocaml/int64.mli -%%PROF%%lib/ocaml/int64.p.cmx +lib/ocaml/int64.p.cmx lib/ocaml/int_misc.cmx %%TK%%lib/ocaml/labltk/balloon.cmi %%TK%%lib/ocaml/labltk/balloon.cmx @@ -608,13 +608,13 @@ lib/ocaml/lazy.cmx lib/ocaml/lazy.ml lib/ocaml/lazy.mli -%%PROF%%lib/ocaml/lazy.p.cmx +lib/ocaml/lazy.p.cmx lib/ocaml/ld.conf lib/ocaml/lexing.cmi lib/ocaml/lexing.cmx lib/ocaml/lexing.ml lib/ocaml/lexing.mli -%%PROF%%lib/ocaml/lexing.p.cmx +lib/ocaml/lexing.p.cmx lib/ocaml/libasmrun.a lib/ocaml/libasmrunp.a lib/ocaml/libbigarray.a @@ -630,27 +630,27 @@ lib/ocaml/list.cmx lib/ocaml/list.ml lib/ocaml/list.mli -%%PROF%%lib/ocaml/list.p.cmx +lib/ocaml/list.p.cmx lib/ocaml/listLabels.cmi lib/ocaml/listLabels.cmx lib/ocaml/listLabels.ml lib/ocaml/listLabels.mli -%%PROF%%lib/ocaml/listLabels.p.cmx +lib/ocaml/listLabels.p.cmx lib/ocaml/map.cmi lib/ocaml/map.cmx lib/ocaml/map.ml lib/ocaml/map.mli -%%PROF%%lib/ocaml/map.p.cmx +lib/ocaml/map.p.cmx lib/ocaml/marshal.cmi lib/ocaml/marshal.cmx lib/ocaml/marshal.ml lib/ocaml/marshal.mli -%%PROF%%lib/ocaml/marshal.p.cmx +lib/ocaml/marshal.p.cmx lib/ocaml/moreLabels.cmi lib/ocaml/moreLabels.cmx lib/ocaml/moreLabels.ml lib/ocaml/moreLabels.mli -%%PROF%%lib/ocaml/moreLabels.p.cmx +lib/ocaml/moreLabels.p.cmx lib/ocaml/mutex.mli lib/ocaml/nat.cmi lib/ocaml/nat.cmx @@ -659,7 +659,7 @@ lib/ocaml/nativeint.cmx lib/ocaml/nativeint.ml lib/ocaml/nativeint.mli -%%PROF%%lib/ocaml/nativeint.p.cmx +lib/ocaml/nativeint.p.cmx lib/ocaml/num.cmi lib/ocaml/num.cmx lib/ocaml/num.mli @@ -670,7 +670,7 @@ lib/ocaml/obj.cmx lib/ocaml/obj.ml lib/ocaml/obj.mli -%%PROF%%lib/ocaml/obj.p.cmx +lib/ocaml/obj.p.cmx lib/ocaml/ocamldoc/custom/.keep lib/ocaml/ocamldoc/ocamldoc.hva lib/ocaml/ocamldoc/odoc.cmi @@ -728,41 +728,41 @@ lib/ocaml/oo.cmx lib/ocaml/oo.ml lib/ocaml/oo.mli -%%PROF%%lib/ocaml/oo.p.cmx +lib/ocaml/oo.p.cmx lib/ocaml/outcometree.cmi lib/ocaml/outcometree.mli lib/ocaml/parsing.cmi lib/ocaml/parsing.cmx lib/ocaml/parsing.ml lib/ocaml/parsing.mli -%%PROF%%lib/ocaml/parsing.p.cmx +lib/ocaml/parsing.p.cmx lib/ocaml/pervasives.cmi lib/ocaml/pervasives.cmx lib/ocaml/pervasives.ml lib/ocaml/pervasives.mli -%%PROF%%lib/ocaml/pervasives.p.cmx +lib/ocaml/pervasives.p.cmx lib/ocaml/printexc.cmi lib/ocaml/printexc.cmx lib/ocaml/printexc.ml lib/ocaml/printexc.mli -%%PROF%%lib/ocaml/printexc.p.cmx +lib/ocaml/printexc.p.cmx lib/ocaml/printf.cmi lib/ocaml/printf.cmx lib/ocaml/printf.ml lib/ocaml/printf.mli -%%PROF%%lib/ocaml/printf.p.cmx +lib/ocaml/printf.p.cmx lib/ocaml/profiling.cmi lib/ocaml/profiling.cmo lib/ocaml/queue.cmi lib/ocaml/queue.cmx lib/ocaml/queue.ml lib/ocaml/queue.mli -%%PROF%%lib/ocaml/queue.p.cmx +lib/ocaml/queue.p.cmx lib/ocaml/random.cmi lib/ocaml/random.cmx lib/ocaml/random.ml lib/ocaml/random.mli -%%PROF%%lib/ocaml/random.p.cmx +lib/ocaml/random.p.cmx lib/ocaml/ratio.cmi lib/ocaml/ratio.cmx lib/ocaml/ratio.mli @@ -770,40 +770,40 @@ lib/ocaml/scanf.cmx lib/ocaml/scanf.ml lib/ocaml/scanf.mli -%%PROF%%lib/ocaml/scanf.p.cmx +lib/ocaml/scanf.p.cmx lib/ocaml/scrapelabels lib/ocaml/set.cmi lib/ocaml/set.cmx lib/ocaml/set.ml lib/ocaml/set.mli -%%PROF%%lib/ocaml/set.p.cmx +lib/ocaml/set.p.cmx lib/ocaml/sort.cmi lib/ocaml/sort.cmx lib/ocaml/sort.ml lib/ocaml/sort.mli -%%PROF%%lib/ocaml/sort.p.cmx +lib/ocaml/sort.p.cmx lib/ocaml/stack.cmi lib/ocaml/stack.cmx lib/ocaml/stack.ml lib/ocaml/stack.mli -%%PROF%%lib/ocaml/stack.p.cmx +lib/ocaml/stack.p.cmx lib/ocaml/stdLabels.cmi lib/ocaml/stdLabels.cmx lib/ocaml/stdLabels.ml lib/ocaml/stdLabels.mli -%%PROF%%lib/ocaml/stdLabels.p.cmx +lib/ocaml/stdLabels.p.cmx lib/ocaml/std_exit.cmi lib/ocaml/std_exit.cmo lib/ocaml/std_exit.cmx lib/ocaml/std_exit.ml lib/ocaml/std_exit.o -%%PROF%%lib/ocaml/std_exit.p.cmx -%%PROF%%lib/ocaml/std_exit.p.o +lib/ocaml/std_exit.p.cmx +lib/ocaml/std_exit.p.o lib/ocaml/stdlib.a lib/ocaml/stdlib.cma lib/ocaml/stdlib.cmxa -%%PROF%%lib/ocaml/stdlib.p.a -%%PROF%%lib/ocaml/stdlib.p.cmxa +lib/ocaml/stdlib.p.a +lib/ocaml/stdlib.p.cmxa lib/ocaml/str.a lib/ocaml/str.cma lib/ocaml/str.cmi @@ -814,17 +814,17 @@ lib/ocaml/stream.cmx lib/ocaml/stream.ml lib/ocaml/stream.mli -%%PROF%%lib/ocaml/stream.p.cmx +lib/ocaml/stream.p.cmx lib/ocaml/string.cmi lib/ocaml/string.cmx lib/ocaml/string.ml lib/ocaml/string.mli -%%PROF%%lib/ocaml/string.p.cmx +lib/ocaml/string.p.cmx lib/ocaml/stringLabels.cmi lib/ocaml/stringLabels.cmx lib/ocaml/stringLabels.ml lib/ocaml/stringLabels.mli -%%PROF%%lib/ocaml/stringLabels.p.cmx +lib/ocaml/stringLabels.p.cmx lib/ocaml/stublibs/dllbigarray.so %%X11%%lib/ocaml/stublibs/dllgraphics.so %%TK%%lib/ocaml/stublibs/dlllabltk.so @@ -839,7 +839,7 @@ lib/ocaml/sys.cmx lib/ocaml/sys.ml lib/ocaml/sys.mli -%%PROF%%lib/ocaml/sys.p.cmx +lib/ocaml/sys.p.cmx lib/ocaml/thread.mli lib/ocaml/threadUnix.mli lib/ocaml/threads/condition.cmi @@ -887,40 +887,40 @@ lib/ocaml/weak.cmx lib/ocaml/weak.ml lib/ocaml/weak.mli -%%PROF%%lib/ocaml/weak.p.cmx -%%TK%%%%EXAMPLESDIR%%/camltk/Makefile -%%TK%%%%EXAMPLESDIR%%/camltk/Makefile.nt -%%TK%%%%EXAMPLESDIR%%/camltk/addition.ml -%%TK%%%%EXAMPLESDIR%%/camltk/eyes.ml -%%TK%%%%EXAMPLESDIR%%/camltk/fileinput.ml -%%TK%%%%EXAMPLESDIR%%/camltk/fileopen.ml -%%TK%%%%EXAMPLESDIR%%/camltk/helloworld.ml -%%TK%%%%EXAMPLESDIR%%/camltk/images/CamlBook.gif -%%TK%%%%EXAMPLESDIR%%/camltk/images/Lambda2.back.gif -%%TK%%%%EXAMPLESDIR%%/camltk/images/dojoji.back.gif -%%TK%%%%EXAMPLESDIR%%/camltk/jptest.ml -%%TK%%%%EXAMPLESDIR%%/camltk/mytext.ml -%%TK%%%%EXAMPLESDIR%%/camltk/socketinput.ml -%%TK%%%%EXAMPLESDIR%%/camltk/taddition.ml -%%TK%%%%EXAMPLESDIR%%/camltk/tetris.ml -%%TK%%%%EXAMPLESDIR%%/camltk/text.ml -%%TK%%%%EXAMPLESDIR%%/camltk/winskel.ml -%%TK%%%%EXAMPLESDIR%%/labltk/Lambda2.back.gif -%%TK%%%%EXAMPLESDIR%%/labltk/Makefile -%%TK%%%%EXAMPLESDIR%%/labltk/Makefile.nt -%%TK%%%%EXAMPLESDIR%%/labltk/README -%%TK%%%%EXAMPLESDIR%%/labltk/calc.ml -%%TK%%%%EXAMPLESDIR%%/labltk/clock.ml -%%TK%%%%EXAMPLESDIR%%/labltk/demo.ml -%%TK%%%%EXAMPLESDIR%%/labltk/eyes.ml -%%TK%%%%EXAMPLESDIR%%/labltk/hello.ml -%%TK%%%%EXAMPLESDIR%%/labltk/hello.tcl -%%TK%%%%EXAMPLESDIR%%/labltk/lang.ml -%%TK%%%%EXAMPLESDIR%%/labltk/taquin.ml -%%TK%%%%EXAMPLESDIR%%/labltk/tetris.ml -%%TK%%@dirrm %%EXAMPLESDIR%%/labltk -%%TK%%@dirrm %%EXAMPLESDIR%%/camltk/images -%%TK%%@dirrm %%EXAMPLESDIR%%/camltk +lib/ocaml/weak.p.cmx +%%TK%%%%EXAMPLESDIR%%/examples_camltk/Makefile +%%TK%%%%EXAMPLESDIR%%/examples_camltk/Makefile.nt +%%TK%%%%EXAMPLESDIR%%/examples_camltk/addition.ml +%%TK%%%%EXAMPLESDIR%%/examples_camltk/eyes.ml +%%TK%%%%EXAMPLESDIR%%/examples_camltk/fileinput.ml +%%TK%%%%EXAMPLESDIR%%/examples_camltk/fileopen.ml +%%TK%%%%EXAMPLESDIR%%/examples_camltk/helloworld.ml +%%TK%%%%EXAMPLESDIR%%/examples_camltk/images/CamlBook.gif +%%TK%%%%EXAMPLESDIR%%/examples_camltk/images/Lambda2.back.gif +%%TK%%%%EXAMPLESDIR%%/examples_camltk/images/dojoji.back.gif +%%TK%%%%EXAMPLESDIR%%/examples_camltk/jptest.ml +%%TK%%%%EXAMPLESDIR%%/examples_camltk/mytext.ml +%%TK%%%%EXAMPLESDIR%%/examples_camltk/socketinput.ml +%%TK%%%%EXAMPLESDIR%%/examples_camltk/taddition.ml +%%TK%%%%EXAMPLESDIR%%/examples_camltk/tetris.ml +%%TK%%%%EXAMPLESDIR%%/examples_camltk/text.ml +%%TK%%%%EXAMPLESDIR%%/examples_camltk/winskel.ml +%%TK%%%%EXAMPLESDIR%%/examples_labltk/Lambda2.back.gif +%%TK%%%%EXAMPLESDIR%%/examples_labltk/Makefile +%%TK%%%%EXAMPLESDIR%%/examples_labltk/Makefile.nt +%%TK%%%%EXAMPLESDIR%%/examples_labltk/README +%%TK%%%%EXAMPLESDIR%%/examples_labltk/calc.ml +%%TK%%%%EXAMPLESDIR%%/examples_labltk/clock.ml +%%TK%%%%EXAMPLESDIR%%/examples_labltk/demo.ml +%%TK%%%%EXAMPLESDIR%%/examples_labltk/eyes.ml +%%TK%%%%EXAMPLESDIR%%/examples_labltk/hello.ml +%%TK%%%%EXAMPLESDIR%%/examples_labltk/hello.tcl +%%TK%%%%EXAMPLESDIR%%/examples_labltk/lang.ml +%%TK%%%%EXAMPLESDIR%%/examples_labltk/taquin.ml +%%TK%%%%EXAMPLESDIR%%/examples_labltk/tetris.ml +%%TK%%@dirrm %%EXAMPLESDIR%%/examples_labltk +%%TK%%@dirrm %%EXAMPLESDIR%%/examples_camltk/images +%%TK%%@dirrm %%EXAMPLESDIR%%/examples_camltk %%TK%%@dirrm %%EXAMPLESDIR%% @dirrm lib/ocaml/vmthreads @dirrm lib/ocaml/threads --- ocaml-3.09.2_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: