diff options
| author | tonio <tonio@pkgsrc.org> | 2009-09-08 18:35:46 +0000 |
|---|---|---|
| committer | tonio <tonio@pkgsrc.org> | 2009-09-08 18:35:46 +0000 |
| commit | febcc0c9201ce042e7da207c0b5f5c0291bdd365 (patch) | |
| tree | b570f4d6b96448ed7b631802be70fc63ebbd63fd /lang/ocaml | |
| parent | 842c6792efadb5235890cd79ccbc5f90b44b0c63 (diff) | |
| download | pkgsrc-febcc0c9201ce042e7da207c0b5f5c0291bdd365.tar.gz | |
Fix x11/labltk for ocaml 3.11.1 [PR pkg/42017]
Diffstat (limited to 'lang/ocaml')
| -rw-r--r-- | lang/ocaml/Makefile.common | 6 | ||||
| -rw-r--r-- | lang/ocaml/distinfo | 4 | ||||
| -rw-r--r-- | lang/ocaml/patches/patch-bc | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/lang/ocaml/Makefile.common b/lang/ocaml/Makefile.common index 4ba0df8a5c0..2a9119e9b09 100644 --- a/lang/ocaml/Makefile.common +++ b/lang/ocaml/Makefile.common @@ -1,5 +1,7 @@ -# $NetBSD: Makefile.common,v 1.23 2009/09/07 21:48:13 tonio Exp $ +# $NetBSD: Makefile.common,v 1.24 2009/09/08 18:35:46 tonio Exp $ +# used by x11/labltk/Makefile +# used by x11/ocaml-graphics/Makefile DISTNAME= ocaml-3.11.1 CATEGORIES= lang MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-3.11/ @@ -22,6 +24,8 @@ CPPFLAGS+= -DDB_DBM_HSEARCH INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX} \ MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR} +DISTINFO_FILE= ${.CURDIR}/../../lang/ocaml/distinfo +PATCHDIR= ${.CURDIR}/../../lang/ocaml/patches .include "../../mk/bsd.prefs.mk" diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo index a3d7924c645..441ae7311b1 100644 --- a/lang/ocaml/distinfo +++ b/lang/ocaml/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.45 2009/09/07 21:48:13 tonio Exp $ +$NetBSD: distinfo,v 1.46 2009/09/08 18:35:46 tonio Exp $ SHA1 (ocaml-3.11.1.tar.bz2) = 570feab47b34b29f866ecadcc16153d5a4a4f6a1 RMD160 (ocaml-3.11.1.tar.bz2) = 991147354a85b975a86ce2dffafce669c9338db5 @@ -20,7 +20,7 @@ SHA1 (patch-ay) = 702dd7d24ac94851bbb0f2c3f22e2141345ee8ea SHA1 (patch-az) = 1aa4bfe207eb4348987612576f30490bee2376ff SHA1 (patch-ba) = cec240f6d6bf7f22e78e5d945221a41ad10bfb4a SHA1 (patch-bb) = 50bd9aa5b46052d8f35c04f6e4c3cbb365d2f93c -SHA1 (patch-bc) = 7be374dd1503e3f7aab94ab72a6f0d97ea04f113 +SHA1 (patch-bc) = 3b6cab5af3d34b2d25c7ba718e5dd89e2d1f2171 SHA1 (patch-bd) = 226fd916ee68db9165e15e462bbf38d3d6bac8a6 SHA1 (patch-be) = 6c7232154b4935b9b4606940fd35799e20fafde2 SHA1 (patch-bf) = 0b4efd564362b816154bfd7ffacecae27c75c0ee diff --git a/lang/ocaml/patches/patch-bc b/lang/ocaml/patches/patch-bc index 73197566381..2ca93729acd 100644 --- a/lang/ocaml/patches/patch-bc +++ b/lang/ocaml/patches/patch-bc @@ -1,4 +1,4 @@ -$NetBSD: patch-bc,v 1.2 2009/09/07 21:48:14 tonio Exp $ +$NetBSD: patch-bc,v 1.3 2009/09/08 18:35:46 tonio Exp $ --- otherlibs/labltk/camltk/Makefile.orig 2007-12-12 15:09:45.000000000 +0100 +++ otherlibs/labltk/camltk/Makefile 2009-05-21 11:13:08.000000000 +0200 @@ -9,7 +9,7 @@ $NetBSD: patch-bc,v 1.2 2009/09/07 21:48:14 tonio Exp $ - if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi - cp $(CAMLTKOBJS:.cmo=.cmi) $(CWIDGETOBJS:.cmo=.mli) $(INSTALLDIR) + if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALLDIR); fi -+ ${BSD_ISNTALL_DATA} $(CAMLTKOBJS:.cmo=.cmi) $(CWIDGETOBJS:.cmo=.mli) $(INSTALLDIR) ++ ${BSD_INSTALL_DATA} $(CAMLTKOBJS:.cmo=.cmi) $(CWIDGETOBJS:.cmo=.mli) $(INSTALLDIR) chmod 644 $(INSTALLDIR)/*.cmi installopt: |