7 files changed, 101 insertions, 36 deletions

diff --git a/converters/kdesupport11/Makefile b/converters/kdesupport11/Makefile
index 118091ee79d4..26702d22a804 100644
--- a/converters/kdesupport11/Makefile
+++ b/converters/kdesupport11/Makefile
@@ -6,14 +6,18 @@
 # $Id: Makefile,v 1.13 1998/10/01 18:35:36 brian Exp $
 #
 
-DISTNAME=	kdesupport-1.0
+DISTNAME=	kdesupport
+PKGNAME=	kdesupport-1.1a1
 CATEGORIES=	x11 kde
 MASTER_SITES=	$(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= stable/1.0/distribution/tar/generic/source 
+MASTER_SITE_SUBDIR= stable/1.1pre1/distribution/tar/generic/source
+EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BROKEN=		upgrade
+EXTRACT_CMD=	bzip2
+EXTRACT_BEFORE_ARGS= -cd
+EXTRACT_AFTER_ARGS= | tar xf -
 
 USE_QT=		yes
 HAS_CONFIGURE=	yes
@@ -21,8 +25,7 @@ CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
 		"--without-libjpeg" \
 		"--without-libgif" \
 		"--without-libgdbm" \
-		"--without-libuulib" \
-#		"--with-extra-includes=$(PREFIX)/include/giflib"
+		"--without-libuulib"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 
diff --git a/converters/kdesupport11/distinfo b/converters/kdesupport11/distinfo
index be5652126ba8..3fd0aa696a3e 100644
--- a/converters/kdesupport11/distinfo
+++ b/converters/kdesupport11/distinfo
@@ -1 +1 @@
-MD5 (kdesupport-1.0.tar.gz) = 2701c55a1f6e3a2423845873595ad754
+MD5 (kdesupport-1.1-alpha1.src.tar.bz2) = 1b1b2f2b05b481752df4cc449efe902b
diff --git a/converters/kdesupport11/files/patch-aa b/converters/kdesupport11/files/patch-aa
new file mode 100644
index 000000000000..bd3b3c71a512
--- /dev/null
+++ b/converters/kdesupport11/files/patch-aa
@@ -0,0 +1,13 @@
+*** rdb/rdb.c.ORIG	Sat Dec 19 21:56:32 1998
+--- rdb/rdb.c	Wed Dec 30 23:28:50 1998
+***************
+*** 40,43 ****
+--- 40,47 ----
+  }
+  
++ #ifndef O_SYNC
++ #define O_SYNC O_FSYNC
++ #endif
++ 
+  /* Muß Datenbank mit cdb laden.
+   * Muß Log einlesen und in Hash tun.
diff --git a/converters/kdesupport11/pkg-plist b/converters/kdesupport11/pkg-plist
index 9c403a773627..27ad023dc6ab 100644
--- a/converters/kdesupport11/pkg-plist
+++ b/converters/kdesupport11/pkg-plist
@@ -1,11 +1,13 @@
-lib/libmimelib.la
-lib/libmimelib.so.1
-lib/libmimelib.a
-lib/libQwSpriteField.la
-lib/libQwSpriteField.so.5.2
-lib/libQwSpriteField.a
+bin/cdbmake
+include/Pix.h
+include/QwCluster.h
+include/QwPublicList.h
+include/QwSpriteField.h
+include/js.h
+include/jsint.h
 include/mimelib/address.h
 include/mimelib/addrlist.h
+include/mimelib/binhex.h
 include/mimelib/body.h
 include/mimelib/bodypart.h
 include/mimelib/boyermor.h
@@ -37,11 +39,32 @@ include/mimelib/text.h
 include/mimelib/token.h
 include/mimelib/utility.h
 include/mimelib/uuencode.h
-include/mimelib/binhex.h
-include/Pix.h
-include/QwCluster.h
-include/QwPublicList.h
-include/QwSpriteField.h
+include/rdb/cdb.h
+include/rdb/cdbmake.h
+include/rdb/hash.h
+include/rdb/rdb.h
+include/rdb/uint32.h
+lib/libQwSpriteField.a
+lib/libQwSpriteField.la
+lib/libQwSpriteField.so.6
+lib/libjs.a
+lib/libjs.la
+lib/libjs.so.2
+lib/libmimelib.a
+lib/libmimelib.la
+lib/libmimelib.so.1
+lib/librdb.a
+lib/librdb.la
+lib/librdb.so.55
+@exec ln -sf libQwSpriteField.so %D/lib/libQwSpriteField.so.6
+@exec ln -sf libjs.so %D/lib/libjs.so.2
+@exec ln -sf libmimelib.so %D/lib/libmimelib.so.1
+@exec ln -sf librdb.so %D/lib/librdb.so.55
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@dirrm include/mimelib
+@dirrm /usr/local/include/rdb
+@dirrm /usr/local/include/mimelib
+@unexec rm -f %D/lib/libQwSpriteField.so
+@unexec rm -f %D/lib/libjs.so
+@unexec rm -f %D/lib/libmimelib.so
+@unexec rm -f %D/lib/librdb.so
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
diff --git a/converters/kdesupport2/Makefile b/converters/kdesupport2/Makefile
index 118091ee79d4..26702d22a804 100644
--- a/converters/kdesupport2/Makefile
+++ b/converters/kdesupport2/Makefile
@@ -6,14 +6,18 @@
 # $Id: Makefile,v 1.13 1998/10/01 18:35:36 brian Exp $
 #
 
-DISTNAME=	kdesupport-1.0
+DISTNAME=	kdesupport
+PKGNAME=	kdesupport-1.1a1
 CATEGORIES=	x11 kde
 MASTER_SITES=	$(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= stable/1.0/distribution/tar/generic/source 
+MASTER_SITE_SUBDIR= stable/1.1pre1/distribution/tar/generic/source
+EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
 
 MAINTAINER=	se@freebsd.org
 
-BROKEN=		upgrade
+EXTRACT_CMD=	bzip2
+EXTRACT_BEFORE_ARGS= -cd
+EXTRACT_AFTER_ARGS= | tar xf -
 
 USE_QT=		yes
 HAS_CONFIGURE=	yes
@@ -21,8 +25,7 @@ CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
 		"--without-libjpeg" \
 		"--without-libgif" \
 		"--without-libgdbm" \
-		"--without-libuulib" \
-#		"--with-extra-includes=$(PREFIX)/include/giflib"
+		"--without-libuulib"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 
diff --git a/converters/kdesupport2/distinfo b/converters/kdesupport2/distinfo
index be5652126ba8..3fd0aa696a3e 100644
--- a/converters/kdesupport2/distinfo
+++ b/converters/kdesupport2/distinfo
@@ -1 +1 @@
-MD5 (kdesupport-1.0.tar.gz) = 2701c55a1f6e3a2423845873595ad754
+MD5 (kdesupport-1.1-alpha1.src.tar.bz2) = 1b1b2f2b05b481752df4cc449efe902b
diff --git a/converters/kdesupport2/pkg-plist b/converters/kdesupport2/pkg-plist
index 9c403a773627..27ad023dc6ab 100644
--- a/converters/kdesupport2/pkg-plist
+++ b/converters/kdesupport2/pkg-plist
@@ -1,11 +1,13 @@
-lib/libmimelib.la
-lib/libmimelib.so.1
-lib/libmimelib.a
-lib/libQwSpriteField.la
-lib/libQwSpriteField.so.5.2
-lib/libQwSpriteField.a
+bin/cdbmake
+include/Pix.h
+include/QwCluster.h
+include/QwPublicList.h
+include/QwSpriteField.h
+include/js.h
+include/jsint.h
 include/mimelib/address.h
 include/mimelib/addrlist.h
+include/mimelib/binhex.h
 include/mimelib/body.h
 include/mimelib/bodypart.h
 include/mimelib/boyermor.h
@@ -37,11 +39,32 @@ include/mimelib/text.h
 include/mimelib/token.h
 include/mimelib/utility.h
 include/mimelib/uuencode.h
-include/mimelib/binhex.h
-include/Pix.h
-include/QwCluster.h
-include/QwPublicList.h
-include/QwSpriteField.h
+include/rdb/cdb.h
+include/rdb/cdbmake.h
+include/rdb/hash.h
+include/rdb/rdb.h
+include/rdb/uint32.h
+lib/libQwSpriteField.a
+lib/libQwSpriteField.la
+lib/libQwSpriteField.so.6
+lib/libjs.a
+lib/libjs.la
+lib/libjs.so.2
+lib/libmimelib.a
+lib/libmimelib.la
+lib/libmimelib.so.1
+lib/librdb.a
+lib/librdb.la
+lib/librdb.so.55
+@exec ln -sf libQwSpriteField.so %D/lib/libQwSpriteField.so.6
+@exec ln -sf libjs.so %D/lib/libjs.so.2
+@exec ln -sf libmimelib.so %D/lib/libmimelib.so.1
+@exec ln -sf librdb.so %D/lib/librdb.so.55
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@dirrm include/mimelib
+@dirrm /usr/local/include/rdb
+@dirrm /usr/local/include/mimelib
+@unexec rm -f %D/lib/libQwSpriteField.so
+@unexec rm -f %D/lib/libjs.so
+@unexec rm -f %D/lib/libmimelib.so
+@unexec rm -f %D/lib/librdb.so
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R