pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/ocaml Do not depend on Tk nor X11. Two new packa...
details: https://anonhg.NetBSD.org/pkgsrc/rev/96472d431ba9
branches: trunk
changeset: 486185:96472d431ba9
user: jmmv <jmmv%pkgsrc.org@localhost>
date: Fri Dec 24 17:16:04 2004 +0000
description:
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:
lang/ocaml/Makefile | 53 +--------
lang/ocaml/Makefile.common | 32 +++++
lang/ocaml/PLIST | 236 +-------------------------------------------
lang/ocaml/PLIST.opt | 99 +------------------
lang/ocaml/PLIST.prof | 6 +-
lang/ocaml/buildlink3.mk | 6 +-
lang/ocaml/distinfo | 6 +-
lang/ocaml/patches/patch-at | 28 ++++-
lang/ocaml/patches/patch-ba | 21 +++-
9 files changed, 93 insertions(+), 394 deletions(-)
diffs (truncated from 665 to 300 lines):
diff -r b240af2fda21 -r 96472d431ba9 lang/ocaml/Makefile
--- a/lang/ocaml/Makefile Fri Dec 24 17:01:40 2004 +0000
+++ b/lang/ocaml/Makefile Fri Dec 24 17:16:04 2004 +0000
@@ -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}/
-
-MAINTAINER= tech-pkg%NetBSD.org@localhost
-HOMEPAGE= http://caml.inria.fr/ocaml/
-COMMENT= The latest implementation of the Caml dialect of ML
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
+.include "Makefile.common"
-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"
+PKGREVISION= 8
-.if ${OPSYS} == "Darwin"
-INSTALL_UNSTRIPPED= yes
-.endif
-
-post-extract:
- ${CP} ${WRKSRC}/asmrun/power-elf.S ${WRKSRC}/asmrun/power-bsd.S
+CONFIGURE_ARGS+= -no-tk
+CONFIGURE_ENV+= disable_x11=yes
-post-build:
- if ${TEST} ${MACHINE_ARCH} = 'i386' -o ${MACHINE_ARCH} = 'powerpc' \
- -o ${MACHINE_ARCH} = 'sparc' ; then \
- cd ${WRKSRC}; \
- ${GMAKE} opt; \
- ${GMAKE} opt.opt; \
- fi
-
+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 -r b240af2fda21 -r 96472d431ba9 lang/ocaml/Makefile.common
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/ocaml/Makefile.common Fri Dec 24 17:16:04 2004 +0000
@@ -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@localhost
+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 -r b240af2fda21 -r 96472d431ba9 lang/ocaml/PLIST
--- a/lang/ocaml/PLIST Fri Dec 24 17:01:40 2004 +0000
+++ b/lang/ocaml/PLIST Fri Dec 24 17:16:04 2004 +0000
@@ -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/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/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
Home |
Main Index |
Thread Index |
Old Index