3 files changed, 135 insertions, 27 deletions

diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile
index 0665b6b01da6..5398eeec4d88 100644
--- a/archivers/ark/Makefile
+++ b/archivers/ark/Makefile
@@ -3,35 +3,26 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.12 1998/05/04 20:23:03 jseger Exp $
+# $Id: Makefile,v 1.13 1998/07/13 23:31:50 se Exp $
 #
 
-DISTNAME=	kdeutils-beta4-1
-PKGNAME=	kdeutils-4.1b
+DISTNAME=	kdeutils-1.0
 CATEGORIES=	misc kde
 MASTER_SITES=	$(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= stable/Beta4/distribution/tgz/source
-EXTRACT_SUFX=	.src.tar.bz2
+MASTER_SITE_SUBDIR= stable/1.0/distribution/tar/generic/source
 
 MAINTAINER=	se@freebsd.org
 
-BROKEN=		upgrade to 1.0 will be committed within the next few days
-
-BUILD_DEPENDS=	bzip2:${PORTSDIR}/archivers/bzip2 \
-		moc:${PORTSDIR}/x11/qt
-LIB_DEPENDS=	qt\\.1\\.3[1-9]:${PORTSDIR}/x11/qt \
+BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt133
+LIB_DEPENDS=	qt\\.1\\.3[3-9]:${PORTSDIR}/x11/qt133 \
 		gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
-		kdecore\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
-		kdeui\\.0\\.9[1-9]:${PORTSDIR}/x11/kdelibs \
+		kdecore\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
+		kdeui\\.1\\.[0-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\\.9[1-9]:${PORTSDIR}/x11/kdelibs
-
-EXTRACT_CMD=	bzip2
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= | tar -xf -
+		khtmlw\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
+		kfm\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs \
+		mediatool\\.1\\.[0-9]:${PORTSDIR}/x11/kdelibs
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
@@ -40,6 +31,4 @@ CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 
-WRKSRC=		${WRKDIR}/kdeutils
-
 .include <bsd.port.mk>
diff --git a/archivers/ark/distinfo b/archivers/ark/distinfo
index 85c66befe4f2..44de06943cc4 100644
--- a/archivers/ark/distinfo
+++ b/archivers/ark/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-beta4-1.src.tar.bz2) = 82adffb50693252c3be9aa4bde33b678
+MD5 (kdeutils-1.0.tar.gz) = e7eeacbe99d529d01890b9dbe7c791a3
diff --git a/archivers/ark/pkg-plist b/archivers/ark/pkg-plist
index aa58dee2552f..94212a3a16d7 100644
--- a/archivers/ark/pkg-plist
+++ b/archivers/ark/pkg-plist
@@ -18,6 +18,8 @@ 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/pics/OpenBook.xpm
+share/apps/kjots/pics/filedel.xpm
 share/apps/knotes/pics/knotesclose.xpm
 share/apps/knotes/pics/knoteslogo.xpm
 share/doc/HTML/de/kcalc/index-1.html
@@ -61,6 +63,11 @@ 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/kjots/index-1.html
+share/doc/HTML/en/kjots/index-2.html
+share/doc/HTML/en/kjots/index-3.html
+share/doc/HTML/en/kjots/index.html
+share/doc/HTML/en/kjots/logotp3.gif
 share/doc/HTML/en/kljettool/README
 share/doc/HTML/en/kljettool/filter
 share/doc/HTML/en/kljettool/kljettool-1.html
@@ -92,6 +99,7 @@ share/icons/karm.xpm
 share/icons/kcalc.xpm
 share/icons/kedit.xpm
 share/icons/khexdit.xpm
+share/icons/kjots.xpm
 share/icons/kljetlogo.xpm
 share/icons/knotes.xpm
 share/icons/kzip.xpm
@@ -99,11 +107,24 @@ share/icons/mini/karm.xpm
 share/icons/mini/kcalc.xpm
 share/icons/mini/kedit.xpm
 share/icons/mini/khexdit.xpm
+share/icons/mini/kjots.xpm
 share/icons/mini/kljettool.xpm
 share/icons/mini/knotes.xpm
 share/icons/mini/kzip.xpm
+share/locale/ca/LC_MESSAGES/karm.mo
+share/locale/ca/LC_MESSAGES/kcalc.mo
+share/locale/ca/LC_MESSAGES/kedit.mo
+share/locale/ca/LC_MESSAGES/kfloppy.mo
+share/locale/ca/LC_MESSAGES/khexdit.mo
+share/locale/ca/LC_MESSAGES/kljettool.mo
+share/locale/ca/LC_MESSAGES/knotes.mo
+share/locale/ca/LC_MESSAGES/kzip.mo
+share/locale/cs/LC_MESSAGES/karm.mo
+share/locale/cs/LC_MESSAGES/kcalc.mo
 share/locale/cs/LC_MESSAGES/kedit.mo
+share/locale/cs/LC_MESSAGES/kfloppy.mo
 share/locale/cs/LC_MESSAGES/khexdit.mo
+share/locale/cs/LC_MESSAGES/kljettool.mo
 share/locale/cs/LC_MESSAGES/knotes.mo
 share/locale/cs/LC_MESSAGES/kzip.mo
 share/locale/da/LC_MESSAGES/karm.mo
@@ -114,14 +135,18 @@ share/locale/da/LC_MESSAGES/kzip.mo
 share/locale/de/LC_MESSAGES/karm.mo
 share/locale/de/LC_MESSAGES/kcalc.mo
 share/locale/de/LC_MESSAGES/kedit.mo
+share/locale/de/LC_MESSAGES/kfloppy.mo
 share/locale/de/LC_MESSAGES/khexdit.mo
+share/locale/de/LC_MESSAGES/kljettool.mo
 share/locale/de/LC_MESSAGES/knotes.mo
 share/locale/de/LC_MESSAGES/kzip.mo
 share/locale/el/LC_MESSAGES/kcalc.mo
 share/locale/el/LC_MESSAGES/kedit.mo
 share/locale/el/LC_MESSAGES/khexdit.mo
 share/locale/es/LC_MESSAGES/karm.mo
+share/locale/es/LC_MESSAGES/kcalc.mo
 share/locale/es/LC_MESSAGES/kedit.mo
+share/locale/es/LC_MESSAGES/kfloppy.mo
 share/locale/es/LC_MESSAGES/khexdit.mo
 share/locale/es/LC_MESSAGES/knotes.mo
 share/locale/es/LC_MESSAGES/kzip.mo
@@ -135,13 +160,16 @@ share/locale/fi/LC_MESSAGES/knotes.mo
 share/locale/fi/LC_MESSAGES/kzip.mo
 share/locale/fr/LC_MESSAGES/karm.mo
 share/locale/fr/LC_MESSAGES/kedit.mo
+share/locale/fr/LC_MESSAGES/kfloppy.mo
 share/locale/fr/LC_MESSAGES/khexdit.mo
 share/locale/fr/LC_MESSAGES/knotes.mo
 share/locale/fr/LC_MESSAGES/kzip.mo
 share/locale/hr/LC_MESSAGES/karm.mo
 share/locale/hr/LC_MESSAGES/kcalc.mo
 share/locale/hr/LC_MESSAGES/kedit.mo
+share/locale/hr/LC_MESSAGES/kfloppy.mo
 share/locale/hr/LC_MESSAGES/khexdit.mo
+share/locale/hr/LC_MESSAGES/kljettool.mo
 share/locale/hr/LC_MESSAGES/knotes.mo
 share/locale/hr/LC_MESSAGES/kzip.mo
 share/locale/hu/LC_MESSAGES/kedit.mo
@@ -149,10 +177,13 @@ share/locale/hu/LC_MESSAGES/khexdit.mo
 share/locale/hu/LC_MESSAGES/knotes.mo
 share/locale/hu/LC_MESSAGES/kzip.mo
 share/locale/it/LC_MESSAGES/karm.mo
+share/locale/it/LC_MESSAGES/kcalc.mo
 share/locale/it/LC_MESSAGES/kedit.mo
 share/locale/it/LC_MESSAGES/khexdit.mo
 share/locale/it/LC_MESSAGES/knotes.mo
 share/locale/it/LC_MESSAGES/kzip.mo
+share/locale/mk/LC_MESSAGES/kedit.mo
+share/locale/mk/LC_MESSAGES/khexdit.mo
 share/locale/nl/LC_MESSAGES/karm.mo
 share/locale/nl/LC_MESSAGES/kcalc.mo
 share/locale/nl/LC_MESSAGES/kedit.mo
@@ -164,48 +195,136 @@ share/locale/nl/LC_MESSAGES/kzip.mo
 share/locale/no/LC_MESSAGES/karm.mo
 share/locale/no/LC_MESSAGES/kcalc.mo
 share/locale/no/LC_MESSAGES/kedit.mo
+share/locale/no/LC_MESSAGES/kfloppy.mo
 share/locale/no/LC_MESSAGES/khexdit.mo
+share/locale/no/LC_MESSAGES/kljettool.mo
 share/locale/no/LC_MESSAGES/knotes.mo
 share/locale/no/LC_MESSAGES/kzip.mo
+share/locale/pl/LC_MESSAGES/karm.mo
+share/locale/pl/LC_MESSAGES/kcalc.mo
 share/locale/pl/LC_MESSAGES/kedit.mo
+share/locale/pl/LC_MESSAGES/kfloppy.mo
 share/locale/pl/LC_MESSAGES/khexdit.mo
+share/locale/pl/LC_MESSAGES/kljettool.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/kcalc.mo
 share/locale/pt/LC_MESSAGES/kedit.mo
+share/locale/pt/LC_MESSAGES/kfloppy.mo
 share/locale/pt/LC_MESSAGES/khexdit.mo
+share/locale/pt/LC_MESSAGES/kljettool.mo
 share/locale/pt/LC_MESSAGES/knotes.mo
 share/locale/pt/LC_MESSAGES/kzip.mo
+share/locale/pt_BR/LC_MESSAGES/karm.mo
+share/locale/pt_BR/LC_MESSAGES/kcalc.mo
+share/locale/pt_BR/LC_MESSAGES/kedit.mo
+share/locale/pt_BR/LC_MESSAGES/kfloppy.mo
+share/locale/pt_BR/LC_MESSAGES/khexdit.mo
+share/locale/pt_BR/LC_MESSAGES/kljettool.mo
+share/locale/pt_BR/LC_MESSAGES/knotes.mo
+share/locale/pt_BR/LC_MESSAGES/kzip.mo
+share/locale/ro/LC_MESSAGES/karm.mo
+share/locale/ro/LC_MESSAGES/kcalc.mo
+share/locale/ro/LC_MESSAGES/kfloppy.mo
 share/locale/ro/LC_MESSAGES/khexdit.mo
+share/locale/ro/LC_MESSAGES/kljettool.mo
+share/locale/ro/LC_MESSAGES/kzip.mo
 share/locale/ru/LC_MESSAGES/khexdit.mo
 share/locale/ru/LC_MESSAGES/knotes.mo
 share/locale/ru/LC_MESSAGES/kzip.mo
 share/locale/sk/LC_MESSAGES/karm.mo
 share/locale/sk/LC_MESSAGES/kcalc.mo
 share/locale/sk/LC_MESSAGES/kedit.mo
+share/locale/sk/LC_MESSAGES/kfloppy.mo
 share/locale/sk/LC_MESSAGES/khexdit.mo
+share/locale/sk/LC_MESSAGES/kljettool.mo
 share/locale/sk/LC_MESSAGES/knotes.mo
 share/locale/sk/LC_MESSAGES/kzip.mo
+share/locale/sv/LC_MESSAGES/kcalc.mo
 share/locale/sv/LC_MESSAGES/kedit.mo
+share/locale/sv/LC_MESSAGES/kfloppy.mo
 share/locale/sv/LC_MESSAGES/khexdit.mo
-share/locale/zh/LC_MESSAGES/karm.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_CN.GB2312/LC_MESSAGES/karm.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/kcalc.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/kedit.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/kfloppy.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/khexdit.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/kljettool.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/knotes.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/kzip.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/karm.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/kcalc.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/kedit.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/khexdit.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/knotes.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/kzip.mo
+share/toolbar/filedel.xpm
+@dirrm share/locale/zh_TW.Big5/LC_MESSAGES
+@dirrm share/locale/zh_TW.Big5
+@dirrm share/locale/zh_CN.GB2312/LC_MESSAGES
+@dirrm share/locale/zh_CN.GB2312
+@dirrm share/locale/sv/LC_MESSAGES
+@dirrm share/locale/sv
+@dirrm share/locale/sk/LC_MESSAGES
+@dirrm share/locale/sk
+@dirrm share/locale/ru/LC_MESSAGES
+@dirrm share/locale/ru
+@dirrm share/locale/ro/LC_MESSAGES
+@dirrm share/locale/ro
+@dirrm share/locale/pt_BR/LC_MESSAGES
+@dirrm share/locale/pt_BR
+@dirrm share/locale/pt/LC_MESSAGES
+@dirrm share/locale/pt
+@dirrm share/locale/pl/LC_MESSAGES
+@dirrm share/locale/pl
+@dirrm share/locale/no/LC_MESSAGES
+@dirrm share/locale/no
+@dirrm share/locale/nl/LC_MESSAGES
+@dirrm share/locale/nl
+@dirrm share/locale/mk/LC_MESSAGES
+@dirrm share/locale/mk
+@dirrm share/locale/it/LC_MESSAGES
+@dirrm share/locale/it
+@dirrm share/locale/hu/LC_MESSAGES
+@dirrm share/locale/hu
+@dirrm share/locale/hr/LC_MESSAGES
+@dirrm share/locale/hr
+@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/el/LC_MESSAGES
+@dirrm share/locale/el
+@dirrm share/locale/de/LC_MESSAGES
+@dirrm share/locale/de
+@dirrm share/locale/da/LC_MESSAGES
+@dirrm share/locale/da
+@dirrm share/locale/cs/LC_MESSAGES
+@dirrm share/locale/cs
+@dirrm share/locale/ca/LC_MESSAGES
+@dirrm share/locale/ca
 @dirrm share/icons/mini
 @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/kljettool
+@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/pics
+@dirrm share/apps/kjots
 @dirrm share/apps/kedit/toolbar
 @dirrm share/apps/kedit/pics
 @dirrm share/apps/kedit