diff options
| author | markd <markd@pkgsrc.org> | 2003-07-30 14:08:42 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2003-07-30 14:08:42 +0000 |
| commit | 8d5be5f106778421329555df5ba9e6c59d541507 (patch) | |
| tree | 67a13d200026e63697717b47049483ea136ad257 /misc | |
| parent | a57a0198b7419d6c4671e430d3528dd13c4703a4 (diff) | |
| download | pkgsrc-8d5be5f106778421329555df5ba9e6c59d541507.tar.gz | |
Update kdeadmin to 3.1.3.
Changes:
* user: UID connected to changed() and Solaris compile fixes (Aaron J. Seigo)
* kuser: Fix mem leak (Laurent Montel)
* kpackage: fix FreeBSD package display so duplicate categories are not shown.
(Andy Fawcett)
* kpackage: Fix crash (Laurent Montel)
* compiler warning fixes (Dirk Mueller)
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/kdeadmin3/Makefile | 9 | ||||
| -rw-r--r-- | misc/kdeadmin3/distinfo | 7 | ||||
| -rw-r--r-- | misc/kdeadmin3/patches/patch-aa | 20 |
3 files changed, 7 insertions, 29 deletions
diff --git a/misc/kdeadmin3/Makefile b/misc/kdeadmin3/Makefile index 992f7e1cae1..7b0db1f269c 100644 --- a/misc/kdeadmin3/Makefile +++ b/misc/kdeadmin3/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.12 2003/07/13 13:52:41 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2003/07/30 14:08:42 markd Exp $ -DISTNAME= kdeadmin-3.1.2 -PKGREVISION= 1 +DISTNAME= kdeadmin-3.1.3 CATEGORIES= misc COMMENT= System administration tools for the KDE integrated X11 desktop -.include "../../x11/kde3/Makefile.kde3" +.include "../../meta-pkgs/kde3/Makefile.kde3" USE_BUILDLINK2= YES @@ -17,6 +16,6 @@ CONFIGURE_ARGS+= --with-shadow CONFIGURE_ARGS+= --without-shadow .endif -.include "../../x11/kde3/buildlink2.mk" +.include "../../meta-pkgs/kde3/buildlink2.mk" .include "../../x11/kdebase3/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/kdeadmin3/distinfo b/misc/kdeadmin3/distinfo index 641363180bd..adbcd40bd36 100644 --- a/misc/kdeadmin3/distinfo +++ b/misc/kdeadmin3/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.9 2003/05/22 02:57:11 markd Exp $ +$NetBSD: distinfo,v 1.10 2003/07/30 14:08:42 markd Exp $ -SHA1 (kdeadmin-3.1.2.tar.bz2) = 4d51d828e951ace62f227eb281c7a9bbd4594b12 -Size (kdeadmin-3.1.2.tar.bz2) = 1557029 bytes -SHA1 (patch-aa) = dd70a532b1ad09a58c59f4a7e2e2cff13484d023 +SHA1 (kdeadmin-3.1.3.tar.bz2) = f1364ea225cba21b9c83e0b4565097cf3effe1f3 +Size (kdeadmin-3.1.3.tar.bz2) = 1557695 bytes SHA1 (patch-ab) = fc8bbc150fd692be3e31d626439963899b0e5519 diff --git a/misc/kdeadmin3/patches/patch-aa b/misc/kdeadmin3/patches/patch-aa deleted file mode 100644 index b2a4b048253..00000000000 --- a/misc/kdeadmin3/patches/patch-aa +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2003/05/05 12:19:16 markd Exp $ - ---- kuser/mnt.cpp.orig 2002-09-16 09:07:31.000000000 +1200 -+++ kuser/mnt.cpp -@@ -98,10 +98,11 @@ Mounts::Mounts() { - if (!CORRECT_FSTYPE((const char *)mt->mnt_fstype)) - continue; - -- quotafilename = QString("%1%2%3") -- .arg(mt->mnt_mountp) -- .arg((mt->mnt_mountp[strlen(mt->mnt_mountp) - 1] == '/') ? "" : "/") -- .arg(_KU_QUOTAFILENAME); -+ quotafilename = QString::fromLatin1("%1%2%3") -+ .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) |