diff options
author | jaapb <jaapb@pkgsrc.org> | 2013-11-01 21:41:45 +0000 |
---|---|---|
committer | jaapb <jaapb@pkgsrc.org> | 2013-11-01 21:41:45 +0000 |
commit | b962d4544293c6c1175f0ed60359528c413b46d3 (patch) | |
tree | b897f9938c4649d19ae237c40b5bb8788ebc2ca5 /x11/lablgtk | |
parent | 18bd2bdf55e76b084257b46f071b0b8da53af5f3 (diff) | |
download | pkgsrc-b962d4544293c6c1175f0ed60359528c413b46d3.tar.gz |
Updated x11/lablgtk to its newest version, 2.18. Changes include:
* update applications for 4.01
* various fixes in windows port
* add some GTK enumerations and update stock icon list
* add properties GtkTreeView.enable_{tree,grid}_lines
* add properties GtkEntry.{primary,secondary}_icon_{stock,name,pixbuf},
see examples/entry2.ml for usage
* add tags in GtkMovementStep
* fix compatibility with ocaml 4.01 (?lab for non-optional arguments)
* add handling of new modifiers
* detect findlib during configuration
* support DESTDIR with findlib-install
* have old-install copy the META file too
* cleanup the two phases of findlib-install
Diffstat (limited to 'x11/lablgtk')
-rw-r--r-- | x11/lablgtk/Makefile | 7 | ||||
-rw-r--r-- | x11/lablgtk/PLIST | 4 | ||||
-rw-r--r-- | x11/lablgtk/distinfo | 10 | ||||
-rw-r--r-- | x11/lablgtk/patches/patch-src_Makefile | 39 |
4 files changed, 24 insertions, 36 deletions
diff --git a/x11/lablgtk/Makefile b/x11/lablgtk/Makefile index 4980d063b5f..6a10161c2ee 100644 --- a/x11/lablgtk/Makefile +++ b/x11/lablgtk/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.85 2013/11/01 11:30:23 jaapb Exp $ +# $NetBSD: Makefile,v 1.86 2013/11/01 21:41:45 jaapb Exp $ # -DISTNAME= lablgtk-2.16.0 -PKGREVISION= 18 +DISTNAME= lablgtk-2.18.0 CATEGORIES= x11 -MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/979/ +MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1261/ MAINTAINER= jaapb@NetBSD.org HOMEPAGE= http://lablgtk.forge.ocamlcore.org/ diff --git a/x11/lablgtk/PLIST b/x11/lablgtk/PLIST index 0ca1fd54536..0d5c2e16b4b 100644 --- a/x11/lablgtk/PLIST +++ b/x11/lablgtk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.15 2012/09/09 18:45:44 jaapb Exp $ +@comment $NetBSD: PLIST,v 1.16 2013/11/01 21:41:45 jaapb Exp $ bin/gdk_pixbuf_mlsource bin/lablgtk2 lib/ocaml/site-lib/lablgtk2/META @@ -349,3 +349,5 @@ lib/ocaml/site-lib/lablgtk2/xml_lexer.mli ${PLIST.stubs}lib/ocaml/site-lib/lablgtk2/dlllablgtk2.so @comment in ocaml: lib/ocaml/stublibs @comment in ocaml: lib/ocaml +@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/lablgtk2 +@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/lablgtk2 diff --git a/x11/lablgtk/distinfo b/x11/lablgtk/distinfo index f19a9934417..233076ff2c5 100644 --- a/x11/lablgtk/distinfo +++ b/x11/lablgtk/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.18 2012/09/10 05:33:25 jaapb Exp $ +$NetBSD: distinfo,v 1.19 2013/11/01 21:41:45 jaapb Exp $ -SHA1 (lablgtk-2.16.0.tar.gz) = 3dec411a410fbb38d6e2e5a43a4ebfb2e407e7e6 -RMD160 (lablgtk-2.16.0.tar.gz) = 47d89ce62e02dc4143f340e92adfdde6bbdef89a -Size (lablgtk-2.16.0.tar.gz) = 787217 bytes -SHA1 (patch-src_Makefile) = 62095e6eff84219e954a839b0fcf4214b9bf42e4 +SHA1 (lablgtk-2.18.0.tar.gz) = df65c72783dc20c364b8a2e2ee5aa07042e68eae +RMD160 (lablgtk-2.18.0.tar.gz) = af5d64cbcaa0bee3ad58954a74cd99096fe57152 +Size (lablgtk-2.18.0.tar.gz) = 789507 bytes +SHA1 (patch-src_Makefile) = a24fafdbc273863e110d4becb79f849053ec9a9c diff --git a/x11/lablgtk/patches/patch-src_Makefile b/x11/lablgtk/patches/patch-src_Makefile index 20abeb65b7e..19b2e8dbeb7 100644 --- a/x11/lablgtk/patches/patch-src_Makefile +++ b/x11/lablgtk/patches/patch-src_Makefile @@ -1,31 +1,18 @@ -$NetBSD: patch-src_Makefile,v 1.2 2012/09/10 05:33:25 jaapb Exp $ +$NetBSD: patch-src_Makefile,v 1.3 2013/11/01 21:41:45 jaapb Exp $ -Support DESTDIR when installing ---- src/Makefile.orig 2012-08-23 10:37:48.000000000 +0000 +Do not create an ld.conf, this is done afterwards through the PLIST +--- src/Makefile.orig 2013-10-01 08:31:50.000000000 +0000 +++ src/Makefile -@@ -391,7 +391,9 @@ old-uninstall: - # Install using ocamlfind - findlib-install: +@@ -395,10 +395,10 @@ findlib-install: + exit 2; fi mkdir -p "$(BINDIR)" -- ocamlfind install lablgtk2 ../META \ -+ ocamlfind install -destdir ${DESTDIR}${PREFIX}/lib/ocaml/site-lib \ -+ -ldconf /var/null lablgtk2 \ -+ ../META \ + mkdir -p "$(DESTDIR)$(FINDLIBDIR)" +- @if test -f "$(DESTDIR)$(OCAMLLDCONF)"; then :; else \ ++# @if test -f "$(DESTDIR)$(OCAMLLDCONF)"; then :; else \ + touch "$(DESTDIR)$(OCAMLLDCONF)"; fi + $(OCAMLFIND) install -destdir "$(DESTDIR)$(FINDLIBDIR)" \ +- -ldconf "$(DESTDIR)$(OCAMLLDCONF)" \ ++ -ldconf ignore \ + lablgtk2 ../META \ build.ml \ $(CLIBS) \ - $(ALLOBJS:.cmo=.cmi) $(EXTRA_OBJS:.cmo=.cmi) \ -@@ -427,11 +429,11 @@ findlib-install: - then \ - echo $(CLIBS:lib%$(XA)=dll%$(XA)) ; \ - fi` -- $(RANLIB) $(CLIBS:%="`ocamlfind query lablgtk2 | tr -d '\r'`"/%) -+ $(RANLIB) $(CLIBS:%=${DESTDIR}${PREFIX}/lib/ocaml/site-lib/lablgtk2/%) - @if test -f lablgtk.cmxa; \ -- then ($(RANLIB) $(MLLIBS:%.cma="`ocamlfind query lablgtk2 | tr -d '\r'`"/%$(XA)) $(EXTRA_MLLIBS:%.cma="`ocamlfind query lablgtk2 | tr -d '\r'`"/%$(XA)) ); fi -+ then ($(RANLIB) $(MLLIBS:%.cma=${DESTDIR}${PREFIX}/lib/ocaml/site-lib/lablgtk2/%$(XA)) $(EXTRA_MLLIBS:%.cma=${DESTDIR}${PREFIX}/lib/ocaml/site-lib/lablgtk2/%$(XA)) ); fi - rm lablgtk2$(XB) -- $(MAKE) INSTALLDIR=`ocamlfind query lablgtk2 | tr -d '\r'` lablgtk2$(XB) -+ $(MAKE) INSTALLDIR=${DESTDIR}${PREFIX}/lib/ocaml/site-lib/lablgtk2 lablgtk2$(XB) - cp lablgtk2$(XB) "$(BINDIR)" - if test -f lablgladecc$(XE); then \ - cp lablgladecc$(XE) "$(BINDIR)/lablgladecc2$(XE)"; \ |