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 /deskutils/kdepim44 | |
parent | Upgrade to version 1.93 . (diff) |
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 'deskutils/kdepim44')
-rw-r--r-- | deskutils/kdepim44/Makefile | 13 | ||||
-rw-r--r-- | deskutils/kdepim44/distinfo | 2 | ||||
-rw-r--r-- | deskutils/kdepim44/files/patch-icallangbind.c | 11 | ||||
-rw-r--r-- | deskutils/kdepim44/files/patch-parseholiday.y | 11 | ||||
-rw-r--r-- | deskutils/kdepim44/files/patch-vcc.y | 11 | ||||
-rw-r--r-- | deskutils/kdepim44/files/patch-vobject.c | 11 | ||||
-rw-r--r-- | deskutils/kdepim44/files/patch-y_tab.c | 11 | ||||
-rw-r--r-- | deskutils/kdepim44/pkg-plist | 18 |
8 files changed, 68 insertions, 20 deletions
diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile index fa9ca79b7d24..34bac7a8ffb6 100644 --- a/deskutils/kdepim44/Makefile +++ b/deskutils/kdepim44/Makefile @@ -6,8 +6,7 @@ # PORTNAME= kdepim -PORTVERSION= 3.0 -PORTREVISION= 1 +PORTVERSION= 3.0.1 CATEGORIES= deskutils kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -22,16 +21,10 @@ USE_BISON= yes USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= -CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -.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" + # Remove kpilot by author's request. CONFIGURE_ENV+=DO_NOT_COMPILE="kpilot" diff --git a/deskutils/kdepim44/distinfo b/deskutils/kdepim44/distinfo index 6a8ef85b266f..28aa7cbbba76 100644 --- a/deskutils/kdepim44/distinfo +++ b/deskutils/kdepim44/distinfo @@ -1 +1 @@ -MD5 (KDE/kdepim-3.0.tar.bz2) = b5d9cd56e7c43ee0f20d938cc0166dfb +MD5 (KDE/kdepim-3.0.1.tar.bz2) = cbc606a7f63b8abd1d03441ced3fb8e6 diff --git a/deskutils/kdepim44/files/patch-icallangbind.c b/deskutils/kdepim44/files/patch-icallangbind.c new file mode 100644 index 000000000000..60005c839535 --- /dev/null +++ b/deskutils/kdepim44/files/patch-icallangbind.c @@ -0,0 +1,11 @@ +--- libical/src/libical/icallangbind.c Wed Apr 11 15:37:32 2001 ++++ libical/src/libical/icallangbind.c.new Sat Jun 1 05:06:07 2002 +@@ -22,7 +22,7 @@ + #include "icalproperty.h" + #include "icalerror.h" + #include "icalmemory.h" +-#include <malloc.h> ++#include <stdlib.h> + #include <string.h> + + int* icallangbind_new_array(int size){ diff --git a/deskutils/kdepim44/files/patch-parseholiday.y b/deskutils/kdepim44/files/patch-parseholiday.y new file mode 100644 index 000000000000..6d448861113d --- /dev/null +++ b/deskutils/kdepim44/files/patch-parseholiday.y @@ -0,0 +1,11 @@ +--- korganizer/plugins/holidays/parseholiday.y Wed Jan 9 14:57:53 2002 ++++ korganizer/plugins/holidays/parseholiday.y.new Mon Jun 3 05:53:59 2002 +@@ -29,7 +29,7 @@ + #include <sys/stat.h> + #include <string.h> + +-#ifdef HAVE_MALLOC_H ++#if !defined(HAVE_MALLOC_H) && !defined(__FreeBSD__) + #include <malloc.h> + #endif + diff --git a/deskutils/kdepim44/files/patch-vcc.y b/deskutils/kdepim44/files/patch-vcc.y new file mode 100644 index 000000000000..e94c1bd66c02 --- /dev/null +++ b/deskutils/kdepim44/files/patch-vcc.y @@ -0,0 +1,11 @@ +--- libical/src/libicalvcal/vcc.y Mon Jan 1 16:49:58 2001 ++++ libical/src/libicalvcal/vcc.y.new Sun Jun 2 12:42:57 2002 +@@ -107,7 +107,7 @@ + #endif + + #include <string.h> +-#ifndef __MWERKS__ ++#if !defined(__MWERKS__) && !defined(__FreeBSD__) + #include <malloc.h> + #endif + #include <stdio.h> diff --git a/deskutils/kdepim44/files/patch-vobject.c b/deskutils/kdepim44/files/patch-vobject.c new file mode 100644 index 000000000000..4b5467f84837 --- /dev/null +++ b/deskutils/kdepim44/files/patch-vobject.c @@ -0,0 +1,11 @@ +--- libical/src/libicalvcal/vobject.c Mon Jan 1 16:37:08 2001 ++++ libical/src/libicalvcal/vobject.c.new Mon Jun 3 02:49:58 2002 +@@ -42,7 +42,7 @@ + * vobject, and convert a vobject into its textual representation. + */ + +-#ifndef MWERKS ++#if !defined(MWERKS) && !defined(__FreeBSD__) + #include <malloc.h> + #endif + diff --git a/deskutils/kdepim44/files/patch-y_tab.c b/deskutils/kdepim44/files/patch-y_tab.c new file mode 100644 index 000000000000..601a2dee96f9 --- /dev/null +++ b/deskutils/kdepim44/files/patch-y_tab.c @@ -0,0 +1,11 @@ +--- kpilot/conduits/vcalconduit/versit/y_tab.c Thu Jul 27 01:57:09 2000 ++++ kpilot/conduits/vcalconduit/versit/y_tab.c.new Mon Jun 3 05:51:54 2002 +@@ -109,7 +109,7 @@ + #endif + + #include <string.h> +-#ifndef __MWERKS__ ++#if !defined(__MWERKS__) && !defined(__FreeBSD__) + #include <malloc.h> + #endif + #include <stdio.h> diff --git a/deskutils/kdepim44/pkg-plist b/deskutils/kdepim44/pkg-plist index 607e1e86bed9..e05eb504651e 100644 --- a/deskutils/kdepim44/pkg-plist +++ b/deskutils/kdepim44/pkg-plist @@ -1,4 +1,3 @@ -@comment files/links bin/ical2vcal bin/kabcfrontend bin/kalarm @@ -211,13 +210,12 @@ share/autostart/kalarm.tray.desktop share/autostart/kalarmd.autostart.desktop share/autostart/korgac.desktop share/config/knotesrc -share/config/korganizerrc -share/doc/HTML/en/auto/alarmmessage.png -share/doc/HTML/en/auto/common -share/doc/HTML/en/auto/editwindow.png -share/doc/HTML/en/auto/index.cache.bz2 -share/doc/HTML/en/auto/index.docbook -share/doc/HTML/en/auto/mainwindow.png +share/doc/HTML/en/kalarm/alarmmessage.png +share/doc/HTML/en/kalarm/common +share/doc/HTML/en/kalarm/editwindow.png +share/doc/HTML/en/kalarm/index.cache.bz2 +share/doc/HTML/en/kalarm/index.docbook +share/doc/HTML/en/kalarm/mainwindow.png share/doc/HTML/en/kandy/common share/doc/HTML/en/kandy/index.cache.bz2 share/doc/HTML/en/kandy/index.docbook @@ -322,9 +320,10 @@ share/servicetypes/korganizerpart.desktop @dirrm share/doc/HTML/en/knotes @dirrm share/doc/HTML/en/karm @dirrm share/doc/HTML/en/kandy -@dirrm share/doc/HTML/en/auto +@dirrm share/doc/HTML/en/kalarm @dirrm share/doc/HTML/en @dirrm share/doc/HTML +@dirrm share/doc @dirrm share/config @dirrm share/autostart @dirrm share/apps/korganizer/sounds @@ -382,6 +381,7 @@ share/servicetypes/korganizerpart.desktop @dirrm share/applnk/Settings @dirrm share/applnk/Applications @dirrm share/applnk +@dirrm lib/kde3 @dirrm include/korganizer @dirrm include/kgantt @dirrm include/calendar |