From 5f86d4f59a856b210d9de24e98e433d9ba8dfa15 Mon Sep 17 00:00:00 2001 From: Michael Nottebrock Date: Thu, 30 Mar 2006 20:30:29 +0000 Subject: Update to KDE 3.5.2 --- x11/kdebase4-workspace/Makefile | 10 ++++++---- x11/kdebase4-workspace/distinfo | 6 +++--- x11/kdebase4-workspace/files/genkdmconf.sh.in | 21 --------------------- x11/kdebase4-workspace/files/kdm.in | 20 ++++++++++++++++++++ x11/kdebase4-workspace/files/patch-kxkb-rules.cpp | 20 -------------------- x11/kdebase4-workspace/files/pkg-install.in | 5 ----- x11/kdebase4-workspace/pkg-plist | 15 +++++++++++---- 7 files changed, 40 insertions(+), 57 deletions(-) delete mode 100644 x11/kdebase4-workspace/files/genkdmconf.sh.in create mode 100644 x11/kdebase4-workspace/files/kdm.in delete mode 100644 x11/kdebase4-workspace/files/patch-kxkb-rules.cpp (limited to 'x11/kdebase4-workspace') 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 -- cgit v1.2.3