Thu Sep 29 11:27:07 2011 UTC ()
Fix MAKE_JOBS build with a strategic .WAIT. While here, fix a broken
printf format and bump PKGREVISION for that.


(dholland)
diff -r1.10 -r1.11 pkgsrc/www/swill/Makefile
diff -r1.4 -r1.5 pkgsrc/www/swill/distinfo
diff -r0 -r1.1 pkgsrc/www/swill/patches/patch-Makefile_in
diff -r0 -r1.1 pkgsrc/www/swill/patches/patch-Source_Objects_base_c
cvs diff -r1.10 -r1.11 pkgsrc/www/swill/Makefile (expand / switch to unified diff)

--- pkgsrc/www/swill/Makefile 2009/07/17 12:35:12 1.10
+++ pkgsrc/www/swill/Makefile 2011/09/29 11:27:07 1.11
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.10 2009/07/17 12:35:12 zafer Exp $ 1# $NetBSD: Makefile,v 1.11 2011/09/29 11:27:07 dholland Exp $
2 2
3DISTNAME= swill-0.3 3DISTNAME= swill-0.3
 4PKGREVISION= 1
4CATEGORIES= www devel 5CATEGORIES= www devel
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=swill/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=swill/}
6EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
7 8
8MAINTAINER= thorpej@NetBSD.org 9MAINTAINER= thorpej@NetBSD.org
9HOMEPAGE= http://swill.sourceforge.net/ 10HOMEPAGE= http://swill.sourceforge.net/
10COMMENT= The Simple Web Interface Link Library 11COMMENT= The Simple Web Interface Link Library
11LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
12 13
13PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
15WRKSRC= ${WRKDIR}/SWILL-0.3 16WRKSRC= ${WRKDIR}/SWILL-0.3
16GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
cvs diff -r1.4 -r1.5 pkgsrc/www/swill/distinfo (expand / switch to unified diff)

--- pkgsrc/www/swill/distinfo 2010/12/30 13:15:14 1.4
+++ pkgsrc/www/swill/distinfo 2011/09/29 11:27:07 1.5
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1$NetBSD: distinfo,v 1.4 2010/12/30 13:15:14 obache Exp $ 1$NetBSD: distinfo,v 1.5 2011/09/29 11:27:07 dholland Exp $
2 2
3SHA1 (swill-0.3.tgz) = 765a15c22ef527a811c41c3a2fd25199c979e298 3SHA1 (swill-0.3.tgz) = 765a15c22ef527a811c41c3a2fd25199c979e298
4RMD160 (swill-0.3.tgz) = 72134ac3213b6e8df3cf5c7d3d73a2378e9f5659 4RMD160 (swill-0.3.tgz) = 72134ac3213b6e8df3cf5c7d3d73a2378e9f5659
5Size (swill-0.3.tgz) = 438745 bytes 5Size (swill-0.3.tgz) = 438745 bytes
 6SHA1 (patch-Makefile_in) = 4e484d79b63edd74e990caf0b7556645f2d8fac8
 7SHA1 (patch-Source_Objects_base_c) = 710bcee4dddbc2178b5c00d5f4827e54fdc2831b
6SHA1 (patch-aa) = a2bdde8349e57f6d6440ce4ed02a246353dc6d93 8SHA1 (patch-aa) = a2bdde8349e57f6d6440ce4ed02a246353dc6d93
7SHA1 (patch-ab) = c855874bfb3df83a8218ff099e52cede9ebd4478 9SHA1 (patch-ab) = c855874bfb3df83a8218ff099e52cede9ebd4478
File Added: pkgsrc/www/swill/patches/Attic/patch-Makefile_in
$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*
File Added: pkgsrc/www/swill/patches/patch-Source_Objects_base_c
$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);