summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--converters/kdesupport/Makefile26
-rw-r--r--converters/kdesupport/files/md52
-rw-r--r--converters/kdesupport/pkg/PLIST10
-rw-r--r--games/kdegames/Makefile29
-rw-r--r--games/kdegames/files/md52
-rw-r--r--games/kdegames/patches/patch-ab11
-rw-r--r--games/kdegames/pkg/PLIST180
-rw-r--r--misc/kdeutils/Makefile29
-rw-r--r--misc/kdeutils/files/md52
-rw-r--r--misc/kdeutils/patches/patch-ab128
-rw-r--r--misc/kdeutils/pkg/PLIST67
-rw-r--r--net/kdenetwork/Makefile31
-rw-r--r--net/kdenetwork/files/md52
-rw-r--r--net/kdenetwork/patches/patch-ab10
-rw-r--r--net/kdenetwork/pkg/PLIST44
-rw-r--r--x11/kde/Makefile14
-rw-r--r--x11/kdebase/Makefile38
-rw-r--r--x11/kdebase/files/md52
-rw-r--r--x11/kdebase/patches/patch-aa44
-rw-r--r--x11/kdebase/pkg/PLIST499
-rw-r--r--x11/kdelibs/Makefile23
-rw-r--r--x11/kdelibs/files/md52
-rw-r--r--x11/kdelibs/pkg/PLIST32
23 files changed, 659 insertions, 568 deletions
diff --git a/converters/kdesupport/Makefile b/converters/kdesupport/Makefile
index ae6ba3b1d8c..24d7ac7d3b6 100644
--- a/converters/kdesupport/Makefile
+++ b/converters/kdesupport/Makefile
@@ -1,21 +1,27 @@
-# $NetBSD: Makefile,v 1.6 1998/04/20 11:56:21 frueauf Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/28 22:52:32 tron Exp $
# FreeBSD Id: Makefile,v 1.2 1997/11/05 04:19:46 asami Exp
#
-DISTNAME= kdesupport-Beta3-1
-PKGNAME= kdesupport-3.1b
+DISTNAME= kdesupport-beta4-1
+PKGNAME= kdesupport-4.1b
CATEGORIES= converters kde
-MASTER_SITES= ftp://ftp.net.lut.ac.uk/kde/stable/Beta3/distribution/tgz/source/ \
- ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta3/distribution/tgz/source/ \
- ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta3/distribution/tgz/source/
-EXTRACT_SUFX= .src.tar.gz
+MASTER_SITES= ftp://ftp.appl-opt.physik.uni-essen.de/pub/linux/kde/stable/Beta4/distribution/tgz/source/ \
+ ftp://ftp.net.lut.ac.uk/kde/stable/Beta4/distribution/tgz/source/ \
+ ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta4/distribution/tgz/source/
+EXTRACT_SUFX= .src.tar.bz2
-MAINTAINER= packages@netbsd.org
+MAINTAINER= tron@netbsd.org
+BUILD_DEPENDS= bzip2:../../archivers/bzip2
+DEPENDS+= qt-1.33:../../x11/qt
+
+EXTRACT_CMD= bzip2
+EXTRACT_BEFORE_ARGS= -d <
+EXTRACT_AFTER_ARGS= | pax -r
+
+USE_X11= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= "--prefix=${PREFIX}" \
- "--x-inc=${X11BASE}/include -I${PREFIX}/include -I${PREFIX}/include/giflib" \
- "--x-lib=${X11BASE}/lib -L${PREFIX}/lib" \
"--datadir=${PREFIX}/share/kde" \
"--with-qt-includes=${X11BASE}/include/qt" \
"--with-qt-libraries=${X11BASE}/lib" \
diff --git a/converters/kdesupport/files/md5 b/converters/kdesupport/files/md5
index 319ed2b4246..8967286283f 100644
--- a/converters/kdesupport/files/md5
+++ b/converters/kdesupport/files/md5
@@ -1 +1 @@
-MD5 (kdesupport-Beta3-1.src.tar.gz) = b7f81ce4b9688739050b268565b790ad
+MD5 (kdesupport-beta4-1.src.tar.bz2) = 3061b434bb1747fbb01278a94d164158
diff --git a/converters/kdesupport/pkg/PLIST b/converters/kdesupport/pkg/PLIST
index 775bcde173f..bc0b60210bf 100644
--- a/converters/kdesupport/pkg/PLIST
+++ b/converters/kdesupport/pkg/PLIST
@@ -1,8 +1,16 @@
-@comment $NetBSD: PLIST,v 1.5 1998/03/21 01:53:17 tron Exp $
+@comment $NetBSD: PLIST,v 1.6 1998/04/28 22:52:32 tron Exp $
+lib/libQwSpriteField.so.5.2
+lib/libQwSpriteField.la
+lib/libQwSpriteField.a
+lib/libmimelib.a
lib/libmimelib.so.1.0
lib/libmimelib.la
@exec /sbin/ldconfig || /usr/bin/true
@unexec /sbin/ldconfig || /usr/bin/true
+include/Pix.h
+include/QwCluster.h
+include/QwPublicList.h
+include/QwSpriteField.h
include/mimelib/address.h
include/mimelib/addrlist.h
include/mimelib/body.h
diff --git a/games/kdegames/Makefile b/games/kdegames/Makefile
index ace333525b1..637eee471a7 100644
--- a/games/kdegames/Makefile
+++ b/games/kdegames/Makefile
@@ -1,23 +1,28 @@
-# $NetBSD: Makefile,v 1.11 1998/04/24 09:20:34 agc Exp $
+# $NetBSD: Makefile,v 1.12 1998/04/28 22:54:36 tron Exp $
# FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:49 asami Exp
#
-DISTNAME= kdegames-Beta3-1
-PKGNAME= kdegames-3.1b
+DISTNAME= kdegames-beta4-1
+PKGNAME= kdegames-4.1b
CATEGORIES= games kde
-MASTER_SITES= ftp://ftp.net.lut.ac.uk/kde/stable/Beta3/distribution/tgz/source/ \
- ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta3/distribution/tgz/source/ \
- ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta3/distribution/tgz/source/
-EXTRACT_SUFX= .src.tar.gz
+MASTER_SITES= ftp://ftp.appl-opt.physik.uni-essen.de/pub/linux/kde/stable/Beta4/distribution/tgz/source/ \
+ ftp://ftp.net.lut.ac.uk/kde/stable/Beta4/distribution/tgz/source/ \
+ ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta4/distribution/tgz/source/
+EXTRACT_SUFX= .src.tar.bz2
-MAINTAINER= packages@netbsd.org
+MAINTAINER= tron@netbsd.org
-BUILD_DEPENDS= moc:../../x11/qt
+BUILD_DEPENDS= bzip2:../../archivers/bzip2 \
+ moc:../../x11/qt
+DEPENDS+= giflib-3.0:../../graphics/giflib
DEPENDS+= jpeg-6a:../../graphics/jpeg
DEPENDS+= qt-1.33:../../x11/qt
-DEPENDS+= kdelibs-3.1b:../../x11/kdelibs
-DEPENDS+= giflib-3.0:../../graphics/giflib
-RUN_DEPENDS= kappfinder:../../x11/kdebase
+DEPENDS+= kdelibs-4.1b:../../x11/kdelibs
+DEPENDS+= kdebase-4.1b:../../x11/kdebase
+
+EXTRACT_CMD= bzip2
+EXTRACT_BEFORE_ARGS= -d <
+EXTRACT_AFTER_ARGS= | pax -r
USE_X11= yes
USE_GMAKE= yes
diff --git a/games/kdegames/files/md5 b/games/kdegames/files/md5
index 96e710246cc..cb973eed4bd 100644
--- a/games/kdegames/files/md5
+++ b/games/kdegames/files/md5
@@ -1 +1 @@
-MD5 (kdegames-Beta3-1.src.tar.gz) = 46ffb365986630c0f56155f41746bcff
+MD5 (kdegames-beta4-1.src.tar.bz2) = 388bb047d1c4aeb344ad9084ea4d52b0
diff --git a/games/kdegames/patches/patch-ab b/games/kdegames/patches/patch-ab
deleted file mode 100644
index 5c5b235fb6f..00000000000
--- a/games/kdegames/patches/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- kshisen/Makefile.in.orig Sun Apr 12 00:45:53 1998
-+++ kshisen/Makefile.in Sun Apr 12 00:46:06 1998
-@@ -80,8 +80,6 @@
- install: all
- $(INSTALL_DIR) $(BINDIR)
- $(INSTALL) $(TARGET) $(BINDIR)
-- $(INSTALL_DIR) $(BINDIR)
-- $(INSTALL) $(TARGET) $(BINDIR)
- $(INSTALL_DIR) $(KDELNKDIR)
- $(INSTALL_DATA) kshisen.kdelnk $(KDELNKDIR)
- $(INSTALL_DIR) $(PICDIR)
diff --git a/games/kdegames/pkg/PLIST b/games/kdegames/pkg/PLIST
index 8e530c829dc..df949d42066 100644
--- a/games/kdegames/pkg/PLIST
+++ b/games/kdegames/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 1998/03/21 01:55:12 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 1998/04/28 22:54:37 tron Exp $
bin/kmahjongg
bin/kmines
bin/kpat
@@ -10,58 +10,97 @@ bin/kasteroids
bin/ksnake
bin/kabalone
bin/kshisen
+share/doc/HTML/en/kasteroids/index.html
+share/doc/HTML/en/kasteroids/index-1.html
+share/doc/HTML/en/kasteroids/index-2.html
+share/doc/HTML/en/kasteroids/index-3.html
+share/doc/HTML/en/kasteroids/logotp3.gif
share/doc/HTML/en/kpoker/index.sgml
share/doc/HTML/en/kpoker/logotp3.gif
share/doc/HTML/en/kpoker/index-2.html
share/doc/HTML/en/kpoker/index-1.html
share/doc/HTML/en/kreversi/index.html
-share/doc/HTML/en/kreversi/gpl.html
share/doc/HTML/en/kmahjongg/index.html
+share/doc/HTML/en/kmahjongg/index-1.html
+share/doc/HTML/en/kmahjongg/index-2.html
+share/doc/HTML/en/kmahjongg/logotp3.gif
share/doc/HTML/en/kmines/index.html
share/doc/HTML/en/kpat/index.html
share/doc/HTML/en/kpoker/index.html
share/doc/HTML/en/ksame/index.html
share/doc/HTML/en/ktetris/index.html
-share/doc/HTML/en/kasteroids/index.html
+share/doc/HTML/en/ktetris/index-1.html
+share/doc/HTML/en/ktetris/index-2.html
+share/doc/HTML/en/ktetris/logotp3.gif
share/doc/HTML/en/ksnake/index.html
share/doc/HTML/en/kabalone/index.html
+share/doc/HTML/en/kabalone/index-1.html
+share/doc/HTML/en/kabalone/index-2.html
+share/doc/HTML/en/kabalone/index-3.html
+share/doc/HTML/en/kabalone/index-4.html
+share/doc/HTML/en/kabalone/logotp3.gif
share/doc/HTML/en/kshisen/index.html
+share/doc/HTML/en/kmines/index-1.html
+share/doc/HTML/en/kmines/index-2.html
+share/doc/HTML/en/kmines/logotp3.gif
+share/doc/HTML/en/kpat/index-1.html
+share/doc/HTML/en/kpat/index-2.html
+share/doc/HTML/en/kpat/logotp3.gif
+share/doc/HTML/en/kpoker/index-3.html
+share/doc/HTML/en/kreversi/index-1.html
+share/doc/HTML/en/kreversi/index-2.html
+share/doc/HTML/en/kreversi/index-3.html
+share/doc/HTML/en/kreversi/index-4.html
+share/doc/HTML/en/kreversi/logotp3.gif
+share/doc/HTML/en/ksame/index-1.html
+share/doc/HTML/en/ksame/index-2.html
+share/doc/HTML/en/ksame/index-3.html
+share/doc/HTML/en/ksame/index-4.html
+share/doc/HTML/en/ksame/logotp3.gif
+share/doc/HTML/en/kshisen/index-1.html
+share/doc/HTML/en/kshisen/index-2.html
+share/doc/HTML/en/kshisen/logotp3.gif
+share/doc/HTML/en/ksnake/index-1.html
+share/doc/HTML/en/ksnake/index-2.html
+share/doc/HTML/en/ksnake/index-3.html
+share/doc/HTML/en/ksnake/index-4.html
+share/doc/HTML/en/ksnake/logotp3.gif
share/doc/HTML/de/kabalone/index.html
+share/applnk/Games/kasteroids.kdelnk
+share/applnk/Games/kreversi.kdelnk
share/applnk/Games/kmahjongg.kdelnk
share/applnk/Games/kmines.kdelnk
share/applnk/Games/kpat.kdelnk
share/applnk/Games/kpoker.kdelnk
share/applnk/Games/ksame.kdelnk
share/applnk/Games/ktetris.kdelnk
-share/applnk/Games/Kasteroids.kdelnk
share/applnk/Games/ksnake.kdelnk
share/applnk/Games/kabalone.kdelnk
share/applnk/Games/kshisen.kdelnk
-share/applnk/Games/Reversi.kdelnk
-share/apps/Reversi/pics/background/Dark_Wood.xpm
-share/apps/Reversi/pics/background/Earth.xpm
-share/apps/Reversi/pics/background/Granite.xpm
-share/apps/Reversi/pics/background/Hexagon.xpm
-share/apps/Reversi/pics/background/Light_Wood.xpm
-share/apps/Reversi/pics/background/Mystique.xpm
-share/apps/Reversi/pics/background/Ocean.xpm
-share/apps/Reversi/pics/background/Pipes.xpm
-share/apps/Reversi/pics/background/Puzzle.xpm
-share/apps/Reversi/pics/background/Stones.xpm
-share/apps/Reversi/pics/hint.xpm
-share/apps/Reversi/pics/help.xpm
-share/apps/Reversi/pics/undo.xpm
-share/apps/Reversi/pics/zoomout.xpm
-share/apps/Reversi/pics/zoomin.xpm
-share/apps/Reversi/pics/stop.xpm
-share/apps/Reversi/pics/chips.xpm
-share/apps/Reversi/pics/logo.xpm
-share/apps/Reversi/pics/chips_mono.xpm
-share/apps/Reversi/sounds/click.wav
-share/apps/Reversi/sounds/lost.wav
-share/apps/Reversi/sounds/won.wav
share/apps/ksame/pics/stones2000_mask.bmp
share/apps/ksame/pics/stones2000.bmp
+share/apps/kreversi/pics/background/Dark_Wood.xpm
+share/apps/kreversi/pics/background/Earth.xpm
+share/apps/kreversi/pics/background/Granite.xpm
+share/apps/kreversi/pics/background/Hexagon.xpm
+share/apps/kreversi/pics/background/Light_Wood.xpm
+share/apps/kreversi/pics/background/Mystique.xpm
+share/apps/kreversi/pics/background/Ocean.xpm
+share/apps/kreversi/pics/background/Pipes.xpm
+share/apps/kreversi/pics/background/Puzzle.xpm
+share/apps/kreversi/pics/background/Stones.xpm
+share/apps/kreversi/pics/hint.xpm
+share/apps/kreversi/pics/help.xpm
+share/apps/kreversi/pics/undo.xpm
+share/apps/kreversi/pics/zoomout.xpm
+share/apps/kreversi/pics/zoomin.xpm
+share/apps/kreversi/pics/stop.xpm
+share/apps/kreversi/pics/chips.xpm
+share/apps/kreversi/pics/logo.xpm
+share/apps/kreversi/pics/chips_mono.xpm
+share/apps/kreversi/sounds/click.wav
+share/apps/kreversi/sounds/lost.wav
+share/apps/kreversi/sounds/won.wav
share/apps/kmahjongg/pics/kmahjongg.bmp
share/apps/kmahjongg/pics/kmahjongg_bgnd.bmp
share/apps/kpat/pics/1.bmp
@@ -525,20 +564,87 @@ share/apps/kabalone/toolbar/hint.xpm
share/apps/kabalone/toolbar/undo.xpm
share/apps/kshisen/pics/kshisen.xpm
share/apps/kshisen/pics/kshisen_bgnd.xpm
-share/icons/kpat.xpm
-share/icons/kpat-lq.xpm
-share/icons/kpoker.xpm
-share/icons/kasteroids.xpm
share/icons/mini/kasteroids.xpm
share/icons/mini/kabalone.xpm
-share/icons/kabalone.xpm
share/icons/mini/kmines.xpm
-share/icons/mini/mini-kpoker.xpm
share/icons/mini/ksnake.xpm
share/icons/mini/ktetris.xpm
+share/icons/mini/kmahjongg.xpm
+share/icons/mini/kpat.xpm
+share/icons/mini/kpoker.xpm
+share/icons/mini/kreversi.xpm
+share/icons/mini/ksame.xpm
+share/icons/mini/kshisen.xpm
+share/icons/kpat.xpm
+share/icons/kpat-lq.xpm
+share/icons/kpoker.xpm
+share/icons/kasteroids.xpm
+share/icons/kabalone.xpm
+share/icons/kmahjongg.xpm
+share/icons/kreversi.xpm
+share/icons/ksame.xpm
+share/icons/kshisen.xpm
share/icons/kmines.xpm
share/icons/ksnake.xpm
share/icons/ktetris.xpm
+share/locale/de/LC_MESSAGES/kmahjongg.mo
+share/locale/fr/LC_MESSAGES/kshisen.mo
+share/locale/cs/LC_MESSAGES/kmahjongg.mo
+share/locale/es/LC_MESSAGES/kshisen.mo
+share/locale/es/LC_MESSAGES/ktetris.mo
+share/locale/es/LC_MESSAGES/kmines.mo
+share/locale/hu/LC_MESSAGES/kmines.mo
+share/locale/it/LC_MESSAGES/kshisen.mo
+share/locale/it/LC_MESSAGES/kmahjongg.mo
+share/locale/it/LC_MESSAGES/kmines.mo
+share/locale/it/LC_MESSAGES/ktetris.mo
+share/locale/nl/LC_MESSAGES/kasteroids.mo
+share/locale/nl/LC_MESSAGES/kmines.mo
+share/locale/nl/LC_MESSAGES/kmahjongg.mo
+share/locale/nl/LC_MESSAGES/ktetris.mo
+share/locale/nl/LC_MESSAGES/kabalone.mo
+share/locale/nl/LC_MESSAGES/kpat.mo
+share/locale/nl/LC_MESSAGES/kpoker.mo
+share/locale/nl/LC_MESSAGES/kreversi.mo
+share/locale/nl/LC_MESSAGES/kshisen.mo
+share/locale/pt/LC_MESSAGES/kmahjongg.mo
+share/locale/no/LC_MESSAGES/kabalone.mo
+share/locale/no/LC_MESSAGES/kpat.mo
+share/locale/no/LC_MESSAGES/kasteroids.mo
+share/locale/no/LC_MESSAGES/kmahjongg.mo
+share/locale/no/LC_MESSAGES/kpoker.mo
+share/locale/no/LC_MESSAGES/kreversi.mo
+share/locale/no/LC_MESSAGES/ktetris.mo
+share/locale/no/LC_MESSAGES/kshisen.mo
+share/locale/pl/LC_MESSAGES/ktetris.mo
+share/locale/fi/LC_MESSAGES/kmahjongg.mo
+share/locale/hr/LC_MESSAGES/kshisen.mo
+share/locale/hr/LC_MESSAGES/kmines.mo
+share/locale/hr/LC_MESSAGES/ktetris.mo
+share/locale/hr/LC_MESSAGES/kmahjongg.mo
+share/locale/ro/LC_MESSAGES/kasteroids.mo
+share/locale/ro/LC_MESSAGES/kabalone.mo
+share/locale/ro/LC_MESSAGES/kmines.mo
+share/locale/ro/LC_MESSAGES/kpat.mo
+share/locale/ro/LC_MESSAGES/kreversi.mo
+share/locale/ro/LC_MESSAGES/kpoker.mo
+share/locale/ro/LC_MESSAGES/ktetris.po
+share/locale/zh/LC_MESSAGES/kabalone.mo
+share/locale/zh/LC_MESSAGES/kasteroids.mo
+share/locale/zh/LC_MESSAGES/kmines.mo
+share/locale/zh/LC_MESSAGES/kshisen.mo
+share/locale/zh/LC_MESSAGES/kreversi.mo
+share/locale/zh/LC_MESSAGES/kmahjongg.mo
+share/locale/zh/LC_MESSAGES/ktetris.mo
+share/locale/zh/LC_MESSAGES/kpat.mo
+share/locale/sk/LC_MESSAGES/kreversi.mo
+share/locale/sk/LC_MESSAGES/kpat.mo
+share/locale/sk/LC_MESSAGES/kasteroids.mo
+share/locale/sk/LC_MESSAGES/kabalone.mo
+share/locale/sk/LC_MESSAGES/kpoker.mo
+share/locale/sk/LC_MESSAGES/kshisen.mo
+share/locale/sk/LC_MESSAGES/kmines.mo
+share/locale/sk/LC_MESSAGES/kmahjongg.mo
share/locale/de/LC_MESSAGES/kpat.mo
share/locale/de/LC_MESSAGES/kasteroids.mo
share/locale/de/LC_MESSAGES/kabalone.mo
@@ -639,7 +745,7 @@ share/locale/hr/LC_MESSAGES/kpoker.mo
@dirrm share/apps/kasteroids
@dirrm share/apps/kabalone/toolbar
@dirrm share/apps/kabalone
-@dirrm share/apps/Reversi/sounds
-@dirrm share/apps/Reversi/pics/background
-@dirrm share/apps/Reversi/pics
-@dirrm share/apps/Reversi
+@dirrm share/apps/kreversi/sounds
+@dirrm share/apps/kreversi/pics/background
+@dirrm share/apps/kreversi/pics
+@dirrm share/apps/kreversi
diff --git a/misc/kdeutils/Makefile b/misc/kdeutils/Makefile
index 1120af66784..ca24f32ec9e 100644
--- a/misc/kdeutils/Makefile
+++ b/misc/kdeutils/Makefile
@@ -1,23 +1,28 @@
-# $NetBSD: Makefile,v 1.11 1998/04/24 09:20:36 agc Exp $
+# $NetBSD: Makefile,v 1.12 1998/04/28 22:54:07 tron Exp $
# FreeBSD Id: Makefile,v 1.4 1997/11/28 00:04:18 se Exp
#
-DISTNAME= kdeutils-Beta3-1
-PKGNAME= kdeutils-3.1b
+DISTNAME= kdeutils-beta4-1
+PKGNAME= kdeutils-4.1b
CATEGORIES= misc kde
-MASTER_SITES= ftp://ftp.net.lut.ac.uk/kde/stable/Beta3/distribution/tgz/source/ \
- ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta3/distribution/tgz/source/ \
- ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta3/distribution/tgz/source/
-EXTRACT_SUFX= .src.tar.gz
+MASTER_SITES= ftp://ftp.appl-opt.physik.uni-essen.de/pub/linux/kde/stable/Beta4/distribution/tgz/source/ \
+ ftp://ftp.net.lut.ac.uk/kde/stable/Beta4/distribution/tgz/source/ \
+ ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta4/distribution/tgz/source/
+EXTRACT_SUFX= .src.tar.bz2
-MAINTAINER= packages@netbsd.org
+MAINTAINER= tron@netbsd.org
-BUILD_DEPENDS= moc:../../x11/qt
+BUILD_DEPENDS= bzip2:../../archivers/bzip2 \
+ moc:../../x11/qt
+DEPENDS+= giflib-3.0:../../graphics/giflib
DEPENDS+= jpeg-6a:../../graphics/jpeg
DEPENDS+= qt-1.33:../../x11/qt
-DEPENDS+= kdelibs-3.1b:../../x11/kdelibs
-DEPENDS+= giflib-3.0:../../graphics/giflib
-RUN_DEPENDS= kappfinder:../../x11/kdebase
+DEPENDS+= kdelibs-4.1b:../../x11/kdelibs
+DEPENDS+= kdebase-4.1b:../../x11/kdebase
+
+EXTRACT_CMD= bzip2
+EXTRACT_BEFORE_ARGS= -d <
+EXTRACT_AFTER_ARGS= | pax -r
USE_X11= yes
HAS_CONFIGURE= yes
diff --git a/misc/kdeutils/files/md5 b/misc/kdeutils/files/md5
index 575709da0ac..85c66befe4f 100644
--- a/misc/kdeutils/files/md5
+++ b/misc/kdeutils/files/md5
@@ -1 +1 @@
-MD5 (kdeutils-Beta3-1.src.tar.gz) = 123bcd61a7de4d6df215a5c33041eede
+MD5 (kdeutils-beta4-1.src.tar.bz2) = 82adffb50693252c3be9aa4bde33b678
diff --git a/misc/kdeutils/patches/patch-ab b/misc/kdeutils/patches/patch-ab
deleted file mode 100644
index 58728f986b4..00000000000
--- a/misc/kdeutils/patches/patch-ab
+++ /dev/null
@@ -1,128 +0,0 @@
---- config.h.in.orig Fri Jan 30 19:53:24 1998
-+++ config.h.in Thu Apr 23 06:25:01 1998
-@@ -31,8 +31,8 @@
- /* Define to 1 if NLS is requested. */
- #undef ENABLE_NLS
-
--/* Define if you have the fabsl function. */
--#undef HAVE_FABSL
-+/* Define if you have the sqrtl function. */
-+#undef HAVE_SQRTL
-
- /* Define if you have the socket function. */
- #undef HAVE_SOCKET
---- configure.in.orig Sat Jan 24 19:51:01 1998
-+++ configure.in Thu Apr 23 06:24:18 1998
-@@ -56,7 +56,7 @@
- AC_C_LONG_DOUBLE
-
- dnl Checks for library functions. MISCOBJS is for kdecore
--AC_CHECK_FUNCS(socket fabsl strdup)
-+AC_CHECK_FUNCS(socket sqrtl strdup)
- AC_CHECK_KSIZE_T
- AC_CHECK_SETENV
-
---- configure.orig Thu Apr 23 06:14:22 1998
-+++ configure Thu Apr 23 06:24:15 1998
-@@ -3501,7 +3501,7 @@
- fi
-
-
--for ac_func in socket fabsl strdup
-+for ac_func in socket sqrtl strdup
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
- echo "configure:3508: checking for $ac_func" >&5
---- kcalc/configdlg.cpp.orig Fri Dec 12 19:14:04 1997
-+++ kcalc/configdlg.cpp Thu Apr 23 06:26:37 1998
-@@ -86,7 +86,7 @@
- label5->setText("Precision:");
-
- int maxprec;
--#ifdef HAVE_FABSL
-+#ifdef HAVE_SQRTL
- maxprec = 16 ;
- #else
- maxprec = 12 ;
-@@ -109,7 +109,7 @@
- cb->setChecked(true);
-
- int fixprec;
--#ifdef HAVE_FABSL
-+#ifdef HAVE_SQRTL
- fixprec = 14 ;
- #else
- fixprec = 10 ;
---- kcalc/kcalc.cpp.orig Fri Dec 12 19:14:07 1997
-+++ kcalc/kcalc.cpp Thu Apr 23 06:26:40 1998
-@@ -1528,7 +1528,7 @@
- "\n\n";
-
- labelstring +=
--#ifdef HAVE_FABSL
-+#ifdef HAVE_SQRTL
- "Base type: long double\n";
- #else
- "Base type: double\n";
-@@ -1635,7 +1635,7 @@
-
- config->setGroup("Precision");
-
--#ifdef HAVE_FABSL
-+#ifdef HAVE_SQRTL
- kcalcdefaults.precision = config->readNumEntry("precision",(int)14);
- #else
- kcalcdefaults.precision = config->readNumEntry("precision",(int)10);
---- kcalc/kcalc_core.cpp.orig Fri Dec 12 19:14:10 1997
-+++ kcalc/kcalc_core.cpp Thu Apr 23 06:26:45 1998
-@@ -1446,7 +1446,7 @@
-
- str_size = sprintf(display_str,
-
--#ifdef HAVE_FABSL
-+#ifdef HAVE_SQRTL
- "%.*Lg", // was *Lg
-
- kcalcdefaults.precision +1,
-@@ -1461,7 +1461,7 @@
-
- str_size = sprintf(display_str,
-
--#ifdef HAVE_FABSL
-+#ifdef HAVE_SQRTL
- "%.*Lf", // was *Lg
-
- kcalcdefaults.fixedprecision ,
-@@ -1478,7 +1478,7 @@
- if ( input_count > 0 && !strpbrk(display_str,"e") &&
- last_input == DIGIT ) {
-
--#ifdef HAVE_FABSL
-+#ifdef HAVE_SQRTL
- str_size = sprintf(display_str,
- "%.*Lf",
- (kcalcdefaults.precision +1 > input_count)?
---- kcalc/kcalctype.h.orig Sat Jan 10 19:59:04 1998
-+++ kcalc/kcalctype.h Thu Apr 23 06:26:50 1998
-@@ -34,10 +34,10 @@
- // I guess it's time to switch to LINUX guys .....
-
-
--#ifdef HAVE_FABSL
-+#ifdef HAVE_SQRTL
-
- /* should be detected by autoconf and defined in config.h
-- Be carefull when modifying these lines. HAVE_FABSL
-+ Be carefull when modifying these lines. HAVE_SQRTL
- is used all over kcalc's sources to determine whether
- long double of double is the fundamental data type for kcalc*/
-
-@@ -49,7 +49,7 @@
- #endif
-
-
--#ifdef HAVE_FABSL
-+#ifdef HAVE_SQRTL
- #define FABS(X) fabsl(X)
- #define MODF(X,Y) modfl(X,Y)
- #define FMOD(X,Y) fmodl(X,Y)
diff --git a/misc/kdeutils/pkg/PLIST b/misc/kdeutils/pkg/PLIST
index 1d7973799eb..b8a21450ed2 100644
--- a/misc/kdeutils/pkg/PLIST
+++ b/misc/kdeutils/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 1998/03/26 23:01:42 frueauf Exp $
+@comment $NetBSD: PLIST,v 1.5 1998/04/28 22:54:08 tron Exp $
bin/kcalc
bin/kedit
bin/khexdit
@@ -61,13 +61,13 @@ share/doc/HTML/en/karm/index.sgml
share/doc/HTML/en/karm/karm.gif
share/doc/HTML/en/karm/logotp3.gif
share/doc/HTML/en/karm/scrn.html
-share/doc/HTML/en/kjots/index.html
share/doc/HTML/en/knotes/index.html
share/doc/HTML/en/knotes/index-1.html
share/doc/HTML/en/knotes/index-2.html
share/doc/HTML/en/knotes/index-3.html
share/doc/HTML/en/knotes/index-4.html
share/doc/HTML/en/knotes/index-5.html
+share/doc/HTML/en/knotes/logotp3.gif
share/doc/HTML/en/kzip/index.html
share/doc/HTML/en/kzip/index-1.html
share/doc/HTML/en/kzip/index-2.html
@@ -75,25 +75,27 @@ share/doc/HTML/en/kzip/index-3.html
share/doc/HTML/en/kzip/index-4.html
share/doc/HTML/en/kzip/logotp3.gif
share/doc/HTML/it/khexdit/index.html
-share/apps/kljettool/pics/kljetlogo.xpm
share/apps/kcalc/pics/kcalclogo.xpm
share/apps/kedit/toolbar/filenew2.xpm
share/apps/kedit/toolbar/send.xpm
share/apps/kedit/pics/keditlogo.xpm
-share/apps/kjots/toolbar/OpenBook.xpm
-share/apps/kjots/toolbar/filedel.xpm
share/apps/knotes/pics/knoteslogo.xpm
share/apps/knotes/pics/knotesclose.xpm
-share/icons/kcalc.xpm
+share/icons/mini/karm.xpm
+share/icons/mini/kljettool.xpm
+share/icons/mini/knotes.xpm
share/icons/mini/kcalc.xpm
share/icons/mini/kedit.xpm
share/icons/mini/khexdit.xpm
share/icons/mini/kzip.xpm
share/icons/kedit.xpm
share/icons/khexdit.xpm
-share/icons/kjots.xpm
-share/icons/knotes.xpm
share/icons/kzip.xpm
+share/icons/karm.xpm
+share/icons/kljetlogo.xpm
+share/icons/knotes.xpm
+share/icons/kcalc.xpm
+share/applnk/Applications/KEdit.kdelnk
share/applnk/Utilities/KLJetTool.kdelnk
share/applnk/Utilities/kcalc.kdelnk
share/applnk/Utilities/khexdit.kdelnk
@@ -101,7 +103,48 @@ share/applnk/Utilities/KArm.kdelnk
share/applnk/Utilities/Kjots.kdelnk
share/applnk/Utilities/knotes.kdelnk
share/applnk/Utilities/kzip.kdelnk
-share/applnk/Applications/kedit.kdelnk
+share/locale/de/LC_MESSAGES/kcalc.mo
+share/locale/fr/LC_MESSAGES/kzip.mo
+share/locale/fr/LC_MESSAGES/karm.mo
+share/locale/es/LC_MESSAGES/karm.mo
+share/locale/da/LC_MESSAGES/kedit.mo
+share/locale/da/LC_MESSAGES/khexdit.mo
+share/locale/da/LC_MESSAGES/knotes.mo
+share/locale/da/LC_MESSAGES/kzip.mo
+share/locale/da/LC_MESSAGES/karm.mo
+share/locale/it/LC_MESSAGES/karm.mo
+share/locale/nl/LC_MESSAGES/kfloppy.mo
+share/locale/nl/LC_MESSAGES/kcalc.mo
+share/locale/nl/LC_MESSAGES/karm.mo
+share/locale/nl/LC_MESSAGES/kljettool.mo
+share/locale/nl/LC_MESSAGES/knotes.mo
+share/locale/nl/LC_MESSAGES/kzip.mo
+share/locale/pt/LC_MESSAGES/kcalc.mo
+share/locale/no/LC_MESSAGES/kcalc.mo
+share/locale/no/LC_MESSAGES/kedit.mo
+share/locale/no/LC_MESSAGES/khexdit.mo
+share/locale/no/LC_MESSAGES/karm.mo
+share/locale/no/LC_MESSAGES/kzip.mo
+share/locale/no/LC_MESSAGES/knotes.mo
+share/locale/el/LC_MESSAGES/kcalc.mo
+share/locale/el/LC_MESSAGES/kedit.mo
+share/locale/fi/LC_MESSAGES/karm.mo
+share/locale/fi/LC_MESSAGES/kcalc.mo
+share/locale/fi/LC_MESSAGES/kfloppy.mo
+share/locale/fi/LC_MESSAGES/kljettool.mo
+share/locale/hr/LC_MESSAGES/karm.mo
+share/locale/hr/LC_MESSAGES/kcalc.mo
+share/locale/zh/LC_MESSAGES/kedit.mo
+share/locale/zh/LC_MESSAGES/khexdit.mo
+share/locale/zh/LC_MESSAGES/knotes.mo
+share/locale/zh/LC_MESSAGES/kzip.mo
+share/locale/zh/LC_MESSAGES/karm.mo
+share/locale/sk/LC_MESSAGES/kedit.mo
+share/locale/sk/LC_MESSAGES/khexdit.mo
+share/locale/sk/LC_MESSAGES/knotes.mo
+share/locale/sk/LC_MESSAGES/kzip.mo
+share/locale/sk/LC_MESSAGES/karm.mo
+share/locale/sk/LC_MESSAGES/kcalc.mo
share/locale/de/LC_MESSAGES/knotes.mo
share/locale/de/LC_MESSAGES/kzip.mo
share/locale/de/LC_MESSAGES/karm.mo
@@ -157,19 +200,13 @@ share/locale/fi/LC_MESSAGES/kedit.mo
@dirrm share/doc/HTML/en/kljettool
@dirrm share/doc/HTML/en/kzip
@dirrm share/doc/HTML/en/knotes
-@dirrm share/doc/HTML/en/kjots
@dirrm share/doc/HTML/en/khexdit
@dirrm share/doc/HTML/en/kedit
@dirrm share/doc/HTML/en/kcalc
@dirrm share/doc/HTML/en/karm
@dirrm share/doc/HTML/de/kcalc
-@dirrm share/doc/HTML/de
-@dirrm share/apps/kljettool/pics
-@dirrm share/apps/kljettool
@dirrm share/apps/knotes/pics
@dirrm share/apps/knotes
-@dirrm share/apps/kjots/toolbar
-@dirrm share/apps/kjots
@dirrm share/apps/kedit/toolbar
@dirrm share/apps/kedit/pics
@dirrm share/apps/kedit
diff --git a/net/kdenetwork/Makefile b/net/kdenetwork/Makefile
index 8fad4037666..17331baf3a1 100644
--- a/net/kdenetwork/Makefile
+++ b/net/kdenetwork/Makefile
@@ -1,26 +1,31 @@
-# $NetBSD: Makefile,v 1.10 1998/04/24 09:20:36 agc Exp $
+# $NetBSD: Makefile,v 1.11 1998/04/28 22:55:14 tron Exp $
# FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:54 asami Exp
#
-DISTNAME= kdenetwork-Beta3-1
-PKGNAME= kdenetwork-3.1b
+DISTNAME= kdenetwork-beta4-1
+PKGNAME= kdenetwork-4.1b
CATEGORIES= net kde
-MASTER_SITES= ftp://ftp.net.lut.ac.uk/kde/stable/Beta3/distribution/tgz/source/ \
- ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta3/distribution/tgz/source/ \
- ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta3/distribution/tgz/source/
-EXTRACT_SUFX= .src.tar.gz
+MASTER_SITES= ftp://ftp.appl-opt.physik.uni-essen.de/pub/linux/kde/stable/Beta4/distribution/tgz/source/ \
+ ftp://ftp.net.lut.ac.uk/kde/stable/Beta4/distribution/tgz/source/ \
+ ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta4/distribution/tgz/source/
+EXTRACT_SUFX= .src.tar.bz2
-MAINTAINER= packages@netbsd.org
+MAINTAINER= tron@netbsd.org
-BUILD_DEPENDS= moc:../../x11/qt \
+BUILD_DEPENDS= bzip2:../../archivers/bzip2 \
+ moc:../../x11/qt \
${LOCALBASE}/lib/libgdbm.a:../../databases/gdbm
+DEPENDS+= giflib-3.0:../../graphics/giflib
DEPENDS+= jpeg-6a:../../graphics/jpeg
DEPENDS+= qt-1.33:../../x11/qt
DEPENDS+= uulib-0.5.13:../../converters/uulib
-DEPENDS+= kdelibs-3.1b:../../x11/kdelibs
-DEPENDS+= giflib-3.0:../../graphics/giflib
-DEPENDS+= kdesupport-3.1b:../../converters/kdesupport
-RUN_DEPENDS= kappfinder:../../x11/kdebase
+DEPENDS+= kdelibs-4.1b:../../x11/kdelibs
+DEPENDS+= kdesupport-4.1b:../../converters/kdesupport
+DEPENDS+= kdebase-4.1b:../../x11/kdebase
+
+EXTRACT_CMD= bzip2
+EXTRACT_BEFORE_ARGS= -d <
+EXTRACT_AFTER_ARGS= | pax -r
USE_X11= yes
HAS_CONFIGURE= yes
diff --git a/net/kdenetwork/files/md5 b/net/kdenetwork/files/md5
index 691f699b87f..a2584d9bff7 100644
--- a/net/kdenetwork/files/md5
+++ b/net/kdenetwork/files/md5
@@ -1 +1 @@
-MD5 (kdenetwork-Beta3-1.src.tar.gz) = e7979cadbf138afc2da4850e674446b6
+MD5 (kdenetwork-beta4-1.src.tar.bz2) = c44e534e75e4a95f7964e85ec60b6a4e
diff --git a/net/kdenetwork/patches/patch-ab b/net/kdenetwork/patches/patch-ab
index 9dc3d21a2c5..82d2bcedef5 100644
--- a/net/kdenetwork/patches/patch-ab
+++ b/net/kdenetwork/patches/patch-ab
@@ -1,11 +1,11 @@
---- krn/Makefile.in.orig Sun Feb 1 02:07:48 1998
-+++ krn/Makefile.in Fri Mar 20 23:23:43 1998
-@@ -122,7 +122,7 @@
+--- krn/Makefile.in.orig Sun Apr 19 01:53:41 1998
++++ krn/Makefile.in Tue Apr 28 01:01:53 1998
+@@ -128,7 +128,7 @@
INCLUDES = $(all_includes)
--LDADD = $(LIBCOMPAT) $(LIBSOCKET) $(all_libraries) -lkfm -lkhtmlw -ljscript -lkdeui -lkdecore $(LIBJPEG) -lgif -lqt -lXext -lX11 -lmimelib -luulib -lgdbm $(KDE_RPATH)
-+LDADD = $(LIBCOMPAT) $(LIBSOCKET) $(all_libraries) -lkfm -lkhtmlw -ljscript -lkdeui -lkdecore $(LIBJPEG) -lgif -lqt -lXext -lX11 -lmimelib -luu -lgdbm $(KDE_RPATH)
+-LDADD = $(LIBCOMPAT) $(LIBSOCKET) $(all_libraries) -lkfm -lkhtmlw -ljscript -lkdeui -lkdecore -lkfile $(LIBJPEG) -lqt -lXext -lX11 -lmimelib -luulib -lgdbm $(KDE_RPATH)
++LDADD = $(LIBCOMPAT) $(LIBSOCKET) $(all_libraries) -lkfm -lkhtmlw -ljscript -lkdeui -lkdecore -lkfile $(LIBJPEG) -lqt -lXext -lX11 -lmimelib -luu -lgdbm $(KDE_RPATH)
ICONDIR = $(kde_icondir)
MINIDIR = $(kde_minidir)
diff --git a/net/kdenetwork/pkg/PLIST b/net/kdenetwork/pkg/PLIST
index 33d2353cc00..de5e4f131a5 100644
--- a/net/kdenetwork/pkg/PLIST
+++ b/net/kdenetwork/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 1998/03/21 01:54:51 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 1998/04/28 22:55:14 tron Exp $
bin/kmail
bin/knu
bin/korn
@@ -69,6 +69,13 @@ share/doc/HTML/en/kmail/index-5.html
share/doc/HTML/en/kmail/index-6.html
share/doc/HTML/en/kmail/index-7.html
share/doc/HTML/en/kmail/logotp3.gif
+share/doc/HTML/en/knu/index-1.html
+share/doc/HTML/en/knu/index-2.html
+share/doc/HTML/en/knu/index-3.html
+share/doc/HTML/en/knu/index-4.html
+share/doc/HTML/en/knu/index-5.html
+share/doc/HTML/en/knu/index-6.html
+share/doc/HTML/en/knu/logotp3.gif
share/doc/HTML/en/knu/knu-host.gif
share/doc/HTML/en/knu/knu-traceroute.gif
share/doc/HTML/en/knu/knu-config.gif
@@ -80,16 +87,44 @@ share/doc/HTML/en/krn/articles.html
share/doc/HTML/en/krn/groups.html
share/doc/HTML/en/krn/offline.html
share/doc/HTML/en/krn/overview.html
-share/applnk/Internet/KMail.kdelnk
share/applnk/Internet/Krn.kdelnk
-share/applnk/Network/knu.kdelnk
-share/applnk/Network/KOrn.kdelnk
+share/applnk/Internet/knu.kdelnk
+share/applnk/Internet/KOrn.kdelnk
+share/applnk/Internet/KMail.kdelnk
share/icons/mini/kmail.xpm
share/icons/mini/krn.xpm
+share/icons/mini/knu.xpm
+share/icons/mini/korn.xpm
share/icons/kmail.xpm
share/icons/knu.xpm
share/icons/korn.xpm
share/icons/krn.xpm
+share/locale/fr/LC_MESSAGES/kppp.mo
+share/locale/da/LC_MESSAGES/kppp.mo
+share/locale/it/LC_MESSAGES/krn.mo
+share/locale/it/LC_MESSAGES/knu.mo
+share/locale/it/LC_MESSAGES/kppp.mo
+share/locale/nl/LC_MESSAGES/kmail.mo
+share/locale/nl/LC_MESSAGES/krn.mo
+share/locale/nl/LC_MESSAGES/knu.mo
+share/locale/nl/LC_MESSAGES/kppp.mo
+share/locale/pt/LC_MESSAGES/krn.mo
+share/locale/no/LC_MESSAGES/kmail.mo
+share/locale/no/LC_MESSAGES/krn.mo
+share/locale/no/LC_MESSAGES/kppp.mo
+share/locale/no/LC_MESSAGES/knu.mo
+share/locale/el/LC_MESSAGES/kmail.mo
+share/locale/el/LC_MESSAGES/krn.mo
+share/locale/el/LC_MESSAGES/kppp.mo
+share/locale/el/LC_MESSAGES/knu.mo
+share/locale/ro/LC_MESSAGES/kmail.mo
+share/locale/ro/LC_MESSAGES/kppp.mo
+share/locale/sk/LC_MESSAGES/kmail.mo
+share/locale/sk/LC_MESSAGES/krn.mo
+share/locale/sk/LC_MESSAGES/knu.mo
+share/locale/sk/LC_MESSAGES/kppp.mo
+share/locale/cr/LC_MESSAGES/kppp.mo
+share/locale/cr/LC_MESSAGES/krn.mo
share/locale/de/LC_MESSAGES/kmail.mo
share/locale/de/LC_MESSAGES/krn.mo
share/locale/de/LC_MESSAGES/knu.mo
@@ -125,7 +160,6 @@ share/locale/cr/LC_MESSAGES/knu.mo
@dirrm share/doc/HTML/en/kmail
@dirrm share/doc/HTML/en/knu
@dirrm share/doc/HTML/en/korn
-@dirrm share/applnk/Network
@dirrm share/apps/krn/toolbar
@dirrm share/apps/krn
@dirrm share/apps/kmail/pics
diff --git a/x11/kde/Makefile b/x11/kde/Makefile
index 98e76aa3d10..78c22a5bde1 100644
--- a/x11/kde/Makefile
+++ b/x11/kde/Makefile
@@ -1,19 +1,17 @@
-# $NetBSD: Makefile,v 1.9 1998/04/24 09:20:38 agc Exp $
+# $NetBSD: Makefile,v 1.10 1998/04/28 22:56:22 tron Exp $
# FreeBSD Id: Makefile,v 1.2 1997/11/27 00:47:46 se Exp
#
-DISTNAME= kde-3.1b
+DISTNAME= kde-4.1b
CATEGORIES= x11 kde
MASTER_SITES= # empty
DISTFILES= # empty
-MAINTAINER= packages@netbsd.org
+MAINTAINER= tron@netbsd.org
-DEPENDS+= kdelibs-3.1b:../../x11/kdelibs
-RUN_DEPENDS= kwm:../../x11/kdebase \
- kcalc:../../misc/kdeutils \
- kmahjongg:../../games/kdegames \
- kmail:../../net/kdenetwork
+DEPENDS+= kdeutils-4.1b:../../misc/kdeutils
+DEPENDS+= kdegames-4.1b:../../games/kdegames
+DEPENDS+= kdenetwork-4.1b:../../net/kdenetwork
EXTRACT_ONLY= # empty
NO_CHECKSUM= yes
diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile
index 3878c8eaf6c..eda50934d38 100644
--- a/x11/kdebase/Makefile
+++ b/x11/kdebase/Makefile
@@ -1,22 +1,27 @@
-# $NetBSD: Makefile,v 1.10 1998/04/24 09:20:38 agc Exp $
+# $NetBSD: Makefile,v 1.11 1998/04/28 22:53:23 tron Exp $
# FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp
#
-DISTNAME= kdebase-Beta3-1
-PKGNAME= kdebase-3.1b
+DISTNAME= kdebase-beta4-1
+PKGNAME= kdebase-4.1b
CATEGORIES= x11 kde
-MASTER_SITES= ftp://ftp.net.lut.ac.uk/kde/stable/Beta3/distribution/tgz/source/ \
- ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta3/distribution/tgz/source/ \
- ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta3/distribution/tgz/source/
-EXTRACT_SUFX= .src.tar.gz
+MASTER_SITES= ftp://ftp.appl-opt.physik.uni-essen.de/pub/linux/kde/stable/Beta4/distribution/tgz/source/ \
+ ftp://ftp.net.lut.ac.uk/kde/stable/Beta4/distribution/tgz/source/ \
+ ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta4/distribution/tgz/source/
+EXTRACT_SUFX= .src.tar.bz2
-MAINTAINER= packages@netbsd.org
+MAINTAINER= tron@netbsd.org
-BUILD_DEPENDS= moc:../../x11/qt
+BUILD_DEPENDS= bzip2:../../archivers/bzip2 \
+ moc:../../x11/qt
+DEPENDS+= giflib-3.0:../../graphics/giflib
DEPENDS+= jpeg-6a:../../graphics/jpeg
DEPENDS+= qt-1.33:../../x11/qt
-DEPENDS+= kdelibs-3.1b:../../x11/kdelibs
-DEPENDS+= giflib-3.0:../../graphics/giflib
+DEPENDS+= kdelibs-4.1b:../../x11/kdelibs
+
+EXTRACT_CMD= bzip2
+EXTRACT_BEFORE_ARGS= -d <
+EXTRACT_AFTER_ARGS= | pax -r
USE_X11= yes
HAS_CONFIGURE= yes
@@ -33,15 +38,12 @@ CONFIGURE_ENV= CXXFLAGS="${CFLAGS}" \
WRKSRC= ${WRKDIR}/kdebase
PLIST_SRC= ${WRKDIR}/PLIST.tmp
-PLIST_DIRS= ${PREFIX}/share/applnk \
- ${PREFIX}/share/apps/kappfinder \
- ${PREFIX}/share/mimelnk
+PLIST_DIRS= share/applnk share/apps/kappfinder share/icons share/mimelnk
post-install:
@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
- @find ${PLIST_DIRS} -type f | \
- ${SED} "s/${PREFIX:S/\//\\\//g}\///g" >>${PLIST_SRC}
- @find ${PLIST_DIRS} -type d | sort -r | \
- ${SED} "s/${PREFIX:S/\//\\\//g}\//\@dirrm /g" >>${PLIST_SRC}
+ @(cd ${PREFIX}; find ${PLIST_DIRS} -type f >>${PLIST_SRC})
+ @(cd ${PREFIX}; find ${PLIST_DIRS} -type d | sort -r | \
+ ${SED} "s/^/\@dirrm /" >>${PLIST_SRC})
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/kdebase/files/md5 b/x11/kdebase/files/md5
index 9c3e423627b..c24b5157f23 100644
--- a/x11/kdebase/files/md5
+++ b/x11/kdebase/files/md5
@@ -1 +1 @@
-MD5 (kdebase-Beta3-1.src.tar.gz) = 4afd429364c745a57d46841967bb7159
+MD5 (kdebase-beta4-1.src.tar.bz2) = 52de2751b0e227f96fe48881982cda44
diff --git a/x11/kdebase/patches/patch-aa b/x11/kdebase/patches/patch-aa
index 7209132c79b..ec52c71febd 100644
--- a/x11/kdebase/patches/patch-aa
+++ b/x11/kdebase/patches/patch-aa
@@ -1,10 +1,38 @@
---- kscreensaver/main.cpp.orig Sat Jan 10 01:13:31 1998
-+++ kscreensaver/main.cpp Wed Mar 18 22:19:20 1998
-@@ -288,6 +288,7 @@
- }
+--- configure.orig Sun Apr 19 01:22:26 1998
++++ configure Mon Apr 27 20:00:47 1998
+@@ -3842,7 +3842,7 @@
- initPasswd();
-+ setuid (getuid ());
- if ( mode == MODE_INSTALL )
- {
+ ac_save_LIBS=$LIBS
+- LIBS="$LIBS -ldl"
++ LIBS="$LIBS"
+ echo $ac_n "checking for main in -lpam_misc""... $ac_c" 1>&6
+ echo "configure:3848: checking for main in -lpam_misc" >&5
+ ac_lib_var=`echo pam_misc'_'main | sed 'y%./+-%__p_%'`
+@@ -3968,7 +3968,7 @@
+ test "x$pam_libraries" = xNONE && pam_libraries=$ac_pam_libraries
+
+ if test ! "x$pam_includes" = xNONE && test ! "x$pam_libraries" = xNONE; then
+- ac_pam_libs="-lpam $PAM_MISC_LIB -ldl"
++ ac_pam_libs="-lpam $PAM_MISC_LIB"
+ ac_cv_path_pam="no_pam= ac_pam_includes=$ac_pam_includes ac_pam_libraries=$ac_pam_libraries ac_pam_libs=\"$ac_pam_libs\""
+ else
+ ac_cv_path_pam="no_pam=yes"
+@@ -4039,7 +4039,7 @@
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_save_LIBS="$LIBS"
+-LIBS="-lpam -ldl $LIBS"
++LIBS="-lpam $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 4045 "configure"
+ #include "confdefs.h"
+@@ -4063,7 +4063,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+- PASSWDLIB="-lpam -ldl"
++ PASSWDLIB="-lpam"
+ cat >> confdefs.h <<EOF
+ #define HAVE_PAM_LIB 1
+ EOF
diff --git a/x11/kdebase/pkg/PLIST b/x11/kdebase/pkg/PLIST
index 1b13c9f8ef1..6d3d40a3643 100644
--- a/x11/kdebase/pkg/PLIST
+++ b/x11/kdebase/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 1998/03/23 20:09:52 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.6 1998/04/28 22:53:24 tron Exp $
bin/kappfinder
bin/kappfinder_restart
bin/kcmkpanel
@@ -52,6 +52,15 @@ bin/kcmkwm
bin/kcminfo
bin/kcontrol
bin/unpack
+bin/kwmsound
+bin/kspace.kss
+bin/kbouboule.kss
+bin/krdb
+bin/kcmsyssound
+bin/kstartondesk
+share/apps/kcmlocale/pics/flag_ro.gif
+share/apps/kcmlocale/pics/flag_zh.gif
+share/apps/kcmlocale/pics/flag_sk.gif
share/apps/kcmlocale/pics/flag_de.gif
share/apps/kcmlocale/pics/flag_en.gif
share/apps/kcmlocale/pics/flag_fr.gif
@@ -95,11 +104,13 @@ share/apps/kfm/Desktop/Templates/WWWUrl.kdelnk
share/apps/kfm/Desktop/Templates/MimeType.kdelnk
share/apps/kfm/Desktop/Templates/URL.kdelnk
share/apps/kfm/Desktop/Templates/Device.kdelnk
+share/apps/kfind/toolbar/search.xpm
share/apps/kfind/toolbar/archive.xpm
share/apps/kfind/toolbar/save.xpm
share/apps/kfind/toolbar/delete.xpm
share/apps/kfind/toolbar/info.xpm
share/apps/kfind/toolbar/idea.xpm
+share/apps/kwm/pics/fog-grey.gif
share/apps/kwm/pics/fog.gif
share/apps/kwm/pics/close.xpm
share/apps/kwm/pics/maximize.xpm
@@ -120,272 +131,37 @@ share/apps/kdm/pics/users/root.xpm
share/apps/kdm/pics/kdelogo.xpm
share/apps/kdmconfig/pics/monitor.xpm
share/apps/kdisplay/pics/monitor.xpm
+share/apps/kdisplay/color-schemes/AtlasGreen.kcsrc
+share/apps/kdisplay/color-schemes/BlueSlate.kcsrc
+share/apps/kdisplay/color-schemes/CDE.kcsrc
+share/apps/kdisplay/color-schemes/DesertRed.kcsrc
+share/apps/kdisplay/color-schemes/DigitalCDE.kcsrc
+share/apps/kdisplay/color-schemes/PaleGray.kcsrc
+share/apps/kdisplay/color-schemes/SolarisCDE.kcsrc
+share/apps/kdisplay/color-schemes/Windows95.kcsrc
+share/apps/kdisplay/app-defaults/AAAAAAGeneral.ad
+share/apps/kdisplay/app-defaults/AAAMotif.ad
+share/apps/kdisplay/app-defaults/AAATk.ad
+share/apps/kdisplay/app-defaults/AAAXaw.ad
+share/apps/kdisplay/app-defaults/Editres.ad
+share/apps/kdisplay/app-defaults/Emacs.ad
+share/apps/kdisplay/app-defaults/ML.ad
+share/apps/kdisplay/app-defaults/Nedit.ad
+share/apps/kdisplay/app-defaults/Netscape.ad
+share/apps/kdisplay/app-defaults/XCalc.ad
+share/apps/kdisplay/app-defaults/XTerm.ad
+share/apps/kdisplay/app-defaults/XV.ad
share/apps/kcontrol/pics/kdekcc.xpm
-share/icons/background.xpm
-share/icons/palette.xpm
-share/icons/kcontrol.xpm
-share/icons/emacs.xpm
-share/icons/edit.xpm
-share/icons/xeyes.xpm
-share/icons/gv.xpm
-share/icons/xv.xpm
-share/icons/xcalc.xpm
-share/icons/pinguin.xpm
-share/icons/network.xpm
-share/icons/information.xpm
-share/icons/kfm.xpm
-share/icons/mini/gv.xpm
-share/icons/mini/mini-kdmconfig.xpm
-share/icons/mini/kdmconfig.xpm
-share/icons/mini/kdm-appear.xpm
-share/icons/mini/kdm-font.xpm
-share/icons/mini/kdm-backgnd.xpm
-share/icons/mini/kdm-users.xpm
-share/icons/mini/kdm-sessions.xpm
-share/icons/mini/kcontrol.xpm
-share/icons/mini/pinguin.xpm
-share/icons/mini/kdehelp.xpm
-share/icons/mini/kfontmanager.xpm
-share/icons/mini/kfind.xpm
-share/icons/mini/kvt.xpm
-share/icons/mini/kwm.xpm
-share/icons/mini/mini-default.xpm
-share/icons/mini/kscreensaver.xpm
-share/icons/mini/maximize2.xpm
-share/icons/mini/mini-ball.xpm
-share/icons/mini/mini-bball.xpm
-share/icons/mini/mini-bomb.xpm
-share/icons/mini/mini-book1.xpm
-share/icons/mini/mini-book2.xpm
-share/icons/mini/mini-bug1.xpm
-share/icons/mini/mini-bug2.xpm
-share/icons/mini/mini-bx2.xpm
-share/icons/mini/mini-calc.xpm
-share/icons/mini/mini-camera.xpm
-share/icons/mini/mini-cdlabel.xpm
-share/icons/mini/mini-clock.xpm
-share/icons/mini/dvi.xpm
-share/icons/mini/mini-colors.xpm
-share/icons/mini/mini-connect.xpm
-share/icons/mini/mini-connected.xpm
-share/icons/mini/mini-cross.xpm
-share/icons/mini/mini-display.xpm
-share/icons/mini/mini-doc.xpm
-share/icons/mini/mini-edit.xpm
-share/icons/mini/mini-exclam.xpm
-share/icons/mini/mini-exp.xpm
-share/icons/mini/mini-eyes.xpm
-share/icons/mini/mini-filemgr.xpm
-share/icons/mini/mini-fractal.xpm
-share/icons/mini/mini-gball.xpm
-share/icons/mini/mini-gv.xpm
-share/icons/mini/mini-hammer.xpm
-share/icons/mini/mini-happy.xpm
-share/icons/mini/mini-hextris.xpm
-share/icons/mini/mini-k.xpm
-share/icons/mini/mini-lock.xpm
-share/icons/mini/mini-lower.xpm
-share/icons/mini/ftp.xpm
-share/icons/mini/mini-mail.xpm
-share/icons/mini/mini-manual.xpm
-share/icons/mini/mini-max1.xpm
-share/icons/mini/mini-maze.xpm
-share/icons/mini/mini-modules.xpm
-share/icons/mini/mini-move.xpm
-share/icons/mini/mini-move1.xpm
-share/icons/mini/mini-nscape.xpm
-share/icons/mini/mini.xpm
-share/icons/mini/mini-ofolder.xpm
-share/icons/mini/mini-olwm.xpm
-share/icons/mini/mini-paint.xpm
-share/icons/mini/mini-pencil.xpm
-share/icons/mini/mini-question.xpm
-share/icons/mini/mini-raise.xpm
-share/icons/mini/mini-ray.xpm
-share/icons/mini/mini-rball.xpm
-share/icons/mini/mini-resize.xpm
-share/icons/mini/mini-roach.xpm
-share/icons/mini/mini-run.xpm
-share/icons/mini/mini-sh.xpm
-share/icons/mini/mini-sh1.xpm
-share/icons/mini/mini-slon.xpm
-share/icons/mini/mini-stop.xpm
-share/icons/mini/mini-term.xpm
-share/icons/mini/mini-tetris.xpm
-share/icons/mini/mini-turn.xpm
-share/icons/mini/mini-up.xpm
-share/icons/mini/mini-windows.xpm
-share/icons/mini/mini-x.xpm
-share/icons/mini/mini-x2.xpm
-share/icons/mini/mini-xmahjongg.xpm
-share/icons/mini/mini-xv.xpm
-share/icons/mini/mini-zoom.xpm
-share/icons/mini/mini.audiovol.xpm
-share/icons/mini/mini.checkmark.xpm
-share/icons/mini/mini.cut.xpm
-share/icons/mini/mini.destroy.xpm
-share/icons/mini/mini.excl.xpm
-share/icons/mini/mini.exit.xpm
-share/icons/mini/mini.fvwm.xpm
-share/icons/mini/mini.letter.xpm
-share/icons/mini/mini.lower.xpm
-share/icons/mini/mini.move.xpm
-share/icons/mini/mini.netscape.xpm
-share/icons/mini/mini.raise.xpm
-share/icons/mini/mini.resize.xpm
-share/icons/mini/mini.xarchie.xpm
-share/icons/mini/mini.xboing.xpm
-share/icons/mini/mini.xlock.xpm
-share/icons/mini/mini.xterm.xpm
-share/icons/mini/mini.zircon.xpm
-share/icons/mini/kmenuedit.xpm
-share/icons/mini/smbstatus.xpm
-share/icons/mini/bell.xpm
-share/icons/mini/background.xpm
-share/icons/mini/colors.xpm
-share/icons/mini/screensaver.xpm
-share/icons/mini/style.xpm
-share/icons/mini/mouse.xpm
-share/icons/mini/keyboard.xpm
-share/icons/mini/windows.xpm
-share/icons/mini/titlebar.xpm
-share/icons/mini/buttons.xpm
-share/icons/mini/memory.xpm
-share/icons/mini/processor.xpm
-share/icons/mini/3floppy_mount.xpm
-share/icons/mini/3floppy_unmount.xpm
-share/icons/mini/5floppy_mount.xpm
-share/icons/mini/5floppy_unmount.xpm
-share/icons/mini/binary.xpm
-share/icons/mini/blockdevice.xpm
-share/icons/mini/c_src.xpm
-share/icons/mini/cdrom_mount.xpm
-share/icons/mini/cdrom_unmount.xpm
-share/icons/mini/chardevice.xpm
-share/icons/mini/core.xpm
-share/icons/mini/document.xpm
-share/icons/mini/exec.xpm
-share/icons/mini/f_src.xpm
-share/icons/mini/folder.xpm
-share/icons/mini/font.xpm
-share/icons/mini/gf.xpm
-share/icons/mini/h_src.xpm
-share/icons/mini/html.xpm
-share/icons/mini/kfm.xpm
-share/icons/mini/image.xpm
-share/icons/mini/info.xpm
-share/icons/mini/java_src.xpm
-share/icons/mini/kfm_fulltrash.xpm
-share/icons/mini/kfm_home.xpm
-share/icons/mini/kfm_trash.xpm
-share/icons/mini/l_src.xpm
-share/icons/mini/library.xpm
-share/icons/mini/lockedfolder.xpm
-share/icons/mini/log.xpm
-share/icons/mini/make.xpm
-share/icons/mini/man.xpm
-share/icons/mini/metafont.xpm
-share/icons/mini/midi.xpm
-share/icons/mini/moc_src.xpm
-share/icons/mini/o_src.xpm
-share/icons/mini/p_src.xpm
-share/icons/mini/pdf.xpm
-share/icons/mini/pipe.xpm
-share/icons/mini/pk.xpm
-share/icons/mini/postscript.xpm
-share/icons/mini/printer.xpm
-share/icons/mini/readme.xpm
-share/icons/mini/resource.xpm
-share/icons/mini/s_src.xpm
-share/icons/mini/script.xpm
-share/icons/mini/socket.xpm
-share/icons/mini/sound.xpm
-share/icons/mini/terminal.xpm
-share/icons/mini/tex.xpm
-share/icons/mini/tgz.xpm
-share/icons/mini/trash.xpm
-share/icons/mini/txt.xpm
-share/icons/mini/unknown.xpm
-share/icons/mini/video.xpm
-share/icons/mini/www.xpm
-share/icons/mini/y_src.xpm
-share/icons/mini/zip_mount.xpm
-share/icons/mini/zip_unmount.xpm
-share/icons/kdehelp.xpm
-share/icons/kfontmanager.xpm
-share/icons/kfind.xpm
-share/icons/kvt.xpm
-share/icons/kwm.xpm
-share/icons/kscreensaver.xpm
-share/icons/kmenuedit.xpm
-share/icons/kcmkwm.xpm
-share/icons/3floppy_mount.xpm
-share/icons/3floppy_unmount.xpm
-share/icons/5floppy_mount.xpm
-share/icons/5floppy_unmount.xpm
-share/icons/binary.xpm
-share/icons/blockdevice.xpm
-share/icons/c_src.xpm
-share/icons/cdrom_mount.xpm
-share/icons/cdrom_unmount.xpm
-share/icons/chardevice.xpm
-share/icons/core.xpm
-share/icons/document.xpm
-share/icons/dvi.xpm
-share/icons/exec.xpm
-share/icons/f_src.xpm
-share/icons/folder.xpm
-share/icons/font.xpm
-share/icons/ftp.xpm
-share/icons/gf.xpm
-share/icons/h_src.xpm
-share/icons/html.xpm
-share/icons/image.xpm
-share/icons/info.xpm
-share/icons/java_src.xpm
-share/icons/kfm_fulltrash.xpm
-share/icons/kfm_home.xpm
-share/icons/kfm_trash.xpm
-share/icons/l_src.xpm
-share/icons/library.xpm
-share/icons/link.xpm
-share/icons/lockedfolder.xpm
-share/icons/log.xpm
-share/icons/make.xpm
-share/icons/man.xpm
-share/icons/metafont.xpm
-share/icons/pdf.xpm
-share/icons/midi.xpm
-share/icons/moc_src.xpm
-share/icons/o_src.xpm
-share/icons/p_src.xpm
-share/icons/pipe.xpm
-share/icons/pk.xpm
-share/icons/postscript.xpm
-share/icons/printer.xpm
-share/icons/readme.xpm
-share/icons/readonly.xpm
-share/icons/resource.xpm
-share/icons/s_src.xpm
-share/icons/script.xpm
-share/icons/socket.xpm
-share/icons/sound.xpm
-share/icons/terminal.xpm
-share/icons/tex.xpm
-share/icons/tgz.xpm
-share/icons/trash.xpm
-share/icons/txt.xpm
-share/icons/unknown.xpm
-share/icons/video.xpm
-share/icons/www.xpm
-share/icons/y_src.xpm
-share/icons/zip_mount.xpm
-share/icons/zip_unmount.xpm
share/config/desktop
share/config/kcmlocalerc
share/config/kdmrc
share/config/kfmrc
share/config/kpanelrc
+share/doc/HTML/en/kcontrol/syssound/index.html
+share/doc/HTML/en/kcontrol/index.html
+share/doc/HTML/en/kcontrol/index-1.html
+share/doc/HTML/en/kcontrol/index-2.html
+share/doc/HTML/en/kcontrol/logotp3.gif
share/doc/HTML/en/kcontrol/kdmconfig/index.html
share/doc/HTML/en/kcontrol/kdmconfig/kdm-appear.html
share/doc/HTML/en/kcontrol/kdmconfig/kdm-font.html
@@ -494,6 +270,7 @@ share/doc/HTML/en/kfind/index.sgml
share/doc/HTML/en/kmenuedit/kmenuedit1.gif
share/doc/HTML/en/kmenuedit/index.html
share/doc/HTML/en/kmenuedit/kmenuedit2.gif
+share/doc/HTML/de/kcontrol/syssound/index.html
share/toolbar/back.xpm
share/toolbar/bottom.xpm
share/toolbar/contents.xpm
@@ -533,10 +310,200 @@ share/toolbar/viewmag-.xpm
share/toolbar/viewmag.xpm
share/toolbar/viewzoom.xpm
share/toolbar/stop.xpm
+share/wallpapers/berries.jpg
+share/wallpapers/blkmarble.gif
+share/wallpapers/chess.jpg
+share/wallpapers/circuit.gif
+share/wallpapers/face.gif
+share/wallpapers/grablkwt.jpg
+share/wallpapers/parrots.jpg
+share/wallpapers/pinkflam.jpg
+share/wallpapers/produce.jpg
+share/wallpapers/prpbumps.gif
+share/wallpapers/ruins.jpg
+share/wallpapers/sandman.jpg
+share/wallpapers/wood1.jpg
+share/wallpapers/foggy1.gif
+share/wallpapers/foggy2.gif
+share/wallpapers/cubic1.gif
+share/wallpapers/cubic2.gif
+share/wallpapers/bowtie.gif
+share/wallpapers/gray2.gif
+share/wallpapers/greek.gif
share/wallpapers/marble01.jpg
share/wallpapers/ocean01.jpg
share/wallpapers/paper01.jpg
share/wallpapers/water01.jpg
+share/locale/de/LC_MESSAGES/kcmsyssound.mo
+share/locale/fr/LC_MESSAGES/kcmsyssound.mo
+share/locale/es/LC_MESSAGES/kcmkpanel.mo
+share/locale/es/LC_MESSAGES/kcmsyssound.mo
+share/locale/ru/LC_MESSAGES/krootwm.mo
+share/locale/ru/LC_MESSAGES/kfm.mo
+share/locale/ru/LC_MESSAGES/kcmsyssound.mo
+share/locale/ru/LC_MESSAGES/kpanel.mo
+share/locale/ru/LC_MESSAGES/kmenuedit.mo
+share/locale/ru/LC_MESSAGES/klock.mo
+share/locale/hu/LC_MESSAGES/kcmlocale.mo
+share/locale/hu/LC_MESSAGES/kdmconfig.mo
+share/locale/da/LC_MESSAGES/kcmsyssound.mo
+share/locale/da/LC_MESSAGES/kfind.mo
+share/locale/it/LC_MESSAGES/kcmkpanel.mo
+share/locale/it/LC_MESSAGES/kcontrol.mo
+share/locale/it/LC_MESSAGES/kcmlocale.mo
+share/locale/it/LC_MESSAGES/kcmbell.mo
+share/locale/it/LC_MESSAGES/kcminfo.mo
+share/locale/it/LC_MESSAGES/kcminput.mo
+share/locale/it/LC_MESSAGES/krootwm.mo
+share/locale/it/LC_MESSAGES/kcmsamba.mo
+share/locale/it/LC_MESSAGES/kcmkwm.mo
+share/locale/it/LC_MESSAGES/kcmsyssound.mo
+share/locale/it/LC_MESSAGES/kmenuedit.mo
+share/locale/it/LC_MESSAGES/kdmconfig.mo
+share/locale/it/LC_MESSAGES/klock.mo
+share/locale/nl/LC_MESSAGES/kcontrol.mo
+share/locale/nl/LC_MESSAGES/kpanel.mo
+share/locale/nl/LC_MESSAGES/krootwm.mo
+share/locale/nl/LC_MESSAGES/kcmbell.mo
+share/locale/nl/LC_MESSAGES/kcminput.mo
+share/locale/nl/LC_MESSAGES/kcmkwm.mo
+share/locale/nl/LC_MESSAGES/kcmsamba.mo
+share/locale/nl/LC_MESSAGES/kcmsyssound.mo
+share/locale/nl/LC_MESSAGES/kcminfo.mo
+share/locale/nl/LC_MESSAGES/kcmkpanel.mo
+share/locale/nl/LC_MESSAGES/kcmlocale.mo
+share/locale/nl/LC_MESSAGES/kcmsample.mo
+share/locale/nl/LC_MESSAGES/kmenuedit.mo
+share/locale/nl/LC_MESSAGES/kdm.mo
+share/locale/nl/LC_MESSAGES/kdmconfig.mo
+share/locale/pt/LC_MESSAGES/kcmsyssound.mo
+share/locale/pt/LC_MESSAGES/kstartondesk.mo
+share/locale/no/LC_MESSAGES/krootwm.mo
+share/locale/no/LC_MESSAGES/kwm.mo
+share/locale/no/LC_MESSAGES/kvt.mo
+share/locale/no/LC_MESSAGES/kcontrol.mo
+share/locale/no/LC_MESSAGES/kcminput.mo
+share/locale/no/LC_MESSAGES/kdisplay.mo
+share/locale/no/LC_MESSAGES/kfontmanager.mo
+share/locale/no/LC_MESSAGES/kpanel.mo
+share/locale/no/LC_MESSAGES/kcmsyssound.mo
+share/locale/no/LC_MESSAGES/kdm.mo
+share/locale/no/LC_MESSAGES/kcmbell.mo
+share/locale/no/LC_MESSAGES/kfm.mo
+share/locale/no/LC_MESSAGES/kfind.mo
+share/locale/no/LC_MESSAGES/kdehelp.mo
+share/locale/no/LC_MESSAGES/kcminfo.mo
+share/locale/no/LC_MESSAGES/kcmsamba.mo
+share/locale/no/LC_MESSAGES/kcmlocale.mo
+share/locale/no/LC_MESSAGES/kmenuedit.mo
+share/locale/no/LC_MESSAGES/kdmconfig.mo
+share/locale/no/LC_MESSAGES/kcmkwm.mo
+share/locale/no/LC_MESSAGES/kcmkpanel.mo
+share/locale/no/LC_MESSAGES/klock.mo
+share/locale/no/LC_MESSAGES/kstartondesk.mo
+share/locale/pl/LC_MESSAGES/kcmsyssound.mo
+share/locale/pl/LC_MESSAGES/kstartondesk.mo
+share/locale/el/LC_MESSAGES/kcmsyssound.mo
+share/locale/el/LC_MESSAGES/kcminput.mo
+share/locale/el/LC_MESSAGES/kcminfo.mo
+share/locale/el/LC_MESSAGES/kcmkpanel.mo
+share/locale/el/LC_MESSAGES/kcmkwm.mo
+share/locale/el/LC_MESSAGES/kcmlocale.mo
+share/locale/el/LC_MESSAGES/kcmsamba.mo
+share/locale/el/LC_MESSAGES/kcontrol.mo
+share/locale/el/LC_MESSAGES/kdehelp.mo
+share/locale/el/LC_MESSAGES/kdmconfig.mo
+share/locale/el/LC_MESSAGES/kfontmanager.mo
+share/locale/el/LC_MESSAGES/klock.mo
+share/locale/el/LC_MESSAGES/krootwm.mo
+share/locale/el/LC_MESSAGES/kvt.mo
+share/locale/el/LC_MESSAGES/kdm.mo
+share/locale/el/LC_MESSAGES/kcmbell.mo
+share/locale/fi/LC_MESSAGES/kcmsyssound.mo
+share/locale/fi/LC_MESSAGES/kstartondesk.mo
+share/locale/hr/LC_MESSAGES/kcmbell.mo
+share/locale/hr/LC_MESSAGES/kcminfo.mo
+share/locale/hr/LC_MESSAGES/kcminput.mo
+share/locale/hr/LC_MESSAGES/kcmkpanel.mo
+share/locale/hr/LC_MESSAGES/kcmkwm.mo
+share/locale/hr/LC_MESSAGES/kcmlocale.mo
+share/locale/hr/LC_MESSAGES/kcmsamba.mo
+share/locale/hr/LC_MESSAGES/kcmsample.mo
+share/locale/hr/LC_MESSAGES/kcmsyssound.mo
+share/locale/hr/LC_MESSAGES/kcontrol.mo
+share/locale/hr/LC_MESSAGES/kdmconfig.mo
+share/locale/hr/LC_MESSAGES/kfontmanager.mo
+share/locale/hr/LC_MESSAGES/kmenuedit.mo
+share/locale/hr/LC_MESSAGES/kwm.mo
+share/locale/hr/LC_MESSAGES/kstartondesk.mo
+share/locale/zh/LC_MESSAGES/kfind.mo
+share/locale/zh/LC_MESSAGES/kdehelp.mo
+share/locale/zh/LC_MESSAGES/kdisplay.mo
+share/locale/zh/LC_MESSAGES/kvt.mo
+share/locale/zh/LC_MESSAGES/kfm.mo
+share/locale/zh/LC_MESSAGES/kwm.mo
+share/locale/zh/LC_MESSAGES/kfontmanager.mo
+share/locale/zh/LC_MESSAGES/kdm.mo
+share/locale/zh/LC_MESSAGES/kpanel.mo
+share/locale/zh/LC_MESSAGES/klock.mo
+share/locale/zh/LC_MESSAGES/krootwm.mo
+share/locale/zh/LC_MESSAGES/kcmbell.mo
+share/locale/zh/LC_MESSAGES/kcminfo.mo
+share/locale/zh/LC_MESSAGES/kcminput.mo
+share/locale/zh/LC_MESSAGES/kcmkwm.mo
+share/locale/zh/LC_MESSAGES/kcmsamba.mo
+share/locale/zh/LC_MESSAGES/kcmsample.mo
+share/locale/zh/LC_MESSAGES/kcontrol.mo
+share/locale/zh/LC_MESSAGES/kmenuedit.mo
+share/locale/zh/LC_MESSAGES/kdmconfig.mo
+share/locale/zh/LC_MESSAGES/kcmkpanel.mo
+share/locale/zh/LC_MESSAGES/kcmlocale.mo
+share/locale/sk/LC_MESSAGES/kfind.mo
+share/locale/sk/LC_MESSAGES/kdehelp.mo
+share/locale/sk/LC_MESSAGES/kdisplay.mo
+share/locale/sk/LC_MESSAGES/kvt.mo
+share/locale/sk/LC_MESSAGES/kfm.mo
+share/locale/sk/LC_MESSAGES/kwm.mo
+share/locale/sk/LC_MESSAGES/kfontmanager.mo
+share/locale/sk/LC_MESSAGES/kdm.mo
+share/locale/sk/LC_MESSAGES/kpanel.mo
+share/locale/sk/LC_MESSAGES/klock.mo
+share/locale/sk/LC_MESSAGES/krootwm.mo
+share/locale/sk/LC_MESSAGES/kcmbell.mo
+share/locale/sk/LC_MESSAGES/kcminfo.mo
+share/locale/sk/LC_MESSAGES/kcminput.mo
+share/locale/sk/LC_MESSAGES/kcmkwm.mo
+share/locale/sk/LC_MESSAGES/kcmsamba.mo
+share/locale/sk/LC_MESSAGES/kcmsample.mo
+share/locale/sk/LC_MESSAGES/kcontrol.mo
+share/locale/sk/LC_MESSAGES/kmenuedit.mo
+share/locale/sk/LC_MESSAGES/kdmconfig.mo
+share/locale/sk/LC_MESSAGES/kcmkpanel.mo
+share/locale/sk/LC_MESSAGES/kcmlocale.mo
+share/locale/sk/LC_MESSAGES/kcmsyssound.mo
+share/locale/sk/LC_MESSAGES/kstartondesk.mo
+share/locale/ca/LC_MESSAGES/kfind.mo
+share/locale/ca/LC_MESSAGES/kdehelp.mo
+share/locale/ca/LC_MESSAGES/kdisplay.mo
+share/locale/ca/LC_MESSAGES/kvt.mo
+share/locale/ca/LC_MESSAGES/kfm.mo
+share/locale/ca/LC_MESSAGES/kfontmanager.mo
+share/locale/ca/LC_MESSAGES/kcminfo.mo
+share/locale/ca/LC_MESSAGES/kcmkpanel.mo
+share/locale/ca/LC_MESSAGES/kpanel.mo
+share/locale/ca/LC_MESSAGES/krootwm.mo
+share/locale/ca/LC_MESSAGES/kcmkwm.mo
+share/locale/ca/LC_MESSAGES/kcmlocale.mo
+share/locale/ca/LC_MESSAGES/kcmbell.mo
+share/locale/ca/LC_MESSAGES/kcminput.mo
+share/locale/ca/LC_MESSAGES/kdm.mo
+share/locale/ca/LC_MESSAGES/kdmconfig.mo
+share/locale/ca/LC_MESSAGES/klock.mo
+share/locale/ca/LC_MESSAGES/kcmsamba.mo
+share/locale/ca/LC_MESSAGES/kcmsample.mo
+share/locale/ca/LC_MESSAGES/kcontrol.mo
+share/locale/ca/LC_MESSAGES/kmenuedit.mo
+share/locale/ca/LC_MESSAGES/kwm.mo
share/locale/de/LC_MESSAGES/krootwm.mo
share/locale/de/LC_MESSAGES/kcmbell.mo
share/locale/de/LC_MESSAGES/kcminfo.mo
@@ -608,7 +575,6 @@ share/locale/ru/LC_MESSAGES/kcmsample.mo
share/locale/ru/LC_MESSAGES/kcontrol.mo
share/locale/ru/LC_MESSAGES/kdm.mo
share/locale/ru/LC_MESSAGES/kdmconfig.mo
-share/locale/ru/LC_MESSAGES/krootwm.po
share/locale/hu/LC_MESSAGES/krootwm.mo
share/locale/hu/LC_MESSAGES/kcmbell.mo
share/locale/hu/LC_MESSAGES/kcminfo.mo
@@ -813,9 +779,6 @@ share/locale/el/LC_MESSAGES/kfm.mo
cgi-bin/helpsearch
cgi-bin/helpindex
@dirrm share/wallpapers
-@dirrm share/toolbar
-@dirrm share/icons/mini
-@dirrm share/icons
@dirrm share/doc/HTML/en/kwm
@dirrm share/doc/HTML/en/kvt
@dirrm share/doc/HTML/en/kmenuedit
@@ -832,7 +795,11 @@ cgi-bin/helpindex
@dirrm share/doc/HTML/en/kcontrol/kcmbell
@dirrm share/doc/HTML/en/kcontrol/kcminfo
@dirrm share/doc/HTML/en/kcontrol/kcmlocale
+@dirrm share/doc/HTML/en/kcontrol/syssound
@dirrm share/doc/HTML/en/kcontrol
+@dirrm share/doc/HTML/de/kcontrol/syssound
+@dirrm share/doc/HTML/de/kcontrol
+@dirrm share/doc/HTML/de
@dirrm share/apps/kwm/pics
@dirrm share/apps/kwm
@dirrm share/apps/kpanel/pics/mini
@@ -849,6 +816,8 @@ cgi-bin/helpindex
@dirrm share/apps/kdm/pics/users
@dirrm share/apps/kdm/pics
@dirrm share/apps/kdm
+@dirrm share/apps/kdisplay/color-schemes
+@dirrm share/apps/kdisplay/app-defaults
@dirrm share/apps/kdisplay/pics
@dirrm share/apps/kdisplay
@dirrm share/apps/kcontrol/pics
diff --git a/x11/kdelibs/Makefile b/x11/kdelibs/Makefile
index 466904414ec..3692558abf5 100644
--- a/x11/kdelibs/Makefile
+++ b/x11/kdelibs/Makefile
@@ -1,22 +1,27 @@
-# $NetBSD: Makefile,v 1.10 1998/04/24 09:20:38 agc Exp $
+# $NetBSD: Makefile,v 1.11 1998/04/28 22:53:00 tron Exp $
# FreeBSD Id: Makefile,v 1.5 1997/11/27 00:25:46 se Exp
#
-DISTNAME= kdelibs-Beta3-1
-PKGNAME= kdelibs-3.1b
+DISTNAME= kdelibs-beta4-1
+PKGNAME= kdelibs-4.1b
CATEGORIES= x11 kde
-MASTER_SITES= ftp://ftp.net.lut.ac.uk/kde/stable/Beta3/distribution/tgz/source/ \
- ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta3/distribution/tgz/source/ \
- ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta3/distribution/tgz/source/
-EXTRACT_SUFX= .src.tar.gz
+MASTER_SITES= ftp://ftp.appl-opt.physik.uni-essen.de/pub/linux/kde/stable/Beta4/distribution/tgz/source/ \
+ ftp://ftp.net.lut.ac.uk/kde/stable/Beta4/distribution/tgz/source/ \
+ ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta4/distribution/tgz/source/
+EXTRACT_SUFX= .src.tar.bz2
-MAINTAINER= packages@netbsd.org
+MAINTAINER= tron@netbsd.org
-BUILD_DEPENDS= moc:../../x11/qt
+BUILD_DEPENDS= bzip2:../../archivers/bzip2 \
+ moc:../../x11/qt
DEPENDS+= jpeg-6a:../../graphics/jpeg
DEPENDS+= qt-1.33:../../x11/qt
DEPENDS+= giflib-3.0:../../graphics/giflib
+EXTRACT_CMD= bzip2
+EXTRACT_BEFORE_ARGS= -d <
+EXTRACT_AFTER_ARGS= | pax -r
+
USE_X11= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= "--prefix=${PREFIX}" \
diff --git a/x11/kdelibs/files/md5 b/x11/kdelibs/files/md5
index 847ab2ad5a0..7d285a90815 100644
--- a/x11/kdelibs/files/md5
+++ b/x11/kdelibs/files/md5
@@ -1 +1 @@
-MD5 (kdelibs-Beta3-1.src.tar.gz) = 3d58d17af821f22427de980b31ec4b52
+MD5 (kdelibs-beta4-1.src.tar.bz2) = d100dbc94290027a655345d2adcf3575
diff --git a/x11/kdelibs/pkg/PLIST b/x11/kdelibs/pkg/PLIST
index a16dfeea59b..884a5c69530 100644
--- a/x11/kdelibs/pkg/PLIST
+++ b/x11/kdelibs/pkg/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 1998/03/21 01:53:37 tron Exp $
-lib/libkdecore.so.0.90
+@comment $NetBSD: PLIST,v 1.6 1998/04/28 22:53:01 tron Exp $
+lib/libkdecore.so.0.91
lib/libkdecore.la
lib/libkdeui.so.0.91
lib/libkdeui.la
@@ -7,9 +7,11 @@ lib/libjscript.so.0.90
lib/libjscript.la
lib/libkhtmlw.so.0.91
lib/libkhtmlw.la
+lib/libkfile.so.0.90
+lib/libkfile.la
lib/libkfm.so.0.90
lib/libkfm.la
-lib/libmediatool.so.0.90
+lib/libmediatool.so.0.91
lib/libmediatool.la
@exec /sbin/ldconfig || /usr/bin/true
@unexec /sbin/ldconfig || /usr/bin/true
@@ -90,13 +92,28 @@ include/kfmclient_ipc.h
include/kfmipc.h
include/mediatool.h
include/kaudio.h
+include/kfileinfo.h
+include/ktmainwindow.h
+include/kfiledialog.h
+include/bookmark.h
+include/kremotefile.h
+include/kdir.h
+include/kdirlistbox.h
+include/kfileinfocontents.h
+include/booktoken.h
+include/kfiledetaillist.h
+include/kcombiview.h
+include/kpreview.h
+include/xview.h
+include/kfilepreview.h
share/apps/kde/pics/error.xpm
share/apps/kde/pics/exclamation.xpm
share/apps/kde/pics/info.xpm
share/apps/kde/pics/stopsign.xpm
share/apps/kde/pics/question.xpm
share/apps/khtmlw/pics/khtmlw_dnd.xpm
-share/config/charsets.config
+share/config/charsets
+share/doc/HTML/en/kdelibs/kdebug.html
share/locale/de/LC_MESSAGES/kde.mo
share/locale/fr/LC_MESSAGES/kde.mo
share/locale/sv/LC_MESSAGES/kde.mo
@@ -114,6 +131,9 @@ share/locale/el/LC_MESSAGES/kde.mo
share/locale/fi/LC_MESSAGES/kde.mo
share/locale/hr/LC_MESSAGES/kde.mo
share/locale/ro/LC_MESSAGES/kde.mo
+share/locale/zh/LC_MESSAGES/kde.mo
+share/locale/sk/LC_MESSAGES/kde.mo
+share/locale/ca/LC_MESSAGES/kde.mo
share/locale/de/charset
share/locale/fr/charset
share/locale/cs/charset
@@ -123,9 +143,11 @@ share/locale/da/charset
share/locale/pl/charset
share/locale/fi/charset
share/locale/ro/charset
-share/doc/HTML/en/kdelibs/kdebug.html
+share/locale/pt/charset
+share/toolbar/configure.xpm
@exec /bin/ln -sf en %D/share/doc/HTML/default
@unexec /bin/rm -f %D/share/doc/HTML/default
+@dirrm share/toolbar
@dirrm share/doc/HTML/en/kdelibs
@dirrm share/doc/HTML/en
@dirrm share/doc/HTML