cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove zsh work-around.

Browse Source 
Add patch to compile with current.
This commit is contained in:
espie 2002-03-05 00:09:49 +00:00
parent 209b1d67ad
commit e0d570355c
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
x11/kde/network2/Makefile
View File

@ -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" COMMENT= "X11 toolkit, network applications"
CATEGORIES= x11 x11/kde CATEGORIES= x11 x11/kde
@ -20,7 +20,7 @@ MODULES=qt2
LIB_DEPENDS= kdecore.3,kdeui::x11/kde/libs2 LIB_DEPENDS= kdecore.3,kdeui::x11/kde/libs2
BUILD_DEPENDS= ::x11/qt2-designer :zsh-*:shells/zsh/stable BUILD_DEPENDS= ::x11/qt2-designer
# for kaddressbook # for kaddressbook
RUN_DEPENDS+= ::x11/kde/base2 RUN_DEPENDS+= ::x11/kde/base2
@ -45,13 +45,8 @@ USE_GMAKE= Yes
CONFIGURE_ENV= RUN_KAPPFINDER=no KDEDIR=${LOCALBASE} CONFIGURE_ENV= RUN_KAPPFINDER=no KDEDIR=${LOCALBASE}
MAKE_ENV= ${CONFIGURE_ENV} 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 # Ensure qt2 will always be at the front
MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}' MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}'
MAKE_FLAGS+=LIBTOOL='$(WRKBUILD)/sh $(WRKBUILD)/libtool'
# GPL # GPL
# Note that lame is not a problem, since kdebase is packaged with a # Note that lame is not a problem, since kdebase is packaged with a

11
x11/kde/network2/patches/patch-kmail_kmfolder_cpp Normal file
View File

@ -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>