diff options
| author | Michael Nottebrock <lofi@FreeBSD.org> | 2006-03-30 20:30:29 +0000 |
|---|---|---|
| committer | Michael Nottebrock <lofi@FreeBSD.org> | 2006-03-30 20:30:29 +0000 |
| commit | 5f86d4f59a856b210d9de24e98e433d9ba8dfa15 (patch) | |
| tree | b1a35722980f31d01f16324fdbec2845e2c6a9f1 /x11/kdebase3/files | |
| parent | Update to 2.2.8. (diff) | |
Update to KDE 3.5.2
Diffstat (limited to 'x11/kdebase3/files')
| -rw-r--r-- | x11/kdebase3/files/kdm.in (renamed from x11/kdebase3/files/genkdmconf.sh.in) | 7 | ||||
| -rw-r--r-- | x11/kdebase3/files/patch-kxkb-rules.cpp | 20 | ||||
| -rw-r--r-- | x11/kdebase3/files/pkg-install.in | 5 |
3 files changed, 3 insertions, 29 deletions
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 |