head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.44 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.42 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.40 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.38 pkgsrc-2011Q2-base:1.2 pkgsrc-2009Q4:1.2.0.36 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.2.0.34 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.32 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.30 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.28 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.26 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.24 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.22 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.20 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.18 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.16 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.14 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.12 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.10 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.8 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.6 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.4 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.2 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.1.0.18 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.16 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.14 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.12 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.0.10 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.6 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2:1.1.0.2 buildlink2-base:1.1 netbsd-1-5-PATCH003:1.1; locks; strict; comment @# @; 1.2 date 2005.01.03.14.32.33; author wiz; state dead; branches; next 1.1; 1.1 date 2001.11.13.21.09.07; author jlam; state Exp; branches; next ; desc @@ 1.2 log @Remove KDE2 packages (and their dependencies) as proposed on tech-pkg. @ text @$NetBSD: patch-bq,v 1.1 2001/11/13 21:09:07 jlam Exp $ --- kio/file/file.cc.orig Tue Sep 4 19:08:16 2001 +++ kio/file/file.cc @@@@ -42,6 +42,8 @@@@ #ifdef HAVE_VOLMGT #include #include +#else +#include #endif #include @@@@ -1071,24 +1073,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; @@@@ -1232,7 +1241,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.1 log @* Strongly buildinkify. * Manage all of the icon directories for all of the KDE2 packages in the PLIST. * Workaround a NetBSD/alpha egcs optimization bug. * Allow artsdsp pre-loadable module to be built. * Fix pkg/14430 by Mark Davies where mounting devices from KDE2 when /sbin isn't in your path doesn't work because mount/umount can't be found. We append /sbin:/usr/sbin to the path before calling mount/umount. * Properly recognize that NetBSD's OSS implementation doesn't include the Linux MIDI interface. * Fix and sort PLIST. @ text @d1 1 a1 1 $NetBSD$ @