- Don't build "QwSpriteField" (now a separte package) and "js" library

  (not needed by any existing package). Now this package fits into the
  category "converters" again.
- Because this package isn't X11 related anymore it is installed into
  "${LOCALBASE}".

3 files changed, 43 insertions, 26 deletions

diff --git a/converters/kdesupport/Makefile b/converters/kdesupport/Makefile
index 9acbbad9568..b4ccc8bcd2f 100644
--- a/converters/kdesupport/Makefile
+++ b/converters/kdesupport/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 1999/02/19 21:56:25 tron Exp $
+# $NetBSD: Makefile,v 1.22 1999/03/23 23:30:23 tron Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/11/05 04:19:46 asami Exp
 #
 
@@ -11,19 +11,13 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.kde.org/
 
-DEPENDS+=	qt-1.42:../../x11/qt
-
-USE_X11BASE=	yes
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--datadir=${PREFIX}/share/kde" \
-		"--with-qt-includes=${PREFIX}/include/qt" \
-		"--with-qt-libraries=${PREFIX}/lib" \
-		"--without-gnu-ld" \
+CONFIGURE_ARGS=	"--without-gnu-ld" \
 		"--without-libjpeg" \
 		"--without-libgif" \
 		"--without-libgdbm" \
-		"--without-libuulib"
-LIBTOOL_FLAGS=	--install-la
+		"--without-libuulib" \
+		"--without-sprite-field"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/kdesupport/patches/patch-aa b/converters/kdesupport/patches/patch-aa
index 1d56c05cd8c..1aecfc49425 100644
--- a/converters/kdesupport/patches/patch-aa
+++ b/converters/kdesupport/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 1999/02/15 22:34:58 tron Exp $
+$NetBSD: patch-aa,v 1.4 1999/03/23 23:30:26 tron Exp $
 
 --- configure.orig	Sat Feb  6 18:56:20 1999
-+++ configure	Mon Feb 15 22:47:27 1999
++++ configure	Tue Mar 23 22:54:30 1999
 @@ -1941,6 +1941,8 @@
  kde_save_cflags="$CFLAGS"
  CC=$CXX
@@ -19,3 +19,39 @@ $NetBSD: patch-aa,v 1.3 1999/02/15 22:34:58 tron Exp $
  
  # Redirect the config.log output again, so that the ltconfig log is not
  # clobbered by the next message.
+@@ -3206,7 +3209,7 @@
+ 
+ 
+ 
+-
++if false; then
+ echo $ac_n "checking for Qt""... $ac_c" 1>&6
+ echo "configure:3212: checking for Qt" >&5
+ ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
+@@ -3540,7 +3543,7 @@
+ 
+ 
+ LIB_QT='-lqt $(LIB_X11)'
+-
++fi
+ 
+ 
+ 
+@@ -5414,7 +5417,7 @@
+ 
+ 
+ 
+-
++if false; then
+ echo $ac_n "checking for main in -ljs""... $ac_c" 1>&6
+ echo "configure:5420: checking for main in -ljs" >&5
+ ac_lib_var=`echo js'_'main | sed 'y%./+-%__p_%'`
+@@ -5460,7 +5463,7 @@
+ For this have a look at http://www.ngs.fi/js/
+ " 1>&2
+  	TOPSUBDIRS="$TOPSUBDIRS js"
+-	
++fi	
+ 
+ cat >> confdefs.h <<EOF
+ #define CANONICAL_HOST "$host"
diff --git a/converters/kdesupport/pkg/PLIST b/converters/kdesupport/pkg/PLIST
index f4c73af5ea5..4e41e3a7b86 100644
--- a/converters/kdesupport/pkg/PLIST
+++ b/converters/kdesupport/pkg/PLIST
@@ -1,10 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 1999/02/15 22:34:58 tron Exp $
-include/Pix.h
-include/QwCluster.h
-include/QwPublicList.h
-include/QwSpriteField.h
-include/js.h
-include/jsint.h
+@comment $NetBSD: PLIST,v 1.11 1999/03/23 23:30:26 tron Exp $
 include/mimelib/address.h
 include/mimelib/addrlist.h
 include/mimelib/body.h
@@ -39,13 +33,6 @@ include/mimelib/token.h
 include/mimelib/utility.h
 include/mimelib/uuencode.h
 include/mimelib/binhex.h
-lib/libQwSpriteField.a
-lib/libQwSpriteField.la
-lib/libQwSpriteField.so.6.0
-lib/libjs.a
-lib/libjs.la
-lib/libjs.so.2.0
 lib/libmimelib.a
-lib/libmimelib.la
 lib/libmimelib.so.1.0
 @dirrm include/mimelib