pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11 Rename lablgtk to lablgtk1 and lablgtk2 to lablgtk.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/bbf58a8b0b7f
branches:  trunk
changeset: 533561:bbf58a8b0b7f
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Sep 21 13:00:50 2007 +0000

description:
Rename lablgtk to lablgtk1 and lablgtk2 to lablgtk.

diffstat:

 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   |   81 ++-----
 x11/lablgtk1/DESCR             |    6 +
 x11/lablgtk1/Makefile          |   48 ++++
 x11/lablgtk1/PLIST             |  179 +++++++++++++++++
 x11/lablgtk1/PLIST.noopt       |  130 ++++++++++++
 x11/lablgtk1/PLIST.stub        |    3 +
 x11/lablgtk1/buildlink3.mk     |   23 ++
 x11/lablgtk1/distinfo          |    6 +
 x11/lablgtk1/patches/patch-aa  |   63 ++++++
 x11/lablgtk2/DESCR             |    6 -
 x11/lablgtk2/Makefile          |   40 ---
 x11/lablgtk2/PLIST             |  250 -----------------------
 x11/lablgtk2/PLIST.glade       |   10 -
 x11/lablgtk2/PLIST.gnome       |   13 -
 x11/lablgtk2/PLIST.gnomecanvas |   21 --
 x11/lablgtk2/PLIST.svg         |   21 --
 x11/lablgtk2/buildlink3.mk     |   20 -
 x11/lablgtk2/distinfo          |    6 -
 x11/lablgtk2/options.mk        |   39 ---
 x11/lablgtk2/patches/patch-aa  |   24 --
 32 files changed, 867 insertions(+), 865 deletions(-)

diffs (truncated from 1896 to 300 lines):

diff -r d3524e111a97 -r bbf58a8b0b7f x11/lablgtk/DESCR
--- a/x11/lablgtk/DESCR Fri Sep 21 13:00:17 2007 +0000
+++ b/x11/lablgtk/DESCR Fri Sep 21 13:00:50 2007 +0000
@@ -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 -r d3524e111a97 -r bbf58a8b0b7f x11/lablgtk/Makefile
--- a/x11/lablgtk/Makefile      Fri Sep 21 13:00:17 2007 +0000
+++ b/x11/lablgtk/Makefile      Fri Sep 21 13:00:50 2007 +0000
@@ -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@localhost
 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}
+.include "options.mk"
 
-.if defined(USE_DOTOPT)
-post-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
-               opt
-.endif
-
-.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 -r d3524e111a97 -r bbf58a8b0b7f x11/lablgtk/PLIST
--- a/x11/lablgtk/PLIST Fri Sep 21 13:00:17 2007 +0000
+++ b/x11/lablgtk/PLIST Fri Sep 21 13:00:50 2007 +0000
@@ -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



Home | Main Index | Thread Index | Old Index