From 4bcd51c02dd4f7f83ece4acbcadfd8c3d9c10d0e Mon Sep 17 00:00:00 2001 From: hiramatsu Date: Sun, 16 Nov 2014 18:08:36 +0000 Subject: Update x11/labltk to 8.06.0. This release does not contain functional changes, but MASTER_SITES, distfile and version number are updated to follow upstream. --- x11/labltk/DESCR | 6 +- x11/labltk/Makefile | 35 +- x11/labltk/PLIST | 447 ++++++++++++----------- x11/labltk/PLIST.opt | 211 ++++++----- x11/labltk/distinfo | 10 + x11/labltk/patches/patch-browser-Makefile.shared | 15 + x11/labltk/patches/patch-compiler-Makefile | 16 + x11/labltk/patches/patch-configure | 107 ++++++ x11/labltk/patches/patch-lib-Makefile | 27 ++ x11/labltk/patches/patch-suppert-Makefile | 18 + 10 files changed, 553 insertions(+), 339 deletions(-) create mode 100644 x11/labltk/distinfo create mode 100644 x11/labltk/patches/patch-browser-Makefile.shared create mode 100644 x11/labltk/patches/patch-compiler-Makefile create mode 100644 x11/labltk/patches/patch-configure create mode 100644 x11/labltk/patches/patch-lib-Makefile create mode 100644 x11/labltk/patches/patch-suppert-Makefile (limited to 'x11/labltk') diff --git a/x11/labltk/DESCR b/x11/labltk/DESCR index 4bae426d02b..7ef51f193d1 100644 --- a/x11/labltk/DESCR +++ b/x11/labltk/DESCR @@ -1,2 +1,4 @@ -This package provides the LablTK library (Tk bindings) that comes with the -ocaml compiler. +LablTk is an interface to the Tcl/Tk GUI framework. It allows to +develop GUI applications in a speedy and type safe way. A legacy +Camltk interface is included. The OCamlBrowser library viewer is also +part of this project. diff --git a/x11/labltk/Makefile b/x11/labltk/Makefile index 106465fb24c..26f63a3a61d 100644 --- a/x11/labltk/Makefile +++ b/x11/labltk/Makefile @@ -1,34 +1,35 @@ -# $NetBSD: Makefile,v 1.21 2014/10/09 19:14:05 jaapb Exp $ +# $NetBSD: Makefile,v 1.22 2014/11/16 18:08:36 hiramatsu Exp $ -INSTALLATION_DIRS+= lib/ocaml/stublibs -MAKE_JOBS_SAFE= no +DISTNAME= labltk-8.06.0 +CATEGORIES= x11 +MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1455/ +LICENSE= gnu-lgpl-v2.1 -.include "../../lang/ocaml/Makefile.common" +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= https://forge.ocamlcore.org/projects/labltk/ +COMMENT= Tk bindings for ocaml -PKGNAME= ${DISTNAME:S/ocaml/labltk/} -PKGREVISION= 12 - -COMMENT= Tk bindings for ocaml +USE_TOOLS+= gmake +MAKE_JOBS_SAFE= no +HAS_CONFIGURE= yes CONFIGURE_ARGS+= -x11include ${X11BASE}/include CONFIGURE_ARGS+= -x11lib ${X11BASE}/lib +CONFIGURE_ARGS+= -use-findlib CONFIGURE_ARGS+= -tkdefs "-I${BUILDLINK_PREFIX.tk}/include -I${BUILDLINK_PREFIX.tcl}/include" CONFIGURE_ARGS+= -tklibs "`${SH} -c '. ${TCLCONFIG_SH}; . ${TKCONFIG_SH}; ${ECHO} $$TK_LD_FLAGS $$TCL_LD_FLAGS $$TK_LIBS $$TCL_LIBS'`" -BUILD_TARGET= world -INSTALL_DIRS= otherlibs/labltk +BUILD_TARGET= all INSTALL_TARGET= install .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \ - (${MACHINE_ARCH} == "sparc") -BUILD_TARGET+= opt opt.opt -INSTALL_TARGET+= installopt + (${MACHINE_ARCH} == "arm") || \ + (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64") +BUILD_TARGET+= opt PLIST_SRC= ${.CURDIR}/PLIST.opt ${.CURDIR}/PLIST .endif -BUILDLINK_DEPMETHOD.ocaml= full -BUILDLINK_DEPMETHOD.${BDB_TYPE}=build - +.include "../../devel/ocaml-findlib/buildlink3.mk" .include "../../lang/ocaml/buildlink3.mk" -.include "../../x11/tk/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" +.include "../../x11/tk/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/labltk/PLIST b/x11/labltk/PLIST index 6393f0a4daa..a17f20c631f 100644 --- a/x11/labltk/PLIST +++ b/x11/labltk/PLIST @@ -1,226 +1,227 @@ -@comment $NetBSD: PLIST,v 1.6 2011/10/29 21:06:51 dholland Exp $ +@comment $NetBSD: PLIST,v 1.7 2014/11/16 18:08:36 hiramatsu Exp $ bin/labltk bin/ocamlbrowser -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/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/tkcompiler -lib/ocaml/labltk/tkthread.cmi -lib/ocaml/labltk/tkthread.cmo -lib/ocaml/labltk/tkthread.mli -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/site-lib/labltk/META +lib/ocaml/site-lib/labltk/balloon.cmi +lib/ocaml/site-lib/labltk/balloon.mli +lib/ocaml/site-lib/labltk/bell.cmi +lib/ocaml/site-lib/labltk/bell.mli +lib/ocaml/site-lib/labltk/button.cmi +lib/ocaml/site-lib/labltk/button.mli +lib/ocaml/site-lib/labltk/cBell.cmi +lib/ocaml/site-lib/labltk/cBell.mli +lib/ocaml/site-lib/labltk/cButton.cmi +lib/ocaml/site-lib/labltk/cButton.mli +lib/ocaml/site-lib/labltk/cCanvas.cmi +lib/ocaml/site-lib/labltk/cCanvas.mli +lib/ocaml/site-lib/labltk/cCheckbutton.cmi +lib/ocaml/site-lib/labltk/cCheckbutton.mli +lib/ocaml/site-lib/labltk/cClipboard.cmi +lib/ocaml/site-lib/labltk/cClipboard.mli +lib/ocaml/site-lib/labltk/cDialog.cmi +lib/ocaml/site-lib/labltk/cDialog.mli +lib/ocaml/site-lib/labltk/cEncoding.cmi +lib/ocaml/site-lib/labltk/cEncoding.mli +lib/ocaml/site-lib/labltk/cEntry.cmi +lib/ocaml/site-lib/labltk/cEntry.mli +lib/ocaml/site-lib/labltk/cFocus.cmi +lib/ocaml/site-lib/labltk/cFocus.mli +lib/ocaml/site-lib/labltk/cFont.cmi +lib/ocaml/site-lib/labltk/cFont.mli +lib/ocaml/site-lib/labltk/cFrame.cmi +lib/ocaml/site-lib/labltk/cFrame.mli +lib/ocaml/site-lib/labltk/cGrab.cmi +lib/ocaml/site-lib/labltk/cGrab.mli +lib/ocaml/site-lib/labltk/cGrid.cmi +lib/ocaml/site-lib/labltk/cGrid.mli +lib/ocaml/site-lib/labltk/cImage.cmi +lib/ocaml/site-lib/labltk/cImage.mli +lib/ocaml/site-lib/labltk/cImagebitmap.cmi +lib/ocaml/site-lib/labltk/cImagebitmap.mli +lib/ocaml/site-lib/labltk/cImagephoto.cmi +lib/ocaml/site-lib/labltk/cImagephoto.mli +lib/ocaml/site-lib/labltk/cLabel.cmi +lib/ocaml/site-lib/labltk/cLabel.mli +lib/ocaml/site-lib/labltk/cListbox.cmi +lib/ocaml/site-lib/labltk/cListbox.mli +lib/ocaml/site-lib/labltk/cMenu.cmi +lib/ocaml/site-lib/labltk/cMenu.mli +lib/ocaml/site-lib/labltk/cMenubutton.cmi +lib/ocaml/site-lib/labltk/cMenubutton.mli +lib/ocaml/site-lib/labltk/cMessage.cmi +lib/ocaml/site-lib/labltk/cMessage.mli +lib/ocaml/site-lib/labltk/cOption.cmi +lib/ocaml/site-lib/labltk/cOption.mli +lib/ocaml/site-lib/labltk/cOptionmenu.cmi +lib/ocaml/site-lib/labltk/cOptionmenu.mli +lib/ocaml/site-lib/labltk/cPack.cmi +lib/ocaml/site-lib/labltk/cPack.mli +lib/ocaml/site-lib/labltk/cPalette.cmi +lib/ocaml/site-lib/labltk/cPalette.mli +lib/ocaml/site-lib/labltk/cPixmap.cmi +lib/ocaml/site-lib/labltk/cPixmap.mli +lib/ocaml/site-lib/labltk/cPlace.cmi +lib/ocaml/site-lib/labltk/cPlace.mli +lib/ocaml/site-lib/labltk/cRadiobutton.cmi +lib/ocaml/site-lib/labltk/cRadiobutton.mli +lib/ocaml/site-lib/labltk/cResource.cmi +lib/ocaml/site-lib/labltk/cResource.mli +lib/ocaml/site-lib/labltk/cScale.cmi +lib/ocaml/site-lib/labltk/cScale.mli +lib/ocaml/site-lib/labltk/cScrollbar.cmi +lib/ocaml/site-lib/labltk/cScrollbar.mli +lib/ocaml/site-lib/labltk/cSelection.cmi +lib/ocaml/site-lib/labltk/cSelection.mli +lib/ocaml/site-lib/labltk/cText.cmi +lib/ocaml/site-lib/labltk/cText.mli +lib/ocaml/site-lib/labltk/cTk.cmi +lib/ocaml/site-lib/labltk/cTkvars.cmi +lib/ocaml/site-lib/labltk/cTkvars.mli +lib/ocaml/site-lib/labltk/cTkwait.cmi +lib/ocaml/site-lib/labltk/cTkwait.mli +lib/ocaml/site-lib/labltk/cToplevel.cmi +lib/ocaml/site-lib/labltk/cToplevel.mli +lib/ocaml/site-lib/labltk/cWinfo.cmi +lib/ocaml/site-lib/labltk/cWinfo.mli +lib/ocaml/site-lib/labltk/cWm.cmi +lib/ocaml/site-lib/labltk/cWm.mli +lib/ocaml/site-lib/labltk/camltk.cmi +lib/ocaml/site-lib/labltk/canvas.cmi +lib/ocaml/site-lib/labltk/canvas.mli +lib/ocaml/site-lib/labltk/checkbutton.cmi +lib/ocaml/site-lib/labltk/checkbutton.mli +lib/ocaml/site-lib/labltk/clipboard.cmi +lib/ocaml/site-lib/labltk/clipboard.mli +lib/ocaml/site-lib/labltk/dialog.cmi +lib/ocaml/site-lib/labltk/dialog.mli +lib/ocaml/site-lib/labltk/encoding.cmi +lib/ocaml/site-lib/labltk/encoding.mli +lib/ocaml/site-lib/labltk/entry.cmi +lib/ocaml/site-lib/labltk/entry.mli +lib/ocaml/site-lib/labltk/fileevent.cmi +lib/ocaml/site-lib/labltk/fileevent.mli +lib/ocaml/site-lib/labltk/fileselect.cmi +lib/ocaml/site-lib/labltk/fileselect.mli +lib/ocaml/site-lib/labltk/focus.cmi +lib/ocaml/site-lib/labltk/focus.mli +lib/ocaml/site-lib/labltk/font.cmi +lib/ocaml/site-lib/labltk/font.mli +lib/ocaml/site-lib/labltk/frame.cmi +lib/ocaml/site-lib/labltk/frame.mli +lib/ocaml/site-lib/labltk/frx_after.cmi +lib/ocaml/site-lib/labltk/frx_after.mli +lib/ocaml/site-lib/labltk/frx_color.cmi +lib/ocaml/site-lib/labltk/frx_color.mli +lib/ocaml/site-lib/labltk/frx_ctext.cmi +lib/ocaml/site-lib/labltk/frx_ctext.mli +lib/ocaml/site-lib/labltk/frx_dialog.cmi +lib/ocaml/site-lib/labltk/frx_dialog.mli +lib/ocaml/site-lib/labltk/frx_entry.cmi +lib/ocaml/site-lib/labltk/frx_entry.mli +lib/ocaml/site-lib/labltk/frx_fillbox.cmi +lib/ocaml/site-lib/labltk/frx_fillbox.mli +lib/ocaml/site-lib/labltk/frx_fit.cmi +lib/ocaml/site-lib/labltk/frx_fit.mli +lib/ocaml/site-lib/labltk/frx_focus.cmi +lib/ocaml/site-lib/labltk/frx_focus.mli +lib/ocaml/site-lib/labltk/frx_font.cmi +lib/ocaml/site-lib/labltk/frx_font.mli +lib/ocaml/site-lib/labltk/frx_lbutton.mli +lib/ocaml/site-lib/labltk/frx_listbox.cmi +lib/ocaml/site-lib/labltk/frx_listbox.mli +lib/ocaml/site-lib/labltk/frx_mem.cmi +lib/ocaml/site-lib/labltk/frx_mem.mli +lib/ocaml/site-lib/labltk/frx_misc.cmi +lib/ocaml/site-lib/labltk/frx_misc.mli +lib/ocaml/site-lib/labltk/frx_req.cmi +lib/ocaml/site-lib/labltk/frx_req.mli +lib/ocaml/site-lib/labltk/frx_rpc.cmi +lib/ocaml/site-lib/labltk/frx_rpc.mli +lib/ocaml/site-lib/labltk/frx_selection.cmi +lib/ocaml/site-lib/labltk/frx_selection.mli +lib/ocaml/site-lib/labltk/frx_synth.cmi +lib/ocaml/site-lib/labltk/frx_synth.mli +lib/ocaml/site-lib/labltk/frx_text.cmi +lib/ocaml/site-lib/labltk/frx_text.mli +lib/ocaml/site-lib/labltk/frx_toplevel.mli +lib/ocaml/site-lib/labltk/frx_widget.cmi +lib/ocaml/site-lib/labltk/frx_widget.mli +lib/ocaml/site-lib/labltk/frxlib.cma +lib/ocaml/site-lib/labltk/grab.cmi +lib/ocaml/site-lib/labltk/grab.mli +lib/ocaml/site-lib/labltk/grid.cmi +lib/ocaml/site-lib/labltk/grid.mli +lib/ocaml/site-lib/labltk/image.cmi +lib/ocaml/site-lib/labltk/image.mli +lib/ocaml/site-lib/labltk/imagebitmap.cmi +lib/ocaml/site-lib/labltk/imagebitmap.mli +lib/ocaml/site-lib/labltk/imagephoto.cmi +lib/ocaml/site-lib/labltk/imagephoto.mli +lib/ocaml/site-lib/labltk/jpf_font.cmi +lib/ocaml/site-lib/labltk/jpf_font.mli +lib/ocaml/site-lib/labltk/jpflib.cma +lib/ocaml/site-lib/labltk/label.cmi +lib/ocaml/site-lib/labltk/label.mli +lib/ocaml/site-lib/labltk/labltk.cma +lib/ocaml/site-lib/labltk/labltk.cmi +lib/ocaml/site-lib/labltk/labltktop +lib/ocaml/site-lib/labltk/liblabltk.a +lib/ocaml/site-lib/labltk/listbox.cmi +lib/ocaml/site-lib/labltk/listbox.mli +lib/ocaml/site-lib/labltk/menu.cmi +lib/ocaml/site-lib/labltk/menu.mli +lib/ocaml/site-lib/labltk/menubutton.cmi +lib/ocaml/site-lib/labltk/menubutton.mli +lib/ocaml/site-lib/labltk/message.cmi +lib/ocaml/site-lib/labltk/message.mli +lib/ocaml/site-lib/labltk/option.cmi +lib/ocaml/site-lib/labltk/option.mli +lib/ocaml/site-lib/labltk/optionmenu.cmi +lib/ocaml/site-lib/labltk/optionmenu.mli +lib/ocaml/site-lib/labltk/pack.cmi +lib/ocaml/site-lib/labltk/pack.mli +lib/ocaml/site-lib/labltk/palette.cmi +lib/ocaml/site-lib/labltk/palette.mli +lib/ocaml/site-lib/labltk/pixmap.cmi +lib/ocaml/site-lib/labltk/pixmap.mli +lib/ocaml/site-lib/labltk/place.cmi +lib/ocaml/site-lib/labltk/place.mli +lib/ocaml/site-lib/labltk/pp +lib/ocaml/site-lib/labltk/protocol.cmi +lib/ocaml/site-lib/labltk/protocol.mli +lib/ocaml/site-lib/labltk/radiobutton.cmi +lib/ocaml/site-lib/labltk/radiobutton.mli +lib/ocaml/site-lib/labltk/rawwidget.cmi +lib/ocaml/site-lib/labltk/rawwidget.mli +lib/ocaml/site-lib/labltk/scale.cmi +lib/ocaml/site-lib/labltk/scale.mli +lib/ocaml/site-lib/labltk/scrollbar.cmi +lib/ocaml/site-lib/labltk/scrollbar.mli +lib/ocaml/site-lib/labltk/selection.cmi +lib/ocaml/site-lib/labltk/selection.mli +lib/ocaml/site-lib/labltk/shell.cmi +lib/ocaml/site-lib/labltk/shell.mli +lib/ocaml/site-lib/labltk/text.cmi +lib/ocaml/site-lib/labltk/text.mli +lib/ocaml/site-lib/labltk/textvariable.cmi +lib/ocaml/site-lib/labltk/textvariable.mli +lib/ocaml/site-lib/labltk/timer.cmi +lib/ocaml/site-lib/labltk/timer.mli +lib/ocaml/site-lib/labltk/tk.cmi +lib/ocaml/site-lib/labltk/tkcompiler +lib/ocaml/site-lib/labltk/tkthread.cmi +lib/ocaml/site-lib/labltk/tkthread.cmo +lib/ocaml/site-lib/labltk/tkthread.mli +lib/ocaml/site-lib/labltk/tkvars.cmi +lib/ocaml/site-lib/labltk/tkvars.mli +lib/ocaml/site-lib/labltk/tkwait.cmi +lib/ocaml/site-lib/labltk/tkwait.mli +lib/ocaml/site-lib/labltk/toplevel.cmi +lib/ocaml/site-lib/labltk/toplevel.mli +lib/ocaml/site-lib/labltk/widget.cmi +lib/ocaml/site-lib/labltk/widget.mli +lib/ocaml/site-lib/labltk/winfo.cmi +lib/ocaml/site-lib/labltk/winfo.mli +lib/ocaml/site-lib/labltk/wm.cmi +lib/ocaml/site-lib/labltk/wm.mli lib/ocaml/stublibs/dlllabltk.so diff --git a/x11/labltk/PLIST.opt b/x11/labltk/PLIST.opt index eb4121e4087..7be952503c4 100644 --- a/x11/labltk/PLIST.opt +++ b/x11/labltk/PLIST.opt @@ -1,97 +1,114 @@ -@comment $NetBSD: PLIST.opt,v 1.4 2011/10/29 21:06:51 dholland Exp $ -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/fileevent.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/protocol.cmx -lib/ocaml/labltk/radiobutton.cmx -lib/ocaml/labltk/rawwidget.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/textvariable.cmx -lib/ocaml/labltk/timer.cmx -lib/ocaml/labltk/tk.cmx -lib/ocaml/labltk/tkthread.cmx -lib/ocaml/labltk/tkvars.cmx -lib/ocaml/labltk/tkwait.cmx -lib/ocaml/labltk/toplevel.cmx -lib/ocaml/labltk/widget.cmx -lib/ocaml/labltk/winfo.cmx -lib/ocaml/labltk/wm.cmx +@comment $NetBSD: PLIST.opt,v 1.5 2014/11/16 18:08:36 hiramatsu Exp $ +lib/ocaml/site-lib/labltk/balloon.cmx +lib/ocaml/site-lib/labltk/bell.cmx +lib/ocaml/site-lib/labltk/button.cmx +lib/ocaml/site-lib/labltk/cBell.cmx +lib/ocaml/site-lib/labltk/cButton.cmx +lib/ocaml/site-lib/labltk/cCanvas.cmx +lib/ocaml/site-lib/labltk/cCheckbutton.cmx +lib/ocaml/site-lib/labltk/cClipboard.cmx +lib/ocaml/site-lib/labltk/cDialog.cmx +lib/ocaml/site-lib/labltk/cEncoding.cmx +lib/ocaml/site-lib/labltk/cEntry.cmx +lib/ocaml/site-lib/labltk/cFocus.cmx +lib/ocaml/site-lib/labltk/cFont.cmx +lib/ocaml/site-lib/labltk/cFrame.cmx +lib/ocaml/site-lib/labltk/cGrab.cmx +lib/ocaml/site-lib/labltk/cGrid.cmx +lib/ocaml/site-lib/labltk/cImage.cmx +lib/ocaml/site-lib/labltk/cImagebitmap.cmx +lib/ocaml/site-lib/labltk/cImagephoto.cmx +lib/ocaml/site-lib/labltk/cLabel.cmx +lib/ocaml/site-lib/labltk/cListbox.cmx +lib/ocaml/site-lib/labltk/cMenu.cmx +lib/ocaml/site-lib/labltk/cMenubutton.cmx +lib/ocaml/site-lib/labltk/cMessage.cmx +lib/ocaml/site-lib/labltk/cOption.cmx +lib/ocaml/site-lib/labltk/cOptionmenu.cmx +lib/ocaml/site-lib/labltk/cPack.cmx +lib/ocaml/site-lib/labltk/cPalette.cmx +lib/ocaml/site-lib/labltk/cPixmap.cmx +lib/ocaml/site-lib/labltk/cPlace.cmx +lib/ocaml/site-lib/labltk/cRadiobutton.cmx +lib/ocaml/site-lib/labltk/cResource.cmx +lib/ocaml/site-lib/labltk/cScale.cmx +lib/ocaml/site-lib/labltk/cScrollbar.cmx +lib/ocaml/site-lib/labltk/cSelection.cmx +lib/ocaml/site-lib/labltk/cText.cmx +lib/ocaml/site-lib/labltk/cTk.cmx +lib/ocaml/site-lib/labltk/cTkvars.cmx +lib/ocaml/site-lib/labltk/cTkwait.cmx +lib/ocaml/site-lib/labltk/cToplevel.cmx +lib/ocaml/site-lib/labltk/cWinfo.cmx +lib/ocaml/site-lib/labltk/cWm.cmx +lib/ocaml/site-lib/labltk/camltk.cmx +lib/ocaml/site-lib/labltk/canvas.cmx +lib/ocaml/site-lib/labltk/checkbutton.cmx +lib/ocaml/site-lib/labltk/clipboard.cmx +lib/ocaml/site-lib/labltk/dialog.cmx +lib/ocaml/site-lib/labltk/encoding.cmx +lib/ocaml/site-lib/labltk/entry.cmx +lib/ocaml/site-lib/labltk/fileevent.cmx +lib/ocaml/site-lib/labltk/fileselect.cmx +lib/ocaml/site-lib/labltk/focus.cmx +lib/ocaml/site-lib/labltk/font.cmx +lib/ocaml/site-lib/labltk/frame.cmx +lib/ocaml/site-lib/labltk/frx_after.cmx +lib/ocaml/site-lib/labltk/frx_color.cmx +lib/ocaml/site-lib/labltk/frx_ctext.cmx +lib/ocaml/site-lib/labltk/frx_dialog.cmx +lib/ocaml/site-lib/labltk/frx_entry.cmx +lib/ocaml/site-lib/labltk/frx_fillbox.cmx +lib/ocaml/site-lib/labltk/frx_fit.cmx +lib/ocaml/site-lib/labltk/frx_focus.cmx +lib/ocaml/site-lib/labltk/frx_font.cmx +lib/ocaml/site-lib/labltk/frx_listbox.cmx +lib/ocaml/site-lib/labltk/frx_mem.cmx +lib/ocaml/site-lib/labltk/frx_misc.cmx +lib/ocaml/site-lib/labltk/frx_req.cmx +lib/ocaml/site-lib/labltk/frx_rpc.cmx +lib/ocaml/site-lib/labltk/frx_selection.cmx +lib/ocaml/site-lib/labltk/frx_synth.cmx +lib/ocaml/site-lib/labltk/frx_text.cmx +lib/ocaml/site-lib/labltk/frx_widget.cmx +lib/ocaml/site-lib/labltk/frxlib.a +lib/ocaml/site-lib/labltk/frxlib.cmxa +lib/ocaml/site-lib/labltk/grab.cmx +lib/ocaml/site-lib/labltk/grid.cmx +lib/ocaml/site-lib/labltk/image.cmx +lib/ocaml/site-lib/labltk/imagebitmap.cmx +lib/ocaml/site-lib/labltk/imagephoto.cmx +lib/ocaml/site-lib/labltk/jpf_font.cmx +lib/ocaml/site-lib/labltk/jpflib.a +lib/ocaml/site-lib/labltk/jpflib.cmxa +lib/ocaml/site-lib/labltk/label.cmx +lib/ocaml/site-lib/labltk/labltk.a +lib/ocaml/site-lib/labltk/labltk.cmx +lib/ocaml/site-lib/labltk/labltk.cmxa +lib/ocaml/site-lib/labltk/listbox.cmx +lib/ocaml/site-lib/labltk/menu.cmx +lib/ocaml/site-lib/labltk/menubutton.cmx +lib/ocaml/site-lib/labltk/message.cmx +lib/ocaml/site-lib/labltk/option.cmx +lib/ocaml/site-lib/labltk/optionmenu.cmx +lib/ocaml/site-lib/labltk/pack.cmx +lib/ocaml/site-lib/labltk/palette.cmx +lib/ocaml/site-lib/labltk/pixmap.cmx +lib/ocaml/site-lib/labltk/place.cmx +lib/ocaml/site-lib/labltk/protocol.cmx +lib/ocaml/site-lib/labltk/radiobutton.cmx +lib/ocaml/site-lib/labltk/rawwidget.cmx +lib/ocaml/site-lib/labltk/scale.cmx +lib/ocaml/site-lib/labltk/scrollbar.cmx +lib/ocaml/site-lib/labltk/selection.cmx +lib/ocaml/site-lib/labltk/shell.cmx +lib/ocaml/site-lib/labltk/text.cmx +lib/ocaml/site-lib/labltk/textvariable.cmx +lib/ocaml/site-lib/labltk/timer.cmx +lib/ocaml/site-lib/labltk/tk.cmx +lib/ocaml/site-lib/labltk/tkvars.cmx +lib/ocaml/site-lib/labltk/tkwait.cmx +lib/ocaml/site-lib/labltk/toplevel.cmx +lib/ocaml/site-lib/labltk/widget.cmx +lib/ocaml/site-lib/labltk/winfo.cmx +lib/ocaml/site-lib/labltk/wm.cmx diff --git a/x11/labltk/distinfo b/x11/labltk/distinfo new file mode 100644 index 00000000000..90c396f5c87 --- /dev/null +++ b/x11/labltk/distinfo @@ -0,0 +1,10 @@ +$NetBSD: distinfo,v 1.1 2014/11/16 18:08:36 hiramatsu Exp $ + +SHA1 (labltk-8.06.0.tar.gz) = c7f36b0a88428f707c3cf326bd8b72220149ad13 +RMD160 (labltk-8.06.0.tar.gz) = 383bbe6ed070ac0229f09b400d47ec25f7cc2fad +Size (labltk-8.06.0.tar.gz) = 368790 bytes +SHA1 (patch-browser-Makefile.shared) = d0fc57beb5a46848d6d21f9afabb3048fe175bc6 +SHA1 (patch-compiler-Makefile) = f896ff03d2aeb1ad974bb3842b4a1dfb09d7f660 +SHA1 (patch-configure) = ff33df4575e3722bc7bb3e5108886fdf5aacbb43 +SHA1 (patch-lib-Makefile) = 0bab4c0ce4a5961a52a6091375bc7e06776a4521 +SHA1 (patch-suppert-Makefile) = f622059399c32488892b006b55828d0b5ab0fd84 diff --git a/x11/labltk/patches/patch-browser-Makefile.shared b/x11/labltk/patches/patch-browser-Makefile.shared new file mode 100644 index 00000000000..6794c7ea862 --- /dev/null +++ b/x11/labltk/patches/patch-browser-Makefile.shared @@ -0,0 +1,15 @@ +$NetBSD: patch-browser-Makefile.shared,v 1.1 2014/11/16 18:08:36 hiramatsu Exp $ + +Install into DESTDIR. +--- browser/Makefile.shared.orig 2014-09-18 13:08:33.000000000 +0900 ++++ browser/Makefile.shared 2014-11-03 20:47:56.000000000 +0900 +@@ -60,7 +60,8 @@ + echo '";;' >> $@ + + install: +- cp ocamlbrowser$(EXE) $(INSTALLBINDIR) ++ $(BSD_INSTALL_SCRIPT_DIR) $(DESTDIR)$(INSTALLBINDIR) ++ $(BSD_INSTALL_SCRIPT) ocamlbrowser$(EXE) $(DESTDIR)$(INSTALLBINDIR) + + clean: + rm -f *.cm? ocamlbrowser$(EXE) dummy.mli *~ *.orig *.$(O) help.ml diff --git a/x11/labltk/patches/patch-compiler-Makefile b/x11/labltk/patches/patch-compiler-Makefile new file mode 100644 index 00000000000..ed86c2939c1 --- /dev/null +++ b/x11/labltk/patches/patch-compiler-Makefile @@ -0,0 +1,16 @@ +$NetBSD: patch-compiler-Makefile,v 1.1 2014/11/16 18:08:36 hiramatsu Exp $ + +Install into DESTDIR. +--- compiler/Makefile.orig 2014-11-03 20:12:13.000000000 +0900 ++++ compiler/Makefile 2014-11-03 20:12:16.000000000 +0900 +@@ -61,8 +61,8 @@ + rm -f *.cm* pplex.ml ppyac.ml ppyac.mli pp$(EXE) + + install: +- cp tkcompiler$(EXE) $(INSTALLDIR) +- cp pp$(EXE) $(INSTALLDIR) ++ $(BSD_INSTALL_SCRIPT) tkcompiler$(EXE) $(DESTDIR)$(INSTALLDIR) ++ $(BSD_INSTALL_SCRIPT) pp$(EXE) $(DESTDIR)$(INSTALLDIR) + + .SUFFIXES : + .SUFFIXES : .mli .ml .cmi .cmo .mlp diff --git a/x11/labltk/patches/patch-configure b/x11/labltk/patches/patch-configure new file mode 100644 index 00000000000..cf3ee735f08 --- /dev/null +++ b/x11/labltk/patches/patch-configure @@ -0,0 +1,107 @@ +$NetBSD: patch-configure,v 1.1 2014/11/16 18:08:36 hiramatsu Exp $ + +- Take X11 location from confgure arguments, + instead of ${LOCALBASE}/lib/ocaml/Makefile.config. +- $has_tk is always true. + +--- configure.orig 2014-09-18 13:08:33.000000000 +0900 ++++ configure 2014-11-04 13:23:58.000000000 +0900 +@@ -63,6 +63,10 @@ + tk_libs=$2; shift;; + -tk-no-x11|--tk-no-x11) + tk_x11=no;; ++ -x11include*|--x11include*) ++ x11_include_dir=$2; shift;; ++ -x11lib*|--x11lib*) ++ x11_lib_dir=$2; shift;; + -use-findlib|--use-findlib) + use_findlib=yes;; + -verbose|--verbose) +@@ -134,8 +138,8 @@ + ocamlc_where=`ocamlc -where 2> /dev/null` + ocamlc_ver=`ocamlc -version 2> /dev/null` + ocamlc_opt_ver=`ocamlc.opt -version 2> /dev/null` +-ocamlopt_ver=`$ocamlopt -version 2> /dev/null` +-ocamlopt_opt_ver=`$ocamlopt.opt -version 2> /dev/null` ++#ocamlopt_ver=`$ocamlopt -version 2> /dev/null` ++#ocamlopt_opt_ver=`$ocamlopt.opt -version 2> /dev/null` + if test x"$where" = x"$ocamlc_where" \ + && test -n "$ocamlc_opt_ver" && test x"$ocamlc_opt_ver" = x"$ocamlc_ver" \ + && (test -z "$ocamlopt_ver" || test x"$ocamlopt_ver" = x"$ocamlopt_opt_ver") +@@ -164,7 +168,7 @@ + + if test $has_tk = true; then + tcl_version='' +- tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c` ++ tcl_version=`sh ./runtest $tk_defs $tk_x11_include_dir tclversion.c` + for tk_incs in \ + "-I/usr/local/include" \ + "-I/opt/local/include" \ +@@ -183,7 +187,7 @@ + "-I/usr/include/tcl8.2 -I/usr/include/tk8.2" + do if test -z "$tcl_version"; then + tk_defs="$tk_incs" +- tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c` ++ tcl_version=`sh ./runtest $tk_defs $tk_x11_include_dir tclversion.c` + fi; done + if test -n "$tcl_version" && test "x$tcl_version" != "xnone"; then + inf "tcl.h and tk.h version $tcl_version found with \"$tk_defs\"." +@@ -204,9 +208,8 @@ + has_tk=false + fi + fi +- ++has_tk=true + system=`cat $where/Makefile.config | grep '^SYSTEM=' | sed -e 's/^SYSTEM=//'` +- + if test $has_tk = true && test -z "$tk_libs"; then + tklibdir="" + if test -n "$tk_defs"; then +@@ -229,7 +232,6 @@ + tk + fi + fi +- + tkauxlibs="$cclibs" + if test $has_tk = true; then + if test -n "$tk_libs" && \ +@@ -253,7 +255,7 @@ + has_tk=false + fi + fi +- ++has_tk=true + if test $has_tk = true; then + if sh ./hasgot $tk_libs $tk_x11_libs $tkauxlibs Tk_SetGrid; then + inf "Tcl/Tk libraries found." +@@ -280,10 +282,17 @@ + fi + fi + ++if test -z "$x11_include_dir" -a -z "$x11_lib_dir"; then ++ if pkg-config --exists x11 2>/dev/null; then ++ x11_include_dir=`pkg-config --cflags x11` ++ x11_lib_dir=`pkg-config --libs x11` ++ fi ++fi ++ + if test $has_tk = true; then + if test $tk_x11 = yes; then +- echo "TK_DEFS=$tk_defs "'$(X11_INCLUDES)' >> Makefile +- echo "TK_LINK=$tk_libs "'$(X11_LINK)' >> Makefile ++ echo "TK_DEFS=$tk_defs $(x11_include_dir)" >> Makefile ++ echo "TK_LINK=$tk_libs $(x11_lib_dir)" >> Makefile + else + echo "TK_DEFS=$tk_defs" >> Makefile + echo "TK_LINK=$tk_libs" >> Makefile +@@ -304,8 +313,8 @@ + if test $has_tk = true; then + inf "Configuration for the \"labltk\" library:" + inf " use tcl/tk version ....... $tcl_version" +-inf " options for compiling .... $tk_defs $tk_x11_include" +-inf " options for linking ...... $tk_libs $tk_x11_libs" ++inf " options for compiling .... $tk_defs $x11_include_dir" ++inf " options for linking ...... $tk_libs $x11_lib_dir" + inf " use native compilers ..... $optcomps" + else + inf "The \"labltk\" library: not supported" diff --git a/x11/labltk/patches/patch-lib-Makefile b/x11/labltk/patches/patch-lib-Makefile new file mode 100644 index 00000000000..0d842701448 --- /dev/null +++ b/x11/labltk/patches/patch-lib-Makefile @@ -0,0 +1,27 @@ +$NetBSD: patch-lib-Makefile,v 1.1 2014/11/16 18:08:36 hiramatsu Exp $ + +Install into DESTDIR. +--- lib/Makefile.orig 2014-09-18 13:08:33.000000000 +0900 ++++ lib/Makefile 2014-11-03 20:55:51.000000000 +0900 +@@ -78,16 +78,17 @@ + @echo 'exec $(INSTALLDIR)/$(LIBNAME)top$(EXE) -I $(INSTALLDIR) "$$@"' >> $@ + + install-script: $(LIBNAME) +- cp $(LIBNAME) $(INSTALLBINDIR) +- chmod 755 $(INSTALLBINDIR)/$(LIBNAME) ++ $(BSD_INSTALL_SCRIPT_DIR) $(DESTDIR)$(INSTALLBINDIR) ++ $(BSD_INSTALL_SCRIPT) $(LIBNAME) $(DESTDIR)$(INSTALLBINDIR) ++# chmod 755 $(INSTALLBINDIR)/$(LIBNAME) + + install-batch: + cp labltk.bat $(INSTALLBINDIR) + +-ifeq ($USE_FINDLIB,yes) ++ifeq ($(USE_FINDLIB),yes) + install: + ocamlfind install labltk -add $(LIBNAME).cma $(LIBNAME)top$(EXE) +- chmod 755 $(INSTALLDIR)/$(LIBNAME)top$(EXE) ++# chmod 755 $(INSTALLDIR)/$(LIBNAME)top$(EXE) + @case x$(TOOLCHAIN) in \ + xmingw|xmsvc) $(MAKE) install-batch ;; \ + *) $(MAKE) install-script ;; \ diff --git a/x11/labltk/patches/patch-suppert-Makefile b/x11/labltk/patches/patch-suppert-Makefile new file mode 100644 index 00000000000..f4daab00758 --- /dev/null +++ b/x11/labltk/patches/patch-suppert-Makefile @@ -0,0 +1,18 @@ +$NetBSD: patch-suppert-Makefile,v 1.1 2014/11/16 18:08:36 hiramatsu Exp $ + +Install into DESTDIR. +--- support/Makefile.orig 2014-09-18 13:08:33.000000000 +0900 ++++ support/Makefile 2014-11-05 00:20:36.000000000 +0900 +@@ -43,9 +43,10 @@ + + ifeq ($(USE_FINDLIB),yes) + install: +- ocamlfind install labltk META $(PUB) lib$(LIBNAME).$(A) \ +- -optional dll$(LIBNAME)$(EXT_DLL) ++ ocamlfind install labltk META $(PUB) lib$(LIBNAME).$(A) + $(RANLIB) lib$(LIBNAME).$(A) ++ $(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(STUBLIBDIR) ++ $(BSD_INSTALL_LIB) dll$(LIBNAME)$(EXT_DLL) $(DESTDIR)$(STUBLIBDIR) + + installopt: + ocamlfind install labltk -add \ -- cgit v1.2.3