Bring in a few changes to the KDE ports infrastructure, and some fixes.

 - Move all stuff specific to kde core ports to x11/kde2/Makefile.kde.
   + Default to compile optimized for speed, not debugging, in ports
     builds, not just packages.  We don't really get that many backtraces
     or debugging information, and there's a better way to provide these
     things to people willing to spend some time working on KDE.  It's
     at (as announced before): http://freebsd.kde.org/.
 - Remove teTeX dependency for kdegraphics2 upon request, and being unable
   to find any reason not to.  Apparently, kdegraphics still compiles
   libkdvi and kdvi -- I guess dvips is merely a runtime dependency.
   Therefore to enable its use one just needs to add the teTeX package.
   Bump PORTREVISION to reflect dependency change.
 - Fix koffice port by removing PYTHON_VERSION, which is unnecessary.

PR:		33650 (part of)
Submitted by:	John Merryweather Cooper <jmcoopr@johncoop.MSHOME.bmi.net>
Reviewed by:	kde-freebsd@lists.csociety.org (teTeX dep removal, and
		optimizing for speed, not debugging capability)

3 files changed, 15 insertions, 60 deletions

diff --git a/graphics/kdegraphics2/Makefile b/graphics/kdegraphics2/Makefile
index e39dc48..2914760 100644
--- a/graphics/kdegraphics2/Makefile
+++ b/graphics/kdegraphics2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kdegraphics
 PORTVERSION=	2.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -15,14 +15,9 @@ DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 
-BUILD_DEPENDS=	dvips:${PORTSDIR}/print/teTeX \
-		autoconf213:${PORTSDIR}/devel/autoconf213 \
+BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
 		automake14:${PORTSDIR}/devel/automake14
-.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK)
-BUILD_DEPENDS+=	objprelink:${PORTSDIR}/devel/objprelink
-.endif
-RUN_DEPENDS=	dvips:${PORTSDIR}/print/teTeX \
-		gs:${PORTSDIR}/print/ghostscript-gnu
+RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu
 
 USE_KDELIBS_VER=2
 USE_BZIP2=	yes
@@ -30,18 +25,8 @@ INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS+=--without-kamera
-.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK)
-CONFIGURE_ARGS+=--enable-objprelink
-.endif
-.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
-.else
-CONFIGURE_ARGS+=--enable-debug
-STRIP=''
-.endif
+
+.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
 
 .include <bsd.port.pre.mk>
 
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index e39dc48..2914760 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kdegraphics
 PORTVERSION=	2.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -15,14 +15,9 @@ DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 
-BUILD_DEPENDS=	dvips:${PORTSDIR}/print/teTeX \
-		autoconf213:${PORTSDIR}/devel/autoconf213 \
+BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
 		automake14:${PORTSDIR}/devel/automake14
-.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK)
-BUILD_DEPENDS+=	objprelink:${PORTSDIR}/devel/objprelink
-.endif
-RUN_DEPENDS=	dvips:${PORTSDIR}/print/teTeX \
-		gs:${PORTSDIR}/print/ghostscript-gnu
+RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu
 
 USE_KDELIBS_VER=2
 USE_BZIP2=	yes
@@ -30,18 +25,8 @@ INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS+=--without-kamera
-.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK)
-CONFIGURE_ARGS+=--enable-objprelink
-.endif
-.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
-.else
-CONFIGURE_ARGS+=--enable-debug
-STRIP=''
-.endif
+
+.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
 
 .include <bsd.port.pre.mk>
 
diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index e39dc48..2914760 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kdegraphics
 PORTVERSION=	2.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -15,14 +15,9 @@ DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 
-BUILD_DEPENDS=	dvips:${PORTSDIR}/print/teTeX \
-		autoconf213:${PORTSDIR}/devel/autoconf213 \
+BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
 		automake14:${PORTSDIR}/devel/automake14
-.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK)
-BUILD_DEPENDS+=	objprelink:${PORTSDIR}/devel/objprelink
-.endif
-RUN_DEPENDS=	dvips:${PORTSDIR}/print/teTeX \
-		gs:${PORTSDIR}/print/ghostscript-gnu
+RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu
 
 USE_KDELIBS_VER=2
 USE_BZIP2=	yes
@@ -30,18 +25,8 @@ INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS+=--without-kamera
-.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK)
-CONFIGURE_ARGS+=--enable-objprelink
-.endif
-.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
-.else
-CONFIGURE_ARGS+=--enable-debug
-STRIP=''
-.endif
+
+.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
 
 .include <bsd.port.pre.mk>