head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.44 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.42 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.40 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.38 pkgsrc-2011Q2-base:1.4 pkgsrc-2009Q4:1.4.0.36 pkgsrc-2009Q4-base:1.4 pkgsrc-2008Q4:1.4.0.34 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.32 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.30 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.28 pkgsrc-2008Q2-base:1.4 pkgsrc-2008Q1:1.4.0.26 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.24 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.22 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.20 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.18 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.16 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.14 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.12 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.10 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.8 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.6 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.4 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.2 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.3.0.18 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.16 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.14 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.12 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.10 pkgsrc-2003Q4-base:1.3 netbsd-1-6-1:1.3.0.6 netbsd-1-6-1-base:1.3 netbsd-1-6:1.3.0.8 netbsd-1-6-RELEASE-base:1.3 pkgviews:1.3.0.4 pkgviews-base:1.3 buildlink2:1.3.0.2 buildlink2-base:1.3 netbsd-1-5-PATCH003:1.3 netbsd-1-5-PATCH001:1.1; locks; strict; comment @# @; 1.4 date 2005.01.03.14.32.30; author wiz; state dead; branches; next 1.3; 1.3 date 2001.12.07.14.07.27; author skrll; state Exp; branches; next 1.2; 1.2 date 2001.10.15.22.45.59; author skrll; state dead; branches; next 1.1; 1.1 date 2001.03.22.14.02.24; author tron; state Exp; branches; next ; desc @@ 1.4 log @Remove KDE2 packages (and their dependencies) as proposed on tech-pkg. @ text @$NetBSD: patch-ah,v 1.3 2001/12/07 14:07:27 skrll Exp $ --- kfloppy/floppy.cpp.orig Thu Jan 18 11:50:53 2001 +++ kfloppy/floppy.cpp @@@@ -176,7 +176,9 @@@@ addDensity(i18n("HD")); addDensity(i18n("DD")); addFileSystem(i18n("Dos")); +#ifndef __NetBSD__ addFileSystem(i18n("ext2fs")); +#endif readSettings(); setWidgets(); @@@@ -226,72 +228,120 @@@@ { if( deviceComboBox->currentText() == FLOPPYA3 ){ if( densityComboBox->currentText() == i18n( "HD")){ +#ifdef __NetBSD__ + device = "/dev/rfd0b"; + tracks = 160; +#else device = "/dev/fd0H1440"; - blocks = 1440; tracks = 80; +#endif + blocks = 1440; //mdev = "/dev/fd0"; +#ifndef __NetBSD__ if( access(QFile::encodeName(device),W_OK) < 0){ device = "/dev/fd0u1440"; } +#endif } else{ +#ifdef __NetBSD__ + device = "/dev/rfd0f"; + tracks = 160; +#else device = "/dev/fd0D720"; - blocks = 720; tracks = 80; +#endif + blocks = 720; //mdev = "/dev/fd0"; +#ifndef __NetBSD__ if( access(QFile::encodeName(device),W_OK) < 0){ device = "/dev/fd0u720"; } +#endif } } if( deviceComboBox->currentText() == FLOPPYA5){ if( densityComboBox->currentText() == i18n( "HD")){ +#ifdef __NetBSD__ + device = "/dev/rfd0c"; + tracks = 160; +#else device = "/dev/fd0h1200"; - blocks = 1200; tracks = 80; +#endif + blocks = 1200; //mdev = "/dev/fd0"; } else{ +#ifdef __NetBSD__ + device = "/dev/rfd0g"; + tracks = 160; +#else device = "/dev/fd0h360"; - blocks = 720; tracks = 40; +#endif + blocks = 720; //mdev = "/dev/fd0"; } } if( deviceComboBox->currentText() == FLOPPYB3){ if( densityComboBox->currentText() == i18n( "HD")){ +#ifdef __NetBSD__ + device = "/dev/rfd1b"; + tracks = 160; +#else device = "/dev/fd1H1440"; - blocks = 1400; tracks = 80; +#endif + blocks = 1400; //mdev = "/dev/fd1"; +#ifndef __NetBSD__ if(access(QFile::encodeName(device),W_OK) < 0){ device = "/dev/fd1u1440"; } +#endif } else{ +#ifdef __NetBSD__ + device = "/dev/rfd1f"; + tracks = 160; +#else device = "/dev/fd1D720"; - blocks = 720; tracks = 80; +#endif + blocks = 720; //mdev = "/dev/fd1"; +#ifndef __NetBSD__ if( access(QFile::encodeName(device),W_OK) < 0){ device = "/dev/fd1u720"; } +#endif } } if( deviceComboBox->currentText() == FLOPPYB5){ if( densityComboBox->currentText() == i18n( "HD")){ +#ifdef __NetBSD__ + device = "/dev/rfd1c"; + tracks = 160; +#else device = "/dev/fd1h1200"; - blocks = 1200; tracks = 80; +#endif + blocks = 1200; //mdev = "/dev/fd1"; } else{ +#ifdef __NetBSD__ + device = "/dev/rfd1g"; + tracks = 160; +#else device = "/dev/fd1h720"; - blocks = 720; tracks = 80; +#endif + blocks = 720; //mdev = "/dev/fd1"; } } @@@@ -318,16 +368,22 @@@@ path.append(":/usr/sbin:/sbin"); fdformat = KGlobal::dirs()->findExe("fdformat", path); +#ifndef __NetBSD__ mke2fs = KGlobal::dirs()->findExe("mke2fs", path); mkdosfs = KGlobal::dirs()->findExe("mkdosfs", path); +#else + mkdosfs = KGlobal::dirs()->findExe("newfs_msdos", path); +#endif QString str = ""; if (fdformat.isEmpty()) { str = i18n("Cannot find fdformat."); } +#ifndef __NetBSD__ if (mke2fs.isEmpty()) { str = i18n("Cannot find mke2fs"); } +#endif if (mkdosfs.isEmpty()) { str = i18n("Cannot find mkdosfs"); @@@@ -406,6 +462,9 @@@@ if (!verifylabel->isChecked()) { *proc << "-n"; } +#ifdef __NetBSD__ + *proc << "-f"; +#endif *proc << device; connect(proc, SIGNAL(processExited(KProcess *)),this, SLOT(formatdone(KProcess*))); @@@@ -423,6 +482,10 @@@@ KMessageBox::error(this, str); reset(); } + +#ifdef __NetBSD__ + proc->writeStdin("y\n", 2); +#endif } void FloppyData::formatdone(KProcess*){ @@@@ -728,12 +791,17 @@@@ *proc << mkdosfs; if(labellabel->isChecked()) +#ifdef __NetBSD__ + *proc << "-L" <text(); +#else *proc << "-n" <text(); if (verifylabel->isChecked()) { *proc << "-c"; } +#endif *proc << device; } +#ifndef __NetBSD__ else{ *proc << mke2fs; @@@@ -745,6 +813,7 @@@@ } *proc << device; } +#endif @ 1.3 log @Apply fix in pkg/14431 from Mark Davies so that the floppy formatter works for NetBSD. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Update to KDE 2.2.1 With apologies to Al I wouldn't know where to start with a summary of the changes between 2.1 and 2.2.1 - there are just too many. A couple of hopefully static URLS that contain useful information are http://www.kde.org/announcements/changelog2_1to2_2.html http://www.kde.org/announcements/changelog2_2to2_2_1.html Support for a.out for kde{libs,base} added by me. The libtool/a.out combination doesn't like the linking of modules into binaries. A better way of doing this will appear in future versions of KDE/pkgsrc. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.1 2001/03/22 14:02:24 tron Exp $ d3 211 a213 11 --- kdf/disks.h.orig Mon Jul 31 21:33:42 2000 +++ kdf/disks.h Thu Mar 22 14:43:50 2001 @@@@ -82,7 +82,7 @@@@ float percentFull() const; signals: - void sysCallError(DiskEntry *disk, int errno); + void sysCallError(DiskEntry *disk, int err_no); void deviceNameChanged(); void mountPointChanged(); void mountOptionsChanged(); @ 1.1 log @Fix build problem under NetBSD-current. Patch suggested by Nick Hudson in private e-mail. This fixes PR pkg/12452 by myself. @ text @d1 1 a1 1 $NetBSD$ @