Fix errno deetection and use of the test results. Isn't it a lot better

when the conditional matches the variable name from the test case?

6 files changed, 89 insertions, 1 deletions

diff --git a/print/LPRng-core/distinfo b/print/LPRng-core/distinfo
index f6b724bb77f..f38d978aef0 100644
--- a/print/LPRng-core/distinfo
+++ b/print/LPRng-core/distinfo
@@ -1,7 +1,12 @@
-$NetBSD: distinfo,v 1.7 2005/11/08 19:25:12 tv Exp $
+$NetBSD: distinfo,v 1.8 2005/12/29 13:46:16 joerg Exp $
 
 SHA1 (LPRng-3.8.28.tgz) = f4373004adb1439819600701bb98517137daf1fc
 RMD160 (LPRng-3.8.28.tgz) = f0460d7fa7d1ea0ce6b49fcb656905fdda3d0d41
 Size (LPRng-3.8.28.tgz) = 10212500 bytes
 SHA1 (patch-aa) = a48d1bc4211e4938a9888fbd219f702dc1c84126
+SHA1 (patch-ab) = d7e360ef0d1aaa7d255d7171aa03cf6a0699983f
 SHA1 (patch-ac) = 820629869ca4452886b5860de11a449a7b4603e9
+SHA1 (patch-ad) = 209456757091d2086f26c1cf7e9408342c4b5af7
+SHA1 (patch-ae) = 7abd651dc1433ea6069d35f201fb146703ce3eb2
+SHA1 (patch-af) = 4a3f03207e3b1a94ebc5dd6375d40d3da8f8aedf
+SHA1 (patch-ag) = bc84154636da3b331076b1051c1e70a9f65c858b
diff --git a/print/LPRng-core/patches/patch-ab b/print/LPRng-core/patches/patch-ab
new file mode 100644
index 00000000000..a20e5a09faf
--- /dev/null
+++ b/print/LPRng-core/patches/patch-ab
@@ -0,0 +1,29 @@
+$NetBSD: patch-ab,v 1.3 2005/12/29 13:46:16 joerg Exp $
+
+--- configure.orig	2004-09-24 20:16:30.000000000 +0000
++++ configure
+@@ -14590,6 +14590,7 @@ else
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
++#include <errno.h>
+ 
+ #ifdef F77_DUMMY_MAIN
+ #  ifdef __cplusplus
+@@ -14600,7 +14601,7 @@ cat >conftest.$ac_ext <<_ACEOF
+ int
+ main ()
+ {
+-extern int errno; return (errno);
++  return (errno);
+   ;
+   return 0;
+ }
+@@ -14653,6 +14654,7 @@ else
+ 	#endif
+ 	#ifdef HAVE_ERRNO_H
+ 	#include <errno.h>
++	#endif
+ 
+ #ifdef F77_DUMMY_MAIN
+ #  ifdef __cplusplus
diff --git a/print/LPRng-core/patches/patch-ad b/print/LPRng-core/patches/patch-ad
new file mode 100644
index 00000000000..2dbc1967a64
--- /dev/null
+++ b/print/LPRng-core/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.3 2005/12/29 13:46:16 joerg Exp $
+
+--- src/include/portable.h.orig	2005-12-28 21:36:47.000000000 +0000
++++ src/include/portable.h
+@@ -364,7 +364,7 @@ typedef struct dirent plp_dir_t;
+ # endif
+ #endif
+ 
+-#ifndef HAVE_ERRNO_DECL
++#ifndef HAVE_DECL_ERRNO
+  extern int errno;
+ #endif
+ 
diff --git a/print/LPRng-core/patches/patch-ae b/print/LPRng-core/patches/patch-ae
new file mode 100644
index 00000000000..fb4cd981c10
--- /dev/null
+++ b/print/LPRng-core/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1 2005/12/29 13:46:16 joerg Exp $
+
+--- src/common/proctitle.c.orig	2005-12-28 21:43:26.000000000 +0000
++++ src/common/proctitle.c
+@@ -87,8 +87,8 @@
+ # endif
+ #endif
+ 
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+-# if defined(__NetBSD__) && (NetBSD > 199307 || NetBSD0_9 > 1)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
++# if (defined(__NetBSD__) && (NetBSD > 199307 || NetBSD0_9 > 1)) || defined(__DragonFly__)
+ #  undef SPT_TYPE
+ #  define SPT_TYPE	SPT_BUILTIN	/* setproctitle is in libc */
+ # endif
diff --git a/print/LPRng-core/patches/patch-af b/print/LPRng-core/patches/patch-af
new file mode 100644
index 00000000000..a618540abfb
--- /dev/null
+++ b/print/LPRng-core/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2005/12/29 13:46:16 joerg Exp $
+
+--- src/common/lpf.c.orig	2005-12-28 21:49:47.000000000 +0000
++++ src/common/lpf.c
+@@ -135,7 +135,7 @@ int plp_vsnprintf ();
+ # include <sys/file.h>
+ #endif
+ 
+-#ifndef HAVE_ERRNO_DECL
++#ifndef HAVE_DECL_ERRNO
+ extern int errno;
+ #endif
+ 
diff --git a/print/LPRng-core/patches/patch-ag b/print/LPRng-core/patches/patch-ag
new file mode 100644
index 00000000000..a6f38bd6852
--- /dev/null
+++ b/print/LPRng-core/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2005/12/29 13:46:16 joerg Exp $
+
+--- src/common/monitor.c.orig	2005-12-28 21:50:57.000000000 +0000
++++ src/common/monitor.c
+@@ -28,8 +28,6 @@
+  */
+ 
+ 
+-extern int errno;
+-
+ int udp_open( int port );
+ int tcp_open( int port );
+