diff options
| author | jaapb <jaapb> | 2012-12-26 10:27:14 +0000 |
|---|---|---|
| committer | jaapb <jaapb> | 2012-12-26 10:27:14 +0000 |
| commit | 63b1a97b6f253d11fc10bd82a80a4f0b45f3ef29 (patch) | |
| tree | 93f26b98bf3408633c9d74dbe3d36d49a3e7520c /textproc/ocaml-expat | |
| parent | 676e3167ac1d1653ce9209b4789f4cd7f9296e28 (diff) | |
| download | pkgsrc-63b1a97b6f253d11fc10bd82a80a4f0b45f3ef29.tar.gz | |
Corrected build failure with clang, slightly cleaned up Makefile
(USE_LANGUAGES, put dependencies in alphabetic order)
Diffstat (limited to 'textproc/ocaml-expat')
| -rw-r--r-- | textproc/ocaml-expat/Makefile | 7 | ||||
| -rw-r--r-- | textproc/ocaml-expat/distinfo | 4 | ||||
| -rw-r--r-- | textproc/ocaml-expat/patches/patch-Makefile | 13 |
3 files changed, 17 insertions, 7 deletions
diff --git a/textproc/ocaml-expat/Makefile b/textproc/ocaml-expat/Makefile index be3e3994fb8..8d510ae9066 100644 --- a/textproc/ocaml-expat/Makefile +++ b/textproc/ocaml-expat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2012/10/25 06:56:09 asau Exp $ +# $NetBSD: Makefile,v 1.3 2012/12/26 10:27:14 jaapb Exp $ # DISTNAME= ocaml-expat-0.9.1 @@ -11,6 +11,7 @@ COMMENT= OCaml bindings for the expat library LICENSE= mit USE_TOOLS+= gmake +USE_LANGUAGES= c BUILD_TARGET= all PLIST_VARS+= opt @@ -21,7 +22,7 @@ PLIST.opt= yes BUILD_TARGET+= allopt .endif -.include "../../textproc/expat/buildlink3.mk" -.include "../../lang/ocaml/buildlink3.mk" .include "../../devel/ocaml-findlib/buildlink3.mk" +.include "../../lang/ocaml/buildlink3.mk" +.include "../../textproc/expat/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/ocaml-expat/distinfo b/textproc/ocaml-expat/distinfo index a9ae3893899..c1351dcf1c4 100644 --- a/textproc/ocaml-expat/distinfo +++ b/textproc/ocaml-expat/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1 2012/10/10 11:25:57 jaapb Exp $ +$NetBSD: distinfo,v 1.2 2012/12/26 10:27:14 jaapb Exp $ SHA1 (ocaml-expat-0.9.1.tar.gz) = c0a65558cf996ac727fe5c61224d3e19dfd7d02a RMD160 (ocaml-expat-0.9.1.tar.gz) = be731eacff0a114d948cfaedfafe9b9fc6dc54e7 Size (ocaml-expat-0.9.1.tar.gz) = 25223 bytes -SHA1 (patch-Makefile) = 2b57503d9548d3d7c8334c48469140c963cbb346 +SHA1 (patch-Makefile) = f2739f8dc4aa53ad038d6b52793bf9c3671d4c24 diff --git a/textproc/ocaml-expat/patches/patch-Makefile b/textproc/ocaml-expat/patches/patch-Makefile index 302bcd48b70..f2538d2eb44 100644 --- a/textproc/ocaml-expat/patches/patch-Makefile +++ b/textproc/ocaml-expat/patches/patch-Makefile @@ -1,6 +1,6 @@ -$NetBSD: patch-Makefile,v 1.1 2012/10/10 11:25:57 jaapb Exp $ +$NetBSD: patch-Makefile,v 1.2 2012/12/26 10:27:14 jaapb Exp $ -Correct location for expat and add DESTDIR support +Correct location for expat, add DESTDIR support, and correct depend for clang --- Makefile.orig 2005-03-13 14:00:29.000000000 +0000 +++ Makefile @@ -3,8 +3,8 @@ @@ -14,6 +14,15 @@ Correct location for expat and add DESTDIR support NAME=expat OBJECTS=expat.cmo +@@ -32,7 +32,7 @@ all: $(ARCHIVE) + allopt: $(XARCHIVE) + + depend: *.c *.ml *.mli +- gcc -MM *.c > depend ++ $(CC) -MM -I$(PREFIX)/lib/ocaml *.c > depend + $(OCAMLDEP) *.mli *.ml >> depend + + ## Library creation @@ -50,7 +50,8 @@ $(XARCHIVE): $(CARCHIVE) $(XOBJECTS) .PHONY: install install: all |