diff options
| author | jaapb <jaapb@pkgsrc.org> | 2012-09-10 05:33:25 +0000 |
|---|---|---|
| committer | jaapb <jaapb@pkgsrc.org> | 2012-09-10 05:33:25 +0000 |
| commit | 5006af9b4685292f968f11e149ec11ad940d2dcf (patch) | |
| tree | fde7607f33c747f5fdcf93776b12842866cab1f5 /x11 | |
| parent | 9838117c1bd91656c6d3494f503da3704f852acd (diff) | |
| download | pkgsrc-5006af9b4685292f968f11e149ec11ad940d2dcf.tar.gz | |
Corrected installation error (DESTDIR not applied correctly).
Added description of options. Added update to changes file.
Used buildlink3 for findlib dependency.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/lablgtk/Makefile | 5 | ||||
| -rw-r--r-- | x11/lablgtk/distinfo | 4 | ||||
| -rw-r--r-- | x11/lablgtk/patches/patch-src_Makefile | 17 |
3 files changed, 20 insertions, 6 deletions
diff --git a/x11/lablgtk/Makefile b/x11/lablgtk/Makefile index c204b14d149..c3d2b9cad1f 100644 --- a/x11/lablgtk/Makefile +++ b/x11/lablgtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.65 2012/09/09 19:04:52 wiz Exp $ +# $NetBSD: Makefile,v 1.66 2012/09/10 05:33:25 jaapb Exp $ # DISTNAME= lablgtk-2.16.0 @@ -11,8 +11,6 @@ COMMENT= GTK+ 2.x bindings for Objective Caml # for installed files; more restrictions on applications/ LICENSE= gnu-lgpl-v2 -DEPENDS+= ocaml-findlib-[0-9]*:../../devel/ocaml-findlib - PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= yes @@ -48,5 +46,6 @@ PLIST.opt= yes INSTALLATION_DIRS+= lib/ocaml/site-lib .include "../../lang/ocaml/buildlink3.mk" +.include "../../devel/ocaml-findlib/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/lablgtk/distinfo b/x11/lablgtk/distinfo index 79c82f0448d..f19a9934417 100644 --- a/x11/lablgtk/distinfo +++ b/x11/lablgtk/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.17 2012/09/09 18:45:45 jaapb Exp $ +$NetBSD: distinfo,v 1.18 2012/09/10 05:33:25 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) = fad55d7546b948b006a8c3ad9f5381ac647cfb53 +SHA1 (patch-src_Makefile) = 62095e6eff84219e954a839b0fcf4214b9bf42e4 diff --git a/x11/lablgtk/patches/patch-src_Makefile b/x11/lablgtk/patches/patch-src_Makefile index ed8ba8fec64..20abeb65b7e 100644 --- a/x11/lablgtk/patches/patch-src_Makefile +++ b/x11/lablgtk/patches/patch-src_Makefile @@ -1,4 +1,4 @@ -$NetBSD: patch-src_Makefile,v 1.1 2012/09/09 18:45:45 jaapb Exp $ +$NetBSD: patch-src_Makefile,v 1.2 2012/09/10 05:33:25 jaapb Exp $ Support DESTDIR when installing --- src/Makefile.orig 2012-08-23 10:37:48.000000000 +0000 @@ -14,3 +14,18 @@ Support DESTDIR when installing 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)"; \ |