From bda8e9b3d49318473fad79469eabd56286ac2396 Mon Sep 17 00:00:00 2001 From: Will Andrews Date: Fri, 11 Jan 2002 06:17:04 +0000 Subject: 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 Reviewed by: kde-freebsd@lists.csociety.org (teTeX dep removal, and optimizing for speed, not debugging capability) --- multimedia/kdemultimedia3/Makefile | 15 +++------------ multimedia/kdemultimedia4/Makefile | 15 +++------------ 2 files changed, 6 insertions(+), 24 deletions(-) (limited to 'multimedia') diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile index bc4659359877..16e24185ebe4 100644 --- a/multimedia/kdemultimedia3/Makefile +++ b/multimedia/kdemultimedia3/Makefile @@ -16,9 +16,6 @@ MAINTAINER= kde@FreeBSD.org 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= xanim:${PORTSDIR}/graphics/xanim USE_KDELIBS_VER=2 @@ -27,15 +24,9 @@ INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.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" + USE_GMAKE= yes MAKE_ENV= ${CONFIGURE_ENV} diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile index bc4659359877..16e24185ebe4 100644 --- a/multimedia/kdemultimedia4/Makefile +++ b/multimedia/kdemultimedia4/Makefile @@ -16,9 +16,6 @@ MAINTAINER= kde@FreeBSD.org 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= xanim:${PORTSDIR}/graphics/xanim USE_KDELIBS_VER=2 @@ -27,15 +24,9 @@ INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib -.if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) -CONFIGURE_ARGS+=--enable-objprelink -.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" + USE_GMAKE= yes MAKE_ENV= ${CONFIGURE_ENV} -- cgit v1.2.3