diff options
| author | Michael Nottebrock <lofi@FreeBSD.org> | 2004-04-20 09:08:07 +0000 |
|---|---|---|
| committer | Michael Nottebrock <lofi@FreeBSD.org> | 2004-04-20 09:08:07 +0000 |
| commit | 6c593b2c29c4078d94a263262e820f4d445c1593 (patch) | |
| tree | 2af72f3c91502583cc65925370924707eacb72a1 /x11 | |
| parent | ec3affc624e956cd7c39259d27d22d2bee8ae222 (diff) | |
| download | ports-6c593b2c29c4078d94a263262e820f4d445c1593.tar.gz ports-6c593b2c29c4078d94a263262e820f4d445c1593.zip | |
Notes
Diffstat (limited to 'x11')
56 files changed, 265 insertions, 305 deletions
diff --git a/x11/kde3/Makefile b/x11/kde3/Makefile index 869d2617b593..1464ef790db5 100644 --- a/x11/kde3/Makefile +++ b/x11/kde3/Makefile @@ -8,7 +8,6 @@ PORTNAME?= kde PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= # empty DISTFILES= # none @@ -34,7 +33,7 @@ CONFIG_FILE= ${LOCALBASE}/etc/kde-meta.conf ## The list of all modules that make up KDE, excluding the base modules ## arts, kdebase and kdelibs -ALL_MODULES= KDEACCESSIBILITY KDEADDONS KDEADMIN KDEARTWORK KDEVELOP KDEEDU\ +ALL_MODULES= KDEACCESSIBILITY KDEADMIN KDEARTWORK KDEVELOP KDEEDU\ KDEGAMES KDEGRAPHICS KDEMULTIMEDIA KDENETWORK KOFFICE KDEPIM\ KDESDK KDETOYS KDEUTILS QUANTA @@ -135,9 +134,6 @@ RUN_DEPENDS+= cervisia:${PORTSDIR}/devel/kdesdk3 .if !defined(WITHOUT_KDEVELOP) RUN_DEPENDS+= kdevelop:${PORTSDIR}/devel/kdevelop .endif -.if !defined(WITHOUT_KDEADDONS) -DEPENDS+= ${PORTSDIR}/misc/kdeaddons3 -.endif .if !defined(WITHOUT_KDEEDU) RUN_DEPENDS+= khangman:${PORTSDIR}/misc/kdeedu3 .endif diff --git a/x11/kde3/scripts/configure.kde3 b/x11/kde3/scripts/configure.kde3 index f42984b04304..63c4763204e7 100644 --- a/x11/kde3/scripts/configure.kde3 +++ b/x11/kde3/scripts/configure.kde3 @@ -68,7 +68,6 @@ if [ -z "${BATCH}" ]; then Please select what additional KDE modules you would like to install.\n\n" \ -1 -1 15 \ "KDEACCESS." "Accessibility applications for KDE" "$status_kdeaccessibility" \ -"KDEADDONS" "Additional plugins and scripts for some applications" "$status_kdeaddons" \ "KDEADMIN" "KDE applications related to system administration" "$status_kdeadmin" \ "KDEARTWORK" "Additional themes, sounds, wallpapers and window styles" "$status_kdeartwork" \ "KDEVELOP" "Powerful IDE for developing KDE/Qt-based applications" "$status_kdevelop" \ diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index dc57e187be90..4d2f8252ffa1 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -44,11 +44,11 @@ OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> -.if defined(WITH_ARTSWRAPPER) +.if !defined(WITHOUT_ARTSWRAPPER) RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper .endif -.if defined(WITH_MOTIF) +.if !defined(WITHOUT_MOTIF) USE_MOTIF= yes PLIST_APPEND+= plist.motif .elseif defined(WITHOUT_MOTIF) diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo index 666a941bc727..d19b2bea5dec 100644 --- a/x11/kde4-baseapps/distinfo +++ b/x11/kde4-baseapps/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kdebase-3.2.1.tar.bz2) = 3a3d89b0b49dbb1eaa9e71c83019bbef -SIZE (KDE/kdebase-3.2.1.tar.bz2) = 17131336 +MD5 (KDE/kdebase-3.2.2.tar.bz2) = 81a348e01625f77beeb53755cb28ba85 +SIZE (KDE/kdebase-3.2.2.tar.bz2) = 17216476 diff --git a/x11/kde4-baseapps/files/patch-kcontrol-arts.cpp b/x11/kde4-baseapps/files/patch-kcontrol-arts.cpp deleted file mode 100644 index df11b254f150..000000000000 --- a/x11/kde4-baseapps/files/patch-kcontrol-arts.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- kcontrol/arts/arts.cpp.orig Fri Mar 5 12:15:10 2004 -+++ kcontrol/arts/arts.cpp Fri Mar 5 12:08:16 2004 -@@ -541,13 +541,13 @@ - - connect(checkProcess, SIGNAL(processExited(KProcess*)), - this, SLOT(slotArtsdExited(KProcess*))); -- checkProcess->start(KProcess::Block); -- -- if (latestProcessStatus == 0) -+ if (checkProcess->start(KProcess::Block) == false) -+ realtimePossible = false; -+ else if (latestProcessStatus == 0) - realtimePossible = true; - else - realtimePossible = false; -- -+ - checked = true; - - } diff --git a/x11/kde4-baseapps/files/patch-startkde b/x11/kde4-baseapps/files/patch-startkde new file mode 100644 index 000000000000..07c59a384354 --- /dev/null +++ b/x11/kde4-baseapps/files/patch-startkde @@ -0,0 +1,12 @@ +--- patch-startkde begins here --- +--- startkde.orig Sun Oct 26 11:45:35 2003 ++++ startkde Thu Apr 8 12:20:47 2004 +@@ -59,7 +59,7 @@ + do_usr_odir=1 + if test -r "$kde_fontpaths" ; then + savifs=$IFS +- IFS=$'\n' ++ IFS=${IFS#??} + for fpath in `grep -v '^[ ]*#' < "$kde_fontpaths"` ; do + rfpath=`echo $fpath | sed s:\~:$HOME:g` + if test -s "$rfpath"/fonts.dir; then diff --git a/x11/kde4-baseapps/files/plist.base b/x11/kde4-baseapps/files/plist.base index a2ca93fb2e3c..6eb17215bba7 100644 --- a/x11/kde4-baseapps/files/plist.base +++ b/x11/kde4-baseapps/files/plist.base @@ -56,6 +56,7 @@ bin/kpersonalizer bin/kpm bin/kprinter bin/krandom.kss +bin/krandrinithack bin/krandrtray bin/krdb bin/kreadconfig @@ -398,6 +399,8 @@ lib/kde3/konsole.la lib/kde3/konsole.so lib/kde3/kprinter.la lib/kde3/kprinter.so +lib/kde3/krandrinithack.la +lib/kde3/krandrinithack.so lib/kde3/ksmserver.la lib/kde3/ksmserver.so lib/kde3/ksplashdefault.la @@ -486,8 +489,6 @@ lib/kde3/taskbar_panelextension.la lib/kde3/taskbar_panelextension.so lib/kde3/textthumbnail.la lib/kde3/textthumbnail.so -lib/krandrinithack.la -lib/krandrinithack.so lib/libkateinterfaces.la lib/libkateinterfaces.so lib/libkateinterfaces.so.0 @@ -535,6 +536,8 @@ lib/libkdeinit_konsole.la lib/libkdeinit_konsole.so lib/libkdeinit_kprinter.la lib/libkdeinit_kprinter.so +lib/libkdeinit_krandrinithack.la +lib/libkdeinit_krandrinithack.so lib/libkdeinit_ksmserver.la lib/libkdeinit_ksmserver.so lib/libkdeinit_kwin.la @@ -1424,7 +1427,6 @@ share/apps/konqueror/pics/indicator_noconnect.png share/apps/konqueror/pics/indicator_viewactive.png share/apps/konqueror/pics/thumbnailfont_7x4.png share/apps/konqueror/profiles/filemanagement -share/apps/konqueror/profiles/filepreview share/apps/konqueror/profiles/midnightcommander share/apps/konqueror/profiles/webbrowsing share/apps/konqueror/servicemenus/cdrom_mounted_konqy.desktop @@ -2209,6 +2211,7 @@ share/icons/crystalsvg/128x128/apps/wp.png share/icons/crystalsvg/128x128/apps/xclock.png share/icons/crystalsvg/128x128/apps/xfmail.png share/icons/crystalsvg/128x128/apps/xmag.png +share/icons/crystalsvg/16x16/actions/newfont.png share/icons/crystalsvg/16x16/apps/access.png share/icons/crystalsvg/16x16/apps/acroread.png share/icons/crystalsvg/16x16/apps/agent.png @@ -2365,12 +2368,14 @@ share/icons/crystalsvg/16x16/apps/xpaint.png share/icons/crystalsvg/16x16/apps/xv.png share/icons/crystalsvg/16x16/devices/print_printer.png share/icons/crystalsvg/16x16/filesystems/folder_print2.png +share/icons/crystalsvg/22x22/actions/newfont.png share/icons/crystalsvg/22x22/apps/klipper.png share/icons/crystalsvg/22x22/apps/konqueror.png share/icons/crystalsvg/22x22/apps/ksplash.png share/icons/crystalsvg/22x22/apps/kvirc.png share/icons/crystalsvg/22x22/apps/nedit.png share/icons/crystalsvg/22x22/apps/randr.png +share/icons/crystalsvg/32x32/actions/newfont.png share/icons/crystalsvg/32x32/apps/access.png share/icons/crystalsvg/32x32/apps/acroread.png share/icons/crystalsvg/32x32/apps/agent.png diff --git a/x11/kde4-baseapps/files/plist.base.rm b/x11/kde4-baseapps/files/plist.base.rm index cea00d682fcd..ee3dc0fad360 100644 --- a/x11/kde4-baseapps/files/plist.base.rm +++ b/x11/kde4-baseapps/files/plist.base.rm @@ -268,12 +268,15 @@ @dirrm share/icons/crystalsvg/32x32/filesystems @dirrm share/icons/crystalsvg/32x32/devices @dirrm share/icons/crystalsvg/32x32/apps +@dirrm share/icons/crystalsvg/32x32/actions @dirrm share/icons/crystalsvg/32x32 @dirrm share/icons/crystalsvg/22x22/apps +@dirrm share/icons/crystalsvg/22x22/actions @dirrm share/icons/crystalsvg/22x22 @dirrm share/icons/crystalsvg/16x16/filesystems @dirrm share/icons/crystalsvg/16x16/devices @dirrm share/icons/crystalsvg/16x16/apps +@dirrm share/icons/crystalsvg/16x16/actions @dirrm share/icons/crystalsvg/16x16 @dirrm share/icons/crystalsvg/128x128/apps @dirrm share/icons/crystalsvg/128x128 diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index dc57e187be90..4d2f8252ffa1 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -44,11 +44,11 @@ OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> -.if defined(WITH_ARTSWRAPPER) +.if !defined(WITHOUT_ARTSWRAPPER) RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper .endif -.if defined(WITH_MOTIF) +.if !defined(WITHOUT_MOTIF) USE_MOTIF= yes PLIST_APPEND+= plist.motif .elseif defined(WITHOUT_MOTIF) diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo index 666a941bc727..d19b2bea5dec 100644 --- a/x11/kde4-runtime/distinfo +++ b/x11/kde4-runtime/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kdebase-3.2.1.tar.bz2) = 3a3d89b0b49dbb1eaa9e71c83019bbef -SIZE (KDE/kdebase-3.2.1.tar.bz2) = 17131336 +MD5 (KDE/kdebase-3.2.2.tar.bz2) = 81a348e01625f77beeb53755cb28ba85 +SIZE (KDE/kdebase-3.2.2.tar.bz2) = 17216476 diff --git a/x11/kde4-runtime/files/patch-kcontrol-arts.cpp b/x11/kde4-runtime/files/patch-kcontrol-arts.cpp deleted file mode 100644 index df11b254f150..000000000000 --- a/x11/kde4-runtime/files/patch-kcontrol-arts.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- kcontrol/arts/arts.cpp.orig Fri Mar 5 12:15:10 2004 -+++ kcontrol/arts/arts.cpp Fri Mar 5 12:08:16 2004 -@@ -541,13 +541,13 @@ - - connect(checkProcess, SIGNAL(processExited(KProcess*)), - this, SLOT(slotArtsdExited(KProcess*))); -- checkProcess->start(KProcess::Block); -- -- if (latestProcessStatus == 0) -+ if (checkProcess->start(KProcess::Block) == false) -+ realtimePossible = false; -+ else if (latestProcessStatus == 0) - realtimePossible = true; - else - realtimePossible = false; -- -+ - checked = true; - - } diff --git a/x11/kde4-runtime/files/patch-startkde b/x11/kde4-runtime/files/patch-startkde new file mode 100644 index 000000000000..07c59a384354 --- /dev/null +++ b/x11/kde4-runtime/files/patch-startkde @@ -0,0 +1,12 @@ +--- patch-startkde begins here --- +--- startkde.orig Sun Oct 26 11:45:35 2003 ++++ startkde Thu Apr 8 12:20:47 2004 +@@ -59,7 +59,7 @@ + do_usr_odir=1 + if test -r "$kde_fontpaths" ; then + savifs=$IFS +- IFS=$'\n' ++ IFS=${IFS#??} + for fpath in `grep -v '^[ ]*#' < "$kde_fontpaths"` ; do + rfpath=`echo $fpath | sed s:\~:$HOME:g` + if test -s "$rfpath"/fonts.dir; then diff --git a/x11/kde4-runtime/files/plist.base b/x11/kde4-runtime/files/plist.base index a2ca93fb2e3c..6eb17215bba7 100644 --- a/x11/kde4-runtime/files/plist.base +++ b/x11/kde4-runtime/files/plist.base @@ -56,6 +56,7 @@ bin/kpersonalizer bin/kpm bin/kprinter bin/krandom.kss +bin/krandrinithack bin/krandrtray bin/krdb bin/kreadconfig @@ -398,6 +399,8 @@ lib/kde3/konsole.la lib/kde3/konsole.so lib/kde3/kprinter.la lib/kde3/kprinter.so +lib/kde3/krandrinithack.la +lib/kde3/krandrinithack.so lib/kde3/ksmserver.la lib/kde3/ksmserver.so lib/kde3/ksplashdefault.la @@ -486,8 +489,6 @@ lib/kde3/taskbar_panelextension.la lib/kde3/taskbar_panelextension.so lib/kde3/textthumbnail.la lib/kde3/textthumbnail.so -lib/krandrinithack.la -lib/krandrinithack.so lib/libkateinterfaces.la lib/libkateinterfaces.so lib/libkateinterfaces.so.0 @@ -535,6 +536,8 @@ lib/libkdeinit_konsole.la lib/libkdeinit_konsole.so lib/libkdeinit_kprinter.la lib/libkdeinit_kprinter.so +lib/libkdeinit_krandrinithack.la +lib/libkdeinit_krandrinithack.so lib/libkdeinit_ksmserver.la lib/libkdeinit_ksmserver.so lib/libkdeinit_kwin.la @@ -1424,7 +1427,6 @@ share/apps/konqueror/pics/indicator_noconnect.png share/apps/konqueror/pics/indicator_viewactive.png share/apps/konqueror/pics/thumbnailfont_7x4.png share/apps/konqueror/profiles/filemanagement -share/apps/konqueror/profiles/filepreview share/apps/konqueror/profiles/midnightcommander share/apps/konqueror/profiles/webbrowsing share/apps/konqueror/servicemenus/cdrom_mounted_konqy.desktop @@ -2209,6 +2211,7 @@ share/icons/crystalsvg/128x128/apps/wp.png share/icons/crystalsvg/128x128/apps/xclock.png share/icons/crystalsvg/128x128/apps/xfmail.png share/icons/crystalsvg/128x128/apps/xmag.png +share/icons/crystalsvg/16x16/actions/newfont.png share/icons/crystalsvg/16x16/apps/access.png share/icons/crystalsvg/16x16/apps/acroread.png share/icons/crystalsvg/16x16/apps/agent.png @@ -2365,12 +2368,14 @@ share/icons/crystalsvg/16x16/apps/xpaint.png share/icons/crystalsvg/16x16/apps/xv.png share/icons/crystalsvg/16x16/devices/print_printer.png share/icons/crystalsvg/16x16/filesystems/folder_print2.png +share/icons/crystalsvg/22x22/actions/newfont.png share/icons/crystalsvg/22x22/apps/klipper.png share/icons/crystalsvg/22x22/apps/konqueror.png share/icons/crystalsvg/22x22/apps/ksplash.png share/icons/crystalsvg/22x22/apps/kvirc.png share/icons/crystalsvg/22x22/apps/nedit.png share/icons/crystalsvg/22x22/apps/randr.png +share/icons/crystalsvg/32x32/actions/newfont.png share/icons/crystalsvg/32x32/apps/access.png share/icons/crystalsvg/32x32/apps/acroread.png share/icons/crystalsvg/32x32/apps/agent.png diff --git a/x11/kde4-runtime/files/plist.base.rm b/x11/kde4-runtime/files/plist.base.rm index cea00d682fcd..ee3dc0fad360 100644 --- a/x11/kde4-runtime/files/plist.base.rm +++ b/x11/kde4-runtime/files/plist.base.rm @@ -268,12 +268,15 @@ @dirrm share/icons/crystalsvg/32x32/filesystems @dirrm share/icons/crystalsvg/32x32/devices @dirrm share/icons/crystalsvg/32x32/apps +@dirrm share/icons/crystalsvg/32x32/actions @dirrm share/icons/crystalsvg/32x32 @dirrm share/icons/crystalsvg/22x22/apps +@dirrm share/icons/crystalsvg/22x22/actions @dirrm share/icons/crystalsvg/22x22 @dirrm share/icons/crystalsvg/16x16/filesystems @dirrm share/icons/crystalsvg/16x16/devices @dirrm share/icons/crystalsvg/16x16/apps +@dirrm share/icons/crystalsvg/16x16/actions @dirrm share/icons/crystalsvg/16x16 @dirrm share/icons/crystalsvg/128x128/apps @dirrm share/icons/crystalsvg/128x128 diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index dc57e187be90..4d2f8252ffa1 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -44,11 +44,11 @@ OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> -.if defined(WITH_ARTSWRAPPER) +.if !defined(WITHOUT_ARTSWRAPPER) RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper .endif -.if defined(WITH_MOTIF) +.if !defined(WITHOUT_MOTIF) USE_MOTIF= yes PLIST_APPEND+= plist.motif .elseif defined(WITHOUT_MOTIF) diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo index 666a941bc727..d19b2bea5dec 100644 --- a/x11/kde4-workspace/distinfo +++ b/x11/kde4-workspace/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kdebase-3.2.1.tar.bz2) = 3a3d89b0b49dbb1eaa9e71c83019bbef -SIZE (KDE/kdebase-3.2.1.tar.bz2) = 17131336 +MD5 (KDE/kdebase-3.2.2.tar.bz2) = 81a348e01625f77beeb53755cb28ba85 +SIZE (KDE/kdebase-3.2.2.tar.bz2) = 17216476 diff --git a/x11/kde4-workspace/files/patch-kcontrol-arts.cpp b/x11/kde4-workspace/files/patch-kcontrol-arts.cpp deleted file mode 100644 index df11b254f150..000000000000 --- a/x11/kde4-workspace/files/patch-kcontrol-arts.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- kcontrol/arts/arts.cpp.orig Fri Mar 5 12:15:10 2004 -+++ kcontrol/arts/arts.cpp Fri Mar 5 12:08:16 2004 -@@ -541,13 +541,13 @@ - - connect(checkProcess, SIGNAL(processExited(KProcess*)), - this, SLOT(slotArtsdExited(KProcess*))); -- checkProcess->start(KProcess::Block); -- -- if (latestProcessStatus == 0) -+ if (checkProcess->start(KProcess::Block) == false) -+ realtimePossible = false; -+ else if (latestProcessStatus == 0) - realtimePossible = true; - else - realtimePossible = false; -- -+ - checked = true; - - } diff --git a/x11/kde4-workspace/files/patch-startkde b/x11/kde4-workspace/files/patch-startkde new file mode 100644 index 000000000000..07c59a384354 --- /dev/null +++ b/x11/kde4-workspace/files/patch-startkde @@ -0,0 +1,12 @@ +--- patch-startkde begins here --- +--- startkde.orig Sun Oct 26 11:45:35 2003 ++++ startkde Thu Apr 8 12:20:47 2004 +@@ -59,7 +59,7 @@ + do_usr_odir=1 + if test -r "$kde_fontpaths" ; then + savifs=$IFS +- IFS=$'\n' ++ IFS=${IFS#??} + for fpath in `grep -v '^[ ]*#' < "$kde_fontpaths"` ; do + rfpath=`echo $fpath | sed s:\~:$HOME:g` + if test -s "$rfpath"/fonts.dir; then diff --git a/x11/kde4-workspace/files/plist.base b/x11/kde4-workspace/files/plist.base index a2ca93fb2e3c..6eb17215bba7 100644 --- a/x11/kde4-workspace/files/plist.base +++ b/x11/kde4-workspace/files/plist.base @@ -56,6 +56,7 @@ bin/kpersonalizer bin/kpm bin/kprinter bin/krandom.kss +bin/krandrinithack bin/krandrtray bin/krdb bin/kreadconfig @@ -398,6 +399,8 @@ lib/kde3/konsole.la lib/kde3/konsole.so lib/kde3/kprinter.la lib/kde3/kprinter.so +lib/kde3/krandrinithack.la +lib/kde3/krandrinithack.so lib/kde3/ksmserver.la lib/kde3/ksmserver.so lib/kde3/ksplashdefault.la @@ -486,8 +489,6 @@ lib/kde3/taskbar_panelextension.la lib/kde3/taskbar_panelextension.so lib/kde3/textthumbnail.la lib/kde3/textthumbnail.so -lib/krandrinithack.la -lib/krandrinithack.so lib/libkateinterfaces.la lib/libkateinterfaces.so lib/libkateinterfaces.so.0 @@ -535,6 +536,8 @@ lib/libkdeinit_konsole.la lib/libkdeinit_konsole.so lib/libkdeinit_kprinter.la lib/libkdeinit_kprinter.so +lib/libkdeinit_krandrinithack.la +lib/libkdeinit_krandrinithack.so lib/libkdeinit_ksmserver.la lib/libkdeinit_ksmserver.so lib/libkdeinit_kwin.la @@ -1424,7 +1427,6 @@ share/apps/konqueror/pics/indicator_noconnect.png share/apps/konqueror/pics/indicator_viewactive.png share/apps/konqueror/pics/thumbnailfont_7x4.png share/apps/konqueror/profiles/filemanagement -share/apps/konqueror/profiles/filepreview share/apps/konqueror/profiles/midnightcommander share/apps/konqueror/profiles/webbrowsing share/apps/konqueror/servicemenus/cdrom_mounted_konqy.desktop @@ -2209,6 +2211,7 @@ share/icons/crystalsvg/128x128/apps/wp.png share/icons/crystalsvg/128x128/apps/xclock.png share/icons/crystalsvg/128x128/apps/xfmail.png share/icons/crystalsvg/128x128/apps/xmag.png +share/icons/crystalsvg/16x16/actions/newfont.png share/icons/crystalsvg/16x16/apps/access.png share/icons/crystalsvg/16x16/apps/acroread.png share/icons/crystalsvg/16x16/apps/agent.png @@ -2365,12 +2368,14 @@ share/icons/crystalsvg/16x16/apps/xpaint.png share/icons/crystalsvg/16x16/apps/xv.png share/icons/crystalsvg/16x16/devices/print_printer.png share/icons/crystalsvg/16x16/filesystems/folder_print2.png +share/icons/crystalsvg/22x22/actions/newfont.png share/icons/crystalsvg/22x22/apps/klipper.png share/icons/crystalsvg/22x22/apps/konqueror.png share/icons/crystalsvg/22x22/apps/ksplash.png share/icons/crystalsvg/22x22/apps/kvirc.png share/icons/crystalsvg/22x22/apps/nedit.png share/icons/crystalsvg/22x22/apps/randr.png +share/icons/crystalsvg/32x32/actions/newfont.png share/icons/crystalsvg/32x32/apps/access.png share/icons/crystalsvg/32x32/apps/acroread.png share/icons/crystalsvg/32x32/apps/agent.png diff --git a/x11/kde4-workspace/files/plist.base.rm b/x11/kde4-workspace/files/plist.base.rm index cea00d682fcd..ee3dc0fad360 100644 --- a/x11/kde4-workspace/files/plist.base.rm +++ b/x11/kde4-workspace/files/plist.base.rm @@ -268,12 +268,15 @@ @dirrm share/icons/crystalsvg/32x32/filesystems @dirrm share/icons/crystalsvg/32x32/devices @dirrm share/icons/crystalsvg/32x32/apps +@dirrm share/icons/crystalsvg/32x32/actions @dirrm share/icons/crystalsvg/32x32 @dirrm share/icons/crystalsvg/22x22/apps +@dirrm share/icons/crystalsvg/22x22/actions @dirrm share/icons/crystalsvg/22x22 @dirrm share/icons/crystalsvg/16x16/filesystems @dirrm share/icons/crystalsvg/16x16/devices @dirrm share/icons/crystalsvg/16x16/apps +@dirrm share/icons/crystalsvg/16x16/actions @dirrm share/icons/crystalsvg/16x16 @dirrm share/icons/crystalsvg/128x128/apps @dirrm share/icons/crystalsvg/128x128 diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile index 869d2617b593..1464ef790db5 100644 --- a/x11/kde4/Makefile +++ b/x11/kde4/Makefile @@ -8,7 +8,6 @@ PORTNAME?= kde PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= # empty DISTFILES= # none @@ -34,7 +33,7 @@ CONFIG_FILE= ${LOCALBASE}/etc/kde-meta.conf ## The list of all modules that make up KDE, excluding the base modules ## arts, kdebase and kdelibs -ALL_MODULES= KDEACCESSIBILITY KDEADDONS KDEADMIN KDEARTWORK KDEVELOP KDEEDU\ +ALL_MODULES= KDEACCESSIBILITY KDEADMIN KDEARTWORK KDEVELOP KDEEDU\ KDEGAMES KDEGRAPHICS KDEMULTIMEDIA KDENETWORK KOFFICE KDEPIM\ KDESDK KDETOYS KDEUTILS QUANTA @@ -135,9 +134,6 @@ RUN_DEPENDS+= cervisia:${PORTSDIR}/devel/kdesdk3 .if !defined(WITHOUT_KDEVELOP) RUN_DEPENDS+= kdevelop:${PORTSDIR}/devel/kdevelop .endif -.if !defined(WITHOUT_KDEADDONS) -DEPENDS+= ${PORTSDIR}/misc/kdeaddons3 -.endif .if !defined(WITHOUT_KDEEDU) RUN_DEPENDS+= khangman:${PORTSDIR}/misc/kdeedu3 .endif diff --git a/x11/kde4/scripts/configure.kde3 b/x11/kde4/scripts/configure.kde3 index f42984b04304..63c4763204e7 100644 --- a/x11/kde4/scripts/configure.kde3 +++ b/x11/kde4/scripts/configure.kde3 @@ -68,7 +68,6 @@ if [ -z "${BATCH}" ]; then Please select what additional KDE modules you would like to install.\n\n" \ -1 -1 15 \ "KDEACCESS." "Accessibility applications for KDE" "$status_kdeaccessibility" \ -"KDEADDONS" "Additional plugins and scripts for some applications" "$status_kdeaddons" \ "KDEADMIN" "KDE applications related to system administration" "$status_kdeadmin" \ "KDEARTWORK" "Additional themes, sounds, wallpapers and window styles" "$status_kdeartwork" \ "KDEVELOP" "Powerful IDE for developing KDE/Qt-based applications" "$status_kdevelop" \ diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index dc57e187be90..4d2f8252ffa1 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -44,11 +44,11 @@ OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> -.if defined(WITH_ARTSWRAPPER) +.if !defined(WITHOUT_ARTSWRAPPER) RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper .endif -.if defined(WITH_MOTIF) +.if !defined(WITHOUT_MOTIF) USE_MOTIF= yes PLIST_APPEND+= plist.motif .elseif defined(WITHOUT_MOTIF) diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo index 666a941bc727..d19b2bea5dec 100644 --- a/x11/kdebase3/distinfo +++ b/x11/kdebase3/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kdebase-3.2.1.tar.bz2) = 3a3d89b0b49dbb1eaa9e71c83019bbef -SIZE (KDE/kdebase-3.2.1.tar.bz2) = 17131336 +MD5 (KDE/kdebase-3.2.2.tar.bz2) = 81a348e01625f77beeb53755cb28ba85 +SIZE (KDE/kdebase-3.2.2.tar.bz2) = 17216476 diff --git a/x11/kdebase3/files/patch-kcontrol-arts.cpp b/x11/kdebase3/files/patch-kcontrol-arts.cpp deleted file mode 100644 index df11b254f150..000000000000 --- a/x11/kdebase3/files/patch-kcontrol-arts.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- kcontrol/arts/arts.cpp.orig Fri Mar 5 12:15:10 2004 -+++ kcontrol/arts/arts.cpp Fri Mar 5 12:08:16 2004 -@@ -541,13 +541,13 @@ - - connect(checkProcess, SIGNAL(processExited(KProcess*)), - this, SLOT(slotArtsdExited(KProcess*))); -- checkProcess->start(KProcess::Block); -- -- if (latestProcessStatus == 0) -+ if (checkProcess->start(KProcess::Block) == false) -+ realtimePossible = false; -+ else if (latestProcessStatus == 0) - realtimePossible = true; - else - realtimePossible = false; -- -+ - checked = true; - - } diff --git a/x11/kdebase3/files/patch-startkde b/x11/kdebase3/files/patch-startkde new file mode 100644 index 000000000000..07c59a384354 --- /dev/null +++ b/x11/kdebase3/files/patch-startkde @@ -0,0 +1,12 @@ +--- patch-startkde begins here --- +--- startkde.orig Sun Oct 26 11:45:35 2003 ++++ startkde Thu Apr 8 12:20:47 2004 +@@ -59,7 +59,7 @@ + do_usr_odir=1 + if test -r "$kde_fontpaths" ; then + savifs=$IFS +- IFS=$'\n' ++ IFS=${IFS#??} + for fpath in `grep -v '^[ ]*#' < "$kde_fontpaths"` ; do + rfpath=`echo $fpath | sed s:\~:$HOME:g` + if test -s "$rfpath"/fonts.dir; then diff --git a/x11/kdebase3/files/plist.base b/x11/kdebase3/files/plist.base index a2ca93fb2e3c..6eb17215bba7 100644 --- a/x11/kdebase3/files/plist.base +++ b/x11/kdebase3/files/plist.base @@ -56,6 +56,7 @@ bin/kpersonalizer bin/kpm bin/kprinter bin/krandom.kss +bin/krandrinithack bin/krandrtray bin/krdb bin/kreadconfig @@ -398,6 +399,8 @@ lib/kde3/konsole.la lib/kde3/konsole.so lib/kde3/kprinter.la lib/kde3/kprinter.so +lib/kde3/krandrinithack.la +lib/kde3/krandrinithack.so lib/kde3/ksmserver.la lib/kde3/ksmserver.so lib/kde3/ksplashdefault.la @@ -486,8 +489,6 @@ lib/kde3/taskbar_panelextension.la lib/kde3/taskbar_panelextension.so lib/kde3/textthumbnail.la lib/kde3/textthumbnail.so -lib/krandrinithack.la -lib/krandrinithack.so lib/libkateinterfaces.la lib/libkateinterfaces.so lib/libkateinterfaces.so.0 @@ -535,6 +536,8 @@ lib/libkdeinit_konsole.la lib/libkdeinit_konsole.so lib/libkdeinit_kprinter.la lib/libkdeinit_kprinter.so +lib/libkdeinit_krandrinithack.la +lib/libkdeinit_krandrinithack.so lib/libkdeinit_ksmserver.la lib/libkdeinit_ksmserver.so lib/libkdeinit_kwin.la @@ -1424,7 +1427,6 @@ share/apps/konqueror/pics/indicator_noconnect.png share/apps/konqueror/pics/indicator_viewactive.png share/apps/konqueror/pics/thumbnailfont_7x4.png share/apps/konqueror/profiles/filemanagement -share/apps/konqueror/profiles/filepreview share/apps/konqueror/profiles/midnightcommander share/apps/konqueror/profiles/webbrowsing share/apps/konqueror/servicemenus/cdrom_mounted_konqy.desktop @@ -2209,6 +2211,7 @@ share/icons/crystalsvg/128x128/apps/wp.png share/icons/crystalsvg/128x128/apps/xclock.png share/icons/crystalsvg/128x128/apps/xfmail.png share/icons/crystalsvg/128x128/apps/xmag.png +share/icons/crystalsvg/16x16/actions/newfont.png share/icons/crystalsvg/16x16/apps/access.png share/icons/crystalsvg/16x16/apps/acroread.png share/icons/crystalsvg/16x16/apps/agent.png @@ -2365,12 +2368,14 @@ share/icons/crystalsvg/16x16/apps/xpaint.png share/icons/crystalsvg/16x16/apps/xv.png share/icons/crystalsvg/16x16/devices/print_printer.png share/icons/crystalsvg/16x16/filesystems/folder_print2.png +share/icons/crystalsvg/22x22/actions/newfont.png share/icons/crystalsvg/22x22/apps/klipper.png share/icons/crystalsvg/22x22/apps/konqueror.png share/icons/crystalsvg/22x22/apps/ksplash.png share/icons/crystalsvg/22x22/apps/kvirc.png share/icons/crystalsvg/22x22/apps/nedit.png share/icons/crystalsvg/22x22/apps/randr.png +share/icons/crystalsvg/32x32/actions/newfont.png share/icons/crystalsvg/32x32/apps/access.png share/icons/crystalsvg/32x32/apps/acroread.png share/icons/crystalsvg/32x32/apps/agent.png diff --git a/x11/kdebase3/files/plist.base.rm b/x11/kdebase3/files/plist.base.rm index cea00d682fcd..ee3dc0fad360 100644 --- a/x11/kdebase3/files/plist.base.rm +++ b/x11/kdebase3/files/plist.base.rm @@ -268,12 +268,15 @@ @dirrm share/icons/crystalsvg/32x32/filesystems @dirrm share/icons/crystalsvg/32x32/devices @dirrm share/icons/crystalsvg/32x32/apps +@dirrm share/icons/crystalsvg/32x32/actions @dirrm share/icons/crystalsvg/32x32 @dirrm share/icons/crystalsvg/22x22/apps +@dirrm share/icons/crystalsvg/22x22/actions @dirrm share/icons/crystalsvg/22x22 @dirrm share/icons/crystalsvg/16x16/filesystems @dirrm share/icons/crystalsvg/16x16/devices @dirrm share/icons/crystalsvg/16x16/apps +@dirrm share/icons/crystalsvg/16x16/actions @dirrm share/icons/crystalsvg/16x16 @dirrm share/icons/crystalsvg/128x128/apps @dirrm share/icons/crystalsvg/128x128 diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index dc57e187be90..4d2f8252ffa1 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -44,11 +44,11 @@ OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> -.if defined(WITH_ARTSWRAPPER) +.if !defined(WITHOUT_ARTSWRAPPER) RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper .endif -.if defined(WITH_MOTIF) +.if !defined(WITHOUT_MOTIF) USE_MOTIF= yes PLIST_APPEND+= plist.motif .elseif defined(WITHOUT_MOTIF) diff --git a/x11/kdebase4-runtime/distinfo b/x11/kdebase4-runtime/distinfo index 666a941bc727..d19b2bea5dec 100644 --- a/x11/kdebase4-runtime/distinfo +++ b/x11/kdebase4-runtime/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kdebase-3.2.1.tar.bz2) = 3a3d89b0b49dbb1eaa9e71c83019bbef -SIZE (KDE/kdebase-3.2.1.tar.bz2) = 17131336 +MD5 (KDE/kdebase-3.2.2.tar.bz2) = 81a348e01625f77beeb53755cb28ba85 +SIZE (KDE/kdebase-3.2.2.tar.bz2) = 17216476 diff --git a/x11/kdebase4-runtime/files/patch-kcontrol-arts.cpp b/x11/kdebase4-runtime/files/patch-kcontrol-arts.cpp deleted file mode 100644 index df11b254f150..000000000000 --- a/x11/kdebase4-runtime/files/patch-kcontrol-arts.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- kcontrol/arts/arts.cpp.orig Fri Mar 5 12:15:10 2004 -+++ kcontrol/arts/arts.cpp Fri Mar 5 12:08:16 2004 -@@ -541,13 +541,13 @@ - - connect(checkProcess, SIGNAL(processExited(KProcess*)), - this, SLOT(slotArtsdExited(KProcess*))); -- checkProcess->start(KProcess::Block); -- -- if (latestProcessStatus == 0) -+ if (checkProcess->start(KProcess::Block) == false) -+ realtimePossible = false; -+ else if (latestProcessStatus == 0) - realtimePossible = true; - else - realtimePossible = false; -- -+ - checked = true; - - } diff --git a/x11/kdebase4-runtime/files/patch-startkde b/x11/kdebase4-runtime/files/patch-startkde new file mode 100644 index 000000000000..07c59a384354 --- /dev/null +++ b/x11/kdebase4-runtime/files/patch-startkde @@ -0,0 +1,12 @@ +--- patch-startkde begins here --- +--- startkde.orig Sun Oct 26 11:45:35 2003 ++++ startkde Thu Apr 8 12:20:47 2004 +@@ -59,7 +59,7 @@ + do_usr_odir=1 + if test -r "$kde_fontpaths" ; then + savifs=$IFS +- IFS=$'\n' ++ IFS=${IFS#??} + for fpath in `grep -v '^[ ]*#' < "$kde_fontpaths"` ; do + rfpath=`echo $fpath | sed s:\~:$HOME:g` + if test -s "$rfpath"/fonts.dir; then diff --git a/x11/kdebase4-runtime/files/plist.base b/x11/kdebase4-runtime/files/plist.base index a2ca93fb2e3c..6eb17215bba7 100644 --- a/x11/kdebase4-runtime/files/plist.base +++ b/x11/kdebase4-runtime/files/plist.base @@ -56,6 +56,7 @@ bin/kpersonalizer bin/kpm bin/kprinter bin/krandom.kss +bin/krandrinithack bin/krandrtray bin/krdb bin/kreadconfig @@ -398,6 +399,8 @@ lib/kde3/konsole.la lib/kde3/konsole.so lib/kde3/kprinter.la lib/kde3/kprinter.so +lib/kde3/krandrinithack.la +lib/kde3/krandrinithack.so lib/kde3/ksmserver.la lib/kde3/ksmserver.so lib/kde3/ksplashdefault.la @@ -486,8 +489,6 @@ lib/kde3/taskbar_panelextension.la lib/kde3/taskbar_panelextension.so lib/kde3/textthumbnail.la lib/kde3/textthumbnail.so -lib/krandrinithack.la -lib/krandrinithack.so lib/libkateinterfaces.la lib/libkateinterfaces.so lib/libkateinterfaces.so.0 @@ -535,6 +536,8 @@ lib/libkdeinit_konsole.la lib/libkdeinit_konsole.so lib/libkdeinit_kprinter.la lib/libkdeinit_kprinter.so +lib/libkdeinit_krandrinithack.la +lib/libkdeinit_krandrinithack.so lib/libkdeinit_ksmserver.la lib/libkdeinit_ksmserver.so lib/libkdeinit_kwin.la @@ -1424,7 +1427,6 @@ share/apps/konqueror/pics/indicator_noconnect.png share/apps/konqueror/pics/indicator_viewactive.png share/apps/konqueror/pics/thumbnailfont_7x4.png share/apps/konqueror/profiles/filemanagement -share/apps/konqueror/profiles/filepreview share/apps/konqueror/profiles/midnightcommander share/apps/konqueror/profiles/webbrowsing share/apps/konqueror/servicemenus/cdrom_mounted_konqy.desktop @@ -2209,6 +2211,7 @@ share/icons/crystalsvg/128x128/apps/wp.png share/icons/crystalsvg/128x128/apps/xclock.png share/icons/crystalsvg/128x128/apps/xfmail.png share/icons/crystalsvg/128x128/apps/xmag.png +share/icons/crystalsvg/16x16/actions/newfont.png share/icons/crystalsvg/16x16/apps/access.png share/icons/crystalsvg/16x16/apps/acroread.png share/icons/crystalsvg/16x16/apps/agent.png @@ -2365,12 +2368,14 @@ share/icons/crystalsvg/16x16/apps/xpaint.png share/icons/crystalsvg/16x16/apps/xv.png share/icons/crystalsvg/16x16/devices/print_printer.png share/icons/crystalsvg/16x16/filesystems/folder_print2.png +share/icons/crystalsvg/22x22/actions/newfont.png share/icons/crystalsvg/22x22/apps/klipper.png share/icons/crystalsvg/22x22/apps/konqueror.png share/icons/crystalsvg/22x22/apps/ksplash.png share/icons/crystalsvg/22x22/apps/kvirc.png share/icons/crystalsvg/22x22/apps/nedit.png share/icons/crystalsvg/22x22/apps/randr.png +share/icons/crystalsvg/32x32/actions/newfont.png share/icons/crystalsvg/32x32/apps/access.png share/icons/crystalsvg/32x32/apps/acroread.png share/icons/crystalsvg/32x32/apps/agent.png diff --git a/x11/kdebase4-runtime/files/plist.base.rm b/x11/kdebase4-runtime/files/plist.base.rm index cea00d682fcd..ee3dc0fad360 100644 --- a/x11/kdebase4-runtime/files/plist.base.rm +++ b/x11/kdebase4-runtime/files/plist.base.rm @@ -268,12 +268,15 @@ @dirrm share/icons/crystalsvg/32x32/filesystems @dirrm share/icons/crystalsvg/32x32/devices @dirrm share/icons/crystalsvg/32x32/apps +@dirrm share/icons/crystalsvg/32x32/actions @dirrm share/icons/crystalsvg/32x32 @dirrm share/icons/crystalsvg/22x22/apps +@dirrm share/icons/crystalsvg/22x22/actions @dirrm share/icons/crystalsvg/22x22 @dirrm share/icons/crystalsvg/16x16/filesystems @dirrm share/icons/crystalsvg/16x16/devices @dirrm share/icons/crystalsvg/16x16/apps +@dirrm share/icons/crystalsvg/16x16/actions @dirrm share/icons/crystalsvg/16x16 @dirrm share/icons/crystalsvg/128x128/apps @dirrm share/icons/crystalsvg/128x128 diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index dc57e187be90..4d2f8252ffa1 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/Makefile @@ -44,11 +44,11 @@ OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> -.if defined(WITH_ARTSWRAPPER) +.if !defined(WITHOUT_ARTSWRAPPER) RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper .endif -.if defined(WITH_MOTIF) +.if !defined(WITHOUT_MOTIF) USE_MOTIF= yes PLIST_APPEND+= plist.motif .elseif defined(WITHOUT_MOTIF) diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo index 666a941bc727..d19b2bea5dec 100644 --- a/x11/kdebase4-workspace/distinfo +++ b/x11/kdebase4-workspace/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kdebase-3.2.1.tar.bz2) = 3a3d89b0b49dbb1eaa9e71c83019bbef -SIZE (KDE/kdebase-3.2.1.tar.bz2) = 17131336 +MD5 (KDE/kdebase-3.2.2.tar.bz2) = 81a348e01625f77beeb53755cb28ba85 +SIZE (KDE/kdebase-3.2.2.tar.bz2) = 17216476 diff --git a/x11/kdebase4-workspace/files/patch-kcontrol-arts.cpp b/x11/kdebase4-workspace/files/patch-kcontrol-arts.cpp deleted file mode 100644 index df11b254f150..000000000000 --- a/x11/kdebase4-workspace/files/patch-kcontrol-arts.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- kcontrol/arts/arts.cpp.orig Fri Mar 5 12:15:10 2004 -+++ kcontrol/arts/arts.cpp Fri Mar 5 12:08:16 2004 -@@ -541,13 +541,13 @@ - - connect(checkProcess, SIGNAL(processExited(KProcess*)), - this, SLOT(slotArtsdExited(KProcess*))); -- checkProcess->start(KProcess::Block); -- -- if (latestProcessStatus == 0) -+ if (checkProcess->start(KProcess::Block) == false) -+ realtimePossible = false; -+ else if (latestProcessStatus == 0) - realtimePossible = true; - else - realtimePossible = false; -- -+ - checked = true; - - } diff --git a/x11/kdebase4-workspace/files/patch-startkde b/x11/kdebase4-workspace/files/patch-startkde new file mode 100644 index 000000000000..07c59a384354 --- /dev/null +++ b/x11/kdebase4-workspace/files/patch-startkde @@ -0,0 +1,12 @@ +--- patch-startkde begins here --- +--- startkde.orig Sun Oct 26 11:45:35 2003 ++++ startkde Thu Apr 8 12:20:47 2004 +@@ -59,7 +59,7 @@ + do_usr_odir=1 + if test -r "$kde_fontpaths" ; then + savifs=$IFS +- IFS=$'\n' ++ IFS=${IFS#??} + for fpath in `grep -v '^[ ]*#' < "$kde_fontpaths"` ; do + rfpath=`echo $fpath | sed s:\~:$HOME:g` + if test -s "$rfpath"/fonts.dir; then diff --git a/x11/kdebase4-workspace/files/plist.base b/x11/kdebase4-workspace/files/plist.base index a2ca93fb2e3c..6eb17215bba7 100644 --- a/x11/kdebase4-workspace/files/plist.base +++ b/x11/kdebase4-workspace/files/plist.base @@ -56,6 +56,7 @@ bin/kpersonalizer bin/kpm bin/kprinter bin/krandom.kss +bin/krandrinithack bin/krandrtray bin/krdb bin/kreadconfig @@ -398,6 +399,8 @@ lib/kde3/konsole.la lib/kde3/konsole.so lib/kde3/kprinter.la lib/kde3/kprinter.so +lib/kde3/krandrinithack.la +lib/kde3/krandrinithack.so lib/kde3/ksmserver.la lib/kde3/ksmserver.so lib/kde3/ksplashdefault.la @@ -486,8 +489,6 @@ lib/kde3/taskbar_panelextension.la lib/kde3/taskbar_panelextension.so lib/kde3/textthumbnail.la lib/kde3/textthumbnail.so -lib/krandrinithack.la -lib/krandrinithack.so lib/libkateinterfaces.la lib/libkateinterfaces.so lib/libkateinterfaces.so.0 @@ -535,6 +536,8 @@ lib/libkdeinit_konsole.la lib/libkdeinit_konsole.so lib/libkdeinit_kprinter.la lib/libkdeinit_kprinter.so +lib/libkdeinit_krandrinithack.la +lib/libkdeinit_krandrinithack.so lib/libkdeinit_ksmserver.la lib/libkdeinit_ksmserver.so lib/libkdeinit_kwin.la @@ -1424,7 +1427,6 @@ share/apps/konqueror/pics/indicator_noconnect.png share/apps/konqueror/pics/indicator_viewactive.png share/apps/konqueror/pics/thumbnailfont_7x4.png share/apps/konqueror/profiles/filemanagement -share/apps/konqueror/profiles/filepreview share/apps/konqueror/profiles/midnightcommander share/apps/konqueror/profiles/webbrowsing share/apps/konqueror/servicemenus/cdrom_mounted_konqy.desktop @@ -2209,6 +2211,7 @@ share/icons/crystalsvg/128x128/apps/wp.png share/icons/crystalsvg/128x128/apps/xclock.png share/icons/crystalsvg/128x128/apps/xfmail.png share/icons/crystalsvg/128x128/apps/xmag.png +share/icons/crystalsvg/16x16/actions/newfont.png share/icons/crystalsvg/16x16/apps/access.png share/icons/crystalsvg/16x16/apps/acroread.png share/icons/crystalsvg/16x16/apps/agent.png @@ -2365,12 +2368,14 @@ share/icons/crystalsvg/16x16/apps/xpaint.png share/icons/crystalsvg/16x16/apps/xv.png share/icons/crystalsvg/16x16/devices/print_printer.png share/icons/crystalsvg/16x16/filesystems/folder_print2.png +share/icons/crystalsvg/22x22/actions/newfont.png share/icons/crystalsvg/22x22/apps/klipper.png share/icons/crystalsvg/22x22/apps/konqueror.png share/icons/crystalsvg/22x22/apps/ksplash.png share/icons/crystalsvg/22x22/apps/kvirc.png share/icons/crystalsvg/22x22/apps/nedit.png share/icons/crystalsvg/22x22/apps/randr.png +share/icons/crystalsvg/32x32/actions/newfont.png share/icons/crystalsvg/32x32/apps/access.png share/icons/crystalsvg/32x32/apps/acroread.png share/icons/crystalsvg/32x32/apps/agent.png diff --git a/x11/kdebase4-workspace/files/plist.base.rm b/x11/kdebase4-workspace/files/plist.base.rm index cea00d682fcd..ee3dc0fad360 100644 --- a/x11/kdebase4-workspace/files/plist.base.rm +++ b/x11/kdebase4-workspace/files/plist.base.rm @@ -268,12 +268,15 @@ @dirrm share/icons/crystalsvg/32x32/filesystems @dirrm share/icons/crystalsvg/32x32/devices @dirrm share/icons/crystalsvg/32x32/apps +@dirrm share/icons/crystalsvg/32x32/actions @dirrm share/icons/crystalsvg/32x32 @dirrm share/icons/crystalsvg/22x22/apps +@dirrm share/icons/crystalsvg/22x22/actions @dirrm share/icons/crystalsvg/22x22 @dirrm share/icons/crystalsvg/16x16/filesystems @dirrm share/icons/crystalsvg/16x16/devices @dirrm share/icons/crystalsvg/16x16/apps +@dirrm share/icons/crystalsvg/16x16/actions @dirrm share/icons/crystalsvg/16x16 @dirrm share/icons/crystalsvg/128x128/apps @dirrm share/icons/crystalsvg/128x128 diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index dc57e187be90..4d2f8252ffa1 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -44,11 +44,11 @@ OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> -.if defined(WITH_ARTSWRAPPER) +.if !defined(WITHOUT_ARTSWRAPPER) RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper .endif -.if defined(WITH_MOTIF) +.if !defined(WITHOUT_MOTIF) USE_MOTIF= yes PLIST_APPEND+= plist.motif .elseif defined(WITHOUT_MOTIF) diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo index 666a941bc727..d19b2bea5dec 100644 --- a/x11/kdebase4/distinfo +++ b/x11/kdebase4/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kdebase-3.2.1.tar.bz2) = 3a3d89b0b49dbb1eaa9e71c83019bbef -SIZE (KDE/kdebase-3.2.1.tar.bz2) = 17131336 +MD5 (KDE/kdebase-3.2.2.tar.bz2) = 81a348e01625f77beeb53755cb28ba85 +SIZE (KDE/kdebase-3.2.2.tar.bz2) = 17216476 diff --git a/x11/kdebase4/files/patch-kcontrol-arts.cpp b/x11/kdebase4/files/patch-kcontrol-arts.cpp deleted file mode 100644 index df11b254f150..000000000000 --- a/x11/kdebase4/files/patch-kcontrol-arts.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- kcontrol/arts/arts.cpp.orig Fri Mar 5 12:15:10 2004 -+++ kcontrol/arts/arts.cpp Fri Mar 5 12:08:16 2004 -@@ -541,13 +541,13 @@ - - connect(checkProcess, SIGNAL(processExited(KProcess*)), - this, SLOT(slotArtsdExited(KProcess*))); -- checkProcess->start(KProcess::Block); -- -- if (latestProcessStatus == 0) -+ if (checkProcess->start(KProcess::Block) == false) -+ realtimePossible = false; -+ else if (latestProcessStatus == 0) - realtimePossible = true; - else - realtimePossible = false; -- -+ - checked = true; - - } diff --git a/x11/kdebase4/files/patch-startkde b/x11/kdebase4/files/patch-startkde new file mode 100644 index 000000000000..07c59a384354 --- /dev/null +++ b/x11/kdebase4/files/patch-startkde @@ -0,0 +1,12 @@ +--- patch-startkde begins here --- +--- startkde.orig Sun Oct 26 11:45:35 2003 ++++ startkde Thu Apr 8 12:20:47 2004 +@@ -59,7 +59,7 @@ + do_usr_odir=1 + if test -r "$kde_fontpaths" ; then + savifs=$IFS +- IFS=$'\n' ++ IFS=${IFS#??} + for fpath in `grep -v '^[ ]*#' < "$kde_fontpaths"` ; do + rfpath=`echo $fpath | sed s:\~:$HOME:g` + if test -s "$rfpath"/fonts.dir; then diff --git a/x11/kdebase4/files/plist.base b/x11/kdebase4/files/plist.base index a2ca93fb2e3c..6eb17215bba7 100644 --- a/x11/kdebase4/files/plist.base +++ b/x11/kdebase4/files/plist.base @@ -56,6 +56,7 @@ bin/kpersonalizer bin/kpm bin/kprinter bin/krandom.kss +bin/krandrinithack bin/krandrtray bin/krdb bin/kreadconfig @@ -398,6 +399,8 @@ lib/kde3/konsole.la lib/kde3/konsole.so lib/kde3/kprinter.la lib/kde3/kprinter.so +lib/kde3/krandrinithack.la +lib/kde3/krandrinithack.so lib/kde3/ksmserver.la lib/kde3/ksmserver.so lib/kde3/ksplashdefault.la @@ -486,8 +489,6 @@ lib/kde3/taskbar_panelextension.la lib/kde3/taskbar_panelextension.so lib/kde3/textthumbnail.la lib/kde3/textthumbnail.so -lib/krandrinithack.la -lib/krandrinithack.so lib/libkateinterfaces.la lib/libkateinterfaces.so lib/libkateinterfaces.so.0 @@ -535,6 +536,8 @@ lib/libkdeinit_konsole.la lib/libkdeinit_konsole.so lib/libkdeinit_kprinter.la lib/libkdeinit_kprinter.so +lib/libkdeinit_krandrinithack.la +lib/libkdeinit_krandrinithack.so lib/libkdeinit_ksmserver.la lib/libkdeinit_ksmserver.so lib/libkdeinit_kwin.la @@ -1424,7 +1427,6 @@ share/apps/konqueror/pics/indicator_noconnect.png share/apps/konqueror/pics/indicator_viewactive.png share/apps/konqueror/pics/thumbnailfont_7x4.png share/apps/konqueror/profiles/filemanagement -share/apps/konqueror/profiles/filepreview share/apps/konqueror/profiles/midnightcommander share/apps/konqueror/profiles/webbrowsing share/apps/konqueror/servicemenus/cdrom_mounted_konqy.desktop @@ -2209,6 +2211,7 @@ share/icons/crystalsvg/128x128/apps/wp.png share/icons/crystalsvg/128x128/apps/xclock.png share/icons/crystalsvg/128x128/apps/xfmail.png share/icons/crystalsvg/128x128/apps/xmag.png +share/icons/crystalsvg/16x16/actions/newfont.png share/icons/crystalsvg/16x16/apps/access.png share/icons/crystalsvg/16x16/apps/acroread.png share/icons/crystalsvg/16x16/apps/agent.png @@ -2365,12 +2368,14 @@ share/icons/crystalsvg/16x16/apps/xpaint.png share/icons/crystalsvg/16x16/apps/xv.png share/icons/crystalsvg/16x16/devices/print_printer.png share/icons/crystalsvg/16x16/filesystems/folder_print2.png +share/icons/crystalsvg/22x22/actions/newfont.png share/icons/crystalsvg/22x22/apps/klipper.png share/icons/crystalsvg/22x22/apps/konqueror.png share/icons/crystalsvg/22x22/apps/ksplash.png share/icons/crystalsvg/22x22/apps/kvirc.png share/icons/crystalsvg/22x22/apps/nedit.png share/icons/crystalsvg/22x22/apps/randr.png +share/icons/crystalsvg/32x32/actions/newfont.png share/icons/crystalsvg/32x32/apps/access.png share/icons/crystalsvg/32x32/apps/acroread.png share/icons/crystalsvg/32x32/apps/agent.png diff --git a/x11/kdebase4/files/plist.base.rm b/x11/kdebase4/files/plist.base.rm index cea00d682fcd..ee3dc0fad360 100644 --- a/x11/kdebase4/files/plist.base.rm +++ b/x11/kdebase4/files/plist.base.rm @@ -268,12 +268,15 @@ @dirrm share/icons/crystalsvg/32x32/filesystems @dirrm share/icons/crystalsvg/32x32/devices @dirrm share/icons/crystalsvg/32x32/apps +@dirrm share/icons/crystalsvg/32x32/actions @dirrm share/icons/crystalsvg/32x32 @dirrm share/icons/crystalsvg/22x22/apps +@dirrm share/icons/crystalsvg/22x22/actions @dirrm share/icons/crystalsvg/22x22 @dirrm share/icons/crystalsvg/16x16/filesystems @dirrm share/icons/crystalsvg/16x16/devices @dirrm share/icons/crystalsvg/16x16/apps +@dirrm share/icons/crystalsvg/16x16/actions @dirrm share/icons/crystalsvg/16x16 @dirrm share/icons/crystalsvg/128x128/apps @dirrm share/icons/crystalsvg/128x128 diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 0f5311360e84..98ba5d9f658a 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdelibs PORTVERSION= ${KDE_VERSION} -PORTREVISION= 3 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo index fb6fef9b3dd1..cc002b79e577 100644 --- a/x11/kdelibs3/distinfo +++ b/x11/kdelibs3/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kdelibs-3.2.1.tar.bz2) = 50ae60072c1fc4ae4e41694bc2325dcb -SIZE (KDE/kdelibs-3.2.1.tar.bz2) = 12597050 +MD5 (KDE/kdelibs-3.2.2.tar.bz2) = 76c656fb4ec7f1ca073f52fad2b8898b +SIZE (KDE/kdelibs-3.2.2.tar.bz2) = 12716460 diff --git a/x11/kdelibs3/files/patch-kdecore-kcharsets.cpp b/x11/kdelibs3/files/patch-kdecore-kcharsets.cpp deleted file mode 100644 index 231f234b211f..000000000000 --- a/x11/kdelibs3/files/patch-kdecore-kcharsets.cpp +++ /dev/null @@ -1,36 +0,0 @@ ---- kdecore/kcharsets.cpp 2003/09/06 19:06:29 1.144 -+++ kdecore/kcharsets.cpp 2004/03/12 09:18:03 1.144.2.1 -@@ -1,6 +1,6 @@ - /* This file is part of the KDE libraries - Copyright (C) 1999 Lars Knoll (knoll@kde.org) -- $Id: kcharsets.cpp,v 1.144 2003/09/06 19:06:29 binner Exp $ -+ $Id: kcharsets.cpp,v 1.144.2.1 2004/03/12 09:18:03 kalass Exp $ - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public -@@ -497,19 +497,19 @@ QString KCharsets::languageForEncoding( - - QString KCharsets::encodingForName( const QString &descriptiveName ) - { -- const int left = descriptiveName.find( '(' ); -+ const int left = descriptiveName.findRev( '(' ); - - if (left<0) // No parenthesis, so assume it is a normal encoding name -- return descriptiveName; -+ return descriptiveName.stripWhiteSpace(); - -- QString name(descriptiveName.mid(left+2)); -+ QString name(descriptiveName.mid(left+1)); - -- const int right = name.find( ')' ); -+ const int right = name.findRev( ')' ); - - if (right<0) - return name; -- -- return name.left(right-1); -+ -+ return name.left(right).stripWhiteSpace(); - } - - QStringList KCharsets::descriptiveEncodingNames()
\ No newline at end of file diff --git a/x11/kdelibs3/files/patch-khtml-khtml_part.cpp b/x11/kdelibs3/files/patch-khtml-khtml_part.cpp deleted file mode 100644 index be59d645ab9a..000000000000 --- a/x11/kdelibs3/files/patch-khtml-khtml_part.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- khtml/khtml_part.cpp.orig Mon Mar 1 09:25:09 2004 -+++ khtml/khtml_part.cpp Sat Mar 13 20:48:58 2004 -@@ -5395,7 +5395,7 @@ - pix = KMimeType::pixmapForURL(u, 0, KIcon::Desktop, KIcon::SizeMedium); - } - -- KURLDrag* urlDrag = new KURLDrag( u, 0 ); -+ KURLDrag* urlDrag = new KURLDrag( u, img ? 0 : d->m_view->viewport() ); - if ( !d->m_referrer.isEmpty() ) - urlDrag->metaData()["referrer"] = d->m_referrer; - diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist index c307ba148107..2e9c0f13fe3c 100644 --- a/x11/kdelibs3/pkg-plist +++ b/x11/kdelibs3/pkg-plist @@ -1189,6 +1189,7 @@ share/apps/khtml/khtml_popupmenu.rc share/apps/kio_uiserver/icons/crystalsvg/16x16/apps/kio_uiserver.png share/apps/kjava/kjava.jar share/apps/kjava/kjava.policy +share/apps/kjava/pluginsinfo share/apps/knotify/eventsrc share/apps/ksgmltools2/customization/README share/apps/ksgmltools2/customization/af/catalog @@ -2501,7 +2502,9 @@ share/icons/crystalsvg/128x128/filesystems/folder.png share/icons/crystalsvg/128x128/filesystems/folder_crystal.png share/icons/crystalsvg/128x128/filesystems/folder_favorite.png share/icons/crystalsvg/128x128/filesystems/folder_green.png +share/icons/crystalsvg/128x128/filesystems/folder_green_open.png share/icons/crystalsvg/128x128/filesystems/folder_grey.png +share/icons/crystalsvg/128x128/filesystems/folder_grey_open.png share/icons/crystalsvg/128x128/filesystems/folder_home.png share/icons/crystalsvg/128x128/filesystems/folder_home2.png share/icons/crystalsvg/128x128/filesystems/folder_html.png @@ -2510,6 +2513,8 @@ share/icons/crystalsvg/128x128/filesystems/folder_important.png share/icons/crystalsvg/128x128/filesystems/folder_locked.png share/icons/crystalsvg/128x128/filesystems/folder_man.png share/icons/crystalsvg/128x128/filesystems/folder_open.png +share/icons/crystalsvg/128x128/filesystems/folder_orange.png +share/icons/crystalsvg/128x128/filesystems/folder_orange_open.png share/icons/crystalsvg/128x128/filesystems/folder_print.png share/icons/crystalsvg/128x128/filesystems/folder_red.png share/icons/crystalsvg/128x128/filesystems/folder_red_open.png @@ -2518,7 +2523,9 @@ share/icons/crystalsvg/128x128/filesystems/folder_tar.png share/icons/crystalsvg/128x128/filesystems/folder_txt.png share/icons/crystalsvg/128x128/filesystems/folder_video.png share/icons/crystalsvg/128x128/filesystems/folder_violet.png +share/icons/crystalsvg/128x128/filesystems/folder_violet_open.png share/icons/crystalsvg/128x128/filesystems/folder_yellow.png +share/icons/crystalsvg/128x128/filesystems/folder_yellow_open.png share/icons/crystalsvg/128x128/filesystems/lockoverlay.png share/icons/crystalsvg/128x128/filesystems/network.png share/icons/crystalsvg/128x128/filesystems/network_local.png @@ -2840,11 +2847,14 @@ share/icons/crystalsvg/16x16/devices/zip_unmount.png share/icons/crystalsvg/16x16/filesystems/chardevice.png share/icons/crystalsvg/16x16/filesystems/desktop.png share/icons/crystalsvg/16x16/filesystems/exec.png +share/icons/crystalsvg/16x16/filesystems/file_broken.png share/icons/crystalsvg/16x16/filesystems/folder.png share/icons/crystalsvg/16x16/filesystems/folder_crystal.png share/icons/crystalsvg/16x16/filesystems/folder_favorite.png share/icons/crystalsvg/16x16/filesystems/folder_green.png +share/icons/crystalsvg/16x16/filesystems/folder_green_open.png share/icons/crystalsvg/16x16/filesystems/folder_grey.png +share/icons/crystalsvg/16x16/filesystems/folder_grey_open.png share/icons/crystalsvg/16x16/filesystems/folder_home.png share/icons/crystalsvg/16x16/filesystems/folder_home2.png share/icons/crystalsvg/16x16/filesystems/folder_html.png @@ -2854,6 +2864,8 @@ share/icons/crystalsvg/16x16/filesystems/folder_inbox.png share/icons/crystalsvg/16x16/filesystems/folder_locked.png share/icons/crystalsvg/16x16/filesystems/folder_man.png share/icons/crystalsvg/16x16/filesystems/folder_open.png +share/icons/crystalsvg/16x16/filesystems/folder_orange.png +share/icons/crystalsvg/16x16/filesystems/folder_orange_open.png share/icons/crystalsvg/16x16/filesystems/folder_outbox.png share/icons/crystalsvg/16x16/filesystems/folder_print.png share/icons/crystalsvg/16x16/filesystems/folder_red.png @@ -2864,7 +2876,9 @@ share/icons/crystalsvg/16x16/filesystems/folder_tar.png share/icons/crystalsvg/16x16/filesystems/folder_txt.png share/icons/crystalsvg/16x16/filesystems/folder_video.png share/icons/crystalsvg/16x16/filesystems/folder_violet.png +share/icons/crystalsvg/16x16/filesystems/folder_violet_open.png share/icons/crystalsvg/16x16/filesystems/folder_yellow.png +share/icons/crystalsvg/16x16/filesystems/folder_yellow_open.png share/icons/crystalsvg/16x16/filesystems/link.png share/icons/crystalsvg/16x16/filesystems/lockoverlay.png share/icons/crystalsvg/16x16/filesystems/network.png @@ -3481,11 +3495,14 @@ share/icons/crystalsvg/32x32/devices/zip_unmount.png share/icons/crystalsvg/32x32/filesystems/chardevice.png share/icons/crystalsvg/32x32/filesystems/desktop.png share/icons/crystalsvg/32x32/filesystems/exec.png +share/icons/crystalsvg/32x32/filesystems/file_broken.png share/icons/crystalsvg/32x32/filesystems/folder.png share/icons/crystalsvg/32x32/filesystems/folder_crystal.png share/icons/crystalsvg/32x32/filesystems/folder_favorite.png share/icons/crystalsvg/32x32/filesystems/folder_green.png +share/icons/crystalsvg/32x32/filesystems/folder_green_open.png share/icons/crystalsvg/32x32/filesystems/folder_grey.png +share/icons/crystalsvg/32x32/filesystems/folder_grey_open.png share/icons/crystalsvg/32x32/filesystems/folder_home.png share/icons/crystalsvg/32x32/filesystems/folder_home2.png share/icons/crystalsvg/32x32/filesystems/folder_html.png @@ -3494,6 +3511,8 @@ share/icons/crystalsvg/32x32/filesystems/folder_important.png share/icons/crystalsvg/32x32/filesystems/folder_locked.png share/icons/crystalsvg/32x32/filesystems/folder_man.png share/icons/crystalsvg/32x32/filesystems/folder_open.png +share/icons/crystalsvg/32x32/filesystems/folder_orange.png +share/icons/crystalsvg/32x32/filesystems/folder_orange_open.png share/icons/crystalsvg/32x32/filesystems/folder_print.png share/icons/crystalsvg/32x32/filesystems/folder_red.png share/icons/crystalsvg/32x32/filesystems/folder_red_open.png @@ -3502,7 +3521,9 @@ share/icons/crystalsvg/32x32/filesystems/folder_tar.png share/icons/crystalsvg/32x32/filesystems/folder_txt.png share/icons/crystalsvg/32x32/filesystems/folder_video.png share/icons/crystalsvg/32x32/filesystems/folder_violet.png +share/icons/crystalsvg/32x32/filesystems/folder_violet_open.png share/icons/crystalsvg/32x32/filesystems/folder_yellow.png +share/icons/crystalsvg/32x32/filesystems/folder_yellow_open.png share/icons/crystalsvg/32x32/filesystems/link.png share/icons/crystalsvg/32x32/filesystems/lockoverlay.png share/icons/crystalsvg/32x32/filesystems/network.png @@ -3644,11 +3665,14 @@ share/icons/crystalsvg/48x48/devices/zip_unmount.png share/icons/crystalsvg/48x48/filesystems/chardevice.png share/icons/crystalsvg/48x48/filesystems/desktop.png share/icons/crystalsvg/48x48/filesystems/exec.png +share/icons/crystalsvg/48x48/filesystems/file_broken.png share/icons/crystalsvg/48x48/filesystems/folder.png share/icons/crystalsvg/48x48/filesystems/folder_crystal.png share/icons/crystalsvg/48x48/filesystems/folder_favorite.png share/icons/crystalsvg/48x48/filesystems/folder_green.png +share/icons/crystalsvg/48x48/filesystems/folder_green_open.png share/icons/crystalsvg/48x48/filesystems/folder_grey.png +share/icons/crystalsvg/48x48/filesystems/folder_grey_open.png share/icons/crystalsvg/48x48/filesystems/folder_home.png share/icons/crystalsvg/48x48/filesystems/folder_home2.png share/icons/crystalsvg/48x48/filesystems/folder_html.png @@ -3658,6 +3682,8 @@ share/icons/crystalsvg/48x48/filesystems/folder_inbox.png share/icons/crystalsvg/48x48/filesystems/folder_locked.png share/icons/crystalsvg/48x48/filesystems/folder_man.png share/icons/crystalsvg/48x48/filesystems/folder_open.png +share/icons/crystalsvg/48x48/filesystems/folder_orange.png +share/icons/crystalsvg/48x48/filesystems/folder_orange_open.png share/icons/crystalsvg/48x48/filesystems/folder_outbox.png share/icons/crystalsvg/48x48/filesystems/folder_print.png share/icons/crystalsvg/48x48/filesystems/folder_red.png @@ -3667,7 +3693,9 @@ share/icons/crystalsvg/48x48/filesystems/folder_tar.png share/icons/crystalsvg/48x48/filesystems/folder_txt.png share/icons/crystalsvg/48x48/filesystems/folder_video.png share/icons/crystalsvg/48x48/filesystems/folder_violet.png +share/icons/crystalsvg/48x48/filesystems/folder_violet_open.png share/icons/crystalsvg/48x48/filesystems/folder_yellow.png +share/icons/crystalsvg/48x48/filesystems/folder_yellow_open.png share/icons/crystalsvg/48x48/filesystems/link.png share/icons/crystalsvg/48x48/filesystems/lockoverlay.png share/icons/crystalsvg/48x48/filesystems/network.png @@ -3801,11 +3829,14 @@ share/icons/crystalsvg/64x64/devices/zip_unmount.png share/icons/crystalsvg/64x64/filesystems/chardevice.png share/icons/crystalsvg/64x64/filesystems/desktop.png share/icons/crystalsvg/64x64/filesystems/exec.png +share/icons/crystalsvg/64x64/filesystems/file_broken.png share/icons/crystalsvg/64x64/filesystems/folder.png share/icons/crystalsvg/64x64/filesystems/folder_crystal.png share/icons/crystalsvg/64x64/filesystems/folder_favorite.png share/icons/crystalsvg/64x64/filesystems/folder_green.png +share/icons/crystalsvg/64x64/filesystems/folder_green_open.png share/icons/crystalsvg/64x64/filesystems/folder_grey.png +share/icons/crystalsvg/64x64/filesystems/folder_grey_open.png share/icons/crystalsvg/64x64/filesystems/folder_home.png share/icons/crystalsvg/64x64/filesystems/folder_home2.png share/icons/crystalsvg/64x64/filesystems/folder_html.png @@ -3814,6 +3845,8 @@ share/icons/crystalsvg/64x64/filesystems/folder_important.png share/icons/crystalsvg/64x64/filesystems/folder_locked.png share/icons/crystalsvg/64x64/filesystems/folder_man.png share/icons/crystalsvg/64x64/filesystems/folder_open.png +share/icons/crystalsvg/64x64/filesystems/folder_orange.png +share/icons/crystalsvg/64x64/filesystems/folder_orange_open.png share/icons/crystalsvg/64x64/filesystems/folder_print.png share/icons/crystalsvg/64x64/filesystems/folder_red.png share/icons/crystalsvg/64x64/filesystems/folder_red_open.png @@ -3822,7 +3855,9 @@ share/icons/crystalsvg/64x64/filesystems/folder_tar.png share/icons/crystalsvg/64x64/filesystems/folder_txt.png share/icons/crystalsvg/64x64/filesystems/folder_video.png share/icons/crystalsvg/64x64/filesystems/folder_violet.png +share/icons/crystalsvg/64x64/filesystems/folder_violet_open.png share/icons/crystalsvg/64x64/filesystems/folder_yellow.png +share/icons/crystalsvg/64x64/filesystems/folder_yellow_open.png share/icons/crystalsvg/64x64/filesystems/lockoverlay.png share/icons/crystalsvg/64x64/filesystems/network.png share/icons/crystalsvg/64x64/filesystems/network_local.png @@ -4140,11 +4175,9 @@ share/mimelnk/application/x-kontour.desktop share/mimelnk/application/x-kpovmodeler.desktop share/mimelnk/application/x-kpresenter.desktop share/mimelnk/application/x-krita.desktop -share/mimelnk/application/x-kspread-crypt.desktop share/mimelnk/application/x-kspread.desktop share/mimelnk/application/x-kudesigner.desktop share/mimelnk/application/x-kugar.desktop -share/mimelnk/application/x-kword-crypt.desktop share/mimelnk/application/x-kword.desktop share/mimelnk/application/x-lha.desktop share/mimelnk/application/x-linguist.desktop diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 0f5311360e84..98ba5d9f658a 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdelibs PORTVERSION= ${KDE_VERSION} -PORTREVISION= 3 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo index fb6fef9b3dd1..cc002b79e577 100644 --- a/x11/kdelibs4/distinfo +++ b/x11/kdelibs4/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kdelibs-3.2.1.tar.bz2) = 50ae60072c1fc4ae4e41694bc2325dcb -SIZE (KDE/kdelibs-3.2.1.tar.bz2) = 12597050 +MD5 (KDE/kdelibs-3.2.2.tar.bz2) = 76c656fb4ec7f1ca073f52fad2b8898b +SIZE (KDE/kdelibs-3.2.2.tar.bz2) = 12716460 diff --git a/x11/kdelibs4/files/patch-kdecore-kcharsets.cpp b/x11/kdelibs4/files/patch-kdecore-kcharsets.cpp deleted file mode 100644 index 231f234b211f..000000000000 --- a/x11/kdelibs4/files/patch-kdecore-kcharsets.cpp +++ /dev/null @@ -1,36 +0,0 @@ ---- kdecore/kcharsets.cpp 2003/09/06 19:06:29 1.144 -+++ kdecore/kcharsets.cpp 2004/03/12 09:18:03 1.144.2.1 -@@ -1,6 +1,6 @@ - /* This file is part of the KDE libraries - Copyright (C) 1999 Lars Knoll (knoll@kde.org) -- $Id: kcharsets.cpp,v 1.144 2003/09/06 19:06:29 binner Exp $ -+ $Id: kcharsets.cpp,v 1.144.2.1 2004/03/12 09:18:03 kalass Exp $ - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public -@@ -497,19 +497,19 @@ QString KCharsets::languageForEncoding( - - QString KCharsets::encodingForName( const QString &descriptiveName ) - { -- const int left = descriptiveName.find( '(' ); -+ const int left = descriptiveName.findRev( '(' ); - - if (left<0) // No parenthesis, so assume it is a normal encoding name -- return descriptiveName; -+ return descriptiveName.stripWhiteSpace(); - -- QString name(descriptiveName.mid(left+2)); -+ QString name(descriptiveName.mid(left+1)); - -- const int right = name.find( ')' ); -+ const int right = name.findRev( ')' ); - - if (right<0) - return name; -- -- return name.left(right-1); -+ -+ return name.left(right).stripWhiteSpace(); - } - - QStringList KCharsets::descriptiveEncodingNames()
\ No newline at end of file diff --git a/x11/kdelibs4/files/patch-khtml-khtml_part.cpp b/x11/kdelibs4/files/patch-khtml-khtml_part.cpp deleted file mode 100644 index be59d645ab9a..000000000000 --- a/x11/kdelibs4/files/patch-khtml-khtml_part.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- khtml/khtml_part.cpp.orig Mon Mar 1 09:25:09 2004 -+++ khtml/khtml_part.cpp Sat Mar 13 20:48:58 2004 -@@ -5395,7 +5395,7 @@ - pix = KMimeType::pixmapForURL(u, 0, KIcon::Desktop, KIcon::SizeMedium); - } - -- KURLDrag* urlDrag = new KURLDrag( u, 0 ); -+ KURLDrag* urlDrag = new KURLDrag( u, img ? 0 : d->m_view->viewport() ); - if ( !d->m_referrer.isEmpty() ) - urlDrag->metaData()["referrer"] = d->m_referrer; - diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist index c307ba148107..2e9c0f13fe3c 100644 --- a/x11/kdelibs4/pkg-plist +++ b/x11/kdelibs4/pkg-plist @@ -1189,6 +1189,7 @@ share/apps/khtml/khtml_popupmenu.rc share/apps/kio_uiserver/icons/crystalsvg/16x16/apps/kio_uiserver.png share/apps/kjava/kjava.jar share/apps/kjava/kjava.policy +share/apps/kjava/pluginsinfo share/apps/knotify/eventsrc share/apps/ksgmltools2/customization/README share/apps/ksgmltools2/customization/af/catalog @@ -2501,7 +2502,9 @@ share/icons/crystalsvg/128x128/filesystems/folder.png share/icons/crystalsvg/128x128/filesystems/folder_crystal.png share/icons/crystalsvg/128x128/filesystems/folder_favorite.png share/icons/crystalsvg/128x128/filesystems/folder_green.png +share/icons/crystalsvg/128x128/filesystems/folder_green_open.png share/icons/crystalsvg/128x128/filesystems/folder_grey.png +share/icons/crystalsvg/128x128/filesystems/folder_grey_open.png share/icons/crystalsvg/128x128/filesystems/folder_home.png share/icons/crystalsvg/128x128/filesystems/folder_home2.png share/icons/crystalsvg/128x128/filesystems/folder_html.png @@ -2510,6 +2513,8 @@ share/icons/crystalsvg/128x128/filesystems/folder_important.png share/icons/crystalsvg/128x128/filesystems/folder_locked.png share/icons/crystalsvg/128x128/filesystems/folder_man.png share/icons/crystalsvg/128x128/filesystems/folder_open.png +share/icons/crystalsvg/128x128/filesystems/folder_orange.png +share/icons/crystalsvg/128x128/filesystems/folder_orange_open.png share/icons/crystalsvg/128x128/filesystems/folder_print.png share/icons/crystalsvg/128x128/filesystems/folder_red.png share/icons/crystalsvg/128x128/filesystems/folder_red_open.png @@ -2518,7 +2523,9 @@ share/icons/crystalsvg/128x128/filesystems/folder_tar.png share/icons/crystalsvg/128x128/filesystems/folder_txt.png share/icons/crystalsvg/128x128/filesystems/folder_video.png share/icons/crystalsvg/128x128/filesystems/folder_violet.png +share/icons/crystalsvg/128x128/filesystems/folder_violet_open.png share/icons/crystalsvg/128x128/filesystems/folder_yellow.png +share/icons/crystalsvg/128x128/filesystems/folder_yellow_open.png share/icons/crystalsvg/128x128/filesystems/lockoverlay.png share/icons/crystalsvg/128x128/filesystems/network.png share/icons/crystalsvg/128x128/filesystems/network_local.png @@ -2840,11 +2847,14 @@ share/icons/crystalsvg/16x16/devices/zip_unmount.png share/icons/crystalsvg/16x16/filesystems/chardevice.png share/icons/crystalsvg/16x16/filesystems/desktop.png share/icons/crystalsvg/16x16/filesystems/exec.png +share/icons/crystalsvg/16x16/filesystems/file_broken.png share/icons/crystalsvg/16x16/filesystems/folder.png share/icons/crystalsvg/16x16/filesystems/folder_crystal.png share/icons/crystalsvg/16x16/filesystems/folder_favorite.png share/icons/crystalsvg/16x16/filesystems/folder_green.png +share/icons/crystalsvg/16x16/filesystems/folder_green_open.png share/icons/crystalsvg/16x16/filesystems/folder_grey.png +share/icons/crystalsvg/16x16/filesystems/folder_grey_open.png share/icons/crystalsvg/16x16/filesystems/folder_home.png share/icons/crystalsvg/16x16/filesystems/folder_home2.png share/icons/crystalsvg/16x16/filesystems/folder_html.png @@ -2854,6 +2864,8 @@ share/icons/crystalsvg/16x16/filesystems/folder_inbox.png share/icons/crystalsvg/16x16/filesystems/folder_locked.png share/icons/crystalsvg/16x16/filesystems/folder_man.png share/icons/crystalsvg/16x16/filesystems/folder_open.png +share/icons/crystalsvg/16x16/filesystems/folder_orange.png +share/icons/crystalsvg/16x16/filesystems/folder_orange_open.png share/icons/crystalsvg/16x16/filesystems/folder_outbox.png share/icons/crystalsvg/16x16/filesystems/folder_print.png share/icons/crystalsvg/16x16/filesystems/folder_red.png @@ -2864,7 +2876,9 @@ share/icons/crystalsvg/16x16/filesystems/folder_tar.png share/icons/crystalsvg/16x16/filesystems/folder_txt.png share/icons/crystalsvg/16x16/filesystems/folder_video.png share/icons/crystalsvg/16x16/filesystems/folder_violet.png +share/icons/crystalsvg/16x16/filesystems/folder_violet_open.png share/icons/crystalsvg/16x16/filesystems/folder_yellow.png +share/icons/crystalsvg/16x16/filesystems/folder_yellow_open.png share/icons/crystalsvg/16x16/filesystems/link.png share/icons/crystalsvg/16x16/filesystems/lockoverlay.png share/icons/crystalsvg/16x16/filesystems/network.png @@ -3481,11 +3495,14 @@ share/icons/crystalsvg/32x32/devices/zip_unmount.png share/icons/crystalsvg/32x32/filesystems/chardevice.png share/icons/crystalsvg/32x32/filesystems/desktop.png share/icons/crystalsvg/32x32/filesystems/exec.png +share/icons/crystalsvg/32x32/filesystems/file_broken.png share/icons/crystalsvg/32x32/filesystems/folder.png share/icons/crystalsvg/32x32/filesystems/folder_crystal.png share/icons/crystalsvg/32x32/filesystems/folder_favorite.png share/icons/crystalsvg/32x32/filesystems/folder_green.png +share/icons/crystalsvg/32x32/filesystems/folder_green_open.png share/icons/crystalsvg/32x32/filesystems/folder_grey.png +share/icons/crystalsvg/32x32/filesystems/folder_grey_open.png share/icons/crystalsvg/32x32/filesystems/folder_home.png share/icons/crystalsvg/32x32/filesystems/folder_home2.png share/icons/crystalsvg/32x32/filesystems/folder_html.png @@ -3494,6 +3511,8 @@ share/icons/crystalsvg/32x32/filesystems/folder_important.png share/icons/crystalsvg/32x32/filesystems/folder_locked.png share/icons/crystalsvg/32x32/filesystems/folder_man.png share/icons/crystalsvg/32x32/filesystems/folder_open.png +share/icons/crystalsvg/32x32/filesystems/folder_orange.png +share/icons/crystalsvg/32x32/filesystems/folder_orange_open.png share/icons/crystalsvg/32x32/filesystems/folder_print.png share/icons/crystalsvg/32x32/filesystems/folder_red.png share/icons/crystalsvg/32x32/filesystems/folder_red_open.png @@ -3502,7 +3521,9 @@ share/icons/crystalsvg/32x32/filesystems/folder_tar.png share/icons/crystalsvg/32x32/filesystems/folder_txt.png share/icons/crystalsvg/32x32/filesystems/folder_video.png share/icons/crystalsvg/32x32/filesystems/folder_violet.png +share/icons/crystalsvg/32x32/filesystems/folder_violet_open.png share/icons/crystalsvg/32x32/filesystems/folder_yellow.png +share/icons/crystalsvg/32x32/filesystems/folder_yellow_open.png share/icons/crystalsvg/32x32/filesystems/link.png share/icons/crystalsvg/32x32/filesystems/lockoverlay.png share/icons/crystalsvg/32x32/filesystems/network.png @@ -3644,11 +3665,14 @@ share/icons/crystalsvg/48x48/devices/zip_unmount.png share/icons/crystalsvg/48x48/filesystems/chardevice.png share/icons/crystalsvg/48x48/filesystems/desktop.png share/icons/crystalsvg/48x48/filesystems/exec.png +share/icons/crystalsvg/48x48/filesystems/file_broken.png share/icons/crystalsvg/48x48/filesystems/folder.png share/icons/crystalsvg/48x48/filesystems/folder_crystal.png share/icons/crystalsvg/48x48/filesystems/folder_favorite.png share/icons/crystalsvg/48x48/filesystems/folder_green.png +share/icons/crystalsvg/48x48/filesystems/folder_green_open.png share/icons/crystalsvg/48x48/filesystems/folder_grey.png +share/icons/crystalsvg/48x48/filesystems/folder_grey_open.png share/icons/crystalsvg/48x48/filesystems/folder_home.png share/icons/crystalsvg/48x48/filesystems/folder_home2.png share/icons/crystalsvg/48x48/filesystems/folder_html.png @@ -3658,6 +3682,8 @@ share/icons/crystalsvg/48x48/filesystems/folder_inbox.png share/icons/crystalsvg/48x48/filesystems/folder_locked.png share/icons/crystalsvg/48x48/filesystems/folder_man.png share/icons/crystalsvg/48x48/filesystems/folder_open.png +share/icons/crystalsvg/48x48/filesystems/folder_orange.png +share/icons/crystalsvg/48x48/filesystems/folder_orange_open.png share/icons/crystalsvg/48x48/filesystems/folder_outbox.png share/icons/crystalsvg/48x48/filesystems/folder_print.png share/icons/crystalsvg/48x48/filesystems/folder_red.png @@ -3667,7 +3693,9 @@ share/icons/crystalsvg/48x48/filesystems/folder_tar.png share/icons/crystalsvg/48x48/filesystems/folder_txt.png share/icons/crystalsvg/48x48/filesystems/folder_video.png share/icons/crystalsvg/48x48/filesystems/folder_violet.png +share/icons/crystalsvg/48x48/filesystems/folder_violet_open.png share/icons/crystalsvg/48x48/filesystems/folder_yellow.png +share/icons/crystalsvg/48x48/filesystems/folder_yellow_open.png share/icons/crystalsvg/48x48/filesystems/link.png share/icons/crystalsvg/48x48/filesystems/lockoverlay.png share/icons/crystalsvg/48x48/filesystems/network.png @@ -3801,11 +3829,14 @@ share/icons/crystalsvg/64x64/devices/zip_unmount.png share/icons/crystalsvg/64x64/filesystems/chardevice.png share/icons/crystalsvg/64x64/filesystems/desktop.png share/icons/crystalsvg/64x64/filesystems/exec.png +share/icons/crystalsvg/64x64/filesystems/file_broken.png share/icons/crystalsvg/64x64/filesystems/folder.png share/icons/crystalsvg/64x64/filesystems/folder_crystal.png share/icons/crystalsvg/64x64/filesystems/folder_favorite.png share/icons/crystalsvg/64x64/filesystems/folder_green.png +share/icons/crystalsvg/64x64/filesystems/folder_green_open.png share/icons/crystalsvg/64x64/filesystems/folder_grey.png +share/icons/crystalsvg/64x64/filesystems/folder_grey_open.png share/icons/crystalsvg/64x64/filesystems/folder_home.png share/icons/crystalsvg/64x64/filesystems/folder_home2.png share/icons/crystalsvg/64x64/filesystems/folder_html.png @@ -3814,6 +3845,8 @@ share/icons/crystalsvg/64x64/filesystems/folder_important.png share/icons/crystalsvg/64x64/filesystems/folder_locked.png share/icons/crystalsvg/64x64/filesystems/folder_man.png share/icons/crystalsvg/64x64/filesystems/folder_open.png +share/icons/crystalsvg/64x64/filesystems/folder_orange.png +share/icons/crystalsvg/64x64/filesystems/folder_orange_open.png share/icons/crystalsvg/64x64/filesystems/folder_print.png share/icons/crystalsvg/64x64/filesystems/folder_red.png share/icons/crystalsvg/64x64/filesystems/folder_red_open.png @@ -3822,7 +3855,9 @@ share/icons/crystalsvg/64x64/filesystems/folder_tar.png share/icons/crystalsvg/64x64/filesystems/folder_txt.png share/icons/crystalsvg/64x64/filesystems/folder_video.png share/icons/crystalsvg/64x64/filesystems/folder_violet.png +share/icons/crystalsvg/64x64/filesystems/folder_violet_open.png share/icons/crystalsvg/64x64/filesystems/folder_yellow.png +share/icons/crystalsvg/64x64/filesystems/folder_yellow_open.png share/icons/crystalsvg/64x64/filesystems/lockoverlay.png share/icons/crystalsvg/64x64/filesystems/network.png share/icons/crystalsvg/64x64/filesystems/network_local.png @@ -4140,11 +4175,9 @@ share/mimelnk/application/x-kontour.desktop share/mimelnk/application/x-kpovmodeler.desktop share/mimelnk/application/x-kpresenter.desktop share/mimelnk/application/x-krita.desktop -share/mimelnk/application/x-kspread-crypt.desktop share/mimelnk/application/x-kspread.desktop share/mimelnk/application/x-kudesigner.desktop share/mimelnk/application/x-kugar.desktop -share/mimelnk/application/x-kword-crypt.desktop share/mimelnk/application/x-kword.desktop share/mimelnk/application/x-lha.desktop share/mimelnk/application/x-linguist.desktop |