From e0d570355cff910d4ee7e7354a261eb77e0ab7c8 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Tue, 5 Mar 2002 00:09:49 +0000
Subject: [PATCH] Remove zsh work-around. Add patch to compile with current.

---
 x11/kde/network2/Makefile                         |  9 ++-------
 x11/kde/network2/patches/patch-kmail_kmfolder_cpp | 11 +++++++++++
 2 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 x11/kde/network2/patches/patch-kmail_kmfolder_cpp

diff --git a/x11/kde/network2/Makefile b/x11/kde/network2/Makefile
index 94fa2aeab92..95b71ffe698 100644
--- a/x11/kde/network2/Makefile
+++ b/x11/kde/network2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2001/12/31 15:05:09 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2002/03/05 00:09:49 espie Exp $
 
 COMMENT= 		"X11 toolkit, network applications"
 CATEGORIES=		x11 x11/kde
@@ -20,7 +20,7 @@ MODULES=qt2
 
 LIB_DEPENDS=	kdecore.3,kdeui::x11/kde/libs2
 
-BUILD_DEPENDS=	::x11/qt2-designer :zsh-*:shells/zsh/stable
+BUILD_DEPENDS=	::x11/qt2-designer 
 
 # for kaddressbook
 RUN_DEPENDS+=	::x11/kde/base2
@@ -45,13 +45,8 @@ USE_GMAKE=		Yes
 CONFIGURE_ENV=		RUN_KAPPFINDER=no KDEDIR=${LOCALBASE}
 MAKE_ENV=		${CONFIGURE_ENV}
 
-pre-build:
-	# Let zsh act as an sh replacement
-	ln -sf $(LOCALBASE)/bin/zsh ${WRKBUILD}/sh
-
 # Ensure qt2 will always be at the front
 MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}'
-MAKE_FLAGS+=LIBTOOL='$(WRKBUILD)/sh $(WRKBUILD)/libtool'
 
 # GPL
 # Note that lame is not a problem, since kdebase is packaged with a
diff --git a/x11/kde/network2/patches/patch-kmail_kmfolder_cpp b/x11/kde/network2/patches/patch-kmail_kmfolder_cpp
new file mode 100644
index 00000000000..07f0f991ad4
--- /dev/null
+++ b/x11/kde/network2/patches/patch-kmail_kmfolder_cpp
@@ -0,0 +1,11 @@
+$OpenBSD: patch-kmail_kmfolder_cpp,v 1.1 2002/03/05 00:09:49 espie Exp $
+--- kmail/kmfolder.cpp.orig	Tue Mar  5 00:42:40 2002
++++ kmail/kmfolder.cpp	Tue Mar  5 00:42:54 2002
+@@ -39,6 +39,7 @@
+ #include <sys/mman.h>
+ #endif
+ 
++#include <ctype.h>
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>