[cups.bugs] Patch for GNU/kFreeBSD support

[Martin Pitt]

Hi Cups developers!

In Debian we use a patch to support building cupsys on a FreeBSD
kernel (GNU/kFreeBSD project). See http://bugs.debian.org/338266 for
details.

It just fixes some #ifdefs and cups-directories.m4 (and also contains
the resulting configure change), so it is trivial enough as a patch.
However, it could interest other distros, too.

Do you consider adopting this upstream?

Thanks,

Martin
-- 
Martin Pitt        http://www.piware.de
Ubuntu Developer   http://www.ubuntu.com
Debian Developer   http://www.debian.org

In a world without walls and fences, who needs Windows and Gates?
-------------- next part --------------
Support GNU/kFreeBSD, see http://bugs.debian.org/338266

diff -urNad cupsys-1.1.99.b1.r4885~/backend/parallel.c cupsys-1.1.99.b1.r4885/backend/parallel.c
--- cupsys-1.1.99.b1.r4885~/backend/parallel.c	2005-12-18 12:40:26.000000000 +0900
+++ cupsys-1.1.99.b1.r4885/backend/parallel.c	2005-12-18 12:40:34.000000000 +0900
@@ -683,7 +683,7 @@
       printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
     }
   }
-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD_kernel__)
   int	i;			/* Looping var */
   int	fd;			/* File descriptor */
   char	device[255];		/* Device filename */
diff -urNad cupsys-1.1.99.b1.r4885~/backend/serial.c cupsys-1.1.99.b1.r4885/backend/serial.c
--- cupsys-1.1.99.b1.r4885~/backend/serial.c	2005-12-18 12:40:26.000000000 +0900
+++ cupsys-1.1.99.b1.r4885/backend/serial.c	2005-12-18 12:40:34.000000000 +0900
@@ -650,10 +650,10 @@
 void
 list_devices(void)
 {
-#if defined(__hpux) || defined(__sgi) || defined(__sun) || defined(__FreeBSD__) || defined(__OpenBSD__)
+#if defined(__hpux) || defined(__sgi) || defined(__sun) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
   static char	*funky_hex = "0123456789abcdefghijklmnopqrstuvwxyz";
 				/* Funky hex numbering used for some devices */
-#endif /* __hpux || __sgi || __sun || __FreeBSD__ || __OpenBSD__ */
+#endif /* __hpux || __sgi || __sun || __FreeBSD__ || __OpenBSD__ || __FreeBSD_kernel__ */
 
 #if defined(__linux) || defined(linux) || defined(__linux__)
   int	i;		/* Looping var */
@@ -900,7 +900,7 @@
       printf("serial serial:%s?baud=38400 \"Unknown\" \"Serial Port #%d\"\n",
              device, i + 1);
   }
-#elif defined(__FreeBSD__) || defined(__OpenBSD__)
+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
   int	i, j;		/* Looping vars */
   int	fd;		/* File descriptor */
   char	device[255];	/* Device filename */
diff -urNad cupsys-1.1.99.b1.r4885~/backend/usb-unix.c cupsys-1.1.99.b1.r4885/backend/usb-unix.c
--- cupsys-1.1.99.b1.r4885~/backend/usb-unix.c	2005-12-18 12:40:26.000000000 +0900
+++ cupsys-1.1.99.b1.r4885/backend/usb-unix.c	2005-12-18 12:40:34.000000000 +0900
@@ -394,7 +394,7 @@
   }
 #elif defined(__hpux)
 #elif defined(__osf)
-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
   int   i;                      /* Looping var */
   char  device[255];            /* Device filename */
 
diff -urNad cupsys-1.1.99.b1.r4885~/backend/usb.c cupsys-1.1.99.b1.r4885/backend/usb.c
--- cupsys-1.1.99.b1.r4885~/backend/usb.c	2005-12-18 12:40:26.000000000 +0900
+++ cupsys-1.1.99.b1.r4885/backend/usb.c	2005-12-18 12:40:34.000000000 +0900
@@ -72,7 +72,7 @@
 
 #ifdef __APPLE__
 #  include "usb-darwin.c"
-#elif defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#elif defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
 #  include "usb-unix.c"
 #else
 /*
diff -urNad cupsys-1.1.99.b1.r4885~/config-scripts/cups-directories.m4 cupsys-1.1.99.b1.r4885/config-scripts/cups-directories.m4
--- cupsys-1.1.99.b1.r4885~/config-scripts/cups-directories.m4	2005-12-18 12:40:26.000000000 +0900
+++ cupsys-1.1.99.b1.r4885/config-scripts/cups-directories.m4	2005-12-18 12:40:34.000000000 +0900
@@ -125,7 +125,7 @@
 			INITDDIR="/System/Library/StartupItems/PrintingServices"
 			;;
 
-		Linux | GNU)
+		Linux | GNU | GNU/k*BSD*)
 			# Linux/HURD seems to choose an init.d directory at random...
 			if test -d /sbin/init.d; then
 				# SuSE
diff -urNad cupsys-1.1.99.b1.r4885~/configure cupsys-1.1.99.b1.r4885/configure
--- cupsys-1.1.99.b1.r4885~/configure	2005-12-18 12:40:34.000000000 +0900
+++ cupsys-1.1.99.b1.r4885/configure	2005-12-18 12:40:50.000000000 +0900
@@ -6884,7 +6884,7 @@
 			INITDDIR="/System/Library/StartupItems/PrintingServices"
 			;;
 
-		Linux | GNU)
+		Linux | GNU | GNU/k*BSD*)
 			# Linux/HURD seems to choose an init.d directory at random...
 			if test -d /sbin/init.d; then
 				# SuSE
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <https://lists.cups.org/pipermail/cups/attachments/20060118/5c340ab9/attachment.bin>