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 ocamldiff -r1.2 -r1.2.58.1 pkgsrc/www/swiftsurf/distinfo
(tron)
| @@ -1,6 +1,7 @@ | @@ -1,6 +1,7 @@ | |||
| 1 | $NetBSD: distinfo,v 1.2 2005/02/24 14:08:39 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.2.58.1 2011/10/30 08:47:19 tron Exp $ | |
| 2 | 2 | |||
| 3 | SHA1 (swiftsurf-1.2.5.tar.gz) = bf58a2afcbb8d9ee4cbeb9b8a6ebe00ab6f3d9c8 | 3 | SHA1 (swiftsurf-1.2.5.tar.gz) = bf58a2afcbb8d9ee4cbeb9b8a6ebe00ab6f3d9c8 | |
| 4 | RMD160 (swiftsurf-1.2.5.tar.gz) = 243c9c05352e83b5f7b64a8398ea1373e7f8dc59 | 4 | RMD160 (swiftsurf-1.2.5.tar.gz) = 243c9c05352e83b5f7b64a8398ea1373e7f8dc59 | |
| 5 | Size (swiftsurf-1.2.5.tar.gz) = 31950 bytes | 5 | Size (swiftsurf-1.2.5.tar.gz) = 31950 bytes | |
| 6 | SHA1 (patch-aa) = 7882d5c8542e8ebab40100462ecfaaf3f282f5a2 | 6 | SHA1 (patch-aa) = 7882d5c8542e8ebab40100462ecfaaf3f282f5a2 | |
| 7 | SHA1 (patch-src_Makefile) = e4dad6b60ca5da10b27a9d90b868b3c0f2845cec |
$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