Fixes for Solaris:

Add libgcc to libraries list
Set KDED_WORKAROUND for non-NetBSD case too
Solaris's grep and sh works in a different way, we need a different
  BUILDLINK_FILES_CMD
Fix typos in c++ file in !netbsd case
Use CXXLINK for linking c++ libraries

5 files changed, 40 insertions, 6 deletions

diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index 558be9cce27..0585e1b6a7f 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2002/10/08 19:04:01 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2002/10/26 13:07:29 bouyer Exp $
 
 DISTNAME=	kdelibs-2.2.2
 PKGREVISION=	3
@@ -27,6 +27,9 @@ BROKEN=		Compilation causes arm32 machines to hang
 .if ${OPSYS} == "NetBSD"
 LIBS+=			-Wl,--export-dynamic
 .endif
+.if ${OPSYS} == "SunOS"
+LIBS+=			`gcc -print-libgcc-file-name`
+.endif
 
 REPLACE_PERL= \
 	${WRKSRC}/kio/proxytype.pl \
@@ -50,6 +53,8 @@ PLIST_SUBST+=		KDED_WORKAROUND="@comment "
 .  else
 PLIST_SUBST+=		KDED_WORKAROUND=""
 .  endif
+.else
+PLIST_SUBST+=		KDED_WORKAROUND=""
 .endif
 
 # Add a newline to EOF so patch on Solaris succeeds with patch-bk
diff --git a/x11/kdelibs2/buildlink2.mk b/x11/kdelibs2/buildlink2.mk
index 31967e95d81..07405bbae80 100644
--- a/x11/kdelibs2/buildlink2.mk
+++ b/x11/kdelibs2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.9 2002/10/15 11:39:13 tron Exp $
+# $NetBSD: buildlink2.mk,v 1.10 2002/10/26 13:07:29 bouyer Exp $
 
 .if !defined(KDELIBS2_BUILDLINK2_MK)
 KDELIBS2_BUILDLINK2_MK=	# defined
@@ -12,8 +12,13 @@ BUILDLINK_PKGSRCDIR.kdelibs2?=	../../x11/kdelibs2
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.kdelibs2=kdelibs
 BUILDLINK_PREFIX.kdelibs2_DEFAULT=	${X11PREFIX}
+.if ${OPSYS} == "SunOS"
+BUILDLINK_FILES_CMD.kdelibs2= \
+	${BUILDLINK_PLIST_CMD.kdelibs2} | ${EGREP} '^(include|lib)'
+.else
 BUILDLINK_FILES_CMD.kdelibs2= \
 	${BUILDLINK_PLIST_CMD.kdelibs2} | ${GREP} '^\(include\|lib\)'
+.endif
 
 KDEDIR=				${BUILDLINK_PREFIX.kdelibs2}
 
diff --git a/x11/kdelibs2/distinfo b/x11/kdelibs2/distinfo
index 74ee881ce9d..50d5723783c 100644
--- a/x11/kdelibs2/distinfo
+++ b/x11/kdelibs2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2002/08/25 18:40:36 jlam Exp $
+$NetBSD: distinfo,v 1.21 2002/10/26 13:07:29 bouyer Exp $
 
 SHA1 (kdelibs-2.2.2.tar.bz2) = 6ae1096ffb547f317adca6b29cb9ce9dcaf1863c
 Size (kdelibs-2.2.2.tar.bz2) = 5955592 bytes
@@ -47,10 +47,11 @@ SHA1 (patch-bp) = 84fe12d8317bbc9eb0ea2f2d320d3fb9fb138faf
 SHA1 (patch-bq) = 37b760bcd4067d3adac6260377f16fcb6ffae909
 SHA1 (patch-br) = e4098450a416d419a8ac947ad7a2244298c2c011
 SHA1 (patch-bs) = 77b183070cc758feff760ffc44044eb2a6cd5005
-SHA1 (patch-bt) = d0bcc9b9bf15e98d9482463795f8ea4d6d133f6f
+SHA1 (patch-bt) = edee7527c4f35f65182e5abaf950ff9643ed63b2
 SHA1 (patch-bu) = dfa7b7e83674ed795af0dc347ed95b1383a7f36d
 SHA1 (patch-bv) = 7cf20147a66d04638226e0488474d300fcde64b4
 SHA1 (patch-bw) = f5492ccb01f0f16400af426a20c778d624c9f616
 SHA1 (patch-bx) = 9a8aaeab8852593b1c8f7037ce8a421f9fa8a953
 SHA1 (patch-by) = dfa7fef53b3cc2b6b467be6b43019b3321dc7c64
 SHA1 (patch-bz) = bca043b64b8ad9b4ba9fdd6c5fa1d65ad940c320
+SHA1 (patch-ca) = e3b068ebf0a1045bd00ca89b88655db97a731e10
diff --git a/x11/kdelibs2/patches/patch-bt b/x11/kdelibs2/patches/patch-bt
index c6e4cc777ab..f7a05b73021 100644
--- a/x11/kdelibs2/patches/patch-bt
+++ b/x11/kdelibs2/patches/patch-bt
@@ -1,4 +1,4 @@
-$NetBSD: patch-bt,v 1.3 2002/08/25 18:40:36 jlam Exp $
+$NetBSD: patch-bt,v 1.4 2002/10/26 13:07:29 bouyer Exp $
 
 --- kssl/kopenssl.cc.orig	Wed Sep  5 00:08:18 2001
 +++ kssl/kopenssl.cc
@@ -37,7 +37,8 @@ $NetBSD: patch-bt,v 1.3 2002/08/25 18:40:36 jlam Exp $
 +   libpaths << "/usr/local/lib/"
              << "/usr/local/openssl/lib/"
              << "/usr/local/ssl/lib/"
-             << "/opt/openssl/lib/"
+-            << "/opt/openssl/lib/"
++            << "/opt/openssl/lib/";
 -            << "";
 +#endif
 +   libpaths << "";
diff --git a/x11/kdelibs2/patches/patch-ca b/x11/kdelibs2/patches/patch-ca
new file mode 100644
index 00000000000..377de67386c
--- /dev/null
+++ b/x11/kdelibs2/patches/patch-ca
@@ -0,0 +1,22 @@
+$NetBSD: patch-ca,v 1.1 2002/10/26 13:07:29 bouyer Exp $
+
+--- arts/artsc/Makefile.in.orig	Fri Oct 18 12:24:19 2002
++++ arts/artsc/Makefile.in	Fri Oct 18 12:29:30 2002
+@@ -441,7 +441,7 @@
+ maintainer-clean-libtool:
+ 
+ libartsc.la: $(libartsc_la_OBJECTS) $(libartsc_la_DEPENDENCIES)
+-	$(LINK) -rpath $(libdir) $(libartsc_la_LDFLAGS) $(libartsc_la_OBJECTS) $(libartsc_la_LIBADD) $(LIBS)
++	$(CXXLINK) -rpath $(libdir) $(libartsc_la_LDFLAGS) $(libartsc_la_OBJECTS) $(libartsc_la_LIBADD) $(LIBS)
+ 
+ #>- libartscbackend.la: $(libartscbackend_la_OBJECTS) $(libartscbackend_la_DEPENDENCIES)
+ #>+ 2
+@@ -453,7 +453,7 @@
+ 	$(LINK) -rpath $(libdir) $(libartsdsp_la_LDFLAGS) $(libartsdsp_la_OBJECTS) $(libartsdsp_la_LIBADD) $(LIBS)
+ 
+ libartsdsp_st.la: $(libartsdsp_st_la_OBJECTS) $(libartsdsp_st_la_DEPENDENCIES)
+-	$(LINK) -rpath $(libdir) $(libartsdsp_st_la_LDFLAGS) $(libartsdsp_st_la_OBJECTS) $(libartsdsp_st_la_LIBADD) $(LIBS)
++	$(CXXLINK) -rpath $(libdir) $(libartsdsp_st_la_LDFLAGS) $(libartsdsp_st_la_OBJECTS) $(libartsdsp_st_la_LIBADD) $(LIBS)
+ 
+ install-binSCRIPTS: $(bin_SCRIPTS)
+ 	@$(NORMAL_INSTALL)