diff options
Diffstat (limited to 'x11')
57 files changed, 256 insertions, 370 deletions
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index fd8ffeab0ec8..d5066a5cc0a3 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 2 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -36,12 +35,12 @@ USE_BZIP2= yes USE_GMAKE= yes USE_XPM= yes USE_REINPLACE= yes -SUB_FILES= genkdmconf.sh pkg-deinstall pkg-install pkg-message +SUB_FILES= kdm pkg-deinstall pkg-install pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:15 INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 @@ -84,7 +83,10 @@ post-install: ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ ${CHMOD} g+s ${PREFIX}/bin/ksysguardd - ${INSTALL_SCRIPT} ${WRKDIR}/genkdmconf.sh ${PREFIX}/etc/rc.d/ + @${MV} ${PREFIX}/bin/kdm ${PREFIX}/bin/kdm-bin + @${MV} ${PREFIX}/bin/kdm_config ${PREFIX}/bin/kdm-bin_config + @${MV} ${PREFIX}/bin/kdm_greet ${PREFIX}/bin/kdm-bin_greet + @${INSTALL_SCRIPT} ${WRKDIR}/kdm ${PREFIX}/bin .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo index 97718cb26462..f93d406327e2 100644 --- a/x11/kde4-baseapps/distinfo +++ b/x11/kde4-baseapps/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-3.5.1.tar.bz2) = 484c7b3895ce4f95173f4789571eb1cc -SHA256 (KDE/kdebase-3.5.1.tar.bz2) = f35169e4d46531f98576522e4e32ff73dc3592083848e73d8d2680838fc3b434 -SIZE (KDE/kdebase-3.5.1.tar.bz2) = 23587827 +MD5 (KDE/kdebase-3.5.2.tar.bz2) = c5685e1be34e033286aa1f37002a0552 +SHA256 (KDE/kdebase-3.5.2.tar.bz2) = 21150b7e553e83487e70e70e3d13ce107c6c5d57133b40f413807887a9e431f7 +SIZE (KDE/kdebase-3.5.2.tar.bz2) = 23590820 diff --git a/x11/kde4-baseapps/files/genkdmconf.sh.in b/x11/kde4-baseapps/files/kdm.in index 3a730a071407..06181ce3bbeb 100644 --- a/x11/kde4-baseapps/files/genkdmconf.sh.in +++ b/x11/kde4-baseapps/files/kdm.in @@ -6,10 +6,6 @@ GENKDMCONF=%%PREFIX%%/bin/genkdmconf KDMCONFDIR=%%PREFIX%%/share/config/kdm -#first, set a path for an X app -PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin -export PATH - #Configure kdm if needed if [ ! -r ${KDMCONFDIR}/kdmrc ]; then echo "Generating KDM configuration"; @@ -19,3 +15,6 @@ else ${GENKDMCONF} --in ${KDMCONFDIR}; fi + +#run kdm +exec "%%PREFIX%%/bin/kdm-bin" "$@" diff --git a/x11/kde4-baseapps/files/patch-kxkb-rules.cpp b/x11/kde4-baseapps/files/patch-kxkb-rules.cpp deleted file mode 100644 index 03baa696dcce..000000000000 --- a/x11/kde4-baseapps/files/patch-kxkb-rules.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- kxkb/rules.cpp (revision 504758) -+++ kxkb/rules.cpp (working copy) -@@ -300,7 +300,7 @@ - */ - const QString KeyRules::getLayout(const QString &layvar) const - { -- static const char* LAYOUT_PATTERN = "[a-z0-9_-]*"; -+ static const char* LAYOUT_PATTERN = "[a-zA-Z0-9_-]*"; - QString varLine = layvar.stripWhiteSpace(); - QRegExp rx(LAYOUT_PATTERN); - int pos = rx.search(varLine, 0); -@@ -318,7 +318,7 @@ - */ - const QString KeyRules::getVariant(const QString &layvar) const - { -- static const char* VARIANT_PATTERN = "\\([a-z0-9_-]*\\)"; -+ static const char* VARIANT_PATTERN = "\\([a-zA-Z0-9_-]*\\)"; - QString varLine = layvar.stripWhiteSpace(); - QRegExp rx(VARIANT_PATTERN); - int pos = rx.search(varLine, 0); diff --git a/x11/kde4-baseapps/files/pkg-install.in b/x11/kde4-baseapps/files/pkg-install.in index fee72a16fe3c..87ea16dd348a 100644 --- a/x11/kde4-baseapps/files/pkg-install.in +++ b/x11/kde4-baseapps/files/pkg-install.in @@ -8,11 +8,6 @@ if [ "$2" != "POST-INSTALL" ]; then fi boguscreatenewentry=%%PREFIX%%/share/templates/.keep_me -kdmrcscript=%%PREFIX%%/etc/rc.d/genkdmconf.sh - -if [ -f $kdmrcscript ]; then - sh -c "$kdmrcscript" -fi if [ -f $boguscreatenewentry ]; then rm -f $boguscreatenewentry diff --git a/x11/kde4-baseapps/pkg-plist b/x11/kde4-baseapps/pkg-plist index 35fac982c6ff..eb4521af50dc 100644 --- a/x11/kde4-baseapps/pkg-plist +++ b/x11/kde4-baseapps/pkg-plist @@ -26,8 +26,9 @@ bin/kdesu bin/kdesud bin/kdialog bin/kdm -bin/kdm_config -bin/kdm_greet +bin/kdm-bin +bin/kdm-bin_config +bin/kdm-bin_greet bin/kdmctl bin/keditbookmarks bin/keditfiletype @@ -82,7 +83,6 @@ bin/nspluginscan bin/nspluginviewer bin/startkde etc/ksysguarddrc -etc/rc.d/genkdmconf.sh etc/xdg/menus/applications-merged/kde-essential.menu etc/xdg/menus/kde-information.menu etc/xdg/menus/kde-screensavers.menu @@ -149,6 +149,7 @@ include/kwin/workspace.h include/libkonq_export.h lib/kconf_update_bin/khotkeys_update lib/kconf_update_bin/kicker-3.4-reverseLayout +lib/kconf_update_bin/kwin_update_default_rules lib/kconf_update_bin/kwin_update_window_settings lib/kde3/appletproxy.a lib/kde3/appletproxy.la @@ -757,8 +758,8 @@ lib/libkdecorations.so.1 lib/libkdeinit_appletproxy.a lib/libkdeinit_appletproxy.la lib/libkdeinit_appletproxy.so -lib/libkdeinit_extensionproxy.la lib/libkdeinit_extensionproxy.a +lib/libkdeinit_extensionproxy.la lib/libkdeinit_extensionproxy.so lib/libkdeinit_kaccess.a lib/libkdeinit_kaccess.la @@ -1301,6 +1302,7 @@ share/apps/kconf_update/kwin_focus1.sh share/apps/kconf_update/kwin_focus1.upd share/apps/kconf_update/kwin_focus2.sh share/apps/kconf_update/kwin_focus2.upd +share/apps/kconf_update/kwin_fsp_workarounds_1.upd share/apps/kconf_update/kwiniconify.upd share/apps/kconf_update/kwinsticky.upd share/apps/kconf_update/kwinupdatewindowsettings.upd @@ -1998,6 +2000,7 @@ share/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.xml share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.preview.png share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.xml share/apps/kwin/b2.desktop +share/apps/kwin/default_rules/fsp_workarounds_1 share/apps/kwin/eventsrc share/apps/kwin/keramik.desktop share/apps/kwin/laptop.desktop @@ -2682,6 +2685,9 @@ share/doc/HTML/en/kwrite/index.docbook share/doc/HTML/en/kxkb/common share/doc/HTML/en/kxkb/index.cache.bz2 share/doc/HTML/en/kxkb/index.docbook +share/doc/HTML/en/kxkb/layout.png +share/doc/HTML/en/kxkb/switching.png +share/doc/HTML/en/kxkb/xkb.png share/doc/kdm/README share/fonts/override/fonts.dir share/icons/crystalsvg/128x128/apps/access.png @@ -4785,6 +4791,7 @@ share/wallpapers/triplegears.jpg.desktop @dirrm share/apps/naughtyapplet/pics @dirrm share/apps/naughtyapplet @dirrm share/apps/kwrite +@dirrm share/apps/kwin/default_rules @dirrm share/apps/kthememanager/themes/YellowOnBlue-big @dirrm share/apps/kthememanager/themes/YellowOnBlue @dirrm share/apps/kthememanager/themes/Sunshine diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index fd8ffeab0ec8..d5066a5cc0a3 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 2 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -36,12 +35,12 @@ USE_BZIP2= yes USE_GMAKE= yes USE_XPM= yes USE_REINPLACE= yes -SUB_FILES= genkdmconf.sh pkg-deinstall pkg-install pkg-message +SUB_FILES= kdm pkg-deinstall pkg-install pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:15 INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 @@ -84,7 +83,10 @@ post-install: ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ ${CHMOD} g+s ${PREFIX}/bin/ksysguardd - ${INSTALL_SCRIPT} ${WRKDIR}/genkdmconf.sh ${PREFIX}/etc/rc.d/ + @${MV} ${PREFIX}/bin/kdm ${PREFIX}/bin/kdm-bin + @${MV} ${PREFIX}/bin/kdm_config ${PREFIX}/bin/kdm-bin_config + @${MV} ${PREFIX}/bin/kdm_greet ${PREFIX}/bin/kdm-bin_greet + @${INSTALL_SCRIPT} ${WRKDIR}/kdm ${PREFIX}/bin .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo index 97718cb26462..f93d406327e2 100644 --- a/x11/kde4-runtime/distinfo +++ b/x11/kde4-runtime/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-3.5.1.tar.bz2) = 484c7b3895ce4f95173f4789571eb1cc -SHA256 (KDE/kdebase-3.5.1.tar.bz2) = f35169e4d46531f98576522e4e32ff73dc3592083848e73d8d2680838fc3b434 -SIZE (KDE/kdebase-3.5.1.tar.bz2) = 23587827 +MD5 (KDE/kdebase-3.5.2.tar.bz2) = c5685e1be34e033286aa1f37002a0552 +SHA256 (KDE/kdebase-3.5.2.tar.bz2) = 21150b7e553e83487e70e70e3d13ce107c6c5d57133b40f413807887a9e431f7 +SIZE (KDE/kdebase-3.5.2.tar.bz2) = 23590820 diff --git a/x11/kde4-workspace/files/genkdmconf.sh.in b/x11/kde4-runtime/files/kdm.in index 3a730a071407..06181ce3bbeb 100644 --- a/x11/kde4-workspace/files/genkdmconf.sh.in +++ b/x11/kde4-runtime/files/kdm.in @@ -6,10 +6,6 @@ GENKDMCONF=%%PREFIX%%/bin/genkdmconf KDMCONFDIR=%%PREFIX%%/share/config/kdm -#first, set a path for an X app -PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin -export PATH - #Configure kdm if needed if [ ! -r ${KDMCONFDIR}/kdmrc ]; then echo "Generating KDM configuration"; @@ -19,3 +15,6 @@ else ${GENKDMCONF} --in ${KDMCONFDIR}; fi + +#run kdm +exec "%%PREFIX%%/bin/kdm-bin" "$@" diff --git a/x11/kde4-runtime/files/patch-kxkb-rules.cpp b/x11/kde4-runtime/files/patch-kxkb-rules.cpp deleted file mode 100644 index 03baa696dcce..000000000000 --- a/x11/kde4-runtime/files/patch-kxkb-rules.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- kxkb/rules.cpp (revision 504758) -+++ kxkb/rules.cpp (working copy) -@@ -300,7 +300,7 @@ - */ - const QString KeyRules::getLayout(const QString &layvar) const - { -- static const char* LAYOUT_PATTERN = "[a-z0-9_-]*"; -+ static const char* LAYOUT_PATTERN = "[a-zA-Z0-9_-]*"; - QString varLine = layvar.stripWhiteSpace(); - QRegExp rx(LAYOUT_PATTERN); - int pos = rx.search(varLine, 0); -@@ -318,7 +318,7 @@ - */ - const QString KeyRules::getVariant(const QString &layvar) const - { -- static const char* VARIANT_PATTERN = "\\([a-z0-9_-]*\\)"; -+ static const char* VARIANT_PATTERN = "\\([a-zA-Z0-9_-]*\\)"; - QString varLine = layvar.stripWhiteSpace(); - QRegExp rx(VARIANT_PATTERN); - int pos = rx.search(varLine, 0); diff --git a/x11/kde4-runtime/files/pkg-install.in b/x11/kde4-runtime/files/pkg-install.in index fee72a16fe3c..87ea16dd348a 100644 --- a/x11/kde4-runtime/files/pkg-install.in +++ b/x11/kde4-runtime/files/pkg-install.in @@ -8,11 +8,6 @@ if [ "$2" != "POST-INSTALL" ]; then fi boguscreatenewentry=%%PREFIX%%/share/templates/.keep_me -kdmrcscript=%%PREFIX%%/etc/rc.d/genkdmconf.sh - -if [ -f $kdmrcscript ]; then - sh -c "$kdmrcscript" -fi if [ -f $boguscreatenewentry ]; then rm -f $boguscreatenewentry diff --git a/x11/kde4-runtime/pkg-plist b/x11/kde4-runtime/pkg-plist index 35fac982c6ff..eb4521af50dc 100644 --- a/x11/kde4-runtime/pkg-plist +++ b/x11/kde4-runtime/pkg-plist @@ -26,8 +26,9 @@ bin/kdesu bin/kdesud bin/kdialog bin/kdm -bin/kdm_config -bin/kdm_greet +bin/kdm-bin +bin/kdm-bin_config +bin/kdm-bin_greet bin/kdmctl bin/keditbookmarks bin/keditfiletype @@ -82,7 +83,6 @@ bin/nspluginscan bin/nspluginviewer bin/startkde etc/ksysguarddrc -etc/rc.d/genkdmconf.sh etc/xdg/menus/applications-merged/kde-essential.menu etc/xdg/menus/kde-information.menu etc/xdg/menus/kde-screensavers.menu @@ -149,6 +149,7 @@ include/kwin/workspace.h include/libkonq_export.h lib/kconf_update_bin/khotkeys_update lib/kconf_update_bin/kicker-3.4-reverseLayout +lib/kconf_update_bin/kwin_update_default_rules lib/kconf_update_bin/kwin_update_window_settings lib/kde3/appletproxy.a lib/kde3/appletproxy.la @@ -757,8 +758,8 @@ lib/libkdecorations.so.1 lib/libkdeinit_appletproxy.a lib/libkdeinit_appletproxy.la lib/libkdeinit_appletproxy.so -lib/libkdeinit_extensionproxy.la lib/libkdeinit_extensionproxy.a +lib/libkdeinit_extensionproxy.la lib/libkdeinit_extensionproxy.so lib/libkdeinit_kaccess.a lib/libkdeinit_kaccess.la @@ -1301,6 +1302,7 @@ share/apps/kconf_update/kwin_focus1.sh share/apps/kconf_update/kwin_focus1.upd share/apps/kconf_update/kwin_focus2.sh share/apps/kconf_update/kwin_focus2.upd +share/apps/kconf_update/kwin_fsp_workarounds_1.upd share/apps/kconf_update/kwiniconify.upd share/apps/kconf_update/kwinsticky.upd share/apps/kconf_update/kwinupdatewindowsettings.upd @@ -1998,6 +2000,7 @@ share/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.xml share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.preview.png share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.xml share/apps/kwin/b2.desktop +share/apps/kwin/default_rules/fsp_workarounds_1 share/apps/kwin/eventsrc share/apps/kwin/keramik.desktop share/apps/kwin/laptop.desktop @@ -2682,6 +2685,9 @@ share/doc/HTML/en/kwrite/index.docbook share/doc/HTML/en/kxkb/common share/doc/HTML/en/kxkb/index.cache.bz2 share/doc/HTML/en/kxkb/index.docbook +share/doc/HTML/en/kxkb/layout.png +share/doc/HTML/en/kxkb/switching.png +share/doc/HTML/en/kxkb/xkb.png share/doc/kdm/README share/fonts/override/fonts.dir share/icons/crystalsvg/128x128/apps/access.png @@ -4785,6 +4791,7 @@ share/wallpapers/triplegears.jpg.desktop @dirrm share/apps/naughtyapplet/pics @dirrm share/apps/naughtyapplet @dirrm share/apps/kwrite +@dirrm share/apps/kwin/default_rules @dirrm share/apps/kthememanager/themes/YellowOnBlue-big @dirrm share/apps/kthememanager/themes/YellowOnBlue @dirrm share/apps/kthememanager/themes/Sunshine diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index fd8ffeab0ec8..d5066a5cc0a3 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 2 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -36,12 +35,12 @@ USE_BZIP2= yes USE_GMAKE= yes USE_XPM= yes USE_REINPLACE= yes -SUB_FILES= genkdmconf.sh pkg-deinstall pkg-install pkg-message +SUB_FILES= kdm pkg-deinstall pkg-install pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:15 INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 @@ -84,7 +83,10 @@ post-install: ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ ${CHMOD} g+s ${PREFIX}/bin/ksysguardd - ${INSTALL_SCRIPT} ${WRKDIR}/genkdmconf.sh ${PREFIX}/etc/rc.d/ + @${MV} ${PREFIX}/bin/kdm ${PREFIX}/bin/kdm-bin + @${MV} ${PREFIX}/bin/kdm_config ${PREFIX}/bin/kdm-bin_config + @${MV} ${PREFIX}/bin/kdm_greet ${PREFIX}/bin/kdm-bin_greet + @${INSTALL_SCRIPT} ${WRKDIR}/kdm ${PREFIX}/bin .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo index 97718cb26462..f93d406327e2 100644 --- a/x11/kde4-workspace/distinfo +++ b/x11/kde4-workspace/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-3.5.1.tar.bz2) = 484c7b3895ce4f95173f4789571eb1cc -SHA256 (KDE/kdebase-3.5.1.tar.bz2) = f35169e4d46531f98576522e4e32ff73dc3592083848e73d8d2680838fc3b434 -SIZE (KDE/kdebase-3.5.1.tar.bz2) = 23587827 +MD5 (KDE/kdebase-3.5.2.tar.bz2) = c5685e1be34e033286aa1f37002a0552 +SHA256 (KDE/kdebase-3.5.2.tar.bz2) = 21150b7e553e83487e70e70e3d13ce107c6c5d57133b40f413807887a9e431f7 +SIZE (KDE/kdebase-3.5.2.tar.bz2) = 23590820 diff --git a/x11/kde4-runtime/files/genkdmconf.sh.in b/x11/kde4-workspace/files/kdm.in index 3a730a071407..06181ce3bbeb 100644 --- a/x11/kde4-runtime/files/genkdmconf.sh.in +++ b/x11/kde4-workspace/files/kdm.in @@ -6,10 +6,6 @@ GENKDMCONF=%%PREFIX%%/bin/genkdmconf KDMCONFDIR=%%PREFIX%%/share/config/kdm -#first, set a path for an X app -PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin -export PATH - #Configure kdm if needed if [ ! -r ${KDMCONFDIR}/kdmrc ]; then echo "Generating KDM configuration"; @@ -19,3 +15,6 @@ else ${GENKDMCONF} --in ${KDMCONFDIR}; fi + +#run kdm +exec "%%PREFIX%%/bin/kdm-bin" "$@" diff --git a/x11/kde4-workspace/files/patch-kxkb-rules.cpp b/x11/kde4-workspace/files/patch-kxkb-rules.cpp deleted file mode 100644 index 03baa696dcce..000000000000 --- a/x11/kde4-workspace/files/patch-kxkb-rules.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- kxkb/rules.cpp (revision 504758) -+++ kxkb/rules.cpp (working copy) -@@ -300,7 +300,7 @@ - */ - const QString KeyRules::getLayout(const QString &layvar) const - { -- static const char* LAYOUT_PATTERN = "[a-z0-9_-]*"; -+ static const char* LAYOUT_PATTERN = "[a-zA-Z0-9_-]*"; - QString varLine = layvar.stripWhiteSpace(); - QRegExp rx(LAYOUT_PATTERN); - int pos = rx.search(varLine, 0); -@@ -318,7 +318,7 @@ - */ - const QString KeyRules::getVariant(const QString &layvar) const - { -- static const char* VARIANT_PATTERN = "\\([a-z0-9_-]*\\)"; -+ static const char* VARIANT_PATTERN = "\\([a-zA-Z0-9_-]*\\)"; - QString varLine = layvar.stripWhiteSpace(); - QRegExp rx(VARIANT_PATTERN); - int pos = rx.search(varLine, 0); diff --git a/x11/kde4-workspace/files/pkg-install.in b/x11/kde4-workspace/files/pkg-install.in index fee72a16fe3c..87ea16dd348a 100644 --- a/x11/kde4-workspace/files/pkg-install.in +++ b/x11/kde4-workspace/files/pkg-install.in @@ -8,11 +8,6 @@ if [ "$2" != "POST-INSTALL" ]; then fi boguscreatenewentry=%%PREFIX%%/share/templates/.keep_me -kdmrcscript=%%PREFIX%%/etc/rc.d/genkdmconf.sh - -if [ -f $kdmrcscript ]; then - sh -c "$kdmrcscript" -fi if [ -f $boguscreatenewentry ]; then rm -f $boguscreatenewentry diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist index 35fac982c6ff..eb4521af50dc 100644 --- a/x11/kde4-workspace/pkg-plist +++ b/x11/kde4-workspace/pkg-plist @@ -26,8 +26,9 @@ bin/kdesu bin/kdesud bin/kdialog bin/kdm -bin/kdm_config -bin/kdm_greet +bin/kdm-bin +bin/kdm-bin_config +bin/kdm-bin_greet bin/kdmctl bin/keditbookmarks bin/keditfiletype @@ -82,7 +83,6 @@ bin/nspluginscan bin/nspluginviewer bin/startkde etc/ksysguarddrc -etc/rc.d/genkdmconf.sh etc/xdg/menus/applications-merged/kde-essential.menu etc/xdg/menus/kde-information.menu etc/xdg/menus/kde-screensavers.menu @@ -149,6 +149,7 @@ include/kwin/workspace.h include/libkonq_export.h lib/kconf_update_bin/khotkeys_update lib/kconf_update_bin/kicker-3.4-reverseLayout +lib/kconf_update_bin/kwin_update_default_rules lib/kconf_update_bin/kwin_update_window_settings lib/kde3/appletproxy.a lib/kde3/appletproxy.la @@ -757,8 +758,8 @@ lib/libkdecorations.so.1 lib/libkdeinit_appletproxy.a lib/libkdeinit_appletproxy.la lib/libkdeinit_appletproxy.so -lib/libkdeinit_extensionproxy.la lib/libkdeinit_extensionproxy.a +lib/libkdeinit_extensionproxy.la lib/libkdeinit_extensionproxy.so lib/libkdeinit_kaccess.a lib/libkdeinit_kaccess.la @@ -1301,6 +1302,7 @@ share/apps/kconf_update/kwin_focus1.sh share/apps/kconf_update/kwin_focus1.upd share/apps/kconf_update/kwin_focus2.sh share/apps/kconf_update/kwin_focus2.upd +share/apps/kconf_update/kwin_fsp_workarounds_1.upd share/apps/kconf_update/kwiniconify.upd share/apps/kconf_update/kwinsticky.upd share/apps/kconf_update/kwinupdatewindowsettings.upd @@ -1998,6 +2000,7 @@ share/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.xml share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.preview.png share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.xml share/apps/kwin/b2.desktop +share/apps/kwin/default_rules/fsp_workarounds_1 share/apps/kwin/eventsrc share/apps/kwin/keramik.desktop share/apps/kwin/laptop.desktop @@ -2682,6 +2685,9 @@ share/doc/HTML/en/kwrite/index.docbook share/doc/HTML/en/kxkb/common share/doc/HTML/en/kxkb/index.cache.bz2 share/doc/HTML/en/kxkb/index.docbook +share/doc/HTML/en/kxkb/layout.png +share/doc/HTML/en/kxkb/switching.png +share/doc/HTML/en/kxkb/xkb.png share/doc/kdm/README share/fonts/override/fonts.dir share/icons/crystalsvg/128x128/apps/access.png @@ -4785,6 +4791,7 @@ share/wallpapers/triplegears.jpg.desktop @dirrm share/apps/naughtyapplet/pics @dirrm share/apps/naughtyapplet @dirrm share/apps/kwrite +@dirrm share/apps/kwin/default_rules @dirrm share/apps/kthememanager/themes/YellowOnBlue-big @dirrm share/apps/kthememanager/themes/YellowOnBlue @dirrm share/apps/kthememanager/themes/Sunshine diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index fd8ffeab0ec8..d5066a5cc0a3 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 2 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -36,12 +35,12 @@ USE_BZIP2= yes USE_GMAKE= yes USE_XPM= yes USE_REINPLACE= yes -SUB_FILES= genkdmconf.sh pkg-deinstall pkg-install pkg-message +SUB_FILES= kdm pkg-deinstall pkg-install pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:15 INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 @@ -84,7 +83,10 @@ post-install: ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ ${CHMOD} g+s ${PREFIX}/bin/ksysguardd - ${INSTALL_SCRIPT} ${WRKDIR}/genkdmconf.sh ${PREFIX}/etc/rc.d/ + @${MV} ${PREFIX}/bin/kdm ${PREFIX}/bin/kdm-bin + @${MV} ${PREFIX}/bin/kdm_config ${PREFIX}/bin/kdm-bin_config + @${MV} ${PREFIX}/bin/kdm_greet ${PREFIX}/bin/kdm-bin_greet + @${INSTALL_SCRIPT} ${WRKDIR}/kdm ${PREFIX}/bin .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo index 97718cb26462..f93d406327e2 100644 --- a/x11/kdebase3/distinfo +++ b/x11/kdebase3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-3.5.1.tar.bz2) = 484c7b3895ce4f95173f4789571eb1cc -SHA256 (KDE/kdebase-3.5.1.tar.bz2) = f35169e4d46531f98576522e4e32ff73dc3592083848e73d8d2680838fc3b434 -SIZE (KDE/kdebase-3.5.1.tar.bz2) = 23587827 +MD5 (KDE/kdebase-3.5.2.tar.bz2) = c5685e1be34e033286aa1f37002a0552 +SHA256 (KDE/kdebase-3.5.2.tar.bz2) = 21150b7e553e83487e70e70e3d13ce107c6c5d57133b40f413807887a9e431f7 +SIZE (KDE/kdebase-3.5.2.tar.bz2) = 23590820 diff --git a/x11/kdebase3/files/genkdmconf.sh.in b/x11/kdebase3/files/kdm.in index 3a730a071407..06181ce3bbeb 100644 --- a/x11/kdebase3/files/genkdmconf.sh.in +++ b/x11/kdebase3/files/kdm.in @@ -6,10 +6,6 @@ GENKDMCONF=%%PREFIX%%/bin/genkdmconf KDMCONFDIR=%%PREFIX%%/share/config/kdm -#first, set a path for an X app -PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin -export PATH - #Configure kdm if needed if [ ! -r ${KDMCONFDIR}/kdmrc ]; then echo "Generating KDM configuration"; @@ -19,3 +15,6 @@ else ${GENKDMCONF} --in ${KDMCONFDIR}; fi + +#run kdm +exec "%%PREFIX%%/bin/kdm-bin" "$@" diff --git a/x11/kdebase3/files/patch-kxkb-rules.cpp b/x11/kdebase3/files/patch-kxkb-rules.cpp deleted file mode 100644 index 03baa696dcce..000000000000 --- a/x11/kdebase3/files/patch-kxkb-rules.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- kxkb/rules.cpp (revision 504758) -+++ kxkb/rules.cpp (working copy) -@@ -300,7 +300,7 @@ - */ - const QString KeyRules::getLayout(const QString &layvar) const - { -- static const char* LAYOUT_PATTERN = "[a-z0-9_-]*"; -+ static const char* LAYOUT_PATTERN = "[a-zA-Z0-9_-]*"; - QString varLine = layvar.stripWhiteSpace(); - QRegExp rx(LAYOUT_PATTERN); - int pos = rx.search(varLine, 0); -@@ -318,7 +318,7 @@ - */ - const QString KeyRules::getVariant(const QString &layvar) const - { -- static const char* VARIANT_PATTERN = "\\([a-z0-9_-]*\\)"; -+ static const char* VARIANT_PATTERN = "\\([a-zA-Z0-9_-]*\\)"; - QString varLine = layvar.stripWhiteSpace(); - QRegExp rx(VARIANT_PATTERN); - int pos = rx.search(varLine, 0); diff --git a/x11/kdebase3/files/pkg-install.in b/x11/kdebase3/files/pkg-install.in index fee72a16fe3c..87ea16dd348a 100644 --- a/x11/kdebase3/files/pkg-install.in +++ b/x11/kdebase3/files/pkg-install.in @@ -8,11 +8,6 @@ if [ "$2" != "POST-INSTALL" ]; then fi boguscreatenewentry=%%PREFIX%%/share/templates/.keep_me -kdmrcscript=%%PREFIX%%/etc/rc.d/genkdmconf.sh - -if [ -f $kdmrcscript ]; then - sh -c "$kdmrcscript" -fi if [ -f $boguscreatenewentry ]; then rm -f $boguscreatenewentry diff --git a/x11/kdebase3/pkg-plist b/x11/kdebase3/pkg-plist index 35fac982c6ff..eb4521af50dc 100644 --- a/x11/kdebase3/pkg-plist +++ b/x11/kdebase3/pkg-plist @@ -26,8 +26,9 @@ bin/kdesu bin/kdesud bin/kdialog bin/kdm -bin/kdm_config -bin/kdm_greet +bin/kdm-bin +bin/kdm-bin_config +bin/kdm-bin_greet bin/kdmctl bin/keditbookmarks bin/keditfiletype @@ -82,7 +83,6 @@ bin/nspluginscan bin/nspluginviewer bin/startkde etc/ksysguarddrc -etc/rc.d/genkdmconf.sh etc/xdg/menus/applications-merged/kde-essential.menu etc/xdg/menus/kde-information.menu etc/xdg/menus/kde-screensavers.menu @@ -149,6 +149,7 @@ include/kwin/workspace.h include/libkonq_export.h lib/kconf_update_bin/khotkeys_update lib/kconf_update_bin/kicker-3.4-reverseLayout +lib/kconf_update_bin/kwin_update_default_rules lib/kconf_update_bin/kwin_update_window_settings lib/kde3/appletproxy.a lib/kde3/appletproxy.la @@ -757,8 +758,8 @@ lib/libkdecorations.so.1 lib/libkdeinit_appletproxy.a lib/libkdeinit_appletproxy.la lib/libkdeinit_appletproxy.so -lib/libkdeinit_extensionproxy.la lib/libkdeinit_extensionproxy.a +lib/libkdeinit_extensionproxy.la lib/libkdeinit_extensionproxy.so lib/libkdeinit_kaccess.a lib/libkdeinit_kaccess.la @@ -1301,6 +1302,7 @@ share/apps/kconf_update/kwin_focus1.sh share/apps/kconf_update/kwin_focus1.upd share/apps/kconf_update/kwin_focus2.sh share/apps/kconf_update/kwin_focus2.upd +share/apps/kconf_update/kwin_fsp_workarounds_1.upd share/apps/kconf_update/kwiniconify.upd share/apps/kconf_update/kwinsticky.upd share/apps/kconf_update/kwinupdatewindowsettings.upd @@ -1998,6 +2000,7 @@ share/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.xml share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.preview.png share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.xml share/apps/kwin/b2.desktop +share/apps/kwin/default_rules/fsp_workarounds_1 share/apps/kwin/eventsrc share/apps/kwin/keramik.desktop share/apps/kwin/laptop.desktop @@ -2682,6 +2685,9 @@ share/doc/HTML/en/kwrite/index.docbook share/doc/HTML/en/kxkb/common share/doc/HTML/en/kxkb/index.cache.bz2 share/doc/HTML/en/kxkb/index.docbook +share/doc/HTML/en/kxkb/layout.png +share/doc/HTML/en/kxkb/switching.png +share/doc/HTML/en/kxkb/xkb.png share/doc/kdm/README share/fonts/override/fonts.dir share/icons/crystalsvg/128x128/apps/access.png @@ -4785,6 +4791,7 @@ share/wallpapers/triplegears.jpg.desktop @dirrm share/apps/naughtyapplet/pics @dirrm share/apps/naughtyapplet @dirrm share/apps/kwrite +@dirrm share/apps/kwin/default_rules @dirrm share/apps/kthememanager/themes/YellowOnBlue-big @dirrm share/apps/kthememanager/themes/YellowOnBlue @dirrm share/apps/kthememanager/themes/Sunshine diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index fd8ffeab0ec8..d5066a5cc0a3 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 2 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -36,12 +35,12 @@ USE_BZIP2= yes USE_GMAKE= yes USE_XPM= yes USE_REINPLACE= yes -SUB_FILES= genkdmconf.sh pkg-deinstall pkg-install pkg-message +SUB_FILES= kdm pkg-deinstall pkg-install pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:15 INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 @@ -84,7 +83,10 @@ post-install: ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ ${CHMOD} g+s ${PREFIX}/bin/ksysguardd - ${INSTALL_SCRIPT} ${WRKDIR}/genkdmconf.sh ${PREFIX}/etc/rc.d/ + @${MV} ${PREFIX}/bin/kdm ${PREFIX}/bin/kdm-bin + @${MV} ${PREFIX}/bin/kdm_config ${PREFIX}/bin/kdm-bin_config + @${MV} ${PREFIX}/bin/kdm_greet ${PREFIX}/bin/kdm-bin_greet + @${INSTALL_SCRIPT} ${WRKDIR}/kdm ${PREFIX}/bin .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif diff --git a/x11/kdebase4-runtime/distinfo b/x11/kdebase4-runtime/distinfo index 97718cb26462..f93d406327e2 100644 --- a/x11/kdebase4-runtime/distinfo +++ b/x11/kdebase4-runtime/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-3.5.1.tar.bz2) = 484c7b3895ce4f95173f4789571eb1cc -SHA256 (KDE/kdebase-3.5.1.tar.bz2) = f35169e4d46531f98576522e4e32ff73dc3592083848e73d8d2680838fc3b434 -SIZE (KDE/kdebase-3.5.1.tar.bz2) = 23587827 +MD5 (KDE/kdebase-3.5.2.tar.bz2) = c5685e1be34e033286aa1f37002a0552 +SHA256 (KDE/kdebase-3.5.2.tar.bz2) = 21150b7e553e83487e70e70e3d13ce107c6c5d57133b40f413807887a9e431f7 +SIZE (KDE/kdebase-3.5.2.tar.bz2) = 23590820 diff --git a/x11/kdebase4-runtime/files/genkdmconf.sh.in b/x11/kdebase4-runtime/files/genkdmconf.sh.in deleted file mode 100644 index 3a730a071407..000000000000 --- a/x11/kdebase4-runtime/files/genkdmconf.sh.in +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ - -# some defs -GENKDMCONF=%%PREFIX%%/bin/genkdmconf -KDMCONFDIR=%%PREFIX%%/share/config/kdm - -#first, set a path for an X app -PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin -export PATH - -#Configure kdm if needed -if [ ! -r ${KDMCONFDIR}/kdmrc ]; then - echo "Generating KDM configuration"; - ${GENKDMCONF} --no-old --in ${KDMCONFDIR}; -else - echo "Updating KDM configuration"; - ${GENKDMCONF} --in ${KDMCONFDIR}; - -fi diff --git a/x11/kdebase4-runtime/files/kdm.in b/x11/kdebase4-runtime/files/kdm.in new file mode 100644 index 000000000000..06181ce3bbeb --- /dev/null +++ b/x11/kdebase4-runtime/files/kdm.in @@ -0,0 +1,20 @@ +#!/bin/sh +# +# $FreeBSD$ + +# some defs +GENKDMCONF=%%PREFIX%%/bin/genkdmconf +KDMCONFDIR=%%PREFIX%%/share/config/kdm + +#Configure kdm if needed +if [ ! -r ${KDMCONFDIR}/kdmrc ]; then + echo "Generating KDM configuration"; + ${GENKDMCONF} --no-old --in ${KDMCONFDIR}; +else + echo "Updating KDM configuration"; + ${GENKDMCONF} --in ${KDMCONFDIR}; + +fi + +#run kdm +exec "%%PREFIX%%/bin/kdm-bin" "$@" diff --git a/x11/kdebase4-runtime/files/patch-kxkb-rules.cpp b/x11/kdebase4-runtime/files/patch-kxkb-rules.cpp deleted file mode 100644 index 03baa696dcce..000000000000 --- a/x11/kdebase4-runtime/files/patch-kxkb-rules.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- kxkb/rules.cpp (revision 504758) -+++ kxkb/rules.cpp (working copy) -@@ -300,7 +300,7 @@ - */ - const QString KeyRules::getLayout(const QString &layvar) const - { -- static const char* LAYOUT_PATTERN = "[a-z0-9_-]*"; -+ static const char* LAYOUT_PATTERN = "[a-zA-Z0-9_-]*"; - QString varLine = layvar.stripWhiteSpace(); - QRegExp rx(LAYOUT_PATTERN); - int pos = rx.search(varLine, 0); -@@ -318,7 +318,7 @@ - */ - const QString KeyRules::getVariant(const QString &layvar) const - { -- static const char* VARIANT_PATTERN = "\\([a-z0-9_-]*\\)"; -+ static const char* VARIANT_PATTERN = "\\([a-zA-Z0-9_-]*\\)"; - QString varLine = layvar.stripWhiteSpace(); - QRegExp rx(VARIANT_PATTERN); - int pos = rx.search(varLine, 0); diff --git a/x11/kdebase4-runtime/files/pkg-install.in b/x11/kdebase4-runtime/files/pkg-install.in index fee72a16fe3c..87ea16dd348a 100644 --- a/x11/kdebase4-runtime/files/pkg-install.in +++ b/x11/kdebase4-runtime/files/pkg-install.in @@ -8,11 +8,6 @@ if [ "$2" != "POST-INSTALL" ]; then fi boguscreatenewentry=%%PREFIX%%/share/templates/.keep_me -kdmrcscript=%%PREFIX%%/etc/rc.d/genkdmconf.sh - -if [ -f $kdmrcscript ]; then - sh -c "$kdmrcscript" -fi if [ -f $boguscreatenewentry ]; then rm -f $boguscreatenewentry diff --git a/x11/kdebase4-runtime/pkg-plist b/x11/kdebase4-runtime/pkg-plist index 35fac982c6ff..eb4521af50dc 100644 --- a/x11/kdebase4-runtime/pkg-plist +++ b/x11/kdebase4-runtime/pkg-plist @@ -26,8 +26,9 @@ bin/kdesu bin/kdesud bin/kdialog bin/kdm -bin/kdm_config -bin/kdm_greet +bin/kdm-bin +bin/kdm-bin_config +bin/kdm-bin_greet bin/kdmctl bin/keditbookmarks bin/keditfiletype @@ -82,7 +83,6 @@ bin/nspluginscan bin/nspluginviewer bin/startkde etc/ksysguarddrc -etc/rc.d/genkdmconf.sh etc/xdg/menus/applications-merged/kde-essential.menu etc/xdg/menus/kde-information.menu etc/xdg/menus/kde-screensavers.menu @@ -149,6 +149,7 @@ include/kwin/workspace.h include/libkonq_export.h lib/kconf_update_bin/khotkeys_update lib/kconf_update_bin/kicker-3.4-reverseLayout +lib/kconf_update_bin/kwin_update_default_rules lib/kconf_update_bin/kwin_update_window_settings lib/kde3/appletproxy.a lib/kde3/appletproxy.la @@ -757,8 +758,8 @@ lib/libkdecorations.so.1 lib/libkdeinit_appletproxy.a lib/libkdeinit_appletproxy.la lib/libkdeinit_appletproxy.so -lib/libkdeinit_extensionproxy.la lib/libkdeinit_extensionproxy.a +lib/libkdeinit_extensionproxy.la lib/libkdeinit_extensionproxy.so lib/libkdeinit_kaccess.a lib/libkdeinit_kaccess.la @@ -1301,6 +1302,7 @@ share/apps/kconf_update/kwin_focus1.sh share/apps/kconf_update/kwin_focus1.upd share/apps/kconf_update/kwin_focus2.sh share/apps/kconf_update/kwin_focus2.upd +share/apps/kconf_update/kwin_fsp_workarounds_1.upd share/apps/kconf_update/kwiniconify.upd share/apps/kconf_update/kwinsticky.upd share/apps/kconf_update/kwinupdatewindowsettings.upd @@ -1998,6 +2000,7 @@ share/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.xml share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.preview.png share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.xml share/apps/kwin/b2.desktop +share/apps/kwin/default_rules/fsp_workarounds_1 share/apps/kwin/eventsrc share/apps/kwin/keramik.desktop share/apps/kwin/laptop.desktop @@ -2682,6 +2685,9 @@ share/doc/HTML/en/kwrite/index.docbook share/doc/HTML/en/kxkb/common share/doc/HTML/en/kxkb/index.cache.bz2 share/doc/HTML/en/kxkb/index.docbook +share/doc/HTML/en/kxkb/layout.png +share/doc/HTML/en/kxkb/switching.png +share/doc/HTML/en/kxkb/xkb.png share/doc/kdm/README share/fonts/override/fonts.dir share/icons/crystalsvg/128x128/apps/access.png @@ -4785,6 +4791,7 @@ share/wallpapers/triplegears.jpg.desktop @dirrm share/apps/naughtyapplet/pics @dirrm share/apps/naughtyapplet @dirrm share/apps/kwrite +@dirrm share/apps/kwin/default_rules @dirrm share/apps/kthememanager/themes/YellowOnBlue-big @dirrm share/apps/kthememanager/themes/YellowOnBlue @dirrm share/apps/kthememanager/themes/Sunshine diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index fd8ffeab0ec8..d5066a5cc0a3 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 2 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -36,12 +35,12 @@ USE_BZIP2= yes USE_GMAKE= yes USE_XPM= yes USE_REINPLACE= yes -SUB_FILES= genkdmconf.sh pkg-deinstall pkg-install pkg-message +SUB_FILES= kdm pkg-deinstall pkg-install pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:15 INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 @@ -84,7 +83,10 @@ post-install: ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ ${CHMOD} g+s ${PREFIX}/bin/ksysguardd - ${INSTALL_SCRIPT} ${WRKDIR}/genkdmconf.sh ${PREFIX}/etc/rc.d/ + @${MV} ${PREFIX}/bin/kdm ${PREFIX}/bin/kdm-bin + @${MV} ${PREFIX}/bin/kdm_config ${PREFIX}/bin/kdm-bin_config + @${MV} ${PREFIX}/bin/kdm_greet ${PREFIX}/bin/kdm-bin_greet + @${INSTALL_SCRIPT} ${WRKDIR}/kdm ${PREFIX}/bin .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo index 97718cb26462..f93d406327e2 100644 --- a/x11/kdebase4-workspace/distinfo +++ b/x11/kdebase4-workspace/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-3.5.1.tar.bz2) = 484c7b3895ce4f95173f4789571eb1cc -SHA256 (KDE/kdebase-3.5.1.tar.bz2) = f35169e4d46531f98576522e4e32ff73dc3592083848e73d8d2680838fc3b434 -SIZE (KDE/kdebase-3.5.1.tar.bz2) = 23587827 +MD5 (KDE/kdebase-3.5.2.tar.bz2) = c5685e1be34e033286aa1f37002a0552 +SHA256 (KDE/kdebase-3.5.2.tar.bz2) = 21150b7e553e83487e70e70e3d13ce107c6c5d57133b40f413807887a9e431f7 +SIZE (KDE/kdebase-3.5.2.tar.bz2) = 23590820 diff --git a/x11/kdebase4-workspace/files/genkdmconf.sh.in b/x11/kdebase4-workspace/files/genkdmconf.sh.in deleted file mode 100644 index 3a730a071407..000000000000 --- a/x11/kdebase4-workspace/files/genkdmconf.sh.in +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ - -# some defs -GENKDMCONF=%%PREFIX%%/bin/genkdmconf -KDMCONFDIR=%%PREFIX%%/share/config/kdm - -#first, set a path for an X app -PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin -export PATH - -#Configure kdm if needed -if [ ! -r ${KDMCONFDIR}/kdmrc ]; then - echo "Generating KDM configuration"; - ${GENKDMCONF} --no-old --in ${KDMCONFDIR}; -else - echo "Updating KDM configuration"; - ${GENKDMCONF} --in ${KDMCONFDIR}; - -fi diff --git a/x11/kdebase4-workspace/files/kdm.in b/x11/kdebase4-workspace/files/kdm.in new file mode 100644 index 000000000000..06181ce3bbeb --- /dev/null +++ b/x11/kdebase4-workspace/files/kdm.in @@ -0,0 +1,20 @@ +#!/bin/sh +# +# $FreeBSD$ + +# some defs +GENKDMCONF=%%PREFIX%%/bin/genkdmconf +KDMCONFDIR=%%PREFIX%%/share/config/kdm + +#Configure kdm if needed +if [ ! -r ${KDMCONFDIR}/kdmrc ]; then + echo "Generating KDM configuration"; + ${GENKDMCONF} --no-old --in ${KDMCONFDIR}; +else + echo "Updating KDM configuration"; + ${GENKDMCONF} --in ${KDMCONFDIR}; + +fi + +#run kdm +exec "%%PREFIX%%/bin/kdm-bin" "$@" diff --git a/x11/kdebase4-workspace/files/patch-kxkb-rules.cpp b/x11/kdebase4-workspace/files/patch-kxkb-rules.cpp deleted file mode 100644 index 03baa696dcce..000000000000 --- a/x11/kdebase4-workspace/files/patch-kxkb-rules.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- kxkb/rules.cpp (revision 504758) -+++ kxkb/rules.cpp (working copy) -@@ -300,7 +300,7 @@ - */ - const QString KeyRules::getLayout(const QString &layvar) const - { -- static const char* LAYOUT_PATTERN = "[a-z0-9_-]*"; -+ static const char* LAYOUT_PATTERN = "[a-zA-Z0-9_-]*"; - QString varLine = layvar.stripWhiteSpace(); - QRegExp rx(LAYOUT_PATTERN); - int pos = rx.search(varLine, 0); -@@ -318,7 +318,7 @@ - */ - const QString KeyRules::getVariant(const QString &layvar) const - { -- static const char* VARIANT_PATTERN = "\\([a-z0-9_-]*\\)"; -+ static const char* VARIANT_PATTERN = "\\([a-zA-Z0-9_-]*\\)"; - QString varLine = layvar.stripWhiteSpace(); - QRegExp rx(VARIANT_PATTERN); - int pos = rx.search(varLine, 0); diff --git a/x11/kdebase4-workspace/files/pkg-install.in b/x11/kdebase4-workspace/files/pkg-install.in index fee72a16fe3c..87ea16dd348a 100644 --- a/x11/kdebase4-workspace/files/pkg-install.in +++ b/x11/kdebase4-workspace/files/pkg-install.in @@ -8,11 +8,6 @@ if [ "$2" != "POST-INSTALL" ]; then fi boguscreatenewentry=%%PREFIX%%/share/templates/.keep_me -kdmrcscript=%%PREFIX%%/etc/rc.d/genkdmconf.sh - -if [ -f $kdmrcscript ]; then - sh -c "$kdmrcscript" -fi if [ -f $boguscreatenewentry ]; then rm -f $boguscreatenewentry diff --git a/x11/kdebase4-workspace/pkg-plist b/x11/kdebase4-workspace/pkg-plist index 35fac982c6ff..eb4521af50dc 100644 --- a/x11/kdebase4-workspace/pkg-plist +++ b/x11/kdebase4-workspace/pkg-plist @@ -26,8 +26,9 @@ bin/kdesu bin/kdesud bin/kdialog bin/kdm -bin/kdm_config -bin/kdm_greet +bin/kdm-bin +bin/kdm-bin_config +bin/kdm-bin_greet bin/kdmctl bin/keditbookmarks bin/keditfiletype @@ -82,7 +83,6 @@ bin/nspluginscan bin/nspluginviewer bin/startkde etc/ksysguarddrc -etc/rc.d/genkdmconf.sh etc/xdg/menus/applications-merged/kde-essential.menu etc/xdg/menus/kde-information.menu etc/xdg/menus/kde-screensavers.menu @@ -149,6 +149,7 @@ include/kwin/workspace.h include/libkonq_export.h lib/kconf_update_bin/khotkeys_update lib/kconf_update_bin/kicker-3.4-reverseLayout +lib/kconf_update_bin/kwin_update_default_rules lib/kconf_update_bin/kwin_update_window_settings lib/kde3/appletproxy.a lib/kde3/appletproxy.la @@ -757,8 +758,8 @@ lib/libkdecorations.so.1 lib/libkdeinit_appletproxy.a lib/libkdeinit_appletproxy.la lib/libkdeinit_appletproxy.so -lib/libkdeinit_extensionproxy.la lib/libkdeinit_extensionproxy.a +lib/libkdeinit_extensionproxy.la lib/libkdeinit_extensionproxy.so lib/libkdeinit_kaccess.a lib/libkdeinit_kaccess.la @@ -1301,6 +1302,7 @@ share/apps/kconf_update/kwin_focus1.sh share/apps/kconf_update/kwin_focus1.upd share/apps/kconf_update/kwin_focus2.sh share/apps/kconf_update/kwin_focus2.upd +share/apps/kconf_update/kwin_fsp_workarounds_1.upd share/apps/kconf_update/kwiniconify.upd share/apps/kconf_update/kwinsticky.upd share/apps/kconf_update/kwinupdatewindowsettings.upd @@ -1998,6 +2000,7 @@ share/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.xml share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.preview.png share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.xml share/apps/kwin/b2.desktop +share/apps/kwin/default_rules/fsp_workarounds_1 share/apps/kwin/eventsrc share/apps/kwin/keramik.desktop share/apps/kwin/laptop.desktop @@ -2682,6 +2685,9 @@ share/doc/HTML/en/kwrite/index.docbook share/doc/HTML/en/kxkb/common share/doc/HTML/en/kxkb/index.cache.bz2 share/doc/HTML/en/kxkb/index.docbook +share/doc/HTML/en/kxkb/layout.png +share/doc/HTML/en/kxkb/switching.png +share/doc/HTML/en/kxkb/xkb.png share/doc/kdm/README share/fonts/override/fonts.dir share/icons/crystalsvg/128x128/apps/access.png @@ -4785,6 +4791,7 @@ share/wallpapers/triplegears.jpg.desktop @dirrm share/apps/naughtyapplet/pics @dirrm share/apps/naughtyapplet @dirrm share/apps/kwrite +@dirrm share/apps/kwin/default_rules @dirrm share/apps/kthememanager/themes/YellowOnBlue-big @dirrm share/apps/kthememanager/themes/YellowOnBlue @dirrm share/apps/kthememanager/themes/Sunshine diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index fd8ffeab0ec8..d5066a5cc0a3 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 2 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -36,12 +35,12 @@ USE_BZIP2= yes USE_GMAKE= yes USE_XPM= yes USE_REINPLACE= yes -SUB_FILES= genkdmconf.sh pkg-deinstall pkg-install pkg-message +SUB_FILES= kdm pkg-deinstall pkg-install pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:15 INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 @@ -84,7 +83,10 @@ post-install: ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ ${CHMOD} g+s ${PREFIX}/bin/ksysguardd - ${INSTALL_SCRIPT} ${WRKDIR}/genkdmconf.sh ${PREFIX}/etc/rc.d/ + @${MV} ${PREFIX}/bin/kdm ${PREFIX}/bin/kdm-bin + @${MV} ${PREFIX}/bin/kdm_config ${PREFIX}/bin/kdm-bin_config + @${MV} ${PREFIX}/bin/kdm_greet ${PREFIX}/bin/kdm-bin_greet + @${INSTALL_SCRIPT} ${WRKDIR}/kdm ${PREFIX}/bin .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo index 97718cb26462..f93d406327e2 100644 --- a/x11/kdebase4/distinfo +++ b/x11/kdebase4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-3.5.1.tar.bz2) = 484c7b3895ce4f95173f4789571eb1cc -SHA256 (KDE/kdebase-3.5.1.tar.bz2) = f35169e4d46531f98576522e4e32ff73dc3592083848e73d8d2680838fc3b434 -SIZE (KDE/kdebase-3.5.1.tar.bz2) = 23587827 +MD5 (KDE/kdebase-3.5.2.tar.bz2) = c5685e1be34e033286aa1f37002a0552 +SHA256 (KDE/kdebase-3.5.2.tar.bz2) = 21150b7e553e83487e70e70e3d13ce107c6c5d57133b40f413807887a9e431f7 +SIZE (KDE/kdebase-3.5.2.tar.bz2) = 23590820 diff --git a/x11/kdebase4/files/genkdmconf.sh.in b/x11/kdebase4/files/genkdmconf.sh.in deleted file mode 100644 index 3a730a071407..000000000000 --- a/x11/kdebase4/files/genkdmconf.sh.in +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ - -# some defs -GENKDMCONF=%%PREFIX%%/bin/genkdmconf -KDMCONFDIR=%%PREFIX%%/share/config/kdm - -#first, set a path for an X app -PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin -export PATH - -#Configure kdm if needed -if [ ! -r ${KDMCONFDIR}/kdmrc ]; then - echo "Generating KDM configuration"; - ${GENKDMCONF} --no-old --in ${KDMCONFDIR}; -else - echo "Updating KDM configuration"; - ${GENKDMCONF} --in ${KDMCONFDIR}; - -fi diff --git a/x11/kdebase4/files/kdm.in b/x11/kdebase4/files/kdm.in new file mode 100644 index 000000000000..06181ce3bbeb --- /dev/null +++ b/x11/kdebase4/files/kdm.in @@ -0,0 +1,20 @@ +#!/bin/sh +# +# $FreeBSD$ + +# some defs +GENKDMCONF=%%PREFIX%%/bin/genkdmconf +KDMCONFDIR=%%PREFIX%%/share/config/kdm + +#Configure kdm if needed +if [ ! -r ${KDMCONFDIR}/kdmrc ]; then + echo "Generating KDM configuration"; + ${GENKDMCONF} --no-old --in ${KDMCONFDIR}; +else + echo "Updating KDM configuration"; + ${GENKDMCONF} --in ${KDMCONFDIR}; + +fi + +#run kdm +exec "%%PREFIX%%/bin/kdm-bin" "$@" diff --git a/x11/kdebase4/files/patch-kxkb-rules.cpp b/x11/kdebase4/files/patch-kxkb-rules.cpp deleted file mode 100644 index 03baa696dcce..000000000000 --- a/x11/kdebase4/files/patch-kxkb-rules.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- kxkb/rules.cpp (revision 504758) -+++ kxkb/rules.cpp (working copy) -@@ -300,7 +300,7 @@ - */ - const QString KeyRules::getLayout(const QString &layvar) const - { -- static const char* LAYOUT_PATTERN = "[a-z0-9_-]*"; -+ static const char* LAYOUT_PATTERN = "[a-zA-Z0-9_-]*"; - QString varLine = layvar.stripWhiteSpace(); - QRegExp rx(LAYOUT_PATTERN); - int pos = rx.search(varLine, 0); -@@ -318,7 +318,7 @@ - */ - const QString KeyRules::getVariant(const QString &layvar) const - { -- static const char* VARIANT_PATTERN = "\\([a-z0-9_-]*\\)"; -+ static const char* VARIANT_PATTERN = "\\([a-zA-Z0-9_-]*\\)"; - QString varLine = layvar.stripWhiteSpace(); - QRegExp rx(VARIANT_PATTERN); - int pos = rx.search(varLine, 0); diff --git a/x11/kdebase4/files/pkg-install.in b/x11/kdebase4/files/pkg-install.in index fee72a16fe3c..87ea16dd348a 100644 --- a/x11/kdebase4/files/pkg-install.in +++ b/x11/kdebase4/files/pkg-install.in @@ -8,11 +8,6 @@ if [ "$2" != "POST-INSTALL" ]; then fi boguscreatenewentry=%%PREFIX%%/share/templates/.keep_me -kdmrcscript=%%PREFIX%%/etc/rc.d/genkdmconf.sh - -if [ -f $kdmrcscript ]; then - sh -c "$kdmrcscript" -fi if [ -f $boguscreatenewentry ]; then rm -f $boguscreatenewentry diff --git a/x11/kdebase4/pkg-plist b/x11/kdebase4/pkg-plist index 35fac982c6ff..eb4521af50dc 100644 --- a/x11/kdebase4/pkg-plist +++ b/x11/kdebase4/pkg-plist @@ -26,8 +26,9 @@ bin/kdesu bin/kdesud bin/kdialog bin/kdm -bin/kdm_config -bin/kdm_greet +bin/kdm-bin +bin/kdm-bin_config +bin/kdm-bin_greet bin/kdmctl bin/keditbookmarks bin/keditfiletype @@ -82,7 +83,6 @@ bin/nspluginscan bin/nspluginviewer bin/startkde etc/ksysguarddrc -etc/rc.d/genkdmconf.sh etc/xdg/menus/applications-merged/kde-essential.menu etc/xdg/menus/kde-information.menu etc/xdg/menus/kde-screensavers.menu @@ -149,6 +149,7 @@ include/kwin/workspace.h include/libkonq_export.h lib/kconf_update_bin/khotkeys_update lib/kconf_update_bin/kicker-3.4-reverseLayout +lib/kconf_update_bin/kwin_update_default_rules lib/kconf_update_bin/kwin_update_window_settings lib/kde3/appletproxy.a lib/kde3/appletproxy.la @@ -757,8 +758,8 @@ lib/libkdecorations.so.1 lib/libkdeinit_appletproxy.a lib/libkdeinit_appletproxy.la lib/libkdeinit_appletproxy.so -lib/libkdeinit_extensionproxy.la lib/libkdeinit_extensionproxy.a +lib/libkdeinit_extensionproxy.la lib/libkdeinit_extensionproxy.so lib/libkdeinit_kaccess.a lib/libkdeinit_kaccess.la @@ -1301,6 +1302,7 @@ share/apps/kconf_update/kwin_focus1.sh share/apps/kconf_update/kwin_focus1.upd share/apps/kconf_update/kwin_focus2.sh share/apps/kconf_update/kwin_focus2.upd +share/apps/kconf_update/kwin_fsp_workarounds_1.upd share/apps/kconf_update/kwiniconify.upd share/apps/kconf_update/kwinsticky.upd share/apps/kconf_update/kwinupdatewindowsettings.upd @@ -1998,6 +2000,7 @@ share/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.xml share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.preview.png share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.xml share/apps/kwin/b2.desktop +share/apps/kwin/default_rules/fsp_workarounds_1 share/apps/kwin/eventsrc share/apps/kwin/keramik.desktop share/apps/kwin/laptop.desktop @@ -2682,6 +2685,9 @@ share/doc/HTML/en/kwrite/index.docbook share/doc/HTML/en/kxkb/common share/doc/HTML/en/kxkb/index.cache.bz2 share/doc/HTML/en/kxkb/index.docbook +share/doc/HTML/en/kxkb/layout.png +share/doc/HTML/en/kxkb/switching.png +share/doc/HTML/en/kxkb/xkb.png share/doc/kdm/README share/fonts/override/fonts.dir share/icons/crystalsvg/128x128/apps/access.png @@ -4785,6 +4791,7 @@ share/wallpapers/triplegears.jpg.desktop @dirrm share/apps/naughtyapplet/pics @dirrm share/apps/naughtyapplet @dirrm share/apps/kwrite +@dirrm share/apps/kwin/default_rules @dirrm share/apps/kthememanager/themes/YellowOnBlue-big @dirrm share/apps/kthememanager/themes/YellowOnBlue @dirrm share/apps/kthememanager/themes/Sunshine diff --git a/x11/kdelibs3-nocups/pkg-plist b/x11/kdelibs3-nocups/pkg-plist index 6d7468092f0d..e2c3b95b2ae7 100644 --- a/x11/kdelibs3-nocups/pkg-plist +++ b/x11/kdelibs3-nocups/pkg-plist @@ -1284,6 +1284,7 @@ share/apps/katepart/syntax/purebasic.xml share/apps/katepart/syntax/python.xml share/apps/katepart/syntax/r.xml share/apps/katepart/syntax/rexx.xml +share/apps/katepart/syntax/rhtml.xml share/apps/katepart/syntax/rib.xml share/apps/katepart/syntax/rpmspec.xml share/apps/katepart/syntax/rsiidl.xml @@ -1719,6 +1720,7 @@ share/apps/ksgmltools2/customization/et/entities/underArtisticLicense.docbook share/apps/ksgmltools2/customization/et/entities/underBSDLicense.docbook share/apps/ksgmltools2/customization/et/entities/underFDL.docbook share/apps/ksgmltools2/customization/et/entities/underGPL.docbook +share/apps/ksgmltools2/customization/et/entities/underLGPL.docbook share/apps/ksgmltools2/customization/et/entities/underX11License.docbook share/apps/ksgmltools2/customization/et/entities/update-doc.docbook share/apps/ksgmltools2/customization/et/lang.entities @@ -3103,6 +3105,7 @@ share/emoticons/Default/unhappy.png share/emoticons/Default/unlove.png share/emoticons/Default/wilted_rose.png share/emoticons/Default/wink.png +share/icons/crystalsvg/128x128/actions/fileopen.png share/icons/crystalsvg/128x128/actions/launch.png share/icons/crystalsvg/128x128/actions/share.png share/icons/crystalsvg/128x128/apps/kmenu.png @@ -4628,6 +4631,7 @@ share/icons/crystalsvg/48x48/mimetypes/widget_doc.png share/icons/crystalsvg/48x48/mimetypes/wordprocessing.png share/icons/crystalsvg/48x48/mimetypes/zip.png share/icons/crystalsvg/64x64/actions/favorites.png +share/icons/crystalsvg/64x64/actions/fileopen.png share/icons/crystalsvg/64x64/actions/knewstuff.png share/icons/crystalsvg/64x64/actions/player_play.png share/icons/crystalsvg/64x64/actions/share.png @@ -4819,6 +4823,7 @@ share/icons/crystalsvg/scalable/actions/eraser.svgz share/icons/crystalsvg/scalable/actions/exit.svgz share/icons/crystalsvg/scalable/actions/fileclose.svgz share/icons/crystalsvg/scalable/actions/filenew.svgz +share/icons/crystalsvg/scalable/actions/fileopen.svgz share/icons/crystalsvg/scalable/actions/fileprint.svgz share/icons/crystalsvg/scalable/actions/filequickprint.svgz share/icons/crystalsvg/scalable/actions/finish.svgz @@ -5282,6 +5287,7 @@ share/mimelnk/image/x-photo-cd.desktop share/mimelnk/image/x-portable-bitmap.desktop share/mimelnk/image/x-portable-greymap.desktop share/mimelnk/image/x-portable-pixmap.desktop +share/mimelnk/image/x-raw.desktop share/mimelnk/image/x-rgb.desktop share/mimelnk/image/x-targa.desktop share/mimelnk/image/x-vnd.adobe.photoshop.desktop @@ -5616,7 +5622,6 @@ share/servicetypes/scriptinterface.desktop @dirrm share/services/kresources @dirrm share/services/kded @dirrm share/mimelnk/uri -@dirrm share/icons/crystalsvg/scalable/mimetypes @dirrm share/emoticons/Default @dirrm share/emoticons @dirrm share/doc/HTML/en/kspell diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 997cf1f30809..f793c673a593 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdelibs PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -59,7 +58,7 @@ PREFIX= ${KDE_PREFIX} INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_TARGET=# empty CONFIGURE_ARGS+=--disable-ltdl-install \ --disable-as-needed \ diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo index 26aac0e8f6ec..3668e7c290e2 100644 --- a/x11/kdelibs3/distinfo +++ b/x11/kdelibs3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdelibs-3.5.1.tar.bz2) = 2a22193ae7c23f3759b02723dab02d30 -SHA256 (KDE/kdelibs-3.5.1.tar.bz2) = 1798452314d36987898faa7de24cbebd6fed06487d45bbfac7146d87815ee981 -SIZE (KDE/kdelibs-3.5.1.tar.bz2) = 15459894 +MD5 (KDE/kdelibs-3.5.2.tar.bz2) = 367738696dc468859cf90d5a6e8f18a9 +SHA256 (KDE/kdelibs-3.5.2.tar.bz2) = d0c252b7f14086f32e126761be55b6661dd9c9f7172f5eb369bd31c6ed19e14b +SIZE (KDE/kdelibs-3.5.2.tar.bz2) = 15442103 diff --git a/x11/kdelibs3/files/patch-khtml_html-html_formimpl.cpp b/x11/kdelibs3/files/patch-khtml_html-html_formimpl.cpp deleted file mode 100644 index 2d6b721339f2..000000000000 --- a/x11/kdelibs3/files/patch-khtml_html-html_formimpl.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- khtml/html/html_formimpl.cpp.orig Sun Jan 29 01:15:24 2006 -+++ khtml/html/html_formimpl.cpp Sun Jan 29 01:43:42 2006 -@@ -2303,7 +2303,7 @@ - NodeImpl* const parent = current->parentNode(); - current = current->nextSibling(); - if (!current) { -- if (parent != this) -+ if (static_cast<HTMLSelectElementImpl*>(parent) != this) - current = parent->nextSibling(); - } - } diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist index d155993597e0..129f4ddb8a8a 100644 --- a/x11/kdelibs3/pkg-plist +++ b/x11/kdelibs3/pkg-plist @@ -1296,6 +1296,7 @@ share/apps/katepart/syntax/purebasic.xml share/apps/katepart/syntax/python.xml share/apps/katepart/syntax/r.xml share/apps/katepart/syntax/rexx.xml +share/apps/katepart/syntax/rhtml.xml share/apps/katepart/syntax/rib.xml share/apps/katepart/syntax/rpmspec.xml share/apps/katepart/syntax/rsiidl.xml @@ -1737,6 +1738,7 @@ share/apps/ksgmltools2/customization/et/entities/underArtisticLicense.docbook share/apps/ksgmltools2/customization/et/entities/underBSDLicense.docbook share/apps/ksgmltools2/customization/et/entities/underFDL.docbook share/apps/ksgmltools2/customization/et/entities/underGPL.docbook +share/apps/ksgmltools2/customization/et/entities/underLGPL.docbook share/apps/ksgmltools2/customization/et/entities/underX11License.docbook share/apps/ksgmltools2/customization/et/entities/update-doc.docbook share/apps/ksgmltools2/customization/et/lang.entities @@ -3122,6 +3124,7 @@ share/emoticons/Default/unhappy.png share/emoticons/Default/unlove.png share/emoticons/Default/wilted_rose.png share/emoticons/Default/wink.png +share/icons/crystalsvg/128x128/actions/fileopen.png share/icons/crystalsvg/128x128/actions/launch.png share/icons/crystalsvg/128x128/actions/share.png share/icons/crystalsvg/128x128/apps/kmenu.png @@ -4647,6 +4650,7 @@ share/icons/crystalsvg/48x48/mimetypes/widget_doc.png share/icons/crystalsvg/48x48/mimetypes/wordprocessing.png share/icons/crystalsvg/48x48/mimetypes/zip.png share/icons/crystalsvg/64x64/actions/favorites.png +share/icons/crystalsvg/64x64/actions/fileopen.png share/icons/crystalsvg/64x64/actions/knewstuff.png share/icons/crystalsvg/64x64/actions/player_play.png share/icons/crystalsvg/64x64/actions/share.png @@ -4838,6 +4842,7 @@ share/icons/crystalsvg/scalable/actions/eraser.svgz share/icons/crystalsvg/scalable/actions/exit.svgz share/icons/crystalsvg/scalable/actions/fileclose.svgz share/icons/crystalsvg/scalable/actions/filenew.svgz +share/icons/crystalsvg/scalable/actions/fileopen.svgz share/icons/crystalsvg/scalable/actions/fileprint.svgz share/icons/crystalsvg/scalable/actions/filequickprint.svgz share/icons/crystalsvg/scalable/actions/finish.svgz @@ -5301,6 +5306,7 @@ share/mimelnk/image/x-photo-cd.desktop share/mimelnk/image/x-portable-bitmap.desktop share/mimelnk/image/x-portable-greymap.desktop share/mimelnk/image/x-portable-pixmap.desktop +share/mimelnk/image/x-raw.desktop share/mimelnk/image/x-rgb.desktop share/mimelnk/image/x-targa.desktop share/mimelnk/image/x-vnd.adobe.photoshop.desktop @@ -5635,7 +5641,6 @@ share/servicetypes/scriptinterface.desktop @dirrm share/services/kresources @dirrm share/services/kded @dirrm share/mimelnk/uri -@dirrm share/icons/crystalsvg/scalable/mimetypes @dirrm share/emoticons/Default @dirrm share/emoticons @dirrm share/doc/HTML/en/kspell diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 997cf1f30809..f793c673a593 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdelibs PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -59,7 +58,7 @@ PREFIX= ${KDE_PREFIX} INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_TARGET=# empty CONFIGURE_ARGS+=--disable-ltdl-install \ --disable-as-needed \ diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo index 26aac0e8f6ec..3668e7c290e2 100644 --- a/x11/kdelibs4/distinfo +++ b/x11/kdelibs4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdelibs-3.5.1.tar.bz2) = 2a22193ae7c23f3759b02723dab02d30 -SHA256 (KDE/kdelibs-3.5.1.tar.bz2) = 1798452314d36987898faa7de24cbebd6fed06487d45bbfac7146d87815ee981 -SIZE (KDE/kdelibs-3.5.1.tar.bz2) = 15459894 +MD5 (KDE/kdelibs-3.5.2.tar.bz2) = 367738696dc468859cf90d5a6e8f18a9 +SHA256 (KDE/kdelibs-3.5.2.tar.bz2) = d0c252b7f14086f32e126761be55b6661dd9c9f7172f5eb369bd31c6ed19e14b +SIZE (KDE/kdelibs-3.5.2.tar.bz2) = 15442103 diff --git a/x11/kdelibs4/files/patch-khtml_html-html_formimpl.cpp b/x11/kdelibs4/files/patch-khtml_html-html_formimpl.cpp deleted file mode 100644 index 2d6b721339f2..000000000000 --- a/x11/kdelibs4/files/patch-khtml_html-html_formimpl.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- khtml/html/html_formimpl.cpp.orig Sun Jan 29 01:15:24 2006 -+++ khtml/html/html_formimpl.cpp Sun Jan 29 01:43:42 2006 -@@ -2303,7 +2303,7 @@ - NodeImpl* const parent = current->parentNode(); - current = current->nextSibling(); - if (!current) { -- if (parent != this) -+ if (static_cast<HTMLSelectElementImpl*>(parent) != this) - current = parent->nextSibling(); - } - } diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist index d155993597e0..129f4ddb8a8a 100644 --- a/x11/kdelibs4/pkg-plist +++ b/x11/kdelibs4/pkg-plist @@ -1296,6 +1296,7 @@ share/apps/katepart/syntax/purebasic.xml share/apps/katepart/syntax/python.xml share/apps/katepart/syntax/r.xml share/apps/katepart/syntax/rexx.xml +share/apps/katepart/syntax/rhtml.xml share/apps/katepart/syntax/rib.xml share/apps/katepart/syntax/rpmspec.xml share/apps/katepart/syntax/rsiidl.xml @@ -1737,6 +1738,7 @@ share/apps/ksgmltools2/customization/et/entities/underArtisticLicense.docbook share/apps/ksgmltools2/customization/et/entities/underBSDLicense.docbook share/apps/ksgmltools2/customization/et/entities/underFDL.docbook share/apps/ksgmltools2/customization/et/entities/underGPL.docbook +share/apps/ksgmltools2/customization/et/entities/underLGPL.docbook share/apps/ksgmltools2/customization/et/entities/underX11License.docbook share/apps/ksgmltools2/customization/et/entities/update-doc.docbook share/apps/ksgmltools2/customization/et/lang.entities @@ -3122,6 +3124,7 @@ share/emoticons/Default/unhappy.png share/emoticons/Default/unlove.png share/emoticons/Default/wilted_rose.png share/emoticons/Default/wink.png +share/icons/crystalsvg/128x128/actions/fileopen.png share/icons/crystalsvg/128x128/actions/launch.png share/icons/crystalsvg/128x128/actions/share.png share/icons/crystalsvg/128x128/apps/kmenu.png @@ -4647,6 +4650,7 @@ share/icons/crystalsvg/48x48/mimetypes/widget_doc.png share/icons/crystalsvg/48x48/mimetypes/wordprocessing.png share/icons/crystalsvg/48x48/mimetypes/zip.png share/icons/crystalsvg/64x64/actions/favorites.png +share/icons/crystalsvg/64x64/actions/fileopen.png share/icons/crystalsvg/64x64/actions/knewstuff.png share/icons/crystalsvg/64x64/actions/player_play.png share/icons/crystalsvg/64x64/actions/share.png @@ -4838,6 +4842,7 @@ share/icons/crystalsvg/scalable/actions/eraser.svgz share/icons/crystalsvg/scalable/actions/exit.svgz share/icons/crystalsvg/scalable/actions/fileclose.svgz share/icons/crystalsvg/scalable/actions/filenew.svgz +share/icons/crystalsvg/scalable/actions/fileopen.svgz share/icons/crystalsvg/scalable/actions/fileprint.svgz share/icons/crystalsvg/scalable/actions/filequickprint.svgz share/icons/crystalsvg/scalable/actions/finish.svgz @@ -5301,6 +5306,7 @@ share/mimelnk/image/x-photo-cd.desktop share/mimelnk/image/x-portable-bitmap.desktop share/mimelnk/image/x-portable-greymap.desktop share/mimelnk/image/x-portable-pixmap.desktop +share/mimelnk/image/x-raw.desktop share/mimelnk/image/x-rgb.desktop share/mimelnk/image/x-targa.desktop share/mimelnk/image/x-vnd.adobe.photoshop.desktop @@ -5635,7 +5641,6 @@ share/servicetypes/scriptinterface.desktop @dirrm share/services/kresources @dirrm share/services/kded @dirrm share/mimelnk/uri -@dirrm share/icons/crystalsvg/scalable/mimetypes @dirrm share/emoticons/Default @dirrm share/emoticons @dirrm share/doc/HTML/en/kspell diff --git a/x11/xscreensaver-kde/Makefile b/x11/xscreensaver-kde/Makefile index d96fa53de538..2f628bb32cb8 100644 --- a/x11/xscreensaver-kde/Makefile +++ b/x11/xscreensaver-kde/Makefile @@ -23,7 +23,7 @@ USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_REINPLACE= yes WRKSRC= ${WRKDIR}/kdeartwork-${PORTVERSION} diff --git a/x11/xscreensaver-kde/distinfo b/x11/xscreensaver-kde/distinfo index d4c539b672cc..38bf00b4a0ea 100644 --- a/x11/xscreensaver-kde/distinfo +++ b/x11/xscreensaver-kde/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeartwork-3.5.1.tar.bz2) = 8053bb1a1b2a5844b29f5f96328b1d96 -SHA256 (KDE/kdeartwork-3.5.1.tar.bz2) = 9108de84f71319ee1e49f1c3515c5ca293ec89985da563855dd8dd64b3aea418 -SIZE (KDE/kdeartwork-3.5.1.tar.bz2) = 16595339 +MD5 (KDE/kdeartwork-3.5.2.tar.bz2) = 211801e7ab7a5e113821625b931f338c +SHA256 (KDE/kdeartwork-3.5.2.tar.bz2) = c1df39d5eba36e5071e47c3534c3117abd91d0c9ae2b798a457fd29257218a31 +SIZE (KDE/kdeartwork-3.5.2.tar.bz2) = 16620565 diff --git a/x11/xscreensaver-kde/pkg-plist b/x11/xscreensaver-kde/pkg-plist index b809f548f70e..1f98c5450aa0 100644 --- a/x11/xscreensaver-kde/pkg-plist +++ b/x11/xscreensaver-kde/pkg-plist @@ -3,6 +3,7 @@ bin/kxsrun share/applnk/System/ScreenSavers/anemone.desktop share/applnk/System/ScreenSavers/anemotaxis.desktop share/applnk/System/ScreenSavers/antinspect.desktop +share/applnk/System/ScreenSavers/antmaze.desktop share/applnk/System/ScreenSavers/antspotlight.desktop share/applnk/System/ScreenSavers/apollonian.desktop share/applnk/System/ScreenSavers/apple2.desktop @@ -14,22 +15,28 @@ share/applnk/System/ScreenSavers/blaster.desktop share/applnk/System/ScreenSavers/blinkbox.desktop share/applnk/System/ScreenSavers/blitspin.desktop share/applnk/System/ScreenSavers/blocktube.desktop +share/applnk/System/ScreenSavers/boing.desktop share/applnk/System/ScreenSavers/bouboule.desktop share/applnk/System/ScreenSavers/bouncingcow.desktop share/applnk/System/ScreenSavers/boxed.desktop +share/applnk/System/ScreenSavers/boxfit.desktop share/applnk/System/ScreenSavers/braid.desktop share/applnk/System/ScreenSavers/bsod.desktop share/applnk/System/ScreenSavers/bubble3d.desktop share/applnk/System/ScreenSavers/bubbles.desktop share/applnk/System/ScreenSavers/bumps.desktop share/applnk/System/ScreenSavers/cage.desktop +share/applnk/System/ScreenSavers/carousel.desktop share/applnk/System/ScreenSavers/ccurve.desktop +share/applnk/System/ScreenSavers/celtic.desktop share/applnk/System/ScreenSavers/circuit.desktop share/applnk/System/ScreenSavers/cloudlife.desktop share/applnk/System/ScreenSavers/compass.desktop share/applnk/System/ScreenSavers/coral.desktop +share/applnk/System/ScreenSavers/crackberg.desktop share/applnk/System/ScreenSavers/critical.desktop share/applnk/System/ScreenSavers/crystal.desktop +share/applnk/System/ScreenSavers/cube21.desktop share/applnk/System/ScreenSavers/cubenetic.desktop share/applnk/System/ScreenSavers/cubestorm.desktop share/applnk/System/ScreenSavers/cynosure.desktop @@ -48,11 +55,13 @@ share/applnk/System/ScreenSavers/eruption.desktop share/applnk/System/ScreenSavers/euler2d.desktop share/applnk/System/ScreenSavers/extrusion.desktop share/applnk/System/ScreenSavers/fadeplot.desktop +share/applnk/System/ScreenSavers/fiberlamp.desktop share/applnk/System/ScreenSavers/fireworkx.desktop share/applnk/System/ScreenSavers/flag.desktop share/applnk/System/ScreenSavers/flame.desktop share/applnk/System/ScreenSavers/flipflop.desktop share/applnk/System/ScreenSavers/flipscreen3d.desktop +share/applnk/System/ScreenSavers/fliptext.desktop share/applnk/System/ScreenSavers/flow.desktop share/applnk/System/ScreenSavers/fluidballs.desktop share/applnk/System/ScreenSavers/flurry.desktop @@ -66,6 +75,7 @@ share/applnk/System/ScreenSavers/gflux.desktop share/applnk/System/ScreenSavers/glblur.desktop share/applnk/System/ScreenSavers/gleidescope.desktop share/applnk/System/ScreenSavers/glforestfire.desktop +share/applnk/System/ScreenSavers/glhanoi.desktop share/applnk/System/ScreenSavers/glknots.desktop share/applnk/System/ScreenSavers/glmatrix.desktop share/applnk/System/ScreenSavers/glplanet.desktop @@ -84,11 +94,13 @@ share/applnk/System/ScreenSavers/hypercube.desktop share/applnk/System/ScreenSavers/hypertorus.desktop share/applnk/System/ScreenSavers/ifs.desktop share/applnk/System/ScreenSavers/imsmap.desktop +share/applnk/System/ScreenSavers/interaggregate.desktop share/applnk/System/ScreenSavers/interference.desktop share/applnk/System/ScreenSavers/intermomentary.desktop share/applnk/System/ScreenSavers/jigglypuff.desktop share/applnk/System/ScreenSavers/jigsaw.desktop share/applnk/System/ScreenSavers/juggle.desktop +share/applnk/System/ScreenSavers/juggler3d.desktop share/applnk/System/ScreenSavers/julia.desktop share/applnk/System/ScreenSavers/kaleidescope.desktop share/applnk/System/ScreenSavers/klein.desktop @@ -166,7 +178,9 @@ share/applnk/System/ScreenSavers/substrate.desktop share/applnk/System/ScreenSavers/superquadrics.desktop share/applnk/System/ScreenSavers/swirl.desktop share/applnk/System/ScreenSavers/t3d.desktop +share/applnk/System/ScreenSavers/tangram.desktop share/applnk/System/ScreenSavers/thornbird.desktop +share/applnk/System/ScreenSavers/timetunnel.desktop share/applnk/System/ScreenSavers/triangle.desktop share/applnk/System/ScreenSavers/truchet.desktop share/applnk/System/ScreenSavers/twang.desktop |