pkg/44426: cups-1.4.6nb1 not compiling on NetBSD/amd64 5.0.2

[MarkoSchuetz%web.de@localhost]

>Number:         44426
>Category:       pkg
>Synopsis:       cups-1.4.6nb1 not compiling on NetBSD/amd64 5.0.2
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu Jan 20 11:10:00 +0000 2011
>Originator:     Marko Schuetz Schmuck
>Release:        NetBSD/amd64 5.0.2
>Organization:
individual
>Environment:
NetBSD prpad.dyndns.org 5.0.2 NetBSD 5.0.2 (PRPAD) #0: Mon May  3 15:16:09 AST 
2010  root%prpad.dyndns.org@localhost:/usr/obj/sys/arch/amd64/compile/PRPAD 
amd64

>Description:
When compiling cups-1.4.6nb1 the configure script checks whether source code 
referencing statfs(2) compiles. This compilation succeeds (with a warning from 
the linker). As a consequence HAVE_STATFS gets set.

The code in scheduler/printers.c prefers HAVE_STATFS over HAVE_STATVFS.


>How-To-Repeat:
cd /usr/pkgsrc/print/cups
make

>Fix:
add the patch:
$NetBSD$

--- scheduler/printers.c.orig   2010-09-22 14:35:07.000000000 -0400
+++ scheduler/printers.c
@@ -293,13 +293,12 @@ cupsdCreateCommonData(void)
                        *notifier;      /* Current notifier */
   cupsd_policy_t       *p;             /* Current policy */
   int                  k_supported;    /* Maximum file size supported */
-#ifdef HAVE_STATFS
-  struct statfs                spoolinfo;      /* FS info for spool directory 
*/
-  double               spoolsize;      /* FS size */
-#elif defined(HAVE_STATVFS)
-  struct statvfs       spoolinfo;      /* FS info for spool directory */
-  double               spoolsize;      /* FS size */
+#if defined(HAVE_STATVFS)
+  struct statvfs        spoolinfo;     /* FS info for spool directory */
+#elif defined(HAVE_STATFS)
+  struct statfs         spoolinfo;     /* FS info for spool directory */
 #endif /* HAVE_STATFS */
+  double               spoolsize;      /* FS size */
   static const int nups[] =            /* number-up-supported values */
                { 1, 2, 4, 6, 9, 16 };
   static const int orients[4] =/* orientation-requested-supported values */