3 files changed, 123 insertions, 118 deletions

diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index 9283bff382a9..abf7da8afe00 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@@ -3,16 +3,16 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.3 1997/11/05 04:19:51 asami Exp $
+# $Id: Makefile,v 1.4 1997/11/28 00:04:18 se Exp $
 #
 
-DISTNAME=	kdeutils-Beta2-1
-PKGNAME=	kdeutils-2.1b
+DISTNAME=	kdeutils-Beta3-1
+PKGNAME=	kdeutils-3.1b
 CATEGORIES=	misc kde
-MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta2/distribution/tgz/source/ \
- 		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta2/distribution/tgz/source/ \
- 		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta2/distribution/tgz/source/
-EXTRACT_SUFX=	.src.tgz
+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
 
 MAINTAINER=	se@freebsd.org
 
@@ -20,17 +20,18 @@ BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
 LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \
-		kdecore\\.0\\.1[1-9]:${PORTSDIR}/x11/kdelibs \
-		kdeui\\.0\\.1[0-9]:${PORTSDIR}/x11/kdelibs \
-		jscript\\.0\\.[1-9]:${PORTSDIR}/x11/kdelibs \
-		khtmlw\\.0\\.1[1-9]:${PORTSDIR}/x11/kdelibs \
-		kfm\\.0\\.[1-9]:${PORTSDIR}/x11/kdelibs \
+		kdecore\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
+		kdeui\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
+		jscript\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
+		khtmlw\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
+		kfm\\.0\\.9[0-9]:${PORTSDIR}/x11/kdelibs \
 		mediatool\\.0\\.[6-9]:${PORTSDIR}/x11/kdelibs
 
 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"
+CONFIGURE_ENV=	INSTALL_SCRIPT="install -c -m 555"
 
 WRKSRC=		${WRKDIR}/kdeutils
 
diff --git a/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo
index 3fea4807ac49..575709da0ac4 100644
--- a/deskutils/kcharselect/distinfo
+++ b/deskutils/kcharselect/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-Beta2-1.src.tgz) = 1a56688809ac05fb41eba3388a2cda2c
+MD5 (kdeutils-Beta3-1.src.tar.gz) = 123bcd61a7de4d6df215a5c33041eede
diff --git a/deskutils/kcharselect/pkg-plist b/deskutils/kcharselect/pkg-plist
index a50f464df49f..3505c71d37a4 100644
--- a/deskutils/kcharselect/pkg-plist
+++ b/deskutils/kcharselect/pkg-plist
@@ -1,10 +1,28 @@
+bin/karm
 bin/kcalc
 bin/kedit
 bin/khexdit
-bin/karm
 bin/kjots
-bin/knotes
+bin/kljettool
 bin/kzip
+bin/knotes
+share/applnk/Applications/kedit.kdelnk
+share/applnk/Utilities/KArm.kdelnk
+share/applnk/Utilities/KLJetTool.kdelnk
+share/applnk/Utilities/Kjots.kdelnk
+share/applnk/Utilities/kcalc.kdelnk
+share/applnk/Utilities/khexdit.kdelnk
+share/applnk/Utilities/knotes.kdelnk
+share/applnk/Utilities/kzip.kdelnk
+share/apps/kcalc/pics/kcalclogo.xpm
+share/apps/kedit/pics/keditlogo.xpm
+share/apps/kedit/toolbar/filenew2.xpm
+share/apps/kedit/toolbar/send.xpm
+share/apps/kjots/toolbar/OpenBook.xpm
+share/apps/kjots/toolbar/filedel.xpm
+share/apps/kljettool/pics/kljetlogo.xpm
+share/apps/knotes/pics/knotesclose.xpm
+share/apps/knotes/pics/knoteslogo.xpm
 share/doc/HTML/de/kcalc/index-1.html
 share/doc/HTML/de/kcalc/index-2.html
 share/doc/HTML/de/kcalc/index-3.html
@@ -13,7 +31,18 @@ share/doc/HTML/de/kcalc/index-5.html
 share/doc/HTML/de/kcalc/index-6.html
 share/doc/HTML/de/kcalc/index-7.html
 share/doc/HTML/de/kcalc/index-8.html
+share/doc/HTML/de/kcalc/index-9.html
 share/doc/HTML/de/kcalc/index.html
+share/doc/HTML/de/kcalc/logotp3.gif
+share/doc/HTML/en/karm/index-1.html
+share/doc/HTML/en/karm/index-2.html
+share/doc/HTML/en/karm/index-3.html
+share/doc/HTML/en/karm/index-4.html
+share/doc/HTML/en/karm/index.html
+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/kcalc/index-1.html
 share/doc/HTML/en/kcalc/index-2.html
 share/doc/HTML/en/kcalc/index-3.html
@@ -22,144 +51,119 @@ share/doc/HTML/en/kcalc/index-5.html
 share/doc/HTML/en/kcalc/index-6.html
 share/doc/HTML/en/kcalc/index-7.html
 share/doc/HTML/en/kcalc/index-8.html
+share/doc/HTML/en/kcalc/index-9.html
 share/doc/HTML/en/kcalc/index.html
 share/doc/HTML/en/kcalc/kcalc_on_Aix.txt
 share/doc/HTML/en/kcalc/kcalc_on_OSF.txt
-share/doc/HTML/en/kedit/index.html
+share/doc/HTML/en/kcalc/logotp3.gif
 share/doc/HTML/en/kedit/index-1.html
 share/doc/HTML/en/kedit/index-2.html
 share/doc/HTML/en/kedit/index-3.html
 share/doc/HTML/en/kedit/index-4.html
 share/doc/HTML/en/kedit/index-5.html
+share/doc/HTML/en/kedit/index.html
+share/doc/HTML/en/kedit/logotp3.gif
 share/doc/HTML/en/khexdit/index.html
-share/doc/HTML/en/karm/index-1.html
-share/doc/HTML/en/karm/index-2.html
-share/doc/HTML/en/karm/index-3.html
-share/doc/HTML/en/karm/index-4.html
-share/doc/HTML/en/karm/karm.gif
-share/doc/HTML/en/karm/index.html
-share/doc/HTML/en/karm/scrn.html
-share/doc/HTML/en/karm/index.sgml
 share/doc/HTML/en/kjots/index.html
-share/doc/HTML/en/knotes/index.html
+share/doc/HTML/en/kljettool/README
+share/doc/HTML/en/kljettool/filter
+share/doc/HTML/en/kljettool/kljettool-1.html
+share/doc/HTML/en/kljettool/kljettool-2.html
+share/doc/HTML/en/kljettool/kljettool-3.html
+share/doc/HTML/en/kljettool/kljettool-4.html
+share/doc/HTML/en/kljettool/kljettool-5.html
+share/doc/HTML/en/kljettool/kljettool-6.html
+share/doc/HTML/en/kljettool/kljettool.html
+share/doc/HTML/en/kljettool/kljettool.nif
+share/doc/HTML/en/kljettool/kljettool.sgml
+share/doc/HTML/en/kljettool/logotp3.gif
+share/doc/HTML/en/kljettool/magic
 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/kzip/index.html
+share/doc/HTML/en/knotes/index.html
 share/doc/HTML/en/kzip/index-1.html
 share/doc/HTML/en/kzip/index-2.html
 share/doc/HTML/en/kzip/index-3.html
 share/doc/HTML/en/kzip/index-4.html
+share/doc/HTML/en/kzip/index.html
+share/doc/HTML/en/kzip/logotp3.gif
 share/doc/HTML/it/khexdit/index.html
-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/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/applnk/Utilities/kcalc.kdelnk
-share/applnk/Utilities/khexdit.kdelnk
-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/mimelnk/application/x-zip.kdelnk
-share/mimelnk/application/x-lha.kdelnk
-share/mimelnk/application/x-ar.kdelnk
+share/icons/mini/kcalc.xpm
+share/icons/mini/kedit.xpm
+share/icons/mini/khexdit.xpm
+share/icons/mini/kzip.xpm
+share/locale/cs/LC_MESSAGES/kedit.mo
+share/locale/cs/LC_MESSAGES/khexdit.mo
+share/locale/cs/LC_MESSAGES/knotes.mo
+share/locale/cs/LC_MESSAGES/kzip.mo
+share/locale/de/LC_MESSAGES/karm.mo
 share/locale/de/LC_MESSAGES/kedit.mo
 share/locale/de/LC_MESSAGES/khexdit.mo
-share/locale/fr/LC_MESSAGES/khexdit.mo
+share/locale/de/LC_MESSAGES/knotes.mo
+share/locale/de/LC_MESSAGES/kzip.mo
+share/locale/el/LC_MESSAGES/khexdit.mo
+share/locale/es/LC_MESSAGES/kedit.mo
+share/locale/es/LC_MESSAGES/khexdit.mo
+share/locale/es/LC_MESSAGES/knotes.mo
+share/locale/es/LC_MESSAGES/kzip.mo
+share/locale/fi/LC_MESSAGES/kedit.mo
+share/locale/fi/LC_MESSAGES/khexdit.mo
+share/locale/fi/LC_MESSAGES/knotes.mo
+share/locale/fi/LC_MESSAGES/kzip.mo
 share/locale/fr/LC_MESSAGES/kedit.mo
+share/locale/fr/LC_MESSAGES/khexdit.mo
 share/locale/fr/LC_MESSAGES/knotes.mo
-share/locale/cs/LC_MESSAGES/khexdit.mo
-share/locale/cs/LC_MESSAGES/kedit.mo
-share/locale/nl/LC_MESSAGES/kedit.mo
-share/locale/nl/LC_MESSAGES/khexdit.mo
-share/locale/sv/LC_MESSAGES/kedit.mo
-share/locale/sv/LC_MESSAGES/khexdit.mo
-share/locale/es/LC_MESSAGES/khexdit.mo
-share/locale/es/LC_MESSAGES/kedit.mo
-share/locale/ru/LC_MESSAGES/khexdit.mo
-share/locale/ru/LC_MESSAGES/knotes.mo
-share/locale/ru/LC_MESSAGES/kzip.mo
+share/locale/hr/LC_MESSAGES/kedit.mo
+share/locale/hr/LC_MESSAGES/khexdit.mo
+share/locale/hr/LC_MESSAGES/knotes.mo
+share/locale/hr/LC_MESSAGES/kzip.mo
 share/locale/hu/LC_MESSAGES/kedit.mo
 share/locale/hu/LC_MESSAGES/khexdit.mo
-share/locale/it/LC_MESSAGES/khexdit.mo
+share/locale/hu/LC_MESSAGES/knotes.mo
+share/locale/hu/LC_MESSAGES/kzip.mo
 share/locale/it/LC_MESSAGES/kedit.mo
-share/locale/pl/LC_MESSAGES/khexdit.mo
+share/locale/it/LC_MESSAGES/khexdit.mo
+share/locale/it/LC_MESSAGES/knotes.mo
+share/locale/it/LC_MESSAGES/kzip.mo
+share/locale/nl/LC_MESSAGES/kedit.mo
+share/locale/nl/LC_MESSAGES/khexdit.mo
 share/locale/pl/LC_MESSAGES/kedit.mo
+share/locale/pl/LC_MESSAGES/khexdit.mo
+share/locale/pl/LC_MESSAGES/knotes.mo
+share/locale/pl/LC_MESSAGES/kzip.mo
+share/locale/pt/LC_MESSAGES/karm.mo
 share/locale/pt/LC_MESSAGES/kedit.mo
 share/locale/pt/LC_MESSAGES/khexdit.mo
+share/locale/pt/LC_MESSAGES/knotes.mo
 share/locale/pt/LC_MESSAGES/kzip.mo
-share/locale/fi/LC_MESSAGES/khexdit.mo
-share/locale/fi/LC_MESSAGES/kedit.mo
-@dirrm share/mimelnk/application
-@dirrm share/mimelnk
-@dirrm share/locale/sv/LC_MESSAGES
-@dirrm share/locale/sv
-@dirrm share/locale/ru/LC_MESSAGES
-@dirrm share/locale/ru
-@dirrm share/locale/pt/LC_MESSAGES
-@dirrm share/locale/pt
-@dirrm share/locale/pl/LC_MESSAGES
-@dirrm share/locale/pl
-@dirrm share/locale/nl/LC_MESSAGES
-@dirrm share/locale/nl
-@dirrm share/locale/it/LC_MESSAGES
-@dirrm share/locale/it
-@dirrm share/locale/hu/LC_MESSAGES
-@dirrm share/locale/hu
-@dirrm share/locale/fr/LC_MESSAGES
-@dirrm share/locale/fr
-@dirrm share/locale/fi/LC_MESSAGES
-@dirrm share/locale/fi
-@dirrm share/locale/es/LC_MESSAGES
-@dirrm share/locale/es
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/de
-@dirrm share/locale/cs/LC_MESSAGES
-@dirrm share/locale/cs
-@dirrm share/locale
-@dirrm share/icons/mini
-@dirrm share/icons
-@dirrm share/doc/HTML/it/khexdit
-@dirrm share/doc/HTML/it
-@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/en
-@dirrm share/doc/HTML/de/kcalc
-@dirrm share/doc/HTML/de
-@dirrm share/doc/HTML
-@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
+share/locale/ro/LC_MESSAGES/khexdit.mo
+share/locale/ru/LC_MESSAGES/khexdit.mo
+share/locale/ru/LC_MESSAGES/knotes.mo
+share/locale/ru/LC_MESSAGES/kzip.mo
+share/locale/sv/LC_MESSAGES/kedit.mo
+share/locale/sv/LC_MESSAGES/khexdit.mo
 @dirrm share/apps/kcalc/pics
-@dirrm share/apps/kcalc
-@dirrm share/apps
-@dirrm share/applnk/Utilities
-@dirrm share/applnk/Applications
-@dirrm share/applnk
+@dirrm share/apps/kedit/pics
+@dirrm share/apps/kedit/toolbar
+@dirrm share/apps/kjots/toolbar
+@dirrm share/apps/kljettool/pics
+@dirrm share/apps/knotes/pics
+@dirrm share/doc/HTML/de/kcalc
+@dirrm share/doc/HTML/en/karm
+@dirrm share/doc/HTML/en/kcalc
+@dirrm share/doc/HTML/en/kedit
+@dirrm share/doc/HTML/en/khexdit
+@dirrm share/doc/HTML/en/kjots
+@dirrm share/doc/HTML/en/kljettool
+@dirrm share/doc/HTML/en/knotes
+@dirrm share/doc/HTML/en/kzip
+@dirrm share/doc/HTML/it/khexdit