From ef3431a44d5a321871caf16e6c9d3b8d50f12be3 Mon Sep 17 00:00:00 2001 From: wiz Date: Fri, 21 Sep 2007 13:00:50 +0000 Subject: Rename lablgtk to lablgtk1 and lablgtk2 to lablgtk. --- x11/lablgtk/DESCR | 7 +- x11/lablgtk/Makefile | 47 ++--- x11/lablgtk/PLIST | 429 ++++++++++++++++++++++++------------------ x11/lablgtk/PLIST.glade | 10 + x11/lablgtk/PLIST.gnome | 13 ++ x11/lablgtk/PLIST.gnomecanvas | 21 +++ x11/lablgtk/PLIST.noopt | 130 ------------- x11/lablgtk/PLIST.stub | 3 - x11/lablgtk/PLIST.svg | 21 +++ x11/lablgtk/buildlink3.mk | 13 +- x11/lablgtk/distinfo | 10 +- x11/lablgtk/options.mk | 39 ++++ x11/lablgtk/patches/patch-aa | 79 ++------ 13 files changed, 408 insertions(+), 414 deletions(-) create mode 100644 x11/lablgtk/PLIST.glade create mode 100644 x11/lablgtk/PLIST.gnome create mode 100644 x11/lablgtk/PLIST.gnomecanvas delete mode 100644 x11/lablgtk/PLIST.noopt delete mode 100644 x11/lablgtk/PLIST.stub create mode 100644 x11/lablgtk/PLIST.svg create mode 100644 x11/lablgtk/options.mk (limited to 'x11/lablgtk') diff --git a/x11/lablgtk/DESCR b/x11/lablgtk/DESCR index bb755fdc075..d9844510eab 100644 --- a/x11/lablgtk/DESCR +++ b/x11/lablgtk/DESCR @@ -1,6 +1,7 @@ -LablGTK is an Objective Caml interface to gtk+. +LablGTK is an Objective Caml interface to GTK+. This version +supports GTK+ from 2.0 to 2.6. It uses the rich type system of Objective Caml 3 to provide a strongly typed, yet very comfortable, object-oriented interface to -gtk+. This is not that easy if you know the dynamic typing approach -taken by gtk+. +GTK+. This is not that easy if you know the dynamic typing approach +taken by GTK+. diff --git a/x11/lablgtk/Makefile b/x11/lablgtk/Makefile index 344648ca437..060f71c976f 100644 --- a/x11/lablgtk/Makefile +++ b/x11/lablgtk/Makefile @@ -1,45 +1,38 @@ -# $NetBSD: Makefile,v 1.26 2006/04/06 06:23:01 reed Exp $ +# $NetBSD: Makefile,v 1.27 2007/09/21 13:00:50 wiz Exp $ +# -DISTNAME= lablgtk-1.2.7 -PKGREVISION= 3 +DISTNAME= lablgtk-2.6.0 +PKGREVISION= 14 CATEGORIES= x11 MASTER_SITES= http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html -COMMENT= GTK+ bindings for ocaml +COMMENT= GTK+ 2.x bindings for Objective Caml -USE_TOOLS+= gmake +GNU_CONFIGURE= yes +USE_TOOLS+= gmake pkg-config + +BUILD_TARGET= world BUILDLINK_DEPMETHOD.ocaml= full -BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.0.5 + +CONFLICTS= lablgtk2-2.* .include "../../mk/bsd.prefs.mk" -# currently ocamlopt is only available on i386, sparc and powerpc. -.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \ - (${MACHINE_ARCH} == "sparc") -USE_DOTOPT= YES +# Stub libraries for functions missing from base system. +.if !empty(MACHINE_PLATFORM:MDarwin-*-powerpc) || \ + ${OPSYS} == "DragonFly" || ${OPSYS} == "NetBSD" || \ + ${OPSYS} == "FreeBSD" || ${OPSYS} == "SunOS" +PLIST_SUBST+= HAVE_STUBS="" .else -CAMLOPT= ocamlc -MAKE_ENV+= CAMLOPT=${CAMLOPT:Q} -PLIST_SRC= ${PKGDIR}/PLIST.noopt -.endif - -.if ${OPSYS} == "Darwin" -PLIST_SRC+= ${PKGDIR}/PLIST.stub +PLIST_SUBST+= HAVE_STUBS="@comment " .endif -do-configure: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \ - configure USE_DOTOPT=${USE_DOTOPT} USE_CC=1 CC=${CC} - -.if defined(USE_DOTOPT) -post-build: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \ - opt -.endif +.include "options.mk" -.include "../../x11/gtk/buildlink3.mk" .include "../../lang/ocaml/buildlink3.mk" +.include "../../textproc/gtkspell/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/lablgtk/PLIST b/x11/lablgtk/PLIST index f3d17e89fe8..23487d320cf 100644 --- a/x11/lablgtk/PLIST +++ b/x11/lablgtk/PLIST @@ -1,179 +1,250 @@ -@comment $NetBSD: PLIST,v 1.5 2006/02/22 20:58:01 wiz Exp $ -bin/lablgtk -lib/ocaml/lablgtk/gBin.cmi -lib/ocaml/lablgtk/gBin.cmx -lib/ocaml/lablgtk/gBin.ml -lib/ocaml/lablgtk/gBin.mli -lib/ocaml/lablgtk/gButton.cmi -lib/ocaml/lablgtk/gButton.cmx -lib/ocaml/lablgtk/gButton.ml -lib/ocaml/lablgtk/gButton.mli -lib/ocaml/lablgtk/gContainer.cmi -lib/ocaml/lablgtk/gContainer.cmx -lib/ocaml/lablgtk/gContainer.ml -lib/ocaml/lablgtk/gContainer.mli -lib/ocaml/lablgtk/gData.cmi -lib/ocaml/lablgtk/gData.cmx -lib/ocaml/lablgtk/gData.ml -lib/ocaml/lablgtk/gData.mli -lib/ocaml/lablgtk/gDraw.cmi -lib/ocaml/lablgtk/gDraw.cmx -lib/ocaml/lablgtk/gDraw.ml -lib/ocaml/lablgtk/gDraw.mli -lib/ocaml/lablgtk/gEdit.cmi -lib/ocaml/lablgtk/gEdit.cmx -lib/ocaml/lablgtk/gEdit.ml -lib/ocaml/lablgtk/gEdit.mli -lib/ocaml/lablgtk/gList.cmi -lib/ocaml/lablgtk/gList.cmx -lib/ocaml/lablgtk/gList.ml -lib/ocaml/lablgtk/gList.mli -lib/ocaml/lablgtk/gMain.cmi -lib/ocaml/lablgtk/gMain.cmx -lib/ocaml/lablgtk/gMain.ml -lib/ocaml/lablgtk/gMain.mli -lib/ocaml/lablgtk/gMenu.cmi -lib/ocaml/lablgtk/gMenu.cmx -lib/ocaml/lablgtk/gMenu.ml -lib/ocaml/lablgtk/gMenu.mli -lib/ocaml/lablgtk/gMisc.cmi -lib/ocaml/lablgtk/gMisc.cmx -lib/ocaml/lablgtk/gMisc.ml -lib/ocaml/lablgtk/gMisc.mli -lib/ocaml/lablgtk/gObj.cmi -lib/ocaml/lablgtk/gObj.cmx -lib/ocaml/lablgtk/gObj.ml -lib/ocaml/lablgtk/gObj.mli -lib/ocaml/lablgtk/gPack.cmi -lib/ocaml/lablgtk/gPack.cmx -lib/ocaml/lablgtk/gPack.ml -lib/ocaml/lablgtk/gPack.mli -lib/ocaml/lablgtk/gRange.cmi -lib/ocaml/lablgtk/gRange.cmx -lib/ocaml/lablgtk/gRange.ml -lib/ocaml/lablgtk/gRange.mli -lib/ocaml/lablgtk/gToolbox.cmi -lib/ocaml/lablgtk/gToolbox.cmx -lib/ocaml/lablgtk/gToolbox.ml -lib/ocaml/lablgtk/gToolbox.mli -lib/ocaml/lablgtk/gTree.cmi -lib/ocaml/lablgtk/gTree.cmx -lib/ocaml/lablgtk/gTree.ml -lib/ocaml/lablgtk/gTree.mli -lib/ocaml/lablgtk/gUtil.cmi -lib/ocaml/lablgtk/gUtil.cmx -lib/ocaml/lablgtk/gUtil.ml -lib/ocaml/lablgtk/gUtil.mli -lib/ocaml/lablgtk/gWindow.cmi -lib/ocaml/lablgtk/gWindow.cmx -lib/ocaml/lablgtk/gWindow.ml -lib/ocaml/lablgtk/gWindow.mli -lib/ocaml/lablgtk/gaux.cmi -lib/ocaml/lablgtk/gaux.cmx -lib/ocaml/lablgtk/gaux.ml -lib/ocaml/lablgtk/gdk.cmi -lib/ocaml/lablgtk/gdk.cmx -lib/ocaml/lablgtk/gdk.ml -lib/ocaml/lablgtk/gdk.mli -lib/ocaml/lablgtk/gdkEvent.cmi -lib/ocaml/lablgtk/gdkEvent.cmx -lib/ocaml/lablgtk/gdkEvent.ml -lib/ocaml/lablgtk/gdkKeysyms.cmi -lib/ocaml/lablgtk/gdkKeysyms.cmx -lib/ocaml/lablgtk/gdkKeysyms.ml -lib/ocaml/lablgtk/gdkPixbuf.mli -lib/ocaml/lablgtk/gdk_tags.h -lib/ocaml/lablgtk/gdkprivate-win32.h -lib/ocaml/lablgtk/glGtk.mli -lib/ocaml/lablgtk/glade.mli -lib/ocaml/lablgtk/glib.cmi -lib/ocaml/lablgtk/glib.cmx -lib/ocaml/lablgtk/glib.ml -lib/ocaml/lablgtk/glib_tags.h -lib/ocaml/lablgtk/gpointer.cmi -lib/ocaml/lablgtk/gpointer.cmx -lib/ocaml/lablgtk/gpointer.ml -lib/ocaml/lablgtk/gpointer.mli -lib/ocaml/lablgtk/gtk.cmi -lib/ocaml/lablgtk/gtk.cmx -lib/ocaml/lablgtk/gtk.ml -lib/ocaml/lablgtk/gtkArgv.cmi -lib/ocaml/lablgtk/gtkArgv.cmx -lib/ocaml/lablgtk/gtkArgv.ml -lib/ocaml/lablgtk/gtkBase.cmi -lib/ocaml/lablgtk/gtkBase.cmx -lib/ocaml/lablgtk/gtkBase.ml -lib/ocaml/lablgtk/gtkBin.cmi -lib/ocaml/lablgtk/gtkBin.cmx -lib/ocaml/lablgtk/gtkBin.ml -lib/ocaml/lablgtk/gtkButton.cmi -lib/ocaml/lablgtk/gtkButton.cmx -lib/ocaml/lablgtk/gtkButton.ml -lib/ocaml/lablgtk/gtkData.cmi -lib/ocaml/lablgtk/gtkData.cmx -lib/ocaml/lablgtk/gtkData.ml -lib/ocaml/lablgtk/gtkEdit.cmi -lib/ocaml/lablgtk/gtkEdit.cmx -lib/ocaml/lablgtk/gtkEdit.ml -lib/ocaml/lablgtk/gtkInit.cmi -lib/ocaml/lablgtk/gtkInit.cmo -lib/ocaml/lablgtk/gtkInit.cmx -lib/ocaml/lablgtk/gtkInit.ml -lib/ocaml/lablgtk/gtkInit.o -lib/ocaml/lablgtk/gtkList.cmi -lib/ocaml/lablgtk/gtkList.cmx -lib/ocaml/lablgtk/gtkList.ml -lib/ocaml/lablgtk/gtkMain.cmi -lib/ocaml/lablgtk/gtkMain.cmx -lib/ocaml/lablgtk/gtkMain.ml -lib/ocaml/lablgtk/gtkMenu.cmi -lib/ocaml/lablgtk/gtkMenu.cmx -lib/ocaml/lablgtk/gtkMenu.ml -lib/ocaml/lablgtk/gtkMisc.cmi -lib/ocaml/lablgtk/gtkMisc.cmx -lib/ocaml/lablgtk/gtkMisc.ml -lib/ocaml/lablgtk/gtkNew.cmi -lib/ocaml/lablgtk/gtkNew.cmx -lib/ocaml/lablgtk/gtkNew.ml -lib/ocaml/lablgtk/gtkPack.cmi -lib/ocaml/lablgtk/gtkPack.cmx -lib/ocaml/lablgtk/gtkPack.ml -lib/ocaml/lablgtk/gtkRange.cmi -lib/ocaml/lablgtk/gtkRange.cmx -lib/ocaml/lablgtk/gtkRange.ml -lib/ocaml/lablgtk/gtkSignal.cmi -lib/ocaml/lablgtk/gtkSignal.cmx -lib/ocaml/lablgtk/gtkSignal.ml -lib/ocaml/lablgtk/gtkSignal.mli -lib/ocaml/lablgtk/gtkThInit.cmo -lib/ocaml/lablgtk/gtkThInit.ml -lib/ocaml/lablgtk/gtkThread.cmi -lib/ocaml/lablgtk/gtkThread.cmo -lib/ocaml/lablgtk/gtkThread.cmx -lib/ocaml/lablgtk/gtkThread.ml -lib/ocaml/lablgtk/gtkThread.mli -lib/ocaml/lablgtk/gtkThread.o -lib/ocaml/lablgtk/gtkTree.cmi -lib/ocaml/lablgtk/gtkTree.cmx -lib/ocaml/lablgtk/gtkTree.ml -lib/ocaml/lablgtk/gtkWindow.cmi -lib/ocaml/lablgtk/gtkWindow.cmx -lib/ocaml/lablgtk/gtkWindow.ml -lib/ocaml/lablgtk/gtk_tags.h -lib/ocaml/lablgtk/lablgtk.a -lib/ocaml/lablgtk/lablgtk.cma -lib/ocaml/lablgtk/lablgtk.cmxa -lib/ocaml/lablgtk/lablgtktop -lib/ocaml/lablgtk/lablgtktop_t -lib/ocaml/lablgtk/liblablgtk.a -lib/ocaml/lablgtk/ml_gdk.h -lib/ocaml/lablgtk/ml_glib.h -lib/ocaml/lablgtk/ml_gpointer.h -lib/ocaml/lablgtk/ml_gtk.h -lib/ocaml/lablgtk/varcc -lib/ocaml/lablgtk/wrappers.h -lib/ocaml/lablgtk/xml_lexer.mli -lib/ocaml/stublibs/dlllablgtk.so -@unexec ${RMDIR} %D/lib/ocaml/stublibs 2>/dev/null || ${TRUE} -@dirrm lib/ocaml/lablgtk -@unexec ${RMDIR} %D/lib/ocaml 2>/dev/null || ${TRUE} +@comment $NetBSD: PLIST,v 1.6 2007/09/21 13:00:51 wiz Exp $ +bin/gdk-pixbuf-mlsource +bin/lablgtk2 +lib/ocaml/lablgtk2/gAction.cmi +lib/ocaml/lablgtk2/gAction.cmx +lib/ocaml/lablgtk2/gAction.ml +lib/ocaml/lablgtk2/gAction.mli +lib/ocaml/lablgtk2/gBin.cmi +lib/ocaml/lablgtk2/gBin.cmx +lib/ocaml/lablgtk2/gBin.ml +lib/ocaml/lablgtk2/gBin.mli +lib/ocaml/lablgtk2/gBroken.cmi +lib/ocaml/lablgtk2/gBroken.cmx +lib/ocaml/lablgtk2/gBroken.ml +lib/ocaml/lablgtk2/gBroken.mli +lib/ocaml/lablgtk2/gButton.cmi +lib/ocaml/lablgtk2/gButton.cmx +lib/ocaml/lablgtk2/gButton.ml +lib/ocaml/lablgtk2/gButton.mli +lib/ocaml/lablgtk2/gContainer.cmi +lib/ocaml/lablgtk2/gContainer.cmx +lib/ocaml/lablgtk2/gContainer.ml +lib/ocaml/lablgtk2/gContainer.mli +lib/ocaml/lablgtk2/gData.cmi +lib/ocaml/lablgtk2/gData.cmx +lib/ocaml/lablgtk2/gData.ml +lib/ocaml/lablgtk2/gData.mli +lib/ocaml/lablgtk2/gDraw.cmi +lib/ocaml/lablgtk2/gDraw.cmx +lib/ocaml/lablgtk2/gDraw.ml +lib/ocaml/lablgtk2/gDraw.mli +lib/ocaml/lablgtk2/gEdit.cmi +lib/ocaml/lablgtk2/gEdit.cmx +lib/ocaml/lablgtk2/gEdit.ml +lib/ocaml/lablgtk2/gEdit.mli +lib/ocaml/lablgtk2/gFile.cmi +lib/ocaml/lablgtk2/gFile.cmx +lib/ocaml/lablgtk2/gFile.ml +lib/ocaml/lablgtk2/gFile.mli +lib/ocaml/lablgtk2/gList.cmi +lib/ocaml/lablgtk2/gList.cmx +lib/ocaml/lablgtk2/gList.ml +lib/ocaml/lablgtk2/gList.mli +lib/ocaml/lablgtk2/gMain.cmi +lib/ocaml/lablgtk2/gMain.cmx +lib/ocaml/lablgtk2/gMain.ml +lib/ocaml/lablgtk2/gMain.mli +lib/ocaml/lablgtk2/gMenu.cmi +lib/ocaml/lablgtk2/gMenu.cmx +lib/ocaml/lablgtk2/gMenu.ml +lib/ocaml/lablgtk2/gMenu.mli +lib/ocaml/lablgtk2/gMisc.cmi +lib/ocaml/lablgtk2/gMisc.cmx +lib/ocaml/lablgtk2/gMisc.ml +lib/ocaml/lablgtk2/gMisc.mli +lib/ocaml/lablgtk2/gObj.cmi +lib/ocaml/lablgtk2/gObj.cmx +lib/ocaml/lablgtk2/gObj.ml +lib/ocaml/lablgtk2/gObj.mli +lib/ocaml/lablgtk2/gPack.cmi +lib/ocaml/lablgtk2/gPack.cmx +lib/ocaml/lablgtk2/gPack.ml +lib/ocaml/lablgtk2/gPack.mli +lib/ocaml/lablgtk2/gPango.cmi +lib/ocaml/lablgtk2/gPango.cmx +lib/ocaml/lablgtk2/gPango.ml +lib/ocaml/lablgtk2/gRange.cmi +lib/ocaml/lablgtk2/gRange.cmx +lib/ocaml/lablgtk2/gRange.ml +lib/ocaml/lablgtk2/gRange.mli +lib/ocaml/lablgtk2/gText.cmi +lib/ocaml/lablgtk2/gText.cmx +lib/ocaml/lablgtk2/gText.ml +lib/ocaml/lablgtk2/gText.mli +lib/ocaml/lablgtk2/gToolbox.cmi +lib/ocaml/lablgtk2/gToolbox.cmx +lib/ocaml/lablgtk2/gToolbox.ml +lib/ocaml/lablgtk2/gToolbox.mli +lib/ocaml/lablgtk2/gTree.cmi +lib/ocaml/lablgtk2/gTree.cmx +lib/ocaml/lablgtk2/gTree.ml +lib/ocaml/lablgtk2/gTree.mli +lib/ocaml/lablgtk2/gUtil.cmi +lib/ocaml/lablgtk2/gUtil.cmx +lib/ocaml/lablgtk2/gUtil.ml +lib/ocaml/lablgtk2/gUtil.mli +lib/ocaml/lablgtk2/gWindow.cmi +lib/ocaml/lablgtk2/gWindow.cmx +lib/ocaml/lablgtk2/gWindow.ml +lib/ocaml/lablgtk2/gWindow.mli +lib/ocaml/lablgtk2/gaux.cmi +lib/ocaml/lablgtk2/gaux.cmx +lib/ocaml/lablgtk2/gaux.ml +lib/ocaml/lablgtk2/gdk.cmi +lib/ocaml/lablgtk2/gdk.cmx +lib/ocaml/lablgtk2/gdk.ml +lib/ocaml/lablgtk2/gdk.mli +lib/ocaml/lablgtk2/gdkEnums.cmi +lib/ocaml/lablgtk2/gdkEnums.cmx +lib/ocaml/lablgtk2/gdkEnums.ml +lib/ocaml/lablgtk2/gdkEvent.cmi +lib/ocaml/lablgtk2/gdkEvent.cmx +lib/ocaml/lablgtk2/gdkEvent.ml +lib/ocaml/lablgtk2/gdkKeysyms.cmi +lib/ocaml/lablgtk2/gdkKeysyms.cmx +lib/ocaml/lablgtk2/gdkKeysyms.ml +lib/ocaml/lablgtk2/gdkPixbuf.cmi +lib/ocaml/lablgtk2/gdkPixbuf.cmx +lib/ocaml/lablgtk2/gdkPixbuf.ml +lib/ocaml/lablgtk2/gdkPixbuf.mli +lib/ocaml/lablgtk2/gdk_tags.h +lib/ocaml/lablgtk2/gdkpixbuf_tags.h +lib/ocaml/lablgtk2/gdkprivate-win32.h +lib/ocaml/lablgtk2/glGtk.mli +lib/ocaml/lablgtk2/glade.mli +lib/ocaml/lablgtk2/glib.cmi +lib/ocaml/lablgtk2/glib.cmx +lib/ocaml/lablgtk2/glib.ml +lib/ocaml/lablgtk2/glib.mli +lib/ocaml/lablgtk2/glib_tags.h +lib/ocaml/lablgtk2/gnoCanvas.mli +lib/ocaml/lablgtk2/gnoDruid.mli +lib/ocaml/lablgtk2/gobject.cmi +lib/ocaml/lablgtk2/gobject.cmx +lib/ocaml/lablgtk2/gobject.ml +lib/ocaml/lablgtk2/gobject.mli +lib/ocaml/lablgtk2/gobject_tags.h +lib/ocaml/lablgtk2/gpointer.cmi +lib/ocaml/lablgtk2/gpointer.cmx +lib/ocaml/lablgtk2/gpointer.ml +lib/ocaml/lablgtk2/gpointer.mli +lib/ocaml/lablgtk2/gtk.cmi +lib/ocaml/lablgtk2/gtk.cmx +lib/ocaml/lablgtk2/gtk.ml +lib/ocaml/lablgtk2/gtkBase.cmi +lib/ocaml/lablgtk2/gtkBase.cmx +lib/ocaml/lablgtk2/gtkBase.ml +lib/ocaml/lablgtk2/gtkBin.cmi +lib/ocaml/lablgtk2/gtkBin.cmx +lib/ocaml/lablgtk2/gtkBin.ml +lib/ocaml/lablgtk2/gtkBroken.cmi +lib/ocaml/lablgtk2/gtkBroken.cmx +lib/ocaml/lablgtk2/gtkBroken.ml +lib/ocaml/lablgtk2/gtkButton.cmi +lib/ocaml/lablgtk2/gtkButton.cmx +lib/ocaml/lablgtk2/gtkButton.ml +lib/ocaml/lablgtk2/gtkData.cmi +lib/ocaml/lablgtk2/gtkData.cmx +lib/ocaml/lablgtk2/gtkData.ml +lib/ocaml/lablgtk2/gtkEdit.cmi +lib/ocaml/lablgtk2/gtkEdit.cmx +lib/ocaml/lablgtk2/gtkEdit.ml +lib/ocaml/lablgtk2/gtkEnums.cmi +lib/ocaml/lablgtk2/gtkEnums.cmx +lib/ocaml/lablgtk2/gtkEnums.ml +lib/ocaml/lablgtk2/gtkFile.cmi +lib/ocaml/lablgtk2/gtkFile.cmx +lib/ocaml/lablgtk2/gtkFile.ml +lib/ocaml/lablgtk2/gtkInit.cmi +lib/ocaml/lablgtk2/gtkInit.cmo +lib/ocaml/lablgtk2/gtkInit.cmx +lib/ocaml/lablgtk2/gtkInit.ml +lib/ocaml/lablgtk2/gtkInit.o +lib/ocaml/lablgtk2/gtkList.cmi +lib/ocaml/lablgtk2/gtkList.cmx +lib/ocaml/lablgtk2/gtkList.ml +lib/ocaml/lablgtk2/gtkMain.cmi +lib/ocaml/lablgtk2/gtkMain.cmx +lib/ocaml/lablgtk2/gtkMain.ml +lib/ocaml/lablgtk2/gtkMenu.cmi +lib/ocaml/lablgtk2/gtkMenu.cmx +lib/ocaml/lablgtk2/gtkMenu.ml +lib/ocaml/lablgtk2/gtkMisc.cmi +lib/ocaml/lablgtk2/gtkMisc.cmx +lib/ocaml/lablgtk2/gtkMisc.ml +lib/ocaml/lablgtk2/gtkObject.cmi +lib/ocaml/lablgtk2/gtkObject.cmx +lib/ocaml/lablgtk2/gtkObject.ml +lib/ocaml/lablgtk2/gtkPack.cmi +lib/ocaml/lablgtk2/gtkPack.cmx +lib/ocaml/lablgtk2/gtkPack.ml +lib/ocaml/lablgtk2/gtkRange.cmi +lib/ocaml/lablgtk2/gtkRange.cmx +lib/ocaml/lablgtk2/gtkRange.ml +lib/ocaml/lablgtk2/gtkSignal.cmi +lib/ocaml/lablgtk2/gtkSignal.cmx +lib/ocaml/lablgtk2/gtkSignal.ml +lib/ocaml/lablgtk2/gtkSignal.mli +lib/ocaml/lablgtk2/gtkSpell.cmi +lib/ocaml/lablgtk2/gtkSpell.cmx +lib/ocaml/lablgtk2/gtkSpell.ml +lib/ocaml/lablgtk2/gtkSpell.mli +lib/ocaml/lablgtk2/gtkStock.cmi +lib/ocaml/lablgtk2/gtkStock.cmx +lib/ocaml/lablgtk2/gtkStock.ml +lib/ocaml/lablgtk2/gtkText.cmi +lib/ocaml/lablgtk2/gtkText.cmx +lib/ocaml/lablgtk2/gtkText.ml +lib/ocaml/lablgtk2/gtkThInit.cmo +lib/ocaml/lablgtk2/gtkThInit.ml +lib/ocaml/lablgtk2/gtkThread.cmi +lib/ocaml/lablgtk2/gtkThread.cmo +lib/ocaml/lablgtk2/gtkThread.cmx +lib/ocaml/lablgtk2/gtkThread.ml +lib/ocaml/lablgtk2/gtkThread.mli +lib/ocaml/lablgtk2/gtkThread.o +lib/ocaml/lablgtk2/gtkTree.cmi +lib/ocaml/lablgtk2/gtkTree.cmx +lib/ocaml/lablgtk2/gtkTree.ml +lib/ocaml/lablgtk2/gtkWindow.cmi +lib/ocaml/lablgtk2/gtkWindow.cmx +lib/ocaml/lablgtk2/gtkWindow.ml +lib/ocaml/lablgtk2/gtk_tags.h +lib/ocaml/lablgtk2/lablgtk.a +lib/ocaml/lablgtk2/lablgtk.cma +lib/ocaml/lablgtk2/lablgtk.cmxa +lib/ocaml/lablgtk2/lablgtkspell.a +lib/ocaml/lablgtk2/lablgtkspell.cma +lib/ocaml/lablgtk2/lablgtkspell.cmxa +lib/ocaml/lablgtk2/lablgtktop +lib/ocaml/lablgtk2/liblablgtk2.a +lib/ocaml/lablgtk2/liblablgtkspell.a +lib/ocaml/lablgtk2/ml_gdk.h +lib/ocaml/lablgtk2/ml_gdkpixbuf.h +lib/ocaml/lablgtk2/ml_glib.h +lib/ocaml/lablgtk2/ml_gobject.h +lib/ocaml/lablgtk2/ml_gpointer.h +lib/ocaml/lablgtk2/ml_gtk.h +lib/ocaml/lablgtk2/ml_gtktree.h +lib/ocaml/lablgtk2/ml_gvaluecaml.h +lib/ocaml/lablgtk2/ml_pango.h +lib/ocaml/lablgtk2/panel.mli +lib/ocaml/lablgtk2/pango.cmi +lib/ocaml/lablgtk2/pango.cmx +lib/ocaml/lablgtk2/pango.ml +lib/ocaml/lablgtk2/pangoEnums.cmi +lib/ocaml/lablgtk2/pangoEnums.cmx +lib/ocaml/lablgtk2/pangoEnums.ml +lib/ocaml/lablgtk2/pango_tags.h +lib/ocaml/lablgtk2/propcc +lib/ocaml/lablgtk2/rsvg.mli +lib/ocaml/lablgtk2/varcc +lib/ocaml/lablgtk2/win32.h +lib/ocaml/lablgtk2/wrappers.h +lib/ocaml/lablgtk2/xml_lexer.mli +${HAVE_STUBS}lib/ocaml/stublibs/dlllablgtk2.so +${HAVE_STUBS}lib/ocaml/stublibs/dlllablgtkspell.so +@comment in ocaml: lib/ocaml/stublibs +@dirrm lib/ocaml/lablgtk2 +@comment in ocaml: lib/ocaml diff --git a/x11/lablgtk/PLIST.glade b/x11/lablgtk/PLIST.glade new file mode 100644 index 00000000000..d8ebf475808 --- /dev/null +++ b/x11/lablgtk/PLIST.glade @@ -0,0 +1,10 @@ +@comment $NetBSD: PLIST.glade,v 1.1 2007/09/21 13:00:51 wiz Exp $ +bin/lablgladecc2 +lib/ocaml/lablgtk2/glade.cmi +lib/ocaml/lablgtk2/glade.cmx +lib/ocaml/lablgtk2/glade.ml +lib/ocaml/lablgtk2/lablglade.a +lib/ocaml/lablgtk2/lablglade.cma +lib/ocaml/lablgtk2/lablglade.cmxa +lib/ocaml/lablgtk2/liblablglade2.a +${HAVE_STUBS}lib/ocaml/stublibs/dlllablglade2.so diff --git a/x11/lablgtk/PLIST.gnome b/x11/lablgtk/PLIST.gnome new file mode 100644 index 00000000000..3cf92d20514 --- /dev/null +++ b/x11/lablgtk/PLIST.gnome @@ -0,0 +1,13 @@ +@comment $NetBSD: PLIST.gnome,v 1.1 2007/09/21 13:00:51 wiz Exp $ +lib/ocaml/lablgtk2/gnoDruid.cmi +lib/ocaml/lablgtk2/gnoDruid.cmx +lib/ocaml/lablgtk2/gnoDruid.ml +lib/ocaml/lablgtk2/gnomeDruid.cmi +lib/ocaml/lablgtk2/gnomeDruid.cmx +lib/ocaml/lablgtk2/gnomeDruid.ml +lib/ocaml/lablgtk2/gnomeui_tags.h +lib/ocaml/lablgtk2/lablgnomeui.a +lib/ocaml/lablgtk2/lablgnomeui.cma +lib/ocaml/lablgtk2/lablgnomeui.cmxa +lib/ocaml/lablgtk2/liblablgnomeui.a +${HAVE_STUBS}lib/ocaml/stublibs/dlllablgnomeui.so diff --git a/x11/lablgtk/PLIST.gnomecanvas b/x11/lablgtk/PLIST.gnomecanvas new file mode 100644 index 00000000000..dd629b9e7d0 --- /dev/null +++ b/x11/lablgtk/PLIST.gnomecanvas @@ -0,0 +1,21 @@ +@comment $NetBSD: PLIST.gnomecanvas,v 1.1 2007/09/21 13:00:52 wiz Exp $ +lib/ocaml/lablgtk2/gnoCanvas.cmi +lib/ocaml/lablgtk2/gnoCanvas.cmx +lib/ocaml/lablgtk2/gnoCanvas.ml +lib/ocaml/lablgtk2/gnomeCanvas.cmi +lib/ocaml/lablgtk2/gnomeCanvas.cmx +lib/ocaml/lablgtk2/gnomeCanvas.ml +lib/ocaml/lablgtk2/lablgnomecanvas.a +lib/ocaml/lablgtk2/lablgnomecanvas.cma +lib/ocaml/lablgtk2/lablgnomecanvas.cmxa +lib/ocaml/lablgtk2/lablpanel.a +lib/ocaml/lablgtk2/lablpanel.cma +lib/ocaml/lablgtk2/lablpanel.cmxa +lib/ocaml/lablgtk2/liblablgnomecanvas.a +lib/ocaml/lablgtk2/liblablpanel.a +lib/ocaml/lablgtk2/panel.cmi +lib/ocaml/lablgtk2/panel.cmx +lib/ocaml/lablgtk2/panel.ml +lib/ocaml/lablgtk2/panel_tags.h +${HAVE_STUBS}lib/ocaml/stublibs/dlllablgnomecanvas.so +${HAVE_STUBS}lib/ocaml/stublibs/dlllablpanel.so diff --git a/x11/lablgtk/PLIST.noopt b/x11/lablgtk/PLIST.noopt deleted file mode 100644 index a805582c54e..00000000000 --- a/x11/lablgtk/PLIST.noopt +++ /dev/null @@ -1,130 +0,0 @@ -@comment $NetBSD: PLIST.noopt,v 1.3 2005/02/04 22:47:24 adrianp Exp $ -bin/lablgtk -lib/ocaml/lablgtk/gBin.cmi -lib/ocaml/lablgtk/gBin.ml -lib/ocaml/lablgtk/gBin.mli -lib/ocaml/lablgtk/gButton.cmi -lib/ocaml/lablgtk/gButton.ml -lib/ocaml/lablgtk/gButton.mli -lib/ocaml/lablgtk/gContainer.cmi -lib/ocaml/lablgtk/gContainer.ml -lib/ocaml/lablgtk/gContainer.mli -lib/ocaml/lablgtk/gData.cmi -lib/ocaml/lablgtk/gData.ml -lib/ocaml/lablgtk/gData.mli -lib/ocaml/lablgtk/gDraw.cmi -lib/ocaml/lablgtk/gDraw.ml -lib/ocaml/lablgtk/gDraw.mli -lib/ocaml/lablgtk/gEdit.cmi -lib/ocaml/lablgtk/gEdit.ml -lib/ocaml/lablgtk/gEdit.mli -lib/ocaml/lablgtk/gList.cmi -lib/ocaml/lablgtk/gList.ml -lib/ocaml/lablgtk/gList.mli -lib/ocaml/lablgtk/gMain.cmi -lib/ocaml/lablgtk/gMain.ml -lib/ocaml/lablgtk/gMain.mli -lib/ocaml/lablgtk/gMenu.cmi -lib/ocaml/lablgtk/gMenu.ml -lib/ocaml/lablgtk/gMenu.mli -lib/ocaml/lablgtk/gMisc.cmi -lib/ocaml/lablgtk/gMisc.ml -lib/ocaml/lablgtk/gMisc.mli -lib/ocaml/lablgtk/gObj.cmi -lib/ocaml/lablgtk/gObj.ml -lib/ocaml/lablgtk/gObj.mli -lib/ocaml/lablgtk/gPack.cmi -lib/ocaml/lablgtk/gPack.ml -lib/ocaml/lablgtk/gPack.mli -lib/ocaml/lablgtk/gRange.cmi -lib/ocaml/lablgtk/gRange.ml -lib/ocaml/lablgtk/gRange.mli -lib/ocaml/lablgtk/gToolbox.cmi -lib/ocaml/lablgtk/gToolbox.ml -lib/ocaml/lablgtk/gToolbox.mli -lib/ocaml/lablgtk/gTree.cmi -lib/ocaml/lablgtk/gTree.ml -lib/ocaml/lablgtk/gTree.mli -lib/ocaml/lablgtk/gUtil.cmi -lib/ocaml/lablgtk/gUtil.ml -lib/ocaml/lablgtk/gUtil.mli -lib/ocaml/lablgtk/gWindow.cmi -lib/ocaml/lablgtk/gWindow.ml -lib/ocaml/lablgtk/gWindow.mli -lib/ocaml/lablgtk/gaux.cmi -lib/ocaml/lablgtk/gaux.ml -lib/ocaml/lablgtk/gdk.cmi -lib/ocaml/lablgtk/gdk.ml -lib/ocaml/lablgtk/gdk.mli -lib/ocaml/lablgtk/gdkEvent.cmi -lib/ocaml/lablgtk/gdkEvent.ml -lib/ocaml/lablgtk/gdkKeysyms.cmi -lib/ocaml/lablgtk/gdkKeysyms.ml -lib/ocaml/lablgtk/gdkPixbuf.mli -lib/ocaml/lablgtk/gdk_tags.h -lib/ocaml/lablgtk/gdkprivate-win32.h -lib/ocaml/lablgtk/glGtk.mli -lib/ocaml/lablgtk/glade.mli -lib/ocaml/lablgtk/glib.cmi -lib/ocaml/lablgtk/glib.ml -lib/ocaml/lablgtk/glib_tags.h -lib/ocaml/lablgtk/gpointer.cmi -lib/ocaml/lablgtk/gpointer.ml -lib/ocaml/lablgtk/gpointer.mli -lib/ocaml/lablgtk/gtk.cmi -lib/ocaml/lablgtk/gtk.ml -lib/ocaml/lablgtk/gtkArgv.cmi -lib/ocaml/lablgtk/gtkArgv.ml -lib/ocaml/lablgtk/gtkBase.cmi -lib/ocaml/lablgtk/gtkBase.ml -lib/ocaml/lablgtk/gtkBin.cmi -lib/ocaml/lablgtk/gtkBin.ml -lib/ocaml/lablgtk/gtkButton.cmi -lib/ocaml/lablgtk/gtkButton.ml -lib/ocaml/lablgtk/gtkData.cmi -lib/ocaml/lablgtk/gtkData.ml -lib/ocaml/lablgtk/gtkEdit.cmi -lib/ocaml/lablgtk/gtkEdit.ml -lib/ocaml/lablgtk/gtkInit.cmi -lib/ocaml/lablgtk/gtkInit.cmo -lib/ocaml/lablgtk/gtkInit.ml -lib/ocaml/lablgtk/gtkList.cmi -lib/ocaml/lablgtk/gtkList.ml -lib/ocaml/lablgtk/gtkMain.cmi -lib/ocaml/lablgtk/gtkMain.ml -lib/ocaml/lablgtk/gtkMenu.cmi -lib/ocaml/lablgtk/gtkMenu.ml -lib/ocaml/lablgtk/gtkMisc.cmi -lib/ocaml/lablgtk/gtkMisc.ml -lib/ocaml/lablgtk/gtkNew.cmi -lib/ocaml/lablgtk/gtkNew.ml -lib/ocaml/lablgtk/gtkPack.cmi -lib/ocaml/lablgtk/gtkPack.ml -lib/ocaml/lablgtk/gtkRange.cmi -lib/ocaml/lablgtk/gtkRange.ml -lib/ocaml/lablgtk/gtkSignal.cmi -lib/ocaml/lablgtk/gtkSignal.ml -lib/ocaml/lablgtk/gtkSignal.mli -lib/ocaml/lablgtk/gtkThInit.cmo -lib/ocaml/lablgtk/gtkThInit.ml -lib/ocaml/lablgtk/gtkThread.cmi -lib/ocaml/lablgtk/gtkThread.cmo -lib/ocaml/lablgtk/gtkThread.ml -lib/ocaml/lablgtk/gtkThread.mli -lib/ocaml/lablgtk/gtkTree.cmi -lib/ocaml/lablgtk/gtkTree.ml -lib/ocaml/lablgtk/gtkWindow.cmi -lib/ocaml/lablgtk/gtkWindow.ml -lib/ocaml/lablgtk/gtk_tags.h -lib/ocaml/lablgtk/lablgtk.cma -lib/ocaml/lablgtk/lablgtktop -lib/ocaml/lablgtk/lablgtktop_t -lib/ocaml/lablgtk/liblablgtk.a -lib/ocaml/lablgtk/ml_gdk.h -lib/ocaml/lablgtk/ml_glib.h -lib/ocaml/lablgtk/ml_gpointer.h -lib/ocaml/lablgtk/ml_gtk.h -lib/ocaml/lablgtk/varcc -lib/ocaml/lablgtk/wrappers.h -lib/ocaml/lablgtk/xml_lexer.mli -@dirrm lib/ocaml/lablgtk diff --git a/x11/lablgtk/PLIST.stub b/x11/lablgtk/PLIST.stub deleted file mode 100644 index 4f5c4e39abc..00000000000 --- a/x11/lablgtk/PLIST.stub +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST.stub,v 1.1 2005/02/04 22:47:24 adrianp Exp $ -lib/ocaml/stublibs/dlllablgtk.so -@unexec ${RMDIR} %D/lib/ocaml/stublibs 2>/dev/null || ${TRUE} diff --git a/x11/lablgtk/PLIST.svg b/x11/lablgtk/PLIST.svg new file mode 100644 index 00000000000..4fe38479743 --- /dev/null +++ b/x11/lablgtk/PLIST.svg @@ -0,0 +1,21 @@ +@comment $NetBSD: PLIST.svg,v 1.1 2007/09/21 13:00:53 wiz Exp $ +lib/ocaml/lablgtk2/gnoDruid.cmi +lib/ocaml/lablgtk2/gnoDruid.cmx +lib/ocaml/lablgtk2/gnoDruid.ml +lib/ocaml/lablgtk2/gnomeDruid.cmi +lib/ocaml/lablgtk2/gnomeDruid.cmx +lib/ocaml/lablgtk2/gnomeDruid.ml +lib/ocaml/lablgtk2/gnomeui_tags.h +lib/ocaml/lablgtk2/lablgnomeui.a +lib/ocaml/lablgtk2/lablgnomeui.cma +lib/ocaml/lablgtk2/lablgnomeui.cmxa +lib/ocaml/lablgtk2/lablrsvg.a +lib/ocaml/lablgtk2/lablrsvg.cma +lib/ocaml/lablgtk2/lablrsvg.cmxa +lib/ocaml/lablgtk2/liblablgnomeui.a +lib/ocaml/lablgtk2/liblablrsvg.a +lib/ocaml/lablgtk2/rsvg.cmi +lib/ocaml/lablgtk2/rsvg.cmx +lib/ocaml/lablgtk2/rsvg.ml +${HAVE_STUBS}lib/ocaml/stublibs/dlllablgnomeui.so +${HAVE_STUBS}lib/ocaml/stublibs/dlllablrsvg.so diff --git a/x11/lablgtk/buildlink3.mk b/x11/lablgtk/buildlink3.mk index 07a9eec4555..0d0ae4c6af0 100644 --- a/x11/lablgtk/buildlink3.mk +++ b/x11/lablgtk/buildlink3.mk @@ -1,6 +1,6 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:14 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2007/09/21 13:00:53 wiz Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LABLGTK_BUILDLINK3_MK:= ${LABLGTK_BUILDLINK3_MK}+ .if !empty(BUILDLINK_DEPTH:M+) @@ -12,12 +12,9 @@ BUILDLINK_PACKAGES+= lablgtk BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lablgtk .if !empty(LABLGTK_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.lablgtk+= lablgtk>=1.2.5nb3 -BUILDLINK_ABI_DEPENDS.lablgtk?= lablgtk>=1.2.7nb2 +BUILDLINK_API_DEPENDS.lablgtk+= lablgtk>=2.6.0nb3 +BUILDLINK_ABI_DEPENDS.lablgtk?= lablgtk>=2.6.0nb5 BUILDLINK_PKGSRCDIR.lablgtk?= ../../x11/lablgtk .endif # LABLGTK_BUILDLINK3_MK -.include "../../x11/gtk/buildlink3.mk" -.include "../../lang/ocaml/buildlink3.mk" - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/lablgtk/distinfo b/x11/lablgtk/distinfo index f7f5b82bfc0..4ad19864c7f 100644 --- a/x11/lablgtk/distinfo +++ b/x11/lablgtk/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.9 2005/06/16 13:09:34 hira Exp $ +$NetBSD: distinfo,v 1.10 2007/09/21 13:00:53 wiz Exp $ -SHA1 (lablgtk-1.2.7.tar.gz) = fe43512efdc7ab4e0dafb7dc8254a784857a1ade -RMD160 (lablgtk-1.2.7.tar.gz) = 27be7ff29fe4370bc9a1bbef8c0fa0db590f27c4 -Size (lablgtk-1.2.7.tar.gz) = 468443 bytes -SHA1 (patch-aa) = 6ed10b4f76376c372094a55bbdc02194358a2d7e +SHA1 (lablgtk-2.6.0.tar.gz) = 99aecd26360c5ba8f0d17fb0cdae42ff083732ce +RMD160 (lablgtk-2.6.0.tar.gz) = cc3bf61170f69bc43e5420bdd28e111744200384 +Size (lablgtk-2.6.0.tar.gz) = 658095 bytes +SHA1 (patch-aa) = a07ea3442cf4ded605c14da56527568209c234ff diff --git a/x11/lablgtk/options.mk b/x11/lablgtk/options.mk new file mode 100644 index 00000000000..476a2f84432 --- /dev/null +++ b/x11/lablgtk/options.mk @@ -0,0 +1,39 @@ +# $NetBSD: options.mk,v 1.1 2007/09/21 13:00:53 wiz Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.lablgtk +PKG_SUPPORTED_OPTIONS= glade gnomecanvas svg +PKG_SUGGESTED_OPTIONS= gnomecanvas svg + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mglade) +.include "../../devel/libglade2/buildlink3.mk" +CONFIGURE_ARGS+= --with-glade +PLIST_SRC+= PLIST.glade +.else +CONFIGURE_ARGS+= --without-glade +.endif + +.if !empty(PKG_OPTIONS:Mgnomecanvas) +.include "../../devel/libgnomeui/buildlink3.mk" +.include "../../graphics/libgnomecanvas/buildlink3.mk" +.include "../../x11/gnome-panel/buildlink3.mk" +CONFIGURE_ARGS+= --with-gnomecanvas +PLIST_SRC+= PLIST.gnomecanvas +.else +CONFIGURE_ARGS+= --without-gnomecanvas +.endif + +.if !empty(PKG_OPTIONS:Msvg) +.include "../../graphics/librsvg/buildlink3.mk" +CONFIGURE_ARGS+= --with-rsvg +PLIST_SRC+= PLIST.svg +.else +CONFIGURE_ARGS+= --without-rsvg +.endif + +.if !empty(PKG_OPTIONS:Mgnomecanvas) || !empty(PKG_OPTIONS:Msvg) +PLIST_SRC+= PLIST.gnome +.endif + +PLIST_SRC+= PLIST diff --git a/x11/lablgtk/patches/patch-aa b/x11/lablgtk/patches/patch-aa index e2494bcd366..95353e7d276 100644 --- a/x11/lablgtk/patches/patch-aa +++ b/x11/lablgtk/patches/patch-aa @@ -1,63 +1,24 @@ -$NetBSD: patch-aa,v 1.5 2005/06/16 13:09:34 hira Exp $ +$NetBSD: patch-aa,v 1.6 2007/09/21 13:00:54 wiz Exp $ ---- src/Makefile.orig 2003-05-15 16:17:53.000000000 +0200 +--- src/Makefile.orig 2005-10-17 13:52:03.000000000 +0200 +++ src/Makefile -@@ -137,32 +137,39 @@ testcc: lablgladecc lablgtktop - rm -f testcc.ml +@@ -220,7 +220,7 @@ build.ml: Makefile $(CONFIG) build.ml.in + -e "s|@GTKLIBS@|$(GTKLIBS)|" < build.ml.in > $@ - install: -- if test -d $(INSTALLDIR); then : ; else mkdir -p $(INSTALLDIR); fi -- cp $(ALLOBJS:.cmo=.cmi) $(THOBJS:.cmo=.cmi) $(INSTALLDIR) -- cp -p *.mli $(INSTALLDIR) -- cp -p $(ALLOBJS:.cmo=.ml) $(ALLTHOBJS:.cmo=.ml) $(INSTALLDIR) -- cp $(MLLIBS) $(THOBJS) $(INITOBJS) $(THINITOBJS) $(INSTALLDIR) -- cp $(CLIBS) $(INSTALLDIR) -- cd $(INSTALLDIR) && $(RANLIB) $(CLIBS) -- cp lablgtktop varcc $(INSTALLDIR) -- if test -f lablgtktop_t; then cp lablgtktop_t $(INSTALLDIR); fi -- cp -p *.h $(INSTALLDIR) -+ if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} ${INSTALLDIR}; fi -+ for F in $(ALLOBJS:.cmo=.cmi) $(THOBJS:.cmo=.cmi) *.mli \ -+ $(ALLOBJS:.cmo=.ml) $(ALLTHOBJS:.cmo=.ml) \ -+ $(MLLIBS) $(THOBJS) $(INITOBJS) $(THINITOBJS) $(CLIBS) *.h; \ -+ do \ -+ ${BSD_INSTALL_DATA} $$F ${INSTALLDIR}; \ -+ done -+ ${BSD_INSTALL_SCRIPT} lablgtktop $(INSTALLDIR) -+ ${BSD_INSTALL_SCRIPT} varcc $(INSTALLDIR) -+ if test -f lablgtktop_t; then ${BSD_INSTALL_SCRIPT} lablgtktop_t $(INSTALLDIR); fi - if test -f lablgtk.cmxa; then $(MAKE) installopt; fi -+ ${BSD_INSTALL_DATA_DIR} $(DLLDIR) - if test -f dlllablgtk.so; then \ -- if test -d $(DLLDIR); then : ; else mkdir -p $(DLLDIR); fi; \ -- cp $(CLIBS:lib%.a=dll%.so) $(DLLDIR) || \ -- echo "Couldn't install dlls in default location"; \ -+ for F in $(CLIBS:lib%.a=dll%.so); \ -+ do \ -+ ${BSD_INSTALL_DATA} $$F $(DLLDIR); \ -+ done; \ - fi -- cp lablgtk $(BINDIR) -+ ${BSD_INSTALL_SCRIPT} lablgtk $(BINDIR) - if test -f lablgladecc; then cp lablgladecc $(BINDIR); fi + gdk-pixbuf-mlsource$(XE) : lablgtk.cma gtkInit.cmo gdk-pixbuf-mlsource.ml +- $(CAMLC) -o $@ $^ ++ $(CAMLC) -I . -o $@ $^ - installopt: -- cp $(MLLIBS:.cma=.cmxa) $(MLLIBS:.cma=.a) $(INSTALLDIR) -- cd $(INSTALLDIR) && $(RANLIB) $(MLLIBS:.cma=.a) -- cp $(ALLOBJS:.cmo=.cmx) $(INSTALLDIR) -- cp $(INITOBJS:.cmo=.o) $(INSTALLDIR) -+ for F in $(MLLIBS:.cma=.cmxa) $(MLLIBS:.cma=.a) \ -+ $(ALLOBJS:.cmo=.cmx) $(INITOBJS:.cmo=.o); \ -+ do \ -+ ${BSD_INSTALL_DATA} $$F $(INSTALLDIR); \ -+ done - if test -f gtkThread.cmx; then \ -- cp $(THOBJS:.cmo=.cmx) $(THOBJS:.cmo=.o) $(INSTALLDIR); fi -+ for F in $(THOBJS:.cmo=.cmx) $(THOBJS:.cmo=.o); \ -+ do \ -+ ${BSD_INSTALL_DATA} $$F $(INSTALLDIR); \ -+ done; \ -+ fi - - liblablgtk.a: $(COBJS) - $(LIBRARIAN) -o lablgtk $(COBJS) $(GTKLIBS) + lablgtkopt:: $(MLLIBS:.cma=.cmxa) $(INITOBJS:.cmo=.cmx) + ifeq ($(THREADS_LIB),system) +@@ -254,9 +254,7 @@ install: + cp $(CLIBS) "$(INSTALLDIR)" + cd "$(INSTALLDIR)" && $(RANLIB) $(CLIBS) + cp varcc$(XE) propcc$(XE) "$(INSTALLDIR)" +- if test $(THREADS_LIB) != system || test $(HAS_DLL_SUPPORT) != yes; \ +- then cp lablgtktop$(XE) "$(INSTALLDIR)"; \ +- fi ++ cp lablgtktop$(XE) "$(INSTALLDIR)" + cp -p *.h "$(INSTALLDIR)" + @if test -f lablgtk.cmxa; then $(MAKE) installopt; fi + @if test -f dlllablgtk2$(XS); then $(MAKE) installdll; fi -- cgit v1.2.3