Fix MAKE_JOBS build with a strategic .WAIT. While here, fix a broken

printf format and bump PKGREVISION for that.

4 files changed, 35 insertions, 2 deletions

diff --git a/www/swill/Makefile b/www/swill/Makefile
index aeecab5ad6a..262bda7d091 100644
--- a/www/swill/Makefile
+++ b/www/swill/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2009/07/17 12:35:12 zafer Exp $
+# $NetBSD: Makefile,v 1.11 2011/09/29 11:27:07 dholland Exp $
 
 DISTNAME=		swill-0.3
+PKGREVISION=		1
 CATEGORIES=		www devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=swill/}
 EXTRACT_SUFX=		.tgz
diff --git a/www/swill/distinfo b/www/swill/distinfo
index 3e495148bf6..5617b82ae1a 100644
--- a/www/swill/distinfo
+++ b/www/swill/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.4 2010/12/30 13:15:14 obache Exp $
+$NetBSD: distinfo,v 1.5 2011/09/29 11:27:07 dholland Exp $
 
 SHA1 (swill-0.3.tgz) = 765a15c22ef527a811c41c3a2fd25199c979e298
 RMD160 (swill-0.3.tgz) = 72134ac3213b6e8df3cf5c7d3d73a2378e9f5659
 Size (swill-0.3.tgz) = 438745 bytes
+SHA1 (patch-Makefile_in) = 4e484d79b63edd74e990caf0b7556645f2d8fac8
+SHA1 (patch-Source_Objects_base_c) = 710bcee4dddbc2178b5c00d5f4827e54fdc2831b
 SHA1 (patch-aa) = a2bdde8349e57f6d6440ce4ed02a246353dc6d93
 SHA1 (patch-ab) = c855874bfb3df83a8218ff099e52cede9ebd4478
diff --git a/www/swill/patches/patch-Makefile_in b/www/swill/patches/patch-Makefile_in
new file mode 100644
index 00000000000..0e1d4436f80
--- /dev/null
+++ b/www/swill/patches/patch-Makefile_in
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile_in,v 1.1 2011/09/29 11:27:07 dholland Exp $
+
+Fix MAKE_JOBS build.
+
+--- Makefile.in~	2007-07-07 04:51:35.000000000 +0000
++++ Makefile.in
+@@ -53,7 +53,7 @@ install:
+ 	@echo "Installing $(INCLUDE_DIR)/swill/swill.h..."
+ 	@$(INSTALL_DATA) $(SRC_DIR)/Include/swill/swill.h $(INCLUDE_DIR)/swill/swill.h
+ 
+-all: static shared
++all: static .WAIT shared
+ 
+ localclean:
+ 	rm -rf *.o *.so libswill*
diff --git a/www/swill/patches/patch-Source_Objects_base_c b/www/swill/patches/patch-Source_Objects_base_c
new file mode 100644
index 00000000000..5258a9134c6
--- /dev/null
+++ b/www/swill/patches/patch-Source_Objects_base_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-Source_Objects_base_c,v 1.1 2011/09/29 11:27:07 dholland Exp $
+
+Use correct printf format. While on the same line, use snprintf.
+
+--- Source/Objects/base.c~	2007-08-09 15:17:37.000000000 +0000
++++ Source/Objects/base.c
+@@ -94,7 +94,7 @@ DohStr(const DOH *obj) {
+       if (objinfo->doh_str) {
+ 	 return (objinfo->doh_str)(b);
+       }
+-      sprintf(buffer,"<Object '%s' at %x>", objinfo->objname, (unsigned int) b);
++      snprintf(buffer, sizeof(buffer), "<Object '%s' at %p>", objinfo->objname, b);
+       return NewString(buffer);
+    } else {
+       return NewString(obj);