diff options
Diffstat (limited to 'misc/kdeadmin3')
| -rw-r--r-- | misc/kdeadmin3/Makefile | 4 | ||||
| -rw-r--r-- | misc/kdeadmin3/PLIST | 90 | ||||
| -rw-r--r-- | misc/kdeadmin3/distinfo | 8 | ||||
| -rw-r--r-- | misc/kdeadmin3/patches/patch-aa | 18 | ||||
| -rw-r--r-- | misc/kdeadmin3/patches/patch-ab | 22 |
5 files changed, 116 insertions, 26 deletions
diff --git a/misc/kdeadmin3/Makefile b/misc/kdeadmin3/Makefile index ef1cff5606d..21378663b42 100644 --- a/misc/kdeadmin3/Makefile +++ b/misc/kdeadmin3/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2003/01/02 09:12:26 skrll Exp $ +# $NetBSD: Makefile,v 1.8 2003/03/11 13:22:20 markd Exp $ -DISTNAME= kdeadmin-3.0.5a +DISTNAME= kdeadmin-3.1 CATEGORIES= misc COMMENT= System administration tools for the KDE integrated X11 desktop diff --git a/misc/kdeadmin3/PLIST b/misc/kdeadmin3/PLIST index 8803affb8d4..62e534d1266 100644 --- a/misc/kdeadmin3/PLIST +++ b/misc/kdeadmin3/PLIST @@ -1,9 +1,14 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:20:19 skrll Exp $ +@comment $NetBSD: PLIST,v 1.2 2003/03/11 13:22:20 markd Exp $ bin/kcron bin/kpackage bin/kuser bin/kwuftpd +bin/kxconfig bin/secpolicy +lib/kde3/kfile_deb.la +lib/kde3/kfile_deb.so +lib/kde3/kfile_rpm.la +lib/kde3/kfile_rpm.so share/doc/kde/HTML/en/kcron/common share/doc/kde/HTML/en/kcron/index.cache.bz2 share/doc/kde/HTML/en/kcron/index.docbook @@ -36,6 +41,11 @@ share/doc/kde/HTML/en/kwuftpd/security.png share/doc/kde/HTML/en/kwuftpd/uploads.png share/doc/kde/HTML/en/kwuftpd/user_classes.png share/doc/kde/HTML/en/kwuftpd/virtual.png +share/doc/kde/HTML/en/kxconfig/common +share/doc/kde/HTML/en/kxconfig/index.cache.bz2 +share/doc/kde/HTML/en/kxconfig/index.docbook +share/kde/applnk/Settings/Peripherals/kxconfig.desktop +share/kde/applnk/System/More/kwuftpd.desktop share/kde/applnk/System/kcron.desktop share/kde/applnk/System/kpackage.desktop share/kde/applnk/System/kuser.desktop @@ -64,32 +74,70 @@ share/kde/apps/kpackage/pics/supdated.png share/kde/apps/kpackage/pics/tick.png share/kde/apps/kpackage/toolbar/ftin.xpm share/kde/apps/kpackage/toolbar/ftout.xpm -share/kde/apps/kuser/icons/hicolor/22x22/actions/add_group.png -share/kde/apps/kuser/icons/hicolor/22x22/actions/add_user.png -share/kde/apps/kuser/icons/hicolor/22x22/actions/delete_group.png -share/kde/apps/kuser/icons/hicolor/22x22/actions/delete_user.png -share/kde/apps/kuser/icons/hicolor/22x22/actions/edit_group.png -share/kde/apps/kuser/icons/hicolor/22x22/actions/edit_user.png +share/kde/apps/kuser/icons/crystalsvg/22x22/actions/add_group.png +share/kde/apps/kuser/icons/crystalsvg/22x22/actions/add_user.png +share/kde/apps/kuser/icons/crystalsvg/22x22/actions/delete_group.png +share/kde/apps/kuser/icons/crystalsvg/22x22/actions/delete_user.png +share/kde/apps/kuser/icons/crystalsvg/22x22/actions/edit_group.png +share/kde/apps/kuser/icons/crystalsvg/22x22/actions/edit_user.png share/kde/apps/kuser/kuserui.rc share/kde/apps/kuser/pics/group.png share/kde/apps/kuser/pics/user.png -share/kde/icons/hicolor/16x16/apps/kcron.png -share/kde/icons/hicolor/16x16/apps/kpackage.png -share/kde/icons/hicolor/16x16/apps/kuser.png -share/kde/icons/hicolor/32x32/apps/kcron.png -share/kde/icons/hicolor/32x32/apps/kpackage.png -share/kde/icons/hicolor/32x32/apps/kuser.png -share/kde/icons/hicolor/48x48/apps/kpackage.png -share/kde/icons/hicolor/48x48/apps/kuser.png +share/kde/apps/kxconfig/XF86Config-4.default +share/kde/apps/kxconfig/XF86Config-4.template +share/kde/apps/kxconfig/hwdata/Monitors +share/kde/apps/kxconfig/hwdata/VideoCards +share/kde/apps/kxconfig/pics/ati.png +share/kde/apps/kxconfig/pics/decreaseX.png +share/kde/apps/kxconfig/pics/decreaseY.png +share/kde/apps/kxconfig/pics/down.png +share/kde/apps/kxconfig/pics/fonts.png +share/kde/apps/kxconfig/pics/general.png +share/kde/apps/kxconfig/pics/increaseX.png +share/kde/apps/kxconfig/pics/increaseY.png +share/kde/apps/kxconfig/pics/keyboard.png +share/kde/apps/kxconfig/pics/layout.png +share/kde/apps/kxconfig/pics/left.png +share/kde/apps/kxconfig/pics/matrox.png +share/kde/apps/kxconfig/pics/monitor.png +share/kde/apps/kxconfig/pics/pointer.png +share/kde/apps/kxconfig/pics/resolution.png +share/kde/apps/kxconfig/pics/right.png +share/kde/apps/kxconfig/pics/threed.png +share/kde/apps/kxconfig/pics/up.png +share/kde/apps/kxconfig/pics/videocard.png +share/kde/apps/kxconfig/pics/xlogo_small.png +share/kde/icons/crystalsvg/128x128/apps/kpackage.png +share/kde/icons/crystalsvg/128x128/apps/kuser.png +share/kde/icons/crystalsvg/16x16/apps/kcron.png +share/kde/icons/crystalsvg/16x16/apps/kpackage.png +share/kde/icons/crystalsvg/16x16/apps/kuser.png +share/kde/icons/crystalsvg/32x32/apps/kcron.png +share/kde/icons/crystalsvg/32x32/apps/kpackage.png +share/kde/icons/crystalsvg/32x32/apps/kuser.png +share/kde/icons/crystalsvg/32x32/apps/kxconfig.png +share/kde/icons/crystalsvg/48x48/apps/kpackage.png +share/kde/icons/crystalsvg/48x48/apps/kuser.png +share/kde/icons/crystalsvg/64x64/apps/kpackage.png +share/kde/icons/crystalsvg/64x64/apps/kuser.png +share/kde/icons/locolor/16x16/apps/kxconfig.png share/kde/mimelnk/application/x-debian-package.desktop +share/kde/services/kfile_deb.desktop +share/kde/services/kfile_rpm.desktop +@comment dirrm share/kde/services @comment dirrm share/kde/mimelnk/application -@comment dirrm share/kde/icons/hicolor/48x48/apps -@comment dirrm share/kde/icons/hicolor/32x32/apps -@comment dirrm share/kde/icons/hicolor/16x16/apps +@comment dirrm share/kde/icons/crystalsvg/64x64/apps +@comment dirrm share/kde/icons/crystalsvg/48x48/apps +@comment dirrm share/kde/icons/crystalsvg/32x32/apps +@comment dirrm share/kde/icons/crystalsvg/16x16/apps +@comment dirrm share/kde/icons/crystalsvg/128x128/apps +@dirrm share/kde/apps/kxconfig/pics +@dirrm share/kde/apps/kxconfig/hwdata +@dirrm share/kde/apps/kxconfig @comment dirrm share/kde/apps/kuser/pics -@dirrm share/kde/apps/kuser/icons/hicolor/22x22/actions -@dirrm share/kde/apps/kuser/icons/hicolor/22x22 -@dirrm share/kde/apps/kuser/icons/hicolor +@dirrm share/kde/apps/kuser/icons/crystalsvg/22x22/actions +@dirrm share/kde/apps/kuser/icons/crystalsvg/22x22 +@dirrm share/kde/apps/kuser/icons/crystalsvg @dirrm share/kde/apps/kuser/icons @comment dirrm share/kde/apps/kuser @dirrm share/kde/apps/kpackage/toolbar diff --git a/misc/kdeadmin3/distinfo b/misc/kdeadmin3/distinfo index d29c160b5e3..11143095c8a 100644 --- a/misc/kdeadmin3/distinfo +++ b/misc/kdeadmin3/distinfo @@ -1,4 +1,6 @@ -$NetBSD: distinfo,v 1.5 2003/01/02 09:12:26 skrll Exp $ +$NetBSD: distinfo,v 1.6 2003/03/11 13:22:21 markd Exp $ -SHA1 (kdeadmin-3.0.5a.tar.bz2) = 4884a08a2817aa0597cd0e300666c1d47f21ff73 -Size (kdeadmin-3.0.5a.tar.bz2) = 1266326 bytes +SHA1 (kdeadmin-3.1.tar.bz2) = e9a62ffea2fa7f288f9eb7b7b2d937f51ea97c74 +Size (kdeadmin-3.1.tar.bz2) = 1563409 bytes +SHA1 (patch-aa) = 0d11896f119ed69dcf5dac8abf9b9f7b33054dad +SHA1 (patch-ab) = fc8bbc150fd692be3e31d626439963899b0e5519 diff --git a/misc/kdeadmin3/patches/patch-aa b/misc/kdeadmin3/patches/patch-aa new file mode 100644 index 00000000000..e232311bc9e --- /dev/null +++ b/misc/kdeadmin3/patches/patch-aa @@ -0,0 +1,18 @@ +$NetBSD: patch-aa,v 1.1 2003/03/11 13:22:21 markd Exp $ + +--- kuser/mnt.cpp.orig 2002-09-16 09:07:31.000000000 +1200 ++++ kuser/mnt.cpp +@@ -99,9 +99,10 @@ Mounts::Mounts() { + continue; + + quotafilename = QString("%1%2%3") +- .arg(mt->mnt_mountp) +- .arg((mt->mnt_mountp[strlen(mt->mnt_mountp) - 1] == '/') ? "" : "/") +- .arg(_KU_QUOTAFILENAME); ++ .arg(QString::fromLatin1(mt->mnt_mountp)) ++ .arg((mt->mnt_mountp[strlen(mt->mnt_mountp) - 1] == '/') ? ++ QString::null : QString::fromLatin1("/")) ++ .arg(QString::fromLatin1(_KU_QUOTAFILENAME)); + #elif defined(BSD) + while ((mt=getfsent()) != NULL) { + if (strstr(mt->fs_mntops,"quota")==NULL) diff --git a/misc/kdeadmin3/patches/patch-ab b/misc/kdeadmin3/patches/patch-ab new file mode 100644 index 00000000000..7ae09d9337a --- /dev/null +++ b/misc/kdeadmin3/patches/patch-ab @@ -0,0 +1,22 @@ +$NetBSD: patch-ab,v 1.1 2003/03/11 13:22:21 markd Exp $ + +--- kxconfig/kxdata.cpp.orig 2002-12-06 09:37:50.000000000 +1300 ++++ kxconfig/kxdata.cpp +@@ -28,7 +28,7 @@ + #include <kstandarddirs.h> + + #include <X11/Xlib.h> +-#ifndef __osf__ ++#if ! (defined(__osf__) || defined(__svr4__)) + #include <X11/extensions/xf86misc.h> + #endif + +@@ -332,7 +332,7 @@ void KXData::loadPointerData() + { + // ### hardcoded + +-#ifndef __osf__ ++#if ! (defined(__osf__) || defined(__svr4__)) + m_pointerModels.append( KXPointerModel( i18n( "Generic PS/2" ), "PS/2", + MTYPE_PS_2 ) ); + m_pointerModels.append( KXPointerModel( i18n( "Generic PS/2 Wheelmouse" ), "PS/2", |