diff options
author | Will Andrews <will@FreeBSD.org> | 2002-06-15 16:16:32 +0000 |
---|---|---|
committer | Will Andrews <will@FreeBSD.org> | 2002-06-15 16:16:32 +0000 |
commit | 1aced58dae2e4b271f74d726a0e8f0edcc323838 (patch) | |
tree | aa290e0641e0448ee8919195bad0a9b5bf828e59 /editors/calligra | |
parent | 26687091c458f586e024178035ef42cf319d663d (diff) | |
download | ports-1aced58dae2e4b271f74d726a0e8f0edcc323838.tar.gz ports-1aced58dae2e4b271f74d726a0e8f0edcc323838.zip |
Upgrade to KDE 3.0.1. The delay in this upgrade is mainly due to the
rigorous testing performed on the part of the KDE/FreeBSD Project
over the last three weeks. Thanks to everyone who helped test!
General changes:
[1] Follow KDE2 style by moving KDE core specific macros and
the like to x11/kde3/Makefile.kde.
[2] Fix a variety of comments or miscellaneous data to reflect
that this is KDE3 and not KDE2.
[3] Account for more empty directories in the PLISTs.
deskutils/kdepim3:
[4] More #include <malloc.h> -> #include <stdlib.h>.
audio/arts:
[5] Upgrade to 1.0.1.
[6] Point at MASTER_SITE_KDE not my own mirror.
audio/kdemultimedia3:
[7] Account for the removal of the <machine/soundcard.h> symlink.
Simply point all such includes at <sys/soundcard.h>.
editors/koffice-kde3:
[8] Get rid of #include <values.h> preemptively.
devel/kdesdk3:
[9] Remove cervisia from build if building on -CURRENT due to
C++-unsafe sys/wait.h. The header is believed to have been
fixed in newer -CURRENT (>= Jun 5) but we have not tested that.
devel/kdevelop:
[10] Upgrade to 2.1.1 and use KDE 3 version.
[11] Remove a number of suggested dependencies that no longer fit.
[12] Account for where the docs for Qt went since they got moved
to fit in hier(7) better.
graphics/kdegraphics3:
[13] Turn off kuickshow by default because it depends on imlib,
which in turn depends on gtk/glib. This will be revisited
when we split up the KDE ports a bit.
games/kdegames3:
[14] Fix compile error on -CURRENT where kpat/freecell-solver/md5.h
tried to define uint32_t after sys/types.h already had.
sysutils/kdeadmin3:
No particular changes.
misc/kdeaddons3:
No particular changes.
misc/kdeedu3:
[15] Re-add the huge number of missing @dirrm's.
misc/kdeutils3:
No particular changes.
misc/kde3-i18n-* and */kde3-i18n:
For the most part, no particular changes. A huge number of I18N
message updates went into this release, though.
french/kde3-i18n:
[16] Fix build Makefile error due to tarball builder's env.
net/kdenetwork3:
No particular changes.
x11-clocks/kdetoys3:
No particular changes.
x11/kdebase3:
[17] Account for mkfontdir "soft" build-time dependency. If
mkfontdir is available, use it to build fonts.dir where
kdebase installs fonts. Otherwise, don't bother.
[18] Patch ElectricEyes.desktop to use the name of the program
that FreeBSD uses when you install the port for it.
[19] Patches for KDM merged into KDE 3.0.1.
[20] Properly fix kdm/backend/xdmcp.c string format error.
x11/kdelibs3:
[21] Support the KDE3 version check to make sure no one
tries to install KDE2 then KDE3. The 'kde-version-check'
target is centralized in x11/kde3/Makefile.kde.
[22] Remove patch for kdeprint/configure.in.in.
[23] Add patch to fix critical icon loader bug.
x11/kde3:
[24] Add Makefile.kde for centralizing KDE core-specific macros
that don't belong in bsd.kde.mk.
x11-toolkits/qt30:
[25] Mark broken on any XFree86 version < 4 due to packing list
related problems if we tried to support XFree86 3.
[26] Error out if the user has Qt2 installed already.
x11-wm/kdeartwork3:
[27] Add USE_MESA to explicitly support the 3D screensavers.
[28] Re-add a large number of missing @dirrm's.
Credits:
[1] [4] [5] [6] [7]
[9] [10] [14] [16]
[21] [22] [24] [26]: will
[2] [3] [8] [15] [17]
[19] [25] [27] [28]: alane
[11] [12]
Submitted by: Lauri Watts <lauri@kde.org>
[13] Found by: mi
Removed by: will
[18] [23]
Submitted by: Andy Fawcett <andy@athame.co.uk>
Tested by: [in addition to the above, in no particular order]
knu
Mattias Douhan <matt@athame.co.uk>
Bradley T. Hughes <bhughes@trolltech.com>
Erik H. Bakke <ebakke@trolltech.com>
David Johnson <david@usermode.org>
JJ Behrens <jj@nttmcl.com>
Michael W. Collette <metrol@metrol.net>
Adriaan de Groot <adridg@sci.kun.nl>
Mark Rowlands <mark.rowlands@minmail.net>
Mark Stosberg <mark@summersault.com>
Dave Cantrell <phaedrus@alltel.net>
Mark Miller <joup@bigfoot.com>
Wesley Morgan <morganw@chemikals.org>
Arjan van Leeuwen <avl@operamail.com>
Notes
Notes:
svn path=/head/; revision=61318
Diffstat (limited to 'editors/calligra')
-rw-r--r-- | editors/calligra/Makefile | 10 | ||||
-rw-r--r-- | editors/calligra/files/patch-KDChartData.h | 15 | ||||
-rw-r--r-- | editors/calligra/files/patch-KDChartTable.h | 15 |
3 files changed, 32 insertions, 8 deletions
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index 3831e9b7e24a..0f42a3c14db2 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/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/calligra/files/patch-KDChartData.h b/editors/calligra/files/patch-KDChartData.h new file mode 100644 index 000000000000..d759e0333010 --- /dev/null +++ b/editors/calligra/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/calligra/files/patch-KDChartTable.h b/editors/calligra/files/patch-KDChartTable.h new file mode 100644 index 000000000000..87007b7e3f70 --- /dev/null +++ b/editors/calligra/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 ) |