head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.54 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.52 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.50 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.48 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.46 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.44 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.42 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.40 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.38 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.36 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.34 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.32 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.30 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.28 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.26 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.24 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.22 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.20 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.18 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.16 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.14 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.12 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.10 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.8 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.6 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.4 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3 netbsd-1-6-1:1.2.0.2 netbsd-1-6-1-base:1.2 netbsd-1-6:1.1.1.1.0.4 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.1.1.0.6 pkgviews-base:1.1 buildlink2-base:1.1 buildlink2:1.1.1.1.0.2 pkg-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2003.03.11.13.10.38; author markd; state dead; branches; next 1.2; 1.2 date 2002.08.25.19.23.54; author jlam; state Exp; branches; next 1.1; 1.1 date 2002.05.31.13.16.47; author skrll; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.05.31.13.16.47; author skrll; state Exp; branches 1.1.1.1.2.1; next ; 1.1.1.1.2.1 date 2002.05.31.13.16.47; author jlam; state dead; branches; next 1.1.1.1.2.2; 1.1.1.1.2.2 date 2002.06.23.19.06.34; author jlam; state Exp; branches; next ; desc @@ 1.3 log @Update KDE to 3.1. Many bugfixes and functionality enhancements including: General New default widget style: Keramik New default icon theme: Crystal Created and enhanced framework to effectively disable certain features of the GUI, like for example shell access, disallowing to select custom wall papers. "Kiosk mode" Usability improvements: Kicker: Context menu, applet menus, wording and panel feature consistency improved Kicker: Redesigned control module. KCalc: Usability Improvements. KSnapshot: Usability Improvements. KsCD: User Interface Improvements in configuration and information dialogs kdelibs Extended the DCOP commandline client to enable nonGUI applications (such as shell scripts) to use DCOP send DCOP messages to multiple users and/or sessions concurrently Added to notification dialog to allow applications to configure their notifications with a common GUI. Added "Open File", "Open Destination" and "Keep window open" to download progress dialog. KDatePicker has now week number display and selection. Added KLocale support for setting/retrieving the first day of a week Support for "Multimedia keys" on your keyboard. Added on-demand icon loading support to improve startup performance of applications. KHTML: Improvements to printing support. Page Info and Frame info dialog. Auto-Scroll support of webpages using Shift combined with arrow keys. Many, many Bugfixes and improvements. Small codebase merges with Safari. The main merge is planned for a future release however, as it requires more testing. KIO: Modified thumbnail ioslave that can extract a thumbnail from the file directly if it contains one, rather than generating one itself. Added fish:// protocol slave, which can access remote filesystems via SSH and SCP Cleanups and Corrections in smtp:// protocol slave. Activated rtsp:// protocol slave. Added support for Public Key Authentication and interopability with newer versions of OpenSSH to sftp:// protocol slave. KSSL: SSL certificate policies can now be configured based on the host name @ text @$NetBSD: patch-bl,v 1.2 2002/08/25 19:23:54 jlam Exp $ --- kioslave/file/file.cc.orig Thu Feb 28 14:50:26 2002 +++ kioslave/file/file.cc @@@@ -43,6 +43,8 @@@@ #ifdef HAVE_VOLMGT #include #include +#else +#include #endif #include @@@@ -1034,24 +1036,31 @@@@ QCString point = QFile::encodeName( shellQuote(_point) ); QCString fstype = _fstype; QCString readonly = _ro ? "-r" : ""; + QString path = getenv("PATH"); + path.append(":/usr/sbin:/sbin"); + QString mountProg = KGlobal::dirs()->findExe("mount", path); + + if (mountProg.isEmpty()) { + mountProg = "mount"; + } // Two steps, in case mount doesn't like it when we pass all options for ( int step = 0 ; step <= 1 ; step++ ) { // Mount using device only if no fstype nor mountpoint (KDE-1.x like) if ( !_dev.isEmpty() && _point.isEmpty() && fstype.isEmpty() ) - buffer.sprintf( "mount %s 2>%s", dev.data(), tmp ); + buffer.sprintf( "%s %s 2>%s", mountProg.latin1(), dev.data(), tmp ); else // Mount using the mountpoint, if no fstype nor device (impossible in first step) if ( !_point.isEmpty() && _dev.isEmpty() && fstype.isEmpty() ) - buffer.sprintf( "mount %s 2>%s", point.data(), tmp ); + buffer.sprintf( "%s %s 2>%s", mountProg.latin1(), point.data(), tmp ); else // mount giving device + mountpoint but no fstype if ( !_point.isEmpty() && !_dev.isEmpty() && fstype.isEmpty() ) - buffer.sprintf( "mount %s %s %s 2>%s", readonly.data(), dev.data(), point.data(), tmp ); + buffer.sprintf( "%s %s %s %s 2>%s", mountProg.latin1(), readonly.data(), dev.data(), point.data(), tmp ); else // mount giving device + mountpoint + fstype - buffer.sprintf( "mount %s -t %s %s %s 2>%s", readonly.data(), + buffer.sprintf( "%s %s -t %s %s %s 2>%s", mountProg.latin1(), readonly.data(), fstype.data(), dev.data(), point.data(), tmp ); kdDebug(7101) << buffer << endl; @@@@ -1195,7 +1204,14 @@@@ return; } #else - buffer.sprintf( "umount %s 2>%s", QFile::encodeName(_point).data(), tmp ); + QString path = getenv("PATH"); + path.append(":/usr/sbin:/sbin"); + QString umountProg = KGlobal::dirs()->findExe("umount", path); + + if (umountProg.isEmpty()) { + umountProg = "umount"; + } + buffer.sprintf( "%s %s 2>%s", umountProg.latin1(), QFile::encodeName(_point).data(), tmp ); system( buffer.ascii() ); #endif /* HAVE_VOLMGT */ @ 1.2 log @Merge changes in packages from the buildlink2 branch that have buildlink2.mk files back into the main trunk. @ text @d1 1 a1 1 $NetBSD: patch-bl,v 1.1.2.1 2002/06/23 19:06:34 jlam Exp $ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @Initial import of a kdelibs3 pkg. @ text @@ 1.1.1.1.2.1 log @file patch-bl was added on branch buildlink2 on 2002-06-23 19:06:34 +0000 @ text @d1 65 @ 1.1.1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 65 $NetBSD: patch-bl,v 1.1.1.1.2.1 2002/06/23 19:06:34 jlam Exp $ --- kioslave/file/file.cc.orig Thu Feb 28 14:50:26 2002 +++ kioslave/file/file.cc @@@@ -43,6 +43,8 @@@@ #ifdef HAVE_VOLMGT #include #include +#else +#include #endif #include @@@@ -1034,24 +1036,31 @@@@ QCString point = QFile::encodeName( shellQuote(_point) ); QCString fstype = _fstype; QCString readonly = _ro ? "-r" : ""; + QString path = getenv("PATH"); + path.append(":/usr/sbin:/sbin"); + QString mountProg = KGlobal::dirs()->findExe("mount", path); + + if (mountProg.isEmpty()) { + mountProg = "mount"; + } // Two steps, in case mount doesn't like it when we pass all options for ( int step = 0 ; step <= 1 ; step++ ) { // Mount using device only if no fstype nor mountpoint (KDE-1.x like) if ( !_dev.isEmpty() && _point.isEmpty() && fstype.isEmpty() ) - buffer.sprintf( "mount %s 2>%s", dev.data(), tmp ); + buffer.sprintf( "%s %s 2>%s", mountProg.latin1(), dev.data(), tmp ); else // Mount using the mountpoint, if no fstype nor device (impossible in first step) if ( !_point.isEmpty() && _dev.isEmpty() && fstype.isEmpty() ) - buffer.sprintf( "mount %s 2>%s", point.data(), tmp ); + buffer.sprintf( "%s %s 2>%s", mountProg.latin1(), point.data(), tmp ); else // mount giving device + mountpoint but no fstype if ( !_point.isEmpty() && !_dev.isEmpty() && fstype.isEmpty() ) - buffer.sprintf( "mount %s %s %s 2>%s", readonly.data(), dev.data(), point.data(), tmp ); + buffer.sprintf( "%s %s %s %s 2>%s", mountProg.latin1(), readonly.data(), dev.data(), point.data(), tmp ); else // mount giving device + mountpoint + fstype - buffer.sprintf( "mount %s -t %s %s %s 2>%s", readonly.data(), + buffer.sprintf( "%s %s -t %s %s %s 2>%s", mountProg.latin1(), readonly.data(), fstype.data(), dev.data(), point.data(), tmp ); kdDebug(7101) << buffer << endl; @@@@ -1195,7 +1204,14 @@@@ return; } #else - buffer.sprintf( "umount %s 2>%s", QFile::encodeName(_point).data(), tmp ); + QString path = getenv("PATH"); + path.append(":/usr/sbin:/sbin"); + QString umountProg = KGlobal::dirs()->findExe("umount", path); + + if (umountProg.isEmpty()) { + umountProg = "umount"; + } + buffer.sprintf( "%s %s 2>%s", umountProg.latin1(), QFile::encodeName(_point).data(), tmp ); system( buffer.ascii() ); #endif /* HAVE_VOLMGT */ @