diff options
author | Will Andrews <will@FreeBSD.org> | 2002-01-11 06:17:04 +0000 |
---|---|---|
committer | Will Andrews <will@FreeBSD.org> | 2002-01-11 06:17:04 +0000 |
commit | bda8e9b3d49318473fad79469eabd56286ac2396 (patch) | |
tree | 3e1572e95d90613e6ab697273311a81aae4badcb /deskutils | |
parent | Fix incorrect dependency (diff) |
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)
Notes
Notes:
svn path=/head/; revision=52903
Diffstat (limited to 'deskutils')
-rw-r--r-- | deskutils/kcharselect/Makefile | 18 | ||||
-rw-r--r-- | deskutils/kdepim/Makefile | 18 | ||||
-rw-r--r-- | deskutils/kdepim3/Makefile | 18 | ||||
-rw-r--r-- | deskutils/kdepim4/Makefile | 18 | ||||
-rw-r--r-- | deskutils/kdepim44/Makefile | 18 |
5 files changed, 14 insertions, 76 deletions
diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile index 49d7d2ce45bf..858ca8e566a6 100644 --- a/deskutils/kcharselect/Makefile +++ b/deskutils/kcharselect/Makefile @@ -16,30 +16,16 @@ 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 USE_KDELIBS_VER=2 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS?= -.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 USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" + pre-configure: ${MKDIR} ${WRKSRC}/auto-bin .for AC in autoconf autoheader diff --git a/deskutils/kdepim/Makefile b/deskutils/kdepim/Makefile index 875c0386e052..2cdf49b1a756 100644 --- a/deskutils/kdepim/Makefile +++ b/deskutils/kdepim/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 LIB_DEPENDS= pisock.4:${PORTSDIR}/palm/pilot-link USE_KDELIBS_VER=2 @@ -26,18 +23,9 @@ USE_BISON= yes USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -.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" + QTCPPFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib QTLDFLAGS= ${QTCPPFLAGS} CONFIGURE_ENV+= LIBS="${QTLDFLAGS}" diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile index 875c0386e052..2cdf49b1a756 100644 --- a/deskutils/kdepim3/Makefile +++ b/deskutils/kdepim3/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 LIB_DEPENDS= pisock.4:${PORTSDIR}/palm/pilot-link USE_KDELIBS_VER=2 @@ -26,18 +23,9 @@ USE_BISON= yes USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -.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" + QTCPPFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib QTLDFLAGS= ${QTCPPFLAGS} CONFIGURE_ENV+= LIBS="${QTLDFLAGS}" diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile index 875c0386e052..2cdf49b1a756 100644 --- a/deskutils/kdepim4/Makefile +++ b/deskutils/kdepim4/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 LIB_DEPENDS= pisock.4:${PORTSDIR}/palm/pilot-link USE_KDELIBS_VER=2 @@ -26,18 +23,9 @@ USE_BISON= yes USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -.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" + QTCPPFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib QTLDFLAGS= ${QTCPPFLAGS} CONFIGURE_ENV+= LIBS="${QTLDFLAGS}" diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile index 875c0386e052..2cdf49b1a756 100644 --- a/deskutils/kdepim44/Makefile +++ b/deskutils/kdepim44/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 LIB_DEPENDS= pisock.4:${PORTSDIR}/palm/pilot-link USE_KDELIBS_VER=2 @@ -26,18 +23,9 @@ USE_BISON= yes USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -.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" + QTCPPFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib QTLDFLAGS= ${QTCPPFLAGS} CONFIGURE_ENV+= LIBS="${QTLDFLAGS}" |