From 02863bf7aba81bee9578096c1be577b5ad0b57e6 Mon Sep 17 00:00:00 2001 From: tron Date: Sun, 30 Oct 2011 08:47:19 +0000 Subject: Pullup ticket #3580 - requested by dholland www/swiftsurf: build fix Revisions pulled up: - www/swiftsurf/distinfo 1.3 - www/swiftsurf/patches/patch-src_Makefile 1.1 --- Module Name: pkgsrc Committed By: dholland Date: Sat Oct 29 15:38:47 UTC 2011 Modified Files: pkgsrc/www/swiftsurf: distinfo Added Files: pkgsrc/www/swiftsurf/patches: patch-src_Makefile Log Message: Fix build with current ocaml --- www/swiftsurf/distinfo | 3 ++- www/swiftsurf/patches/patch-src_Makefile | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 www/swiftsurf/patches/patch-src_Makefile diff --git a/www/swiftsurf/distinfo b/www/swiftsurf/distinfo index bcfaf716f79..d896d9b7775 100644 --- a/www/swiftsurf/distinfo +++ b/www/swiftsurf/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.2 2005/02/24 14:08:39 wiz Exp $ +$NetBSD: distinfo,v 1.2.58.1 2011/10/30 08:47:19 tron Exp $ SHA1 (swiftsurf-1.2.5.tar.gz) = bf58a2afcbb8d9ee4cbeb9b8a6ebe00ab6f3d9c8 RMD160 (swiftsurf-1.2.5.tar.gz) = 243c9c05352e83b5f7b64a8398ea1373e7f8dc59 Size (swiftsurf-1.2.5.tar.gz) = 31950 bytes SHA1 (patch-aa) = 7882d5c8542e8ebab40100462ecfaaf3f282f5a2 +SHA1 (patch-src_Makefile) = e4dad6b60ca5da10b27a9d90b868b3c0f2845cec diff --git a/www/swiftsurf/patches/patch-src_Makefile b/www/swiftsurf/patches/patch-src_Makefile new file mode 100644 index 00000000000..e8a26c45769 --- /dev/null +++ b/www/swiftsurf/patches/patch-src_Makefile @@ -0,0 +1,20 @@ +$NetBSD: patch-src_Makefile,v 1.1.2.2 2011/10/30 08:47:19 tron Exp $ + +--- src/Makefile~ 2002-02-25 18:27:15.000000000 +0000 ++++ src/Makefile +@@ -18,13 +18,13 @@ byte: swift + + swift: $(OBJS-SWIFT) + $(OCAMLLINK) -custom -o swift unix.cma str.cma \ +- $(OBJS-SWIFT) -cclib -lunix -cclib -lstr ++ $(OBJS-SWIFT) -cclib -lunix + + nat: swift.opt + + swift.opt: $(OBJS-SWIFT-NAT) + $(OCAMLOPTLINK) -o swift.opt unix.cmxa str.cmxa \ +- $(OBJS-SWIFT-NAT) -cclib -lunix -cclib -lstr ++ $(OBJS-SWIFT-NAT) -cclib -lunix + + conflex.ml: conflex.mll + confpars.mli confpars.ml: confpars.mly -- cgit v1.2.3