diff options
author | jmmv <jmmv> | 2004-12-24 17:16:04 +0000 |
---|---|---|
committer | jmmv <jmmv> | 2004-12-24 17:16:04 +0000 |
commit | c0fc74cc502d504abb174c2357a5dec8e392b43b (patch) | |
tree | 02780c74fbf4b93e89ef6bc58a8842bb730f22cd /lang | |
parent | 880326896eb905dc226764947bdfd358dc6e385f (diff) | |
download | pkgsrc-c0fc74cc502d504abb174c2357a5dec8e392b43b.tar.gz |
Do not depend on Tk nor X11. Two new packages will be added to provide
the missing bits, namely labltk and ocaml-graphics, respectively. To
simplify this, add a Makefile.common. Bump PKGREVISION to 8.
Per discussion with wiz@ a while ago.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/ocaml/Makefile | 53 | ||||
-rw-r--r-- | lang/ocaml/Makefile.common | 32 | ||||
-rw-r--r-- | lang/ocaml/PLIST | 236 | ||||
-rw-r--r-- | lang/ocaml/PLIST.opt | 99 | ||||
-rw-r--r-- | lang/ocaml/PLIST.prof | 6 | ||||
-rw-r--r-- | lang/ocaml/buildlink3.mk | 6 | ||||
-rw-r--r-- | lang/ocaml/distinfo | 6 | ||||
-rw-r--r-- | lang/ocaml/patches/patch-at | 28 | ||||
-rw-r--r-- | lang/ocaml/patches/patch-ba | 21 |
9 files changed, 93 insertions, 394 deletions
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index 6cf78840265..8142c50966f 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -1,56 +1,21 @@ -# $NetBSD: Makefile,v 1.34 2004/12/10 00:48:40 uebayasi Exp $ +# $NetBSD: Makefile,v 1.35 2004/12/24 17:16:04 jmmv Exp $ -DISTNAME= ocaml-3.06 -PKGREVISION= 7 -CATEGORIES= lang -MASTER_SITES= ftp://ftp.inria.fr/INRIA/cristal/ocaml/${DISTNAME}/ +.include "Makefile.common" -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://caml.inria.fr/ocaml/ -COMMENT= The latest implementation of the Caml dialect of ML +PKGREVISION= 8 -PKG_INSTALLATION_TYPES= overwrite pkgviews - -USE_BUILDLINK3= yes -USE_GNU_TOOLS+= make -HAS_CONFIGURE= yes -CONFIGURE_ARGS+= -prefix ${PREFIX} -CONFIGURE_ARGS+= -x11include ${X11BASE}/include -CONFIGURE_ARGS+= -x11lib ${X11BASE}/lib -CONFIGURE_ARGS+= -tkdefs "-I${BUILDLINK_PREFIX.tk}/include -I${BUILDLINK_PREFIX.tcl}/include" -CONFIGURE_ARGS+= -tklibs "`${SH} -c '. ${TCLCONFIG_SH}; . ${TKCONFIG_SH}; ${ECHO} $$TK_LIBS $$TCL_LIBS'`" -CONFIGURE_ARGS+= -libs "${LDFLAGS}" -CONFIGURE_ARGS+= -with-pthread - -BUILD_TARGET= world - -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "Darwin" -INSTALL_UNSTRIPPED= yes -.endif - -post-extract: - ${CP} ${WRKSRC}/asmrun/power-elf.S ${WRKSRC}/asmrun/power-bsd.S - -post-build: - if ${TEST} ${MACHINE_ARCH} = 'i386' -o ${MACHINE_ARCH} = 'powerpc' \ - -o ${MACHINE_ARCH} = 'sparc' ; then \ - cd ${WRKSRC}; \ - ${GMAKE} opt; \ - ${GMAKE} opt.opt; \ - fi +CONFIGURE_ARGS+= -no-tk +CONFIGURE_ENV+= disable_x11=yes +BUILD_TARGET= world .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \ (${MACHINE_ARCH} == "sparc") -PLIST_SRC= ${PKGDIR}/PLIST.opt ${PKGDIR}/PLIST +BUILD_TARGET+= opt opt.opt +PLIST_SRC= ${PKGDIR}/PLIST.opt . if ${OPSYS} != "Darwin" PLIST_SRC+= ${PKGDIR}/PLIST.prof . endif -.else -PLIST_SRC= ${PKGDIR}/PLIST +PLIST_SRC+= ${PKGDIR}/PLIST .endif -.include "../../x11/tk/buildlink3.mk" -.include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/ocaml/Makefile.common b/lang/ocaml/Makefile.common new file mode 100644 index 00000000000..a8664c69d5b --- /dev/null +++ b/lang/ocaml/Makefile.common @@ -0,0 +1,32 @@ +# $NetBSD: Makefile.common,v 1.1 2004/12/24 17:16:04 jmmv Exp $ + +DISTNAME= ocaml-3.06 +CATEGORIES= lang +MASTER_SITES= ftp://ftp.inria.fr/INRIA/cristal/ocaml/${DISTNAME}/ + +MAINTAINER= tech-pkg@NetBSD.org +HOMEPAGE= http://caml.inria.fr/ocaml/ +COMMENT= The latest implementation of the Caml dialect of ML + +DISTINFO_FILE= ${.CURDIR}/../../lang/ocaml/distinfo +PATCHDIR= ${.CURDIR}/../../lang/ocaml/patches + +USE_BUILDLINK3= yes +USE_GNU_TOOLS+= make +HAS_CONFIGURE= yes +CONFIGURE_ARGS+= -prefix ${PREFIX} +CONFIGURE_ARGS+= -libs "${LDFLAGS}" +CONFIGURE_ARGS+= -with-pthread + +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "Darwin" +INSTALL_UNSTRIPPED= yes +.endif + +post-extract: cp-power-bsd + +cp-power-bsd: + ${CP} ${WRKSRC}/asmrun/power-elf.S ${WRKSRC}/asmrun/power-bsd.S + +.include "../../mk/pthread.buildlink3.mk" diff --git a/lang/ocaml/PLIST b/lang/ocaml/PLIST index 3e6da9e972a..eadd9543c43 100644 --- a/lang/ocaml/PLIST +++ b/lang/ocaml/PLIST @@ -1,11 +1,9 @@ -@comment $NetBSD: PLIST,v 1.9 2004/11/27 01:34:09 dmcmahill Exp $ +@comment $NetBSD: PLIST,v 1.10 2004/12/24 17:16:04 jmmv Exp $ bin/camlp4 bin/camlp4o bin/camlp4r -bin/labltk bin/mkcamlp4 bin/ocaml -bin/ocamlbrowser bin/ocamlc bin/ocamlcp bin/ocamldebug @@ -155,11 +153,6 @@ lib/ocaml/gc.mli lib/ocaml/genlex.cmi lib/ocaml/genlex.ml lib/ocaml/genlex.mli -lib/ocaml/graphics.cma -lib/ocaml/graphics.cmi -lib/ocaml/graphics.mli -lib/ocaml/graphicsX11.cmi -lib/ocaml/graphicsX11.mli lib/ocaml/hashtbl.cmi lib/ocaml/hashtbl.ml lib/ocaml/hashtbl.mli @@ -169,229 +162,6 @@ lib/ocaml/int32.mli lib/ocaml/int64.cmi lib/ocaml/int64.ml lib/ocaml/int64.mli -lib/ocaml/labltk/balloon.cmi -lib/ocaml/labltk/balloon.mli -lib/ocaml/labltk/bell.cmi -lib/ocaml/labltk/bell.mli -lib/ocaml/labltk/button.cmi -lib/ocaml/labltk/button.mli -lib/ocaml/labltk/cBell.cmi -lib/ocaml/labltk/cBell.mli -lib/ocaml/labltk/cButton.cmi -lib/ocaml/labltk/cButton.mli -lib/ocaml/labltk/cCanvas.cmi -lib/ocaml/labltk/cCanvas.mli -lib/ocaml/labltk/cCheckbutton.cmi -lib/ocaml/labltk/cCheckbutton.mli -lib/ocaml/labltk/cClipboard.cmi -lib/ocaml/labltk/cClipboard.mli -lib/ocaml/labltk/cDialog.cmi -lib/ocaml/labltk/cDialog.mli -lib/ocaml/labltk/cEncoding.cmi -lib/ocaml/labltk/cEncoding.mli -lib/ocaml/labltk/cEntry.cmi -lib/ocaml/labltk/cEntry.mli -lib/ocaml/labltk/cFocus.cmi -lib/ocaml/labltk/cFocus.mli -lib/ocaml/labltk/cFont.cmi -lib/ocaml/labltk/cFont.mli -lib/ocaml/labltk/cFrame.cmi -lib/ocaml/labltk/cFrame.mli -lib/ocaml/labltk/cGrab.cmi -lib/ocaml/labltk/cGrab.mli -lib/ocaml/labltk/cGrid.cmi -lib/ocaml/labltk/cGrid.mli -lib/ocaml/labltk/cImage.cmi -lib/ocaml/labltk/cImage.mli -lib/ocaml/labltk/cImagebitmap.cmi -lib/ocaml/labltk/cImagebitmap.mli -lib/ocaml/labltk/cImagephoto.cmi -lib/ocaml/labltk/cImagephoto.mli -lib/ocaml/labltk/cLabel.cmi -lib/ocaml/labltk/cLabel.mli -lib/ocaml/labltk/cListbox.cmi -lib/ocaml/labltk/cListbox.mli -lib/ocaml/labltk/cMenu.cmi -lib/ocaml/labltk/cMenu.mli -lib/ocaml/labltk/cMenubutton.cmi -lib/ocaml/labltk/cMenubutton.mli -lib/ocaml/labltk/cMessage.cmi -lib/ocaml/labltk/cMessage.mli -lib/ocaml/labltk/cOption.cmi -lib/ocaml/labltk/cOption.mli -lib/ocaml/labltk/cOptionmenu.cmi -lib/ocaml/labltk/cOptionmenu.mli -lib/ocaml/labltk/cPack.cmi -lib/ocaml/labltk/cPack.mli -lib/ocaml/labltk/cPalette.cmi -lib/ocaml/labltk/cPalette.mli -lib/ocaml/labltk/cPixmap.cmi -lib/ocaml/labltk/cPixmap.mli -lib/ocaml/labltk/cPlace.cmi -lib/ocaml/labltk/cPlace.mli -lib/ocaml/labltk/cRadiobutton.cmi -lib/ocaml/labltk/cRadiobutton.mli -lib/ocaml/labltk/cResource.cmi -lib/ocaml/labltk/cResource.mli -lib/ocaml/labltk/cScale.cmi -lib/ocaml/labltk/cScale.mli -lib/ocaml/labltk/cScrollbar.cmi -lib/ocaml/labltk/cScrollbar.mli -lib/ocaml/labltk/cSelection.cmi -lib/ocaml/labltk/cSelection.mli -lib/ocaml/labltk/cText.cmi -lib/ocaml/labltk/cText.mli -lib/ocaml/labltk/cTk.cmi -lib/ocaml/labltk/cTkvars.cmi -lib/ocaml/labltk/cTkvars.mli -lib/ocaml/labltk/cTkwait.cmi -lib/ocaml/labltk/cTkwait.mli -lib/ocaml/labltk/cToplevel.cmi -lib/ocaml/labltk/cToplevel.mli -lib/ocaml/labltk/cWinfo.cmi -lib/ocaml/labltk/cWinfo.mli -lib/ocaml/labltk/cWm.cmi -lib/ocaml/labltk/cWm.mli -lib/ocaml/labltk/camltk.cmi -lib/ocaml/labltk/canvas.cmi -lib/ocaml/labltk/canvas.mli -lib/ocaml/labltk/checkbutton.cmi -lib/ocaml/labltk/checkbutton.mli -lib/ocaml/labltk/clipboard.cmi -lib/ocaml/labltk/clipboard.mli -lib/ocaml/labltk/dialog.cmi -lib/ocaml/labltk/dialog.mli -lib/ocaml/labltk/encoding.cmi -lib/ocaml/labltk/encoding.mli -lib/ocaml/labltk/entry.cmi -lib/ocaml/labltk/entry.mli -lib/ocaml/labltk/fileevent.cmi -lib/ocaml/labltk/fileevent.mli -lib/ocaml/labltk/fileselect.cmi -lib/ocaml/labltk/fileselect.mli -lib/ocaml/labltk/focus.cmi -lib/ocaml/labltk/focus.mli -lib/ocaml/labltk/font.cmi -lib/ocaml/labltk/font.mli -lib/ocaml/labltk/frame.cmi -lib/ocaml/labltk/frame.mli -lib/ocaml/labltk/frx_after.cmi -lib/ocaml/labltk/frx_after.mli -lib/ocaml/labltk/frx_color.cmi -lib/ocaml/labltk/frx_color.mli -lib/ocaml/labltk/frx_ctext.cmi -lib/ocaml/labltk/frx_ctext.mli -lib/ocaml/labltk/frx_dialog.cmi -lib/ocaml/labltk/frx_dialog.mli -lib/ocaml/labltk/frx_entry.cmi -lib/ocaml/labltk/frx_entry.mli -lib/ocaml/labltk/frx_fillbox.cmi -lib/ocaml/labltk/frx_fillbox.mli -lib/ocaml/labltk/frx_fit.cmi -lib/ocaml/labltk/frx_fit.mli -lib/ocaml/labltk/frx_focus.cmi -lib/ocaml/labltk/frx_focus.mli -lib/ocaml/labltk/frx_font.cmi -lib/ocaml/labltk/frx_font.mli -lib/ocaml/labltk/frx_lbutton.mli -lib/ocaml/labltk/frx_listbox.cmi -lib/ocaml/labltk/frx_listbox.mli -lib/ocaml/labltk/frx_mem.cmi -lib/ocaml/labltk/frx_mem.mli -lib/ocaml/labltk/frx_misc.cmi -lib/ocaml/labltk/frx_misc.mli -lib/ocaml/labltk/frx_req.cmi -lib/ocaml/labltk/frx_req.mli -lib/ocaml/labltk/frx_rpc.cmi -lib/ocaml/labltk/frx_rpc.mli -lib/ocaml/labltk/frx_selection.cmi -lib/ocaml/labltk/frx_selection.mli -lib/ocaml/labltk/frx_synth.cmi -lib/ocaml/labltk/frx_synth.mli -lib/ocaml/labltk/frx_text.cmi -lib/ocaml/labltk/frx_text.mli -lib/ocaml/labltk/frx_toplevel.mli -lib/ocaml/labltk/frx_widget.cmi -lib/ocaml/labltk/frx_widget.mli -lib/ocaml/labltk/frxlib.cma -lib/ocaml/labltk/grab.cmi -lib/ocaml/labltk/grab.mli -lib/ocaml/labltk/grid.cmi -lib/ocaml/labltk/grid.mli -lib/ocaml/labltk/image.cmi -lib/ocaml/labltk/image.mli -lib/ocaml/labltk/imagebitmap.cmi -lib/ocaml/labltk/imagebitmap.mli -lib/ocaml/labltk/imagephoto.cmi -lib/ocaml/labltk/imagephoto.mli -lib/ocaml/labltk/jpf_font.cmi -lib/ocaml/labltk/jpf_font.mli -lib/ocaml/labltk/jpflib.cma -lib/ocaml/labltk/label.cmi -lib/ocaml/labltk/label.mli -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 -lib/ocaml/labltk/menu.mli -lib/ocaml/labltk/menubutton.cmi -lib/ocaml/labltk/menubutton.mli -lib/ocaml/labltk/message.cmi -lib/ocaml/labltk/message.mli -lib/ocaml/labltk/option.cmi -lib/ocaml/labltk/option.mli -lib/ocaml/labltk/optionmenu.cmi -lib/ocaml/labltk/optionmenu.mli -lib/ocaml/labltk/pack.cmi -lib/ocaml/labltk/pack.mli -lib/ocaml/labltk/palette.cmi -lib/ocaml/labltk/palette.mli -lib/ocaml/labltk/pixmap.cmi -lib/ocaml/labltk/pixmap.mli -lib/ocaml/labltk/place.cmi -lib/ocaml/labltk/place.mli -lib/ocaml/labltk/pp -lib/ocaml/labltk/protocol.cmi -lib/ocaml/labltk/protocol.mli -lib/ocaml/labltk/radiobutton.cmi -lib/ocaml/labltk/radiobutton.mli -lib/ocaml/labltk/rawwidget.cmi -lib/ocaml/labltk/rawwidget.mli -lib/ocaml/labltk/scale.cmi -lib/ocaml/labltk/scale.mli -lib/ocaml/labltk/scrollbar.cmi -lib/ocaml/labltk/scrollbar.mli -lib/ocaml/labltk/selection.cmi -lib/ocaml/labltk/selection.mli -lib/ocaml/labltk/shell.cmi -lib/ocaml/labltk/shell.mli -lib/ocaml/labltk/text.cmi -lib/ocaml/labltk/text.mli -lib/ocaml/labltk/textvariable.cmi -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/tkvars.cmi -lib/ocaml/labltk/tkvars.mli -lib/ocaml/labltk/tkwait.cmi -lib/ocaml/labltk/tkwait.mli -lib/ocaml/labltk/toplevel.cmi -lib/ocaml/labltk/toplevel.mli -lib/ocaml/labltk/widget.cmi -lib/ocaml/labltk/widget.mli -lib/ocaml/labltk/winfo.cmi -lib/ocaml/labltk/winfo.mli -lib/ocaml/labltk/wm.cmi -lib/ocaml/labltk/wm.mli lib/ocaml/lazy.cmi lib/ocaml/lazy.ml lib/ocaml/lazy.mli @@ -401,7 +171,6 @@ lib/ocaml/lexing.ml lib/ocaml/lexing.mli lib/ocaml/libbigarray.a lib/ocaml/libcamlrun.a -lib/ocaml/libgraphics.a lib/ocaml/libmldbm.a lib/ocaml/libnums.a lib/ocaml/libstr.a @@ -664,11 +433,10 @@ man/mano/Weak.Make.o man/mano/Weak.S.o man/mano/Weak.o @dirrm man/mano -@exec ${MKDIR} %D/lib/ocaml/stublibs @dirrm lib/ocaml/threads +@exec ${MKDIR} %D/lib/ocaml/stublibs @dirrm lib/ocaml/stublibs @dirrm lib/ocaml/ocamldoc -@dirrm lib/ocaml/labltk @dirrm lib/ocaml/camlp4 @dirrm lib/ocaml/caml @dirrm lib/ocaml diff --git a/lang/ocaml/PLIST.opt b/lang/ocaml/PLIST.opt index 19ddda2d04c..ac28452a961 100644 --- a/lang/ocaml/PLIST.opt +++ b/lang/ocaml/PLIST.opt @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.opt,v 1.6 2004/11/27 01:34:09 dmcmahill Exp $ +@comment $NetBSD: PLIST.opt,v 1.7 2004/12/24 17:16:04 jmmv Exp $ bin/camlp4o.opt bin/camlp4r.opt bin/ocamlc.opt @@ -38,104 +38,11 @@ lib/ocaml/filename.cmx lib/ocaml/format.cmx lib/ocaml/gc.cmx lib/ocaml/genlex.cmx -lib/ocaml/graphics.a -lib/ocaml/graphics.cmxa lib/ocaml/hashtbl.cmx lib/ocaml/int32.cmx lib/ocaml/int64.cmx lib/ocaml/int_misc.cmx lib/ocaml/labelled.cmx -lib/ocaml/labltk/balloon.cmx -lib/ocaml/labltk/bell.cmx -lib/ocaml/labltk/button.cmx -lib/ocaml/labltk/cBell.cmx -lib/ocaml/labltk/cButton.cmx -lib/ocaml/labltk/cCanvas.cmx -lib/ocaml/labltk/cCheckbutton.cmx -lib/ocaml/labltk/cClipboard.cmx -lib/ocaml/labltk/cDialog.cmx -lib/ocaml/labltk/cEncoding.cmx -lib/ocaml/labltk/cEntry.cmx -lib/ocaml/labltk/cFocus.cmx -lib/ocaml/labltk/cFont.cmx -lib/ocaml/labltk/cFrame.cmx -lib/ocaml/labltk/cGrab.cmx -lib/ocaml/labltk/cGrid.cmx -lib/ocaml/labltk/cImage.cmx -lib/ocaml/labltk/cImagebitmap.cmx -lib/ocaml/labltk/cImagephoto.cmx -lib/ocaml/labltk/cLabel.cmx -lib/ocaml/labltk/cListbox.cmx -lib/ocaml/labltk/cMenu.cmx -lib/ocaml/labltk/cMenubutton.cmx -lib/ocaml/labltk/cMessage.cmx -lib/ocaml/labltk/cOption.cmx -lib/ocaml/labltk/cOptionmenu.cmx -lib/ocaml/labltk/cPack.cmx -lib/ocaml/labltk/cPalette.cmx -lib/ocaml/labltk/cPixmap.cmx -lib/ocaml/labltk/cPlace.cmx -lib/ocaml/labltk/cRadiobutton.cmx -lib/ocaml/labltk/cResource.cmx -lib/ocaml/labltk/cScale.cmx -lib/ocaml/labltk/cScrollbar.cmx -lib/ocaml/labltk/cSelection.cmx -lib/ocaml/labltk/cText.cmx -lib/ocaml/labltk/cTk.cmx -lib/ocaml/labltk/cTkvars.cmx -lib/ocaml/labltk/cTkwait.cmx -lib/ocaml/labltk/cToplevel.cmx -lib/ocaml/labltk/cWinfo.cmx -lib/ocaml/labltk/cWm.cmx -lib/ocaml/labltk/camltk.cmx -lib/ocaml/labltk/canvas.cmx -lib/ocaml/labltk/checkbutton.cmx -lib/ocaml/labltk/clipboard.cmx -lib/ocaml/labltk/dialog.cmx -lib/ocaml/labltk/encoding.cmx -lib/ocaml/labltk/entry.cmx -lib/ocaml/labltk/fileselect.cmx -lib/ocaml/labltk/focus.cmx -lib/ocaml/labltk/font.cmx -lib/ocaml/labltk/frame.cmx -lib/ocaml/labltk/frxlib.a -lib/ocaml/labltk/frxlib.cmxa -lib/ocaml/labltk/grab.cmx -lib/ocaml/labltk/grid.cmx -lib/ocaml/labltk/image.cmx -lib/ocaml/labltk/imagebitmap.cmx -lib/ocaml/labltk/imagephoto.cmx -lib/ocaml/labltk/jpf_font.cmx -lib/ocaml/labltk/jpflib.a -lib/ocaml/labltk/jpflib.cmxa -lib/ocaml/labltk/label.cmx -lib/ocaml/labltk/labltk.a -lib/ocaml/labltk/labltk.cmx -lib/ocaml/labltk/labltk.cmxa -lib/ocaml/labltk/listbox.cmx -lib/ocaml/labltk/menu.cmx -lib/ocaml/labltk/menubutton.cmx -lib/ocaml/labltk/message.cmx -lib/ocaml/labltk/option.cmx -lib/ocaml/labltk/optionmenu.cmx -lib/ocaml/labltk/pack.cmx -lib/ocaml/labltk/palette.cmx -lib/ocaml/labltk/pixmap.cmx -lib/ocaml/labltk/place.cmx -lib/ocaml/labltk/radiobutton.cmx -lib/ocaml/labltk/scale.cmx -lib/ocaml/labltk/scrollbar.cmx -lib/ocaml/labltk/selection.cmx -lib/ocaml/labltk/shell.cmx -lib/ocaml/labltk/text.cmx -lib/ocaml/labltk/tk.cmx -lib/ocaml/labltk/tkanim.a -lib/ocaml/labltk/tkanim.cmxa -lib/ocaml/labltk/tkvars.cmx -lib/ocaml/labltk/tkwait.cmx -lib/ocaml/labltk/toplevel.cmx -lib/ocaml/labltk/winfo.cmx -lib/ocaml/labltk/wm.cmx lib/ocaml/lazy.cmx lib/ocaml/lexing.cmx lib/ocaml/libasmrun.a @@ -170,12 +77,8 @@ lib/ocaml/stack.cmx lib/ocaml/stdLabels.cmx lib/ocaml/std_exit.cmx lib/ocaml/std_exit.o -lib/ocaml/std_exit.p.cmx -lib/ocaml/std_exit.p.o lib/ocaml/stdlib.a lib/ocaml/stdlib.cmxa -lib/ocaml/stdlib.p.a -lib/ocaml/stdlib.p.cmxa lib/ocaml/str.a lib/ocaml/str.cmx lib/ocaml/str.cmxa diff --git a/lang/ocaml/PLIST.prof b/lang/ocaml/PLIST.prof index bc3623da958..18b40b274be 100644 --- a/lang/ocaml/PLIST.prof +++ b/lang/ocaml/PLIST.prof @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.prof,v 1.1 2004/04/24 14:45:15 danw Exp $ +@comment $NetBSD: PLIST.prof,v 1.2 2004/12/24 17:16:04 jmmv Exp $ lib/ocaml/arg.p.cmx lib/ocaml/array.p.cmx lib/ocaml/arrayLabels.p.cmx @@ -37,6 +37,10 @@ lib/ocaml/set.p.cmx lib/ocaml/sort.p.cmx lib/ocaml/stack.p.cmx lib/ocaml/stdLabels.p.cmx +lib/ocaml/std_exit.p.cmx +lib/ocaml/std_exit.p.o +lib/ocaml/stdlib.p.a +lib/ocaml/stdlib.p.cmxa lib/ocaml/stream.p.cmx lib/ocaml/string.p.cmx lib/ocaml/stringLabels.p.cmx diff --git a/lang/ocaml/buildlink3.mk b/lang/ocaml/buildlink3.mk index cfa7ff7607b..fdd0ec61157 100644 --- a/lang/ocaml/buildlink3.mk +++ b/lang/ocaml/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2004/12/04 20:31:29 jmmv Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2004/12/24 17:16:04 jmmv Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ OCAML_BUILDLINK3_MK:= ${OCAML_BUILDLINK3_MK}+ @@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= ocaml BUILDLINK_DEPMETHOD.ocaml?= build .if !empty(OCAML_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.ocaml+= ocaml>=3.06nb6 +BUILDLINK_DEPENDS.ocaml+= ocaml>=3.06nb8 BUILDLINK_PKGSRCDIR.ocaml?= ../../lang/ocaml . include "../../mk/bsd.prefs.mk" @@ -25,6 +25,4 @@ PRINT_PLIST_AWK+= /^@dirrm lib\/ocaml$$/ \ .endif # OCAML_BUILDLINK3_MK -.include "../../x11/tk/buildlink3.mk" - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo index 6bc1ae4889b..90a1d6d501b 100644 --- a/lang/ocaml/distinfo +++ b/lang/ocaml/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2004/04/23 03:06:02 danw Exp $ +$NetBSD: distinfo,v 1.18 2004/12/24 17:16:04 jmmv Exp $ SHA1 (ocaml-3.06.tar.gz) = cf1b053bf751ad566e445ca13c620ffef3a1b863 Size (ocaml-3.06.tar.gz) = 2436887 bytes @@ -21,14 +21,14 @@ SHA1 (patch-ap) = 852b73b2a75442e32ae6eca40b87ccb972555143 SHA1 (patch-aq) = 86b1c641f5adf4fd13b49b8d3149d266b4863d05 SHA1 (patch-ar) = b52759d59840fb0e156ede1192ea3cfc66df88a7 SHA1 (patch-as) = e2fe81931265e70cdb9fcb7b9f743ac39ea45528 -SHA1 (patch-at) = 1298e7bcff37b51530b5eb9cb2cfb654d5d708b5 +SHA1 (patch-at) = 13f1b894a662510a16f86d63f015e2e8cfde3403 SHA1 (patch-au) = 348834bb0a5e22fd1adce0003f73cd6bcc07e79d SHA1 (patch-av) = d61391c89398e0e2b0386f39247a693aa87baf74 SHA1 (patch-aw) = 51273d1a11e28e161167f904406cf28ffebbbc7a SHA1 (patch-ax) = 81843d235df97e5cea6344af14f2b9b0f74cd48c SHA1 (patch-ay) = 538b5d0aa3353add40f72714ca0d8edc413aa867 SHA1 (patch-az) = 7ef66ce5ac11a5012f30db3161b1aadcd8c55c7e -SHA1 (patch-ba) = 21967eb97376f4734a1c043e1312555d15c059bd +SHA1 (patch-ba) = 0fe24ac68c4de49feb76689987fbae5f5daa9340 SHA1 (patch-bb) = d60cca088fa92cf15a4d46d53dd42ed84f851f9c SHA1 (patch-bc) = 4aa365ca555e01955c7787588a4effeacca7b8b0 SHA1 (patch-bd) = 2ab20ead8779de1f2eb77d3504e89d182f39a63d diff --git a/lang/ocaml/patches/patch-at b/lang/ocaml/patches/patch-at index ea6b6d22145..1effd54ca8f 100644 --- a/lang/ocaml/patches/patch-at +++ b/lang/ocaml/patches/patch-at @@ -1,8 +1,8 @@ -$NetBSD: patch-at,v 1.1 2004/04/22 09:18:39 tron Exp $ +$NetBSD: patch-at,v 1.2 2004/12/24 17:16:04 jmmv Exp $ ---- configure.orig Wed Aug 7 14:45:00 2002 -+++ configure Thu Apr 22 10:34:37 2004 -@@ -528,6 +528,7 @@ +--- configure.orig 2002-08-07 14:45:00.000000000 +0200 ++++ configure +@@ -528,6 +528,7 @@ case "$host" in rs6000-*-aix*) arch=power; model=rs6000; system=aix;; powerpc-*-aix*) arch=power; model=ppc; system=aix;; powerpc-*-linux*) arch=power; model=ppc; system=elf;; @@ -10,7 +10,7 @@ $NetBSD: patch-at,v 1.1 2004/04/22 09:18:39 tron Exp $ powerpc-*-rhapsody*) arch=power; model=ppc; system=rhapsody;; powerpc-*-darwin*) arch=power; model=ppc; system=rhapsody;; arm*-*-linux*) arch=arm; system=linux;; -@@ -591,6 +592,7 @@ +@@ -591,6 +592,7 @@ case "$arch,$model,$system" in power,rs6000,aix) asflags='-u -m pwr -w'; asppflags="$asflags";; power,ppc,aix) asflags='-u -m ppc -w'; asppflags="$asflags";; power,*,elf) aspp='gcc'; asppflags='-c';; @@ -18,7 +18,7 @@ $NetBSD: patch-at,v 1.1 2004/04/22 09:18:39 tron Exp $ power,*,rhapsody) ;; arm,*,linux) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';; ia64,*,linux) asflags=-xexplicit -@@ -601,6 +603,7 @@ +@@ -601,6 +603,7 @@ case "$arch,$model,$system" in alpha,*,digital) profiling='prof';; i386,*,linux_elf) profiling='prof';; i386,*,bsd_elf) profiling='prof';; @@ -26,3 +26,19 @@ $NetBSD: patch-at,v 1.1 2004/04/22 09:18:39 tron Exp $ *) profiling='noprof';; esac +@@ -1044,6 +1047,7 @@ fi + x11_include="not found" + x11_link="not found" + ++if test "$disable_x11" != "yes"; then + for dir in \ + $x11_include_dir \ + \ +@@ -1152,6 +1156,7 @@ do + break + fi + done ++fi + + + if test "$x11_include" = "not found" || test "$x11_link" = "not found" diff --git a/lang/ocaml/patches/patch-ba b/lang/ocaml/patches/patch-ba index 41016f86635..c7303822f2a 100644 --- a/lang/ocaml/patches/patch-ba +++ b/lang/ocaml/patches/patch-ba @@ -1,8 +1,21 @@ -$NetBSD: patch-ba,v 1.1 2004/04/22 09:18:41 tron Exp $ +$NetBSD: patch-ba,v 1.2 2004/12/24 17:16:04 jmmv Exp $ ---- otherlibs/graph/Makefile.orig Thu Jun 27 13:36:01 2002 -+++ otherlibs/graph/Makefile Thu Apr 22 10:34:37 2004 -@@ -50,13 +50,13 @@ +--- otherlibs/graph/Makefile.orig 2002-06-27 13:36:01.000000000 +0200 ++++ otherlibs/graph/Makefile +@@ -19,9 +19,9 @@ include ../../config/Makefile + + CC=$(BYTECC) + CFLAGS=-I../../byterun $(X11_INCLUDES) -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) +-CAMLC=../../ocamlcomp.sh +-CAMLOPT=../../ocamlcompopt.sh +-MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib ++CAMLC=ocamlc ++CAMLOPT=ocamlopt ++MKLIB=ocamlmklib + COMPFLAGS=-warn-error A + + OBJS=open.o draw.o fill.o color.o text.o \ +@@ -50,13 +50,13 @@ clean: partialclean rm -f *.a *.so *.o install: |