3 files changed, 32 insertions, 8 deletions

diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile
index 3831e9b7e24a..0f42a3c14db2 100644
--- a/editors/koffice-kde4/Makefile
+++ b/editors/koffice-kde4/Makefile
@@ -23,19 +23,13 @@ LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_KDELIBS_VER=3
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=
-CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_PYTHON=	yes
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
-.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL)
-CONFIGURE_ARGS+=--enable-final
-.endif
-.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG)
-CONFIGURE_ARGS+=--disable-debug
-.endif
 USE_GMAKE=	yes
 
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+
 pre-configure:
 	cd ${WRKSRC} && ${GMAKE} -f Makefile.cvs
 
diff --git a/editors/koffice-kde4/files/patch-KDChartData.h b/editors/koffice-kde4/files/patch-KDChartData.h
new file mode 100644
index 000000000000..d759e0333010
--- /dev/null
+++ b/editors/koffice-kde4/files/patch-KDChartData.h
@@ -0,0 +1,15 @@
+--- ./kchart/kdchart/KDChartData.h.orig	Mon Dec 10 18:01:12 2001
++++ ./kchart/kdchart/KDChartData.h	Sat May 25 13:27:21 2002
+@@ -12,12 +12,8 @@
+ 
+ #include <qstring.h>
+ #include <qdatetime.h>
+-#ifdef unix
+-#include <values.h>
+-#else
+ #include <float.h>
+ #define MINDOUBLE DBL_MIN
+-#endif
+ 
+ // Please leave all methods in this class inline!
+ // It's necessary since it's part of the interface provided by KDChart
diff --git a/editors/koffice-kde4/files/patch-KDChartTable.h b/editors/koffice-kde4/files/patch-KDChartTable.h
new file mode 100644
index 000000000000..87007b7e3f70
--- /dev/null
+++ b/editors/koffice-kde4/files/patch-KDChartTable.h
@@ -0,0 +1,15 @@
+--- ./kchart/kdchart/KDChartTable.h.orig	Mon Dec 10 06:53:35 2001
++++ ./kchart/kdchart/KDChartTable.h	Sat May 25 13:28:46 2002
+@@ -28,9 +28,9 @@
+ #define MAXDOUBLE DBL_MAX
+ #define MINDOUBLE DBL_MIN
+ #else
+-#include <values.h>
+-#include <limits.h>
+-#include <math.h>
++#include <float.h>
++#define MAXDOUBLE DBL_MAX
++#define MINDOUBLE DBL_MIN
+ #endif
+ 
+ #if defined SUN7 || ( defined HP11_aCC && defined HP1100 )