Subject: Build fixes for Debian GNU/kFreeBSD
From: Axel Beckert <abe@debian.org>
Bug-Debian: #565539
Last-updated: 2010-04-04
Index: sash-3.7/Makefile
===================================================================
--- sash-3.7.orig/Makefile	2010-04-04 11:13:36.005953632 +0200
+++ sash-3.7/Makefile	2010-04-04 11:38:19.300955689 +0200
@@ -9,9 +9,17 @@
 #
 HAVE_GZIP		= 1
+ifeq (Linux,$(shell uname -s))
 HAVE_LINUX_ATTR		= 1
 HAVE_LINUX_MOUNT	= 1
 HAVE_BSD_MOUNT		= 0
 MOUNT_TYPE		= '"ext3"'
+endif
+ifeq (GNU/kFreeBSD,$(shell uname -s))
+HAVE_LINUX_ATTR	= 0
+HAVE_LINUX_MOUNT	= 0
+HAVE_BSD_MOUNT		= 1
+MOUNT_TYPE		= '"ufs"'
+endif
 
 DEFS = -DHAVE_GZIP=$(HAVE_GZIP) \
 	-DHAVE_LINUX_ATTR=$(HAVE_LINUX_ATTR) \
Index: sash-3.7/cmds.c
===================================================================
--- sash-3.7.orig/cmds.c	2010-04-04 11:13:36.025952857 +0200
+++ sash-3.7/cmds.c	2010-04-04 11:37:59.160966064 +0200
@@ -19,6 +19,10 @@
 
 #if	HAVE_LINUX_MOUNT
 #include <linux/fs.h>
+#elif	HAVE_BSD_MOUNT
+#include <ufs/ufs/ufsmount.h>
+#include <fs/cd9660/cd9660_mount.h>
+#include <fs/msdosfs/msdosfsmount.h>
 #endif
 
 
@@ -599,26 +603,16 @@
 #elif	HAVE_BSD_MOUNT
 	{
 		struct	    ufs_args ufs;
-		struct	    adosfs_args adosfs;
 		struct	    iso_args iso;
-		struct	    mfs_args mfs;
 		struct	    msdosfs_args msdosfs;
 		void *	    args;
 
 		if(!strcmp(type, "ffs") || !strcmp(type, "ufs")) {
 			ufs.fspec = (char*) argv[0];
 			args = &ufs;
-		} else if(!strcmp(type, "adosfs")) {
-			adosfs.fspec = (char*) argv[0];
-			adosfs.uid = 0;
-			adosfs.gid = 0;
-			args = &adosfs;
 		} else if(!strcmp(type, "cd9660")) {
 			iso.fspec = (char*) argv[0];
 			args = &iso;
-		} else if(!strcmp(type, "mfs")) {
-			mfs.fspec = (char*) argv[0];
-			args = &mfs;
 		} else if(!strcmp(type, "msdos")) {
 			msdosfs.fspec = (char*) argv[0];
 			msdosfs.uid = 0;
