Add proper support for device type kdelnk: allow non-root users to specify

fs type and mount point; don't propose an entry to mount from an fstab
entry in menu; try an eject on the device at unmount time.
With this it is possible to have kdelnk files for cdrom and zip drives
do the rigth thing :)

7 files changed, 188 insertions, 1 deletions

diff --git a/x11/kdebase/files/patch-sum b/x11/kdebase/files/patch-sum
index 2a3dd949dfc..04e5f2c0860 100644
--- a/x11/kdebase/files/patch-sum
+++ b/x11/kdebase/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.8 1999/09/30 07:19:52 tron Exp $
+$NetBSD: patch-sum,v 1.9 1999/10/08 15:55:07 bouyer Exp $
 
 MD5 (patch-aa) = b02c21a3d700b6a6f1f350b0df7c1a57
 MD5 (patch-ab) = 8fd3d2def74bfcffd97ee0b4707dacd0
@@ -18,3 +18,9 @@ MD5 (patch-ap) = 747c8fc023114a90e8826feb5a73ad16
 MD5 (patch-aq) = fcaaee7a19064589042d52cd8b1b3844
 MD5 (patch-ar) = 66012da1191f029d9d1296044a6e3a14
 MD5 (patch-as) = dec49266e7f09ffa0da50444241904c6
+MD5 (patch-at) = bf41eb671b048b7ba79d421356a29faf
+MD5 (patch-au) = ec32169076a30bf4aaacc27bdb5303e6
+MD5 (patch-av) = 9cc20f04432c9e0012ff90aa8efb4607
+MD5 (patch-aw) = cf7dd9dc8982ffeaa7e8cb376ceff44c
+MD5 (patch-ax) = 9f4c1040e590d626785b915d799e43ef
+MD5 (patch-ay) = c223fb725d235c87d37debd0b001989f
diff --git a/x11/kdebase/patches/patch-at b/x11/kdebase/patches/patch-at
new file mode 100644
index 00000000000..e8e02c6ea6f
--- /dev/null
+++ b/x11/kdebase/patches/patch-at
@@ -0,0 +1,25 @@
+$NetBSD: patch-at,v 1.1 1999/10/08 15:55:08 bouyer Exp $
+
+--- kfm/kioslave/main.cpp.orig	Thu Apr  8 00:56:48 1999
++++ kfm/kioslave/main.cpp	Tue Oct  5 23:26:24 1999
+@@ -319,7 +319,7 @@
+     return;
+ }
+ 
+-void KIOSlave::unmount( const char *_point )
++void KIOSlave::unmount( const char *_dev )
+ {
+     char buffer[ 1024 ];
+     int t = (int)time( 0L );
+@@ -352,8 +352,10 @@
+  	err = QString( "Volume Management is not running." );
+     }
+ #else
+-    sprintf( buffer, "umount %s 2>"_PATH_TMP"mnt%i", _point, t );
++    sprintf( buffer, "umount %s 2>"_PATH_TMP"mnt%i", _dev, t );
+     retvalue = system( buffer );
++    sprintf( buffer, "eject %s", _dev);
++    system( buffer );
+     
+     // test logfile here to remove it if it exists
+     // (if there is a warning, it can exist even if revalue==0)
diff --git a/x11/kdebase/patches/patch-au b/x11/kdebase/patches/patch-au
new file mode 100644
index 00000000000..6dbd4aaad92
--- /dev/null
+++ b/x11/kdebase/patches/patch-au
@@ -0,0 +1,35 @@
+$NetBSD: patch-au,v 1.1 1999/10/08 15:55:08 bouyer Exp $
+
+diff -u kfm/kfmprops.cpp.orig kfm/kfmprops.cpp
+--- kfm/kfmprops.cpp.orig	Tue Oct  5 20:16:26 1999
++++ kfm/kfmprops.cpp	Tue Oct  5 20:18:37 1999
+@@ -2156,14 +2156,18 @@
+     mountpoint = new QLineEdit( this, "LineEdit_2" );
+     mountpoint->setGeometry( 10, 110, 180, 30 );
+     mountpoint->setText( "" );
++#ifndef __NetBSD__
+     if ( !IamRoot )
+ 	mountpoint->setEnabled( false );
++#endif
+     
+     readonly = new QCheckBox( this, "CheckBox_1" );
+     readonly->setGeometry( 220, 40, 130, 30 );
+     readonly->setText(  klocale->translate("Readonly") );
++#ifndef __NetBSD__
+     if ( !IamRoot )
+ 	readonly->setEnabled( false );
++#endif
+     
+     tmpQLabel = new QLabel( this, "Label_4" );
+     tmpQLabel->move( 10, 150 );
+@@ -2173,8 +2177,10 @@
+     fstype = new QLineEdit( this, "LineEdit_3" );
+     fstype->setGeometry( 10, 180, 280, 30 );
+     fstype->setText( "" );
++#ifndef __NetBSD__
+     if ( !IamRoot )
+ 	fstype->setEnabled( false );
++#endif
+ 
+     tmpQLabel = new QLabel( this, "Label_5" );
+     tmpQLabel->move( 10, 220 );
diff --git a/x11/kdebase/patches/patch-av b/x11/kdebase/patches/patch-av
new file mode 100644
index 00000000000..eb46221370a
--- /dev/null
+++ b/x11/kdebase/patches/patch-av
@@ -0,0 +1,28 @@
+$NetBSD: patch-av,v 1.1 1999/10/08 15:55:08 bouyer Exp $
+
+diff -u kfm/kiojob.cpp.orig kfm/kiojob.cpp
+--- kfm/kiojob.cpp.orig	Tue Oct  5 20:27:53 1999
++++ kfm/kiojob.cpp	Tue Oct  5 22:32:24 1999
+@@ -163,10 +163,11 @@
+     server->getSlave( this );
+ }
+ 
+-void KIOJob::unmount( const char *_point )
++void KIOJob::unmount( const char* _dev, const char *_point )
+ {
+     action = KIOJob::JOB_UNMOUNT;
+-    
++   
++    mntDev   = _dev; 
+     mntPoint = _point;
+     mntPoint.detach();
+ 
+@@ -1850,7 +1851,7 @@
+ 	    if ( action == KIOJob::JOB_MOUNT )
+ 		slave->mount( mntReadOnly, mntFSType.data(), mntDev.data(), mntPoint.data() );
+ 	    else
+-		slave->unmount( mntPoint.data() );
++		slave->unmount( mntDev.data() );
+ 	}
+ 	break;
+     case KIOJob::JOB_LIST:
diff --git a/x11/kdebase/patches/patch-aw b/x11/kdebase/patches/patch-aw
new file mode 100644
index 00000000000..5ec12ff3a3b
--- /dev/null
+++ b/x11/kdebase/patches/patch-aw
@@ -0,0 +1,32 @@
+$NetBSD: patch-aw,v 1.1 1999/10/08 15:55:08 bouyer Exp $
+
+diff -u kfm/kioserver.cpp.orig kfm/kioserver.cpp
+--- kfm/kioserver.cpp.orig	Tue Oct  5 20:30:24 1999
++++ kfm/kioserver.cpp	Tue Oct  5 20:36:31 1999
+@@ -19,7 +19,7 @@
+ #include <sys/mnttab.h>
+ #endif
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined (__NetBSD__)
+ #include <sys/param.h>
+ #include <sys/ucred.h>
+ #include <sys/mount.h>
+@@ -420,7 +420,7 @@
+ 
+ QString KIOServer::findDeviceMountPoint( const char *_device, const char *_file )
+ {
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined (__NetBSD__)
+     if( !strcmp( "/etc/mtab", _file))
+     {
+ 	struct statfs *buf;
+@@ -447,7 +447,7 @@
+ 	}
+     }
+     
+-#endif /* __FreeBSD__ */             
++#endif /* __FreeBSD__ || __NetBSD__ */             
+ 
+ #ifdef HAVE_VOLMGT
+     const char *volpath;
diff --git a/x11/kdebase/patches/patch-ax b/x11/kdebase/patches/patch-ax
new file mode 100644
index 00000000000..c9bb65b38f1
--- /dev/null
+++ b/x11/kdebase/patches/patch-ax
@@ -0,0 +1,47 @@
+$NetBSD: patch-ax,v 1.1 1999/10/08 15:55:08 bouyer Exp $
+
+diff -u kfm/kbind.cpp.orig kfm/kbind.cpp
+--- kfm/kbind.cpp.orig	Tue Oct  5 22:10:13 1999
++++ kfm/kbind.cpp	Tue Oct  5 23:16:57 1999
+@@ -644,11 +644,12 @@
+ 			    _pixlist.append( emptyPixmap );
+ 			}
+ 		    }			
+-
++#ifndef __NetBSD__
+ 		    // Add default mount binding
+ 		    QString s( i18n( "Mount" ) );
+ 		    _list.append( s.data() );   
+ 		    _pixlist.append( emptyPixmap );
++#endif
+ 		}
+ 		else
+ 		{
+@@ -1948,7 +1949,7 @@
+ 		KIOJob * job = new KIOJob();
+ 		// job->unmount( point.data() );
+ 		// Patch ( unmount the device )
+-		job->unmount( dev.data() );
++		job->unmount( dev.data(), point.data() );
+ 		delete config;
+ 		return TRUE;
+ 	    }
+@@ -2001,12 +2002,17 @@
+ 		else
+ 		{
+ 		    QString readonly = config->readEntry( "ReadOnly" );
++		    QString fstype = config->readEntry( "FSType" );
+ 		    bool ro = FALSE;
+ 		    if ( !readonly.isNull() )
+ 			if ( readonly == '1' )
+ 			    ro = true;
+-		    
++
++#ifdef __NetBSD__		    
++		    (void) new KFMAutoMount( ro, fstype, dev, point );
++#else
+ 		    (void) new KFMAutoMount( ro, 0L, dev, 0L );
++#endif
+ 
+ 		    delete config;
+ 		    return TRUE;
diff --git a/x11/kdebase/patches/patch-ay b/x11/kdebase/patches/patch-ay
new file mode 100644
index 00000000000..f3c41f39115
--- /dev/null
+++ b/x11/kdebase/patches/patch-ay
@@ -0,0 +1,14 @@
+$NetBSD: patch-ay,v 1.1 1999/10/08 15:55:08 bouyer Exp $
+
+diff -u kfm/kiojob.h.orig kfm/kiojob.h
+--- kfm/kiojob.h.orig	Tue Oct  5 22:33:18 1999
++++ kfm/kiojob.h	Tue Oct  5 22:33:43 1999
+@@ -58,7 +58,7 @@
+      * give values for every parameter.
+      */
+     void mount( bool _ro, const char *_fstype, const char* _dev, const char *_point );
+-    void unmount( const char *_point );
++    void unmount( const char *_dev, const char *_point );
+     /**
+      * Gets a directory listing.
+      * Connect to 'newDirEntry' to get the directory entries. You must expect that the