Thu Jul 9 11:56:59 2015 UTC ()
Use nbcompat, add some other patch comments.  Fixes build on SunOS.


(jperkin)
diff -r1.5 -r1.6 pkgsrc/devel/error/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/error/patches/patch-Makefile
diff -r1.1 -r1.2 pkgsrc/devel/error/patches/patch-aa
diff -r1.2 -r1.3 pkgsrc/devel/error/patches/patch-ab
diff -r1.2 -r1.3 pkgsrc/devel/error/patches/patch-ac
diff -r0 -r1.1 pkgsrc/devel/error/patches/patch-filter.c
diff -r0 -r1.1 pkgsrc/devel/error/patches/patch-input.c
diff -r0 -r1.1 pkgsrc/devel/error/patches/patch-main.c
diff -r0 -r1.1 pkgsrc/devel/error/patches/patch-pi.c
diff -r0 -r1.1 pkgsrc/devel/error/patches/patch-subr.c
diff -r0 -r1.1 pkgsrc/devel/error/patches/patch-touch.c
cvs diff -r1.5 -r1.6 pkgsrc/devel/error/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/error/distinfo 2014/02/09 16:48:42 1.5
+++ pkgsrc/devel/error/distinfo 2015/07/09 11:56:58 1.6
@@ -1,10 +1,16 @@ @@ -1,10 +1,16 @@
1$NetBSD: distinfo,v 1.5 2014/02/09 16:48:42 wiedi Exp $ 1$NetBSD: distinfo,v 1.6 2015/07/09 11:56:58 jperkin Exp $
2 2
3SHA1 (error-0.0.tar.gz) = b791825e6864e9459401d2bc780521a7411f1ce2 3SHA1 (error-0.0.tar.gz) = b791825e6864e9459401d2bc780521a7411f1ce2
4RMD160 (error-0.0.tar.gz) = 8546498a08045c44eb1a5693447954640d2bf9e4 4RMD160 (error-0.0.tar.gz) = 8546498a08045c44eb1a5693447954640d2bf9e4
5Size (error-0.0.tar.gz) = 25818 bytes 5Size (error-0.0.tar.gz) = 25818 bytes
6SHA1 (patch-Makefile) = 53979fb590663c9b28c9a57bdc69dfd27e878f33 6SHA1 (patch-Makefile) = ec0605adf1b5968d4ab7ff70dd8f0a9d09041473
7SHA1 (patch-aa) = 8a5addfb206d969b8cf5d2ff8b1505f28d499f02 7SHA1 (patch-aa) = 79a08a78256211fc509eb7c545ce4a3c580daee3
8SHA1 (patch-ab) = d07451d05915be0fdc0e941befc292d26807fa8d 8SHA1 (patch-ab) = 52084feda3deb718136ae9f1bc3896c72eb36acc
9SHA1 (patch-ac) = 4077d23e2a155ff022e767eacdabb0a3eb815415 9SHA1 (patch-ac) = 9500ca2702ae57b383676e614fc4253fa3042bbf
 10SHA1 (patch-filter.c) = d2c50245539e854aa6094a1324f4a5f607133434
 11SHA1 (patch-input.c) = 277c4a7e2d71960c8fc78c350329e63669ead211
 12SHA1 (patch-main.c) = a101d954a92cf69ed443b72f772bea8a71f7cc65
10SHA1 (patch-pathnames.h) = 5d88acd43f71b91f41f6c25d17f2576f347563aa 13SHA1 (patch-pathnames.h) = 5d88acd43f71b91f41f6c25d17f2576f347563aa
 14SHA1 (patch-pi.c) = 404c23b18901fbe2371cc9e2d51bc4f5d321d0e6
 15SHA1 (patch-subr.c) = 3277879b10ac912f6d731cf097b4fcd9fd5867b0
 16SHA1 (patch-touch.c) = 105e404825e05a564ba7675f6f012dc4958e92a3
cvs diff -r1.1 -r1.2 pkgsrc/devel/error/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/devel/error/patches/patch-Makefile 2012/12/30 04:24:41 1.1
+++ pkgsrc/devel/error/patches/patch-Makefile 2015/07/09 11:56:59 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-Makefile,v 1.1 2012/12/30 04:24:41 dholland Exp $ 1$NetBSD: patch-Makefile,v 1.2 2015/07/09 11:56:59 jperkin Exp $
2 2
3Honor PKGMANDIR. 3Honor PKGMANDIR.
4 4
5--- Makefile~ 2005-05-10 20:53:43.000000000 +0000 5--- Makefile.orig 2005-05-10 20:53:43.000000000 +0000
6+++ Makefile 6+++ Makefile
7@@ -3,5 +3,5 @@ 7@@ -3,5 +3,5 @@
8  8
9 BINDIR=${PREFIX}/bin 9 BINDIR=${PREFIX}/bin
10-MANDIR=${PREFIX}/man 10-MANDIR=${PREFIX}/man
11+MANDIR=${PREFIX}/${PKGMANDIR} 11+MANDIR=${PREFIX}/${PKGMANDIR}
12 CPPFLAGS='-D__COPYRIGHT(a)=' '-D__RCSID(a)=' 12 CPPFLAGS='-D__COPYRIGHT(a)=' '-D__RCSID(a)='
13  13
cvs diff -r1.1 -r1.2 pkgsrc/devel/error/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/devel/error/patches/patch-aa 2005/06/21 21:02:16 1.1
+++ pkgsrc/devel/error/patches/patch-aa 2015/07/09 11:56:59 1.2
@@ -1,12 +1,14 @@ @@ -1,12 +1,14 @@
1$NetBSD: patch-aa,v 1.1 2005/06/21 21:02:16 jlam Exp $ 1$NetBSD: patch-aa,v 1.2 2015/07/09 11:56:59 jperkin Exp $
2 2
3--- error.h.orig 2005-05-10 16:48:24.000000000 -0400 3Fix strl* return types.
 4
 5--- error.h.orig 2005-05-10 20:48:24.000000000 +0000
4+++ error.h 6+++ error.h
5@@ -248,5 +248,5 @@ char **wordvsplice(int, int, char **); 7@@ -248,5 +248,5 @@ char **wordvsplice(int, int, char **);
6 boolean writetouched(int); 8 boolean writetouched(int);
7  9
8 extern char *fgetln(FILE *, size_t*); 10 extern char *fgetln(FILE *, size_t*);
9-extern ssize_t strlcpy(char *, const char *, size_t); 11-extern ssize_t strlcpy(char *, const char *, size_t);
10-extern ssize_t strlcat(char *, const char *, size_t); 12-extern ssize_t strlcat(char *, const char *, size_t);
11+extern size_t strlcpy(char *, const char *, size_t); 13+extern size_t strlcpy(char *, const char *, size_t);
12+extern size_t strlcat(char *, const char *, size_t); 14+extern size_t strlcat(char *, const char *, size_t);
cvs diff -r1.2 -r1.3 pkgsrc/devel/error/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/devel/error/patches/patch-ab 2005/12/05 20:50:03 1.2
+++ pkgsrc/devel/error/patches/patch-ab 2015/07/09 11:56:59 1.3
@@ -1,12 +1,19 @@ @@ -1,12 +1,19 @@
1$NetBSD: patch-ab,v 1.2 2005/12/05 20:50:03 rillig Exp $ 1$NetBSD: patch-ab,v 1.3 2015/07/09 11:56:59 jperkin Exp $
2 2
3--- strlcat.c.orig 2005-05-10 16:48:24.000000000 -0400 3Don't redefine _DIAGASSERT.
 4
 5--- strlcat.c.orig 2005-05-10 20:48:24.000000000 +0000
4+++ strlcat.c 6+++ strlcat.c
5@@ -35,6 +35,7 @@ 7@@ -23,3 +23,8 @@
6  8
7 size_t 9+#if defined(HAVE_NBCOMPAT_H)
 10+#include <nbcompat.h>
 11+#include <nbcompat/cdefs.h>
 12+#else
 13 #include <sys/cdefs.h>
 14+#endif
 15 #if defined(LIBC_SCCS) && !defined(lint)
 16@@ -37,2 +42,3 @@ size_t
8 strlcat(char *dst, const char *src, size_t siz); 17 strlcat(char *dst, const char *src, size_t siz);
9+#undef _DIAGASSERT 18+#undef _DIAGASSERT
10 #define _DIAGASSERT(a) 19 #define _DIAGASSERT(a)
11  
12 #ifdef _LIBC 
cvs diff -r1.2 -r1.3 pkgsrc/devel/error/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/devel/error/patches/patch-ac 2005/12/05 20:50:03 1.2
+++ pkgsrc/devel/error/patches/patch-ac 2015/07/09 11:56:59 1.3
@@ -1,12 +1,19 @@ @@ -1,12 +1,19 @@
1$NetBSD: patch-ac,v 1.2 2005/12/05 20:50:03 rillig Exp $ 1$NetBSD: patch-ac,v 1.3 2015/07/09 11:56:59 jperkin Exp $
2 2
3--- strlcpy.c.orig 2005-05-10 16:48:24.000000000 -0400 3Don't redefine _DIAGASSERT.
 4
 5--- strlcpy.c.orig 2005-05-10 20:48:24.000000000 +0000
4+++ strlcpy.c 6+++ strlcpy.c
5@@ -34,6 +34,7 @@ 7@@ -23,3 +23,8 @@
6 #include <string.h> 8
7 size_t 9+#if defined(HAVE_NBCOMPAT_H)
 10+#include <nbcompat.h>
 11+#include <nbcompat/cdefs.h>
 12+#else
 13 #include <sys/cdefs.h>
 14+#endif
 15 #if defined(LIBC_SCCS) && !defined(lint)
 16@@ -36,2 +41,3 @@ size_t
8 strlcpy(char *dst, const char *src, size_t siz); 17 strlcpy(char *dst, const char *src, size_t siz);
9+#undef _DIAGASSERT 18+#undef _DIAGASSERT
10 #define _DIAGASSERT(a) 19 #define _DIAGASSERT(a)
11  
12 #ifdef _LIBC 
File Added: pkgsrc/devel/error/patches/patch-filter.c
$NetBSD: patch-filter.c,v 1.1 2015/07/09 11:56:59 jperkin Exp $

Use nbcompat.

--- filter.c.orig	2005-05-10 20:48:24.000000000 +0000
+++ filter.c
@@ -29,7 +29,12 @@
  * SUCH DAMAGE.
  */
 
+#if defined(HAVE_NBCOMPAT_H)
+#include <nbcompat.h>
+#include <nbcompat/cdefs.h>
+#else
 #include <sys/cdefs.h>
+#endif
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)filter.c	8.1 (Berkeley) 6/6/93";
File Added: pkgsrc/devel/error/patches/patch-input.c
$NetBSD: patch-input.c,v 1.1 2015/07/09 11:56:59 jperkin Exp $

Use nbcompat.

--- input.c.orig	2005-05-10 20:48:24.000000000 +0000
+++ input.c
@@ -29,7 +29,12 @@
  * SUCH DAMAGE.
  */
 
+#if defined(HAVE_NBCOMPAT_H)
+#include <nbcompat.h>
+#include <nbcompat/cdefs.h>
+#else
 #include <sys/cdefs.h>
+#endif
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)input.c	8.1 (Berkeley) 6/6/93";
File Added: pkgsrc/devel/error/patches/patch-main.c
$NetBSD: patch-main.c,v 1.1 2015/07/09 11:56:59 jperkin Exp $

Use nbcompat.

--- main.c.orig	2005-05-10 20:48:24.000000000 +0000
+++ main.c
@@ -29,7 +29,12 @@
  * SUCH DAMAGE.
  */
 
+#if defined(HAVE_NBCOMPAT_H)
+#include <nbcompat.h>
+#include <nbcompat/cdefs.h>
+#else
 #include <sys/cdefs.h>
+#endif
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n");
File Added: pkgsrc/devel/error/patches/patch-pi.c
$NetBSD: patch-pi.c,v 1.1 2015/07/09 11:56:59 jperkin Exp $

Use nbcompat.

--- pi.c.orig	2005-05-10 20:49:29.000000000 +0000
+++ pi.c
@@ -29,7 +29,12 @@
  * SUCH DAMAGE.
  */
 
+#if defined(HAVE_NBCOMPAT_H)
+#include <nbcompat.h>
+#include <nbcompat/cdefs.h>
+#else
 #include <sys/cdefs.h>
+#endif
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)pi.c	8.1 (Berkeley) 6/6/93";
File Added: pkgsrc/devel/error/patches/patch-subr.c
$NetBSD: patch-subr.c,v 1.1 2015/07/09 11:56:59 jperkin Exp $

Use nbcompat.

--- subr.c.orig	2005-05-10 20:48:24.000000000 +0000
+++ subr.c
@@ -29,7 +29,12 @@
  * SUCH DAMAGE.
  */
 
+#if defined(HAVE_NBCOMPAT_H)
+#include <nbcompat.h>
+#include <nbcompat/cdefs.h>
+#else
 #include <sys/cdefs.h>
+#endif
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)subr.c	8.1 (Berkeley) 6/6/93";
File Added: pkgsrc/devel/error/patches/patch-touch.c
$NetBSD: patch-touch.c,v 1.1 2015/07/09 11:56:59 jperkin Exp $

Use nbcompat.

--- touch.c.orig	2005-05-10 20:48:24.000000000 +0000
+++ touch.c
@@ -29,7 +29,12 @@
  * SUCH DAMAGE.
  */
 
+#if defined(HAVE_NBCOMPAT_H)
+#include <nbcompat.h>
+#include <nbcompat/cdefs.h>
+#else
 #include <sys/cdefs.h>
+#endif
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)touch.c	8.1 (Berkeley) 6/6/93";