Index: head/x11/kde4-baseapps/Makefile =================================================================== --- head/x11/kde4-baseapps/Makefile (revision 116072) +++ head/x11/kde4-baseapps/Makefile (revision 116073) @@ -1,88 +1,88 @@ # -*-mode: makefile-*- # New ports collection makefile for: kdebase3.1 # Date created: 29 November 2002 # Whom: kde@freebsd.org # # $FreeBSD$ # PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for the KDE system BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT} LIB_DEPENDS= smbclient:${PORTSDIR}/net/samba-libsmbclient USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} USE_OPENLDAP= yes USE_BZIP2= yes USE_GMAKE= yes USE_XPM= yes USE_REINPLACE= yes PKGMESSAGE= ${WRKDIR}/MESSAGE PKGINSTALL= ${WRKDIR}/INSTALL GNU_CONFIGURE= yes INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no CONFIGURE_ARGS+=--without-java \ --with-qt-dir=${X11BASE} \ --with-xdmdir=${X11BASE}/lib/X11/xdm OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ MOTIF "Support Netscape plugins, requires openmotif" on .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include .if !defined(WITHOUT_ARTSWRAPPER) RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper .endif .if !defined(WITHOUT_MOTIF) RUN_DEPENDS= nspluginviewer:${PORTSDIR}/www/konqueror-nsplugins .elseif defined(WITHOUT_MOTIF) CONFIGURE_ARGS+= --without-motif .endif post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv post-configure: ${REINPLACE_CMD} -e "s@^\s*Exec=.*\$$@Exec=ElectricEyes@" \ ${WRKSRC}/kappfinder/apps/Graphics/ElectricEyes.desktop ${REINPLACE_CMD} -e 's/444/644/g' \ ${WRKSRC}/kdesktop/init/Templates/Makefile post-build: @${CAT} ${PKGDIR}/pkg-message | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${PKGMESSAGE} @${CAT} ${PKGDIR}/pkg-install | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${PKGINSTALL} @${CAT} ${FILESDIR}/kdm.sh | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${WRKDIR}/kdm.sh post-install: ${RM} -f ${PREFIX}/share/apps/konsole/linux.desktop ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ ${CHMOD} g+s ${PREFIX}/bin/ksysguardd ${INSTALL_SCRIPT} ${WRKDIR}/kdm.sh ${PREFIX}/etc/rc.d .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif @${CAT} ${PKGMESSAGE} .include Property changes on: head/x11/kde4-baseapps/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.141 \ No newline at end of property +1.142 \ No newline at end of property Index: head/x11/kde4-baseapps/files/patch-kxkb_kcmlayout.cpp =================================================================== --- head/x11/kde4-baseapps/files/patch-kxkb_kcmlayout.cpp (nonexistent) +++ head/x11/kde4-baseapps/files/patch-kxkb_kcmlayout.cpp (revision 116073) @@ -0,0 +1,83 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/kcmlayout.cpp,v +retrieving revision 1.82.2.1 +retrieving revision 1.86 +diff -u -p -r1.82.2.1 -r1.86 +--- kxkb/kcmlayout.cpp 2004/05/19 12:09:58 1.82.2.1 ++++ kxkb/kcmlayout.cpp 2004/06/28 14:19:03 1.86 +@@ -79,7 +79,8 @@ OptionListItem * OptionListItem::findChi + } + + LayoutConfig::LayoutConfig(QWidget *parent, const char *name) +- : KCModule(parent, name), m_rules(0) ++ : KCModule(parent, name), ++ m_rules(NULL) + { + QVBoxLayout *main = new QVBoxLayout(this, 0, KDialog::spacingHint()); + +@@ -122,7 +124,7 @@ LayoutConfig::LayoutConfig(QWidget *pare + #endif + + //Read rules - we _must_ read _before_ creating xkb-options comboboxes +- ruleChanged("xfree86"); ++ ruleChanged(); + + makeOptionsTab(); + +@@ -292,6 +294,8 @@ QWidget* LayoutConfig::makeOptionsTab() + connect(listView, SIGNAL(clicked(QListViewItem *)), SLOT(changed())); + connect(listView, SIGNAL(clicked(QListViewItem *)), SLOT(updateOptionsCommand())); + ++ connect(widget->chkEnableOptions, SIGNAL(toggled(bool)), SLOT(changed())); ++ + connect(widget->checkResetOld, SIGNAL(toggled(bool)), SLOT(changed())); + connect(widget->checkResetOld, SIGNAL(toggled(bool)), SLOT(updateOptionsCommand())); + +@@ -405,10 +409,10 @@ void LayoutConfig::load() + bool use = config->readBoolEntry( "Use", false ); + + // find out which rule applies +- QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); ++ //QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); + + // update other files +- ruleChanged(rule); ++ ruleChanged(); + + // find out about the model + QString model = config->readEntry("Model", "pc104"); +@@ -499,12 +506,12 @@ void LayoutConfig::load() + emit KCModule::changed( false ); + } + +-void LayoutConfig::ruleChanged(const QString &rule) ++void LayoutConfig::ruleChanged() + { +- if( rule == m_rule ) +- return; ++// if( rule == m_rule ) ++// return; + +- m_rule = rule; ++// m_rule = rule; + + QString model; //, layout; + if (m_rules) +@@ -514,7 +521,7 @@ void LayoutConfig::ruleChanged(const QSt + } + + delete m_rules; +- m_rules = new KeyRules(rule); ++ m_rules = new KeyRules(); + + QStringList tmp; + widget->comboModel->clear(); +@@ -672,7 +680,7 @@ void LayoutConfig::save() + void LayoutConfig::defaults() + { + widget->chkEnable->setChecked(false); +- ruleChanged("xfree86"); ++ ruleChanged(); + + widget->comboModel->setCurrentText("pc104"); + //layoutCombo->setCurrentText("us"); Property changes on: head/x11/kde4-baseapps/files/patch-kxkb_kcmlayout.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kde4-baseapps/files/patch-kxkb_kcmlayout.h =================================================================== --- head/x11/kde4-baseapps/files/patch-kxkb_kcmlayout.h (nonexistent) +++ head/x11/kde4-baseapps/files/patch-kxkb_kcmlayout.h (revision 116073) @@ -0,0 +1,25 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/kcmlayout.h,v +retrieving revision 1.22 +retrieving revision 1.23 +diff -u -p -r1.22 -r1.23 +--- kxkb/kcmlayout.h 2003/10/29 07:30:36 1.22 ++++ kxkb/kcmlayout.h 2004/06/28 14:19:03 1.23 +@@ -54,7 +54,7 @@ protected slots: + void variantChanged(); + void latinChanged(); + void layoutSelChanged(QListViewItem *); +- void ruleChanged(const QString &rule); ++ void ruleChanged(); + void updateLayoutCommand(); + void updateOptionsCommand(); + void add(); +@@ -71,7 +71,7 @@ private: + QDict m_optionGroups; + QDict m_variants; + QDict m_includes; +- QString m_rule; ++// QString m_rule; + KeyRules *m_rules; + + QWidget* makeOptionsTab(); Property changes on: head/x11/kde4-baseapps/files/patch-kxkb_kcmlayout.h ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kde4-baseapps/files/patch-kxkb_kxkb.cpp =================================================================== --- head/x11/kde4-baseapps/files/patch-kxkb_kxkb.cpp (nonexistent) +++ head/x11/kde4-baseapps/files/patch-kxkb_kxkb.cpp (revision 116073) @@ -0,0 +1,23 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/kxkb.cpp,v +retrieving revision 1.70 +retrieving revision 1.72 +diff -u -p -r1.70 -r1.72 +--- kxkb/kxkb.cpp 2003/10/30 18:58:11 1.70 ++++ kxkb/kxkb.cpp 2004/06/28 14:19:03 1.72 +@@ -222,12 +222,12 @@ bool KXKBApp::settingsRead() + } + } + +- QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); +- m_rules = new KeyRules( rule ); ++ m_rules = new KeyRules(); + m_model = config->readEntry("Model", "pc104"); + m_layout = config->readEntry("Layout", ""); + m_defaultLayout = m_layout; + ++ + m_list = config->readListEntry("Additional"); + if (!m_list.contains(m_layout)) + { + Property changes on: head/x11/kde4-baseapps/files/patch-kxkb_kxkb.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kde4-baseapps/files/patch-kxkb_rules.cpp =================================================================== --- head/x11/kde4-baseapps/files/patch-kxkb_rules.cpp (nonexistent) +++ head/x11/kde4-baseapps/files/patch-kxkb_rules.cpp (revision 116073) @@ -0,0 +1,85 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/rules.cpp,v +retrieving revision 1.37 +retrieving revision 1.38 +diff -u -p -r1.37 -r1.38 +--- kxkb/rules.cpp 2003/10/24 06:15:26 1.37 ++++ kxkb/rules.cpp 2004/06/28 14:19:03 1.38 +@@ -16,11 +16,23 @@ + + #include "rules.h" + +-const QString X11_DIR( "/usr/X11R6/lib/X11/" ); ++const char* X11DirList[2] = {"/usr/X11R6/lib/X11/", "/usr/local/X11R6/lib/X11/"}; ++const char* rulesFileList[2] = {"xkb/rules/xfree86", "xkb/rules/xorg"}; + +-KeyRules::KeyRules(QString rule): ++KeyRules::KeyRules(): + m_layouts(90) + { ++ for(int ii=0; ii<2; ii++) ++ if( QDir(X11DirList[ii]).exists() ) { ++ X11_DIR = X11DirList[ii]; ++ break; ++ } ++ ++ if( X11_DIR.isEmpty() ) { ++ kdDebug() << "Cannot find X11 directory!" << endl; ++ return; ++ } ++ + // ugly check for XFree 4.3 or older + if( QDir(X11_DIR + "xkb/symbols/pc").exists() ) { + m_xfree43 = true; +@@ -29,8 +41,20 @@ KeyRules::KeyRules(QString rule): + m_xfree43 = false; + } + +- loadRules(X11_DIR + QString("xkb/rules/%1").arg(rule)); +- loadOldLayouts(X11_DIR + QString("xkb/rules/xfree86")); ++ QString rulesFile; ++ for(int ii=0; ii<2; ii++) ++ if( QFile(X11_DIR + QString(rulesFileList[ii])).exists() ) { ++ rulesFile = X11_DIR + rulesFileList[ii]; ++ break; ++ } ++ ++ if( rulesFile.isEmpty() ) { ++ kdDebug() << "Cannot find rules file in " << X11_DIR << endl; ++ return; ++ } ++ ++ loadRules(rulesFile); ++ loadOldLayouts(rulesFile); + loadGroups(::locate("config", "kxkb_groups")); + } + +@@ -51,9 +75,7 @@ static struct { + { 0, 0 } + }; + +- XkbRF_RulesPtr rules; +- +- rules = XkbRF_Load(QFile::encodeName(file).data(), "", true, true); ++ XkbRF_RulesPtr rules = XkbRF_Load(QFile::encodeName(file).data(), "", true, true); + + if (rules == NULL) { + kdDebug() << "Unable to load rules" << endl; +@@ -176,7 +198,7 @@ unsigned int KeyRules::getGroup(const QS + return it == m_initialGroups.end() ? 0 : it.data(); + } + +- ++/* + QStringList KeyRules::rules(QString path) + { + QStringList result; +@@ -193,7 +215,7 @@ QStringList KeyRules::rules(QString path + + return result; + } +- ++*/ + + /* pretty simple algorithm - reads the layout file and + tries to find "xkb_symbols" Property changes on: head/x11/kde4-baseapps/files/patch-kxkb_rules.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kde4-baseapps/files/patch-kxkb_rules.h =================================================================== --- head/x11/kde4-baseapps/files/patch-kxkb_rules.h (nonexistent) +++ head/x11/kde4-baseapps/files/patch-kxkb_rules.h (revision 116073) @@ -0,0 +1,33 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/rules.h,v +retrieving revision 1.11 +retrieving revision 1.12 +diff -u -p -r1.11 -r1.12 +--- kxkb/rules.h 2003/08/24 04:02:38 1.11 ++++ kxkb/rules.h 2004/06/28 14:19:03 1.12 +@@ -10,14 +10,14 @@ class KeyRules + { + public: + +- KeyRules(QString rule="xfree86"); ++ KeyRules(); + + const QDict &models() const { return m_models; }; + const QDict &layouts() const { return m_layouts; }; + const QDict &options() const { return m_options; }; + + void parseVariants(const QStringList& vars, QDict& variants, bool chkVars=true); +- static QStringList rules(QString path = QString::null); ++// static QStringList rules(QString path = QString::null); + + QStringList getVariants(const QString& layout); + unsigned int getGroup(const QString& layout, const char* baseGr); +@@ -42,6 +42,8 @@ private: + QStringList m_oldLayouts; + QStringList m_nonLatinLayouts; + bool m_xfree43; ++ ++ QString X11_DIR; // pseudo-constant + }; + + Property changes on: head/x11/kde4-baseapps/files/patch-kxkb_rules.h ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kde4-runtime/Makefile =================================================================== --- head/x11/kde4-runtime/Makefile (revision 116072) +++ head/x11/kde4-runtime/Makefile (revision 116073) @@ -1,88 +1,88 @@ # -*-mode: makefile-*- # New ports collection makefile for: kdebase3.1 # Date created: 29 November 2002 # Whom: kde@freebsd.org # # $FreeBSD$ # PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for the KDE system BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT} LIB_DEPENDS= smbclient:${PORTSDIR}/net/samba-libsmbclient USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} USE_OPENLDAP= yes USE_BZIP2= yes USE_GMAKE= yes USE_XPM= yes USE_REINPLACE= yes PKGMESSAGE= ${WRKDIR}/MESSAGE PKGINSTALL= ${WRKDIR}/INSTALL GNU_CONFIGURE= yes INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no CONFIGURE_ARGS+=--without-java \ --with-qt-dir=${X11BASE} \ --with-xdmdir=${X11BASE}/lib/X11/xdm OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ MOTIF "Support Netscape plugins, requires openmotif" on .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include .if !defined(WITHOUT_ARTSWRAPPER) RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper .endif .if !defined(WITHOUT_MOTIF) RUN_DEPENDS= nspluginviewer:${PORTSDIR}/www/konqueror-nsplugins .elseif defined(WITHOUT_MOTIF) CONFIGURE_ARGS+= --without-motif .endif post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv post-configure: ${REINPLACE_CMD} -e "s@^\s*Exec=.*\$$@Exec=ElectricEyes@" \ ${WRKSRC}/kappfinder/apps/Graphics/ElectricEyes.desktop ${REINPLACE_CMD} -e 's/444/644/g' \ ${WRKSRC}/kdesktop/init/Templates/Makefile post-build: @${CAT} ${PKGDIR}/pkg-message | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${PKGMESSAGE} @${CAT} ${PKGDIR}/pkg-install | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${PKGINSTALL} @${CAT} ${FILESDIR}/kdm.sh | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${WRKDIR}/kdm.sh post-install: ${RM} -f ${PREFIX}/share/apps/konsole/linux.desktop ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ ${CHMOD} g+s ${PREFIX}/bin/ksysguardd ${INSTALL_SCRIPT} ${WRKDIR}/kdm.sh ${PREFIX}/etc/rc.d .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif @${CAT} ${PKGMESSAGE} .include Property changes on: head/x11/kde4-runtime/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.141 \ No newline at end of property +1.142 \ No newline at end of property Index: head/x11/kde4-runtime/files/patch-kxkb_kcmlayout.cpp =================================================================== --- head/x11/kde4-runtime/files/patch-kxkb_kcmlayout.cpp (nonexistent) +++ head/x11/kde4-runtime/files/patch-kxkb_kcmlayout.cpp (revision 116073) @@ -0,0 +1,83 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/kcmlayout.cpp,v +retrieving revision 1.82.2.1 +retrieving revision 1.86 +diff -u -p -r1.82.2.1 -r1.86 +--- kxkb/kcmlayout.cpp 2004/05/19 12:09:58 1.82.2.1 ++++ kxkb/kcmlayout.cpp 2004/06/28 14:19:03 1.86 +@@ -79,7 +79,8 @@ OptionListItem * OptionListItem::findChi + } + + LayoutConfig::LayoutConfig(QWidget *parent, const char *name) +- : KCModule(parent, name), m_rules(0) ++ : KCModule(parent, name), ++ m_rules(NULL) + { + QVBoxLayout *main = new QVBoxLayout(this, 0, KDialog::spacingHint()); + +@@ -122,7 +124,7 @@ LayoutConfig::LayoutConfig(QWidget *pare + #endif + + //Read rules - we _must_ read _before_ creating xkb-options comboboxes +- ruleChanged("xfree86"); ++ ruleChanged(); + + makeOptionsTab(); + +@@ -292,6 +294,8 @@ QWidget* LayoutConfig::makeOptionsTab() + connect(listView, SIGNAL(clicked(QListViewItem *)), SLOT(changed())); + connect(listView, SIGNAL(clicked(QListViewItem *)), SLOT(updateOptionsCommand())); + ++ connect(widget->chkEnableOptions, SIGNAL(toggled(bool)), SLOT(changed())); ++ + connect(widget->checkResetOld, SIGNAL(toggled(bool)), SLOT(changed())); + connect(widget->checkResetOld, SIGNAL(toggled(bool)), SLOT(updateOptionsCommand())); + +@@ -405,10 +409,10 @@ void LayoutConfig::load() + bool use = config->readBoolEntry( "Use", false ); + + // find out which rule applies +- QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); ++ //QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); + + // update other files +- ruleChanged(rule); ++ ruleChanged(); + + // find out about the model + QString model = config->readEntry("Model", "pc104"); +@@ -499,12 +506,12 @@ void LayoutConfig::load() + emit KCModule::changed( false ); + } + +-void LayoutConfig::ruleChanged(const QString &rule) ++void LayoutConfig::ruleChanged() + { +- if( rule == m_rule ) +- return; ++// if( rule == m_rule ) ++// return; + +- m_rule = rule; ++// m_rule = rule; + + QString model; //, layout; + if (m_rules) +@@ -514,7 +521,7 @@ void LayoutConfig::ruleChanged(const QSt + } + + delete m_rules; +- m_rules = new KeyRules(rule); ++ m_rules = new KeyRules(); + + QStringList tmp; + widget->comboModel->clear(); +@@ -672,7 +680,7 @@ void LayoutConfig::save() + void LayoutConfig::defaults() + { + widget->chkEnable->setChecked(false); +- ruleChanged("xfree86"); ++ ruleChanged(); + + widget->comboModel->setCurrentText("pc104"); + //layoutCombo->setCurrentText("us"); Property changes on: head/x11/kde4-runtime/files/patch-kxkb_kcmlayout.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kde4-runtime/files/patch-kxkb_kcmlayout.h =================================================================== --- head/x11/kde4-runtime/files/patch-kxkb_kcmlayout.h (nonexistent) +++ head/x11/kde4-runtime/files/patch-kxkb_kcmlayout.h (revision 116073) @@ -0,0 +1,25 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/kcmlayout.h,v +retrieving revision 1.22 +retrieving revision 1.23 +diff -u -p -r1.22 -r1.23 +--- kxkb/kcmlayout.h 2003/10/29 07:30:36 1.22 ++++ kxkb/kcmlayout.h 2004/06/28 14:19:03 1.23 +@@ -54,7 +54,7 @@ protected slots: + void variantChanged(); + void latinChanged(); + void layoutSelChanged(QListViewItem *); +- void ruleChanged(const QString &rule); ++ void ruleChanged(); + void updateLayoutCommand(); + void updateOptionsCommand(); + void add(); +@@ -71,7 +71,7 @@ private: + QDict m_optionGroups; + QDict m_variants; + QDict m_includes; +- QString m_rule; ++// QString m_rule; + KeyRules *m_rules; + + QWidget* makeOptionsTab(); Property changes on: head/x11/kde4-runtime/files/patch-kxkb_kcmlayout.h ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kde4-runtime/files/patch-kxkb_kxkb.cpp =================================================================== --- head/x11/kde4-runtime/files/patch-kxkb_kxkb.cpp (nonexistent) +++ head/x11/kde4-runtime/files/patch-kxkb_kxkb.cpp (revision 116073) @@ -0,0 +1,23 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/kxkb.cpp,v +retrieving revision 1.70 +retrieving revision 1.72 +diff -u -p -r1.70 -r1.72 +--- kxkb/kxkb.cpp 2003/10/30 18:58:11 1.70 ++++ kxkb/kxkb.cpp 2004/06/28 14:19:03 1.72 +@@ -222,12 +222,12 @@ bool KXKBApp::settingsRead() + } + } + +- QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); +- m_rules = new KeyRules( rule ); ++ m_rules = new KeyRules(); + m_model = config->readEntry("Model", "pc104"); + m_layout = config->readEntry("Layout", ""); + m_defaultLayout = m_layout; + ++ + m_list = config->readListEntry("Additional"); + if (!m_list.contains(m_layout)) + { + Property changes on: head/x11/kde4-runtime/files/patch-kxkb_kxkb.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kde4-runtime/files/patch-kxkb_rules.cpp =================================================================== --- head/x11/kde4-runtime/files/patch-kxkb_rules.cpp (nonexistent) +++ head/x11/kde4-runtime/files/patch-kxkb_rules.cpp (revision 116073) @@ -0,0 +1,85 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/rules.cpp,v +retrieving revision 1.37 +retrieving revision 1.38 +diff -u -p -r1.37 -r1.38 +--- kxkb/rules.cpp 2003/10/24 06:15:26 1.37 ++++ kxkb/rules.cpp 2004/06/28 14:19:03 1.38 +@@ -16,11 +16,23 @@ + + #include "rules.h" + +-const QString X11_DIR( "/usr/X11R6/lib/X11/" ); ++const char* X11DirList[2] = {"/usr/X11R6/lib/X11/", "/usr/local/X11R6/lib/X11/"}; ++const char* rulesFileList[2] = {"xkb/rules/xfree86", "xkb/rules/xorg"}; + +-KeyRules::KeyRules(QString rule): ++KeyRules::KeyRules(): + m_layouts(90) + { ++ for(int ii=0; ii<2; ii++) ++ if( QDir(X11DirList[ii]).exists() ) { ++ X11_DIR = X11DirList[ii]; ++ break; ++ } ++ ++ if( X11_DIR.isEmpty() ) { ++ kdDebug() << "Cannot find X11 directory!" << endl; ++ return; ++ } ++ + // ugly check for XFree 4.3 or older + if( QDir(X11_DIR + "xkb/symbols/pc").exists() ) { + m_xfree43 = true; +@@ -29,8 +41,20 @@ KeyRules::KeyRules(QString rule): + m_xfree43 = false; + } + +- loadRules(X11_DIR + QString("xkb/rules/%1").arg(rule)); +- loadOldLayouts(X11_DIR + QString("xkb/rules/xfree86")); ++ QString rulesFile; ++ for(int ii=0; ii<2; ii++) ++ if( QFile(X11_DIR + QString(rulesFileList[ii])).exists() ) { ++ rulesFile = X11_DIR + rulesFileList[ii]; ++ break; ++ } ++ ++ if( rulesFile.isEmpty() ) { ++ kdDebug() << "Cannot find rules file in " << X11_DIR << endl; ++ return; ++ } ++ ++ loadRules(rulesFile); ++ loadOldLayouts(rulesFile); + loadGroups(::locate("config", "kxkb_groups")); + } + +@@ -51,9 +75,7 @@ static struct { + { 0, 0 } + }; + +- XkbRF_RulesPtr rules; +- +- rules = XkbRF_Load(QFile::encodeName(file).data(), "", true, true); ++ XkbRF_RulesPtr rules = XkbRF_Load(QFile::encodeName(file).data(), "", true, true); + + if (rules == NULL) { + kdDebug() << "Unable to load rules" << endl; +@@ -176,7 +198,7 @@ unsigned int KeyRules::getGroup(const QS + return it == m_initialGroups.end() ? 0 : it.data(); + } + +- ++/* + QStringList KeyRules::rules(QString path) + { + QStringList result; +@@ -193,7 +215,7 @@ QStringList KeyRules::rules(QString path + + return result; + } +- ++*/ + + /* pretty simple algorithm - reads the layout file and + tries to find "xkb_symbols" Property changes on: head/x11/kde4-runtime/files/patch-kxkb_rules.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kde4-runtime/files/patch-kxkb_rules.h =================================================================== --- head/x11/kde4-runtime/files/patch-kxkb_rules.h (nonexistent) +++ head/x11/kde4-runtime/files/patch-kxkb_rules.h (revision 116073) @@ -0,0 +1,33 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/rules.h,v +retrieving revision 1.11 +retrieving revision 1.12 +diff -u -p -r1.11 -r1.12 +--- kxkb/rules.h 2003/08/24 04:02:38 1.11 ++++ kxkb/rules.h 2004/06/28 14:19:03 1.12 +@@ -10,14 +10,14 @@ class KeyRules + { + public: + +- KeyRules(QString rule="xfree86"); ++ KeyRules(); + + const QDict &models() const { return m_models; }; + const QDict &layouts() const { return m_layouts; }; + const QDict &options() const { return m_options; }; + + void parseVariants(const QStringList& vars, QDict& variants, bool chkVars=true); +- static QStringList rules(QString path = QString::null); ++// static QStringList rules(QString path = QString::null); + + QStringList getVariants(const QString& layout); + unsigned int getGroup(const QString& layout, const char* baseGr); +@@ -42,6 +42,8 @@ private: + QStringList m_oldLayouts; + QStringList m_nonLatinLayouts; + bool m_xfree43; ++ ++ QString X11_DIR; // pseudo-constant + }; + + Property changes on: head/x11/kde4-runtime/files/patch-kxkb_rules.h ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kde4-workspace/Makefile =================================================================== --- head/x11/kde4-workspace/Makefile (revision 116072) +++ head/x11/kde4-workspace/Makefile (revision 116073) @@ -1,88 +1,88 @@ # -*-mode: makefile-*- # New ports collection makefile for: kdebase3.1 # Date created: 29 November 2002 # Whom: kde@freebsd.org # # $FreeBSD$ # PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for the KDE system BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT} LIB_DEPENDS= smbclient:${PORTSDIR}/net/samba-libsmbclient USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} USE_OPENLDAP= yes USE_BZIP2= yes USE_GMAKE= yes USE_XPM= yes USE_REINPLACE= yes PKGMESSAGE= ${WRKDIR}/MESSAGE PKGINSTALL= ${WRKDIR}/INSTALL GNU_CONFIGURE= yes INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no CONFIGURE_ARGS+=--without-java \ --with-qt-dir=${X11BASE} \ --with-xdmdir=${X11BASE}/lib/X11/xdm OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ MOTIF "Support Netscape plugins, requires openmotif" on .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include .if !defined(WITHOUT_ARTSWRAPPER) RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper .endif .if !defined(WITHOUT_MOTIF) RUN_DEPENDS= nspluginviewer:${PORTSDIR}/www/konqueror-nsplugins .elseif defined(WITHOUT_MOTIF) CONFIGURE_ARGS+= --without-motif .endif post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv post-configure: ${REINPLACE_CMD} -e "s@^\s*Exec=.*\$$@Exec=ElectricEyes@" \ ${WRKSRC}/kappfinder/apps/Graphics/ElectricEyes.desktop ${REINPLACE_CMD} -e 's/444/644/g' \ ${WRKSRC}/kdesktop/init/Templates/Makefile post-build: @${CAT} ${PKGDIR}/pkg-message | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${PKGMESSAGE} @${CAT} ${PKGDIR}/pkg-install | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${PKGINSTALL} @${CAT} ${FILESDIR}/kdm.sh | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${WRKDIR}/kdm.sh post-install: ${RM} -f ${PREFIX}/share/apps/konsole/linux.desktop ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ ${CHMOD} g+s ${PREFIX}/bin/ksysguardd ${INSTALL_SCRIPT} ${WRKDIR}/kdm.sh ${PREFIX}/etc/rc.d .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif @${CAT} ${PKGMESSAGE} .include Property changes on: head/x11/kde4-workspace/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.141 \ No newline at end of property +1.142 \ No newline at end of property Index: head/x11/kde4-workspace/files/patch-kxkb_kcmlayout.cpp =================================================================== --- head/x11/kde4-workspace/files/patch-kxkb_kcmlayout.cpp (nonexistent) +++ head/x11/kde4-workspace/files/patch-kxkb_kcmlayout.cpp (revision 116073) @@ -0,0 +1,83 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/kcmlayout.cpp,v +retrieving revision 1.82.2.1 +retrieving revision 1.86 +diff -u -p -r1.82.2.1 -r1.86 +--- kxkb/kcmlayout.cpp 2004/05/19 12:09:58 1.82.2.1 ++++ kxkb/kcmlayout.cpp 2004/06/28 14:19:03 1.86 +@@ -79,7 +79,8 @@ OptionListItem * OptionListItem::findChi + } + + LayoutConfig::LayoutConfig(QWidget *parent, const char *name) +- : KCModule(parent, name), m_rules(0) ++ : KCModule(parent, name), ++ m_rules(NULL) + { + QVBoxLayout *main = new QVBoxLayout(this, 0, KDialog::spacingHint()); + +@@ -122,7 +124,7 @@ LayoutConfig::LayoutConfig(QWidget *pare + #endif + + //Read rules - we _must_ read _before_ creating xkb-options comboboxes +- ruleChanged("xfree86"); ++ ruleChanged(); + + makeOptionsTab(); + +@@ -292,6 +294,8 @@ QWidget* LayoutConfig::makeOptionsTab() + connect(listView, SIGNAL(clicked(QListViewItem *)), SLOT(changed())); + connect(listView, SIGNAL(clicked(QListViewItem *)), SLOT(updateOptionsCommand())); + ++ connect(widget->chkEnableOptions, SIGNAL(toggled(bool)), SLOT(changed())); ++ + connect(widget->checkResetOld, SIGNAL(toggled(bool)), SLOT(changed())); + connect(widget->checkResetOld, SIGNAL(toggled(bool)), SLOT(updateOptionsCommand())); + +@@ -405,10 +409,10 @@ void LayoutConfig::load() + bool use = config->readBoolEntry( "Use", false ); + + // find out which rule applies +- QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); ++ //QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); + + // update other files +- ruleChanged(rule); ++ ruleChanged(); + + // find out about the model + QString model = config->readEntry("Model", "pc104"); +@@ -499,12 +506,12 @@ void LayoutConfig::load() + emit KCModule::changed( false ); + } + +-void LayoutConfig::ruleChanged(const QString &rule) ++void LayoutConfig::ruleChanged() + { +- if( rule == m_rule ) +- return; ++// if( rule == m_rule ) ++// return; + +- m_rule = rule; ++// m_rule = rule; + + QString model; //, layout; + if (m_rules) +@@ -514,7 +521,7 @@ void LayoutConfig::ruleChanged(const QSt + } + + delete m_rules; +- m_rules = new KeyRules(rule); ++ m_rules = new KeyRules(); + + QStringList tmp; + widget->comboModel->clear(); +@@ -672,7 +680,7 @@ void LayoutConfig::save() + void LayoutConfig::defaults() + { + widget->chkEnable->setChecked(false); +- ruleChanged("xfree86"); ++ ruleChanged(); + + widget->comboModel->setCurrentText("pc104"); + //layoutCombo->setCurrentText("us"); Property changes on: head/x11/kde4-workspace/files/patch-kxkb_kcmlayout.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kde4-workspace/files/patch-kxkb_kcmlayout.h =================================================================== --- head/x11/kde4-workspace/files/patch-kxkb_kcmlayout.h (nonexistent) +++ head/x11/kde4-workspace/files/patch-kxkb_kcmlayout.h (revision 116073) @@ -0,0 +1,25 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/kcmlayout.h,v +retrieving revision 1.22 +retrieving revision 1.23 +diff -u -p -r1.22 -r1.23 +--- kxkb/kcmlayout.h 2003/10/29 07:30:36 1.22 ++++ kxkb/kcmlayout.h 2004/06/28 14:19:03 1.23 +@@ -54,7 +54,7 @@ protected slots: + void variantChanged(); + void latinChanged(); + void layoutSelChanged(QListViewItem *); +- void ruleChanged(const QString &rule); ++ void ruleChanged(); + void updateLayoutCommand(); + void updateOptionsCommand(); + void add(); +@@ -71,7 +71,7 @@ private: + QDict m_optionGroups; + QDict m_variants; + QDict m_includes; +- QString m_rule; ++// QString m_rule; + KeyRules *m_rules; + + QWidget* makeOptionsTab(); Property changes on: head/x11/kde4-workspace/files/patch-kxkb_kcmlayout.h ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kde4-workspace/files/patch-kxkb_kxkb.cpp =================================================================== --- head/x11/kde4-workspace/files/patch-kxkb_kxkb.cpp (nonexistent) +++ head/x11/kde4-workspace/files/patch-kxkb_kxkb.cpp (revision 116073) @@ -0,0 +1,23 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/kxkb.cpp,v +retrieving revision 1.70 +retrieving revision 1.72 +diff -u -p -r1.70 -r1.72 +--- kxkb/kxkb.cpp 2003/10/30 18:58:11 1.70 ++++ kxkb/kxkb.cpp 2004/06/28 14:19:03 1.72 +@@ -222,12 +222,12 @@ bool KXKBApp::settingsRead() + } + } + +- QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); +- m_rules = new KeyRules( rule ); ++ m_rules = new KeyRules(); + m_model = config->readEntry("Model", "pc104"); + m_layout = config->readEntry("Layout", ""); + m_defaultLayout = m_layout; + ++ + m_list = config->readListEntry("Additional"); + if (!m_list.contains(m_layout)) + { + Property changes on: head/x11/kde4-workspace/files/patch-kxkb_kxkb.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kde4-workspace/files/patch-kxkb_rules.cpp =================================================================== --- head/x11/kde4-workspace/files/patch-kxkb_rules.cpp (nonexistent) +++ head/x11/kde4-workspace/files/patch-kxkb_rules.cpp (revision 116073) @@ -0,0 +1,85 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/rules.cpp,v +retrieving revision 1.37 +retrieving revision 1.38 +diff -u -p -r1.37 -r1.38 +--- kxkb/rules.cpp 2003/10/24 06:15:26 1.37 ++++ kxkb/rules.cpp 2004/06/28 14:19:03 1.38 +@@ -16,11 +16,23 @@ + + #include "rules.h" + +-const QString X11_DIR( "/usr/X11R6/lib/X11/" ); ++const char* X11DirList[2] = {"/usr/X11R6/lib/X11/", "/usr/local/X11R6/lib/X11/"}; ++const char* rulesFileList[2] = {"xkb/rules/xfree86", "xkb/rules/xorg"}; + +-KeyRules::KeyRules(QString rule): ++KeyRules::KeyRules(): + m_layouts(90) + { ++ for(int ii=0; ii<2; ii++) ++ if( QDir(X11DirList[ii]).exists() ) { ++ X11_DIR = X11DirList[ii]; ++ break; ++ } ++ ++ if( X11_DIR.isEmpty() ) { ++ kdDebug() << "Cannot find X11 directory!" << endl; ++ return; ++ } ++ + // ugly check for XFree 4.3 or older + if( QDir(X11_DIR + "xkb/symbols/pc").exists() ) { + m_xfree43 = true; +@@ -29,8 +41,20 @@ KeyRules::KeyRules(QString rule): + m_xfree43 = false; + } + +- loadRules(X11_DIR + QString("xkb/rules/%1").arg(rule)); +- loadOldLayouts(X11_DIR + QString("xkb/rules/xfree86")); ++ QString rulesFile; ++ for(int ii=0; ii<2; ii++) ++ if( QFile(X11_DIR + QString(rulesFileList[ii])).exists() ) { ++ rulesFile = X11_DIR + rulesFileList[ii]; ++ break; ++ } ++ ++ if( rulesFile.isEmpty() ) { ++ kdDebug() << "Cannot find rules file in " << X11_DIR << endl; ++ return; ++ } ++ ++ loadRules(rulesFile); ++ loadOldLayouts(rulesFile); + loadGroups(::locate("config", "kxkb_groups")); + } + +@@ -51,9 +75,7 @@ static struct { + { 0, 0 } + }; + +- XkbRF_RulesPtr rules; +- +- rules = XkbRF_Load(QFile::encodeName(file).data(), "", true, true); ++ XkbRF_RulesPtr rules = XkbRF_Load(QFile::encodeName(file).data(), "", true, true); + + if (rules == NULL) { + kdDebug() << "Unable to load rules" << endl; +@@ -176,7 +198,7 @@ unsigned int KeyRules::getGroup(const QS + return it == m_initialGroups.end() ? 0 : it.data(); + } + +- ++/* + QStringList KeyRules::rules(QString path) + { + QStringList result; +@@ -193,7 +215,7 @@ QStringList KeyRules::rules(QString path + + return result; + } +- ++*/ + + /* pretty simple algorithm - reads the layout file and + tries to find "xkb_symbols" Property changes on: head/x11/kde4-workspace/files/patch-kxkb_rules.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kde4-workspace/files/patch-kxkb_rules.h =================================================================== --- head/x11/kde4-workspace/files/patch-kxkb_rules.h (nonexistent) +++ head/x11/kde4-workspace/files/patch-kxkb_rules.h (revision 116073) @@ -0,0 +1,33 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/rules.h,v +retrieving revision 1.11 +retrieving revision 1.12 +diff -u -p -r1.11 -r1.12 +--- kxkb/rules.h 2003/08/24 04:02:38 1.11 ++++ kxkb/rules.h 2004/06/28 14:19:03 1.12 +@@ -10,14 +10,14 @@ class KeyRules + { + public: + +- KeyRules(QString rule="xfree86"); ++ KeyRules(); + + const QDict &models() const { return m_models; }; + const QDict &layouts() const { return m_layouts; }; + const QDict &options() const { return m_options; }; + + void parseVariants(const QStringList& vars, QDict& variants, bool chkVars=true); +- static QStringList rules(QString path = QString::null); ++// static QStringList rules(QString path = QString::null); + + QStringList getVariants(const QString& layout); + unsigned int getGroup(const QString& layout, const char* baseGr); +@@ -42,6 +42,8 @@ private: + QStringList m_oldLayouts; + QStringList m_nonLatinLayouts; + bool m_xfree43; ++ ++ QString X11_DIR; // pseudo-constant + }; + + Property changes on: head/x11/kde4-workspace/files/patch-kxkb_rules.h ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kdebase3/Makefile =================================================================== --- head/x11/kdebase3/Makefile (revision 116072) +++ head/x11/kdebase3/Makefile (revision 116073) @@ -1,88 +1,88 @@ # -*-mode: makefile-*- # New ports collection makefile for: kdebase3.1 # Date created: 29 November 2002 # Whom: kde@freebsd.org # # $FreeBSD$ # PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for the KDE system BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT} LIB_DEPENDS= smbclient:${PORTSDIR}/net/samba-libsmbclient USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} USE_OPENLDAP= yes USE_BZIP2= yes USE_GMAKE= yes USE_XPM= yes USE_REINPLACE= yes PKGMESSAGE= ${WRKDIR}/MESSAGE PKGINSTALL= ${WRKDIR}/INSTALL GNU_CONFIGURE= yes INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no CONFIGURE_ARGS+=--without-java \ --with-qt-dir=${X11BASE} \ --with-xdmdir=${X11BASE}/lib/X11/xdm OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ MOTIF "Support Netscape plugins, requires openmotif" on .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include .if !defined(WITHOUT_ARTSWRAPPER) RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper .endif .if !defined(WITHOUT_MOTIF) RUN_DEPENDS= nspluginviewer:${PORTSDIR}/www/konqueror-nsplugins .elseif defined(WITHOUT_MOTIF) CONFIGURE_ARGS+= --without-motif .endif post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv post-configure: ${REINPLACE_CMD} -e "s@^\s*Exec=.*\$$@Exec=ElectricEyes@" \ ${WRKSRC}/kappfinder/apps/Graphics/ElectricEyes.desktop ${REINPLACE_CMD} -e 's/444/644/g' \ ${WRKSRC}/kdesktop/init/Templates/Makefile post-build: @${CAT} ${PKGDIR}/pkg-message | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${PKGMESSAGE} @${CAT} ${PKGDIR}/pkg-install | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${PKGINSTALL} @${CAT} ${FILESDIR}/kdm.sh | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${WRKDIR}/kdm.sh post-install: ${RM} -f ${PREFIX}/share/apps/konsole/linux.desktop ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ ${CHMOD} g+s ${PREFIX}/bin/ksysguardd ${INSTALL_SCRIPT} ${WRKDIR}/kdm.sh ${PREFIX}/etc/rc.d .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif @${CAT} ${PKGMESSAGE} .include Property changes on: head/x11/kdebase3/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.141 \ No newline at end of property +1.142 \ No newline at end of property Index: head/x11/kdebase3/files/patch-kxkb_kcmlayout.cpp =================================================================== --- head/x11/kdebase3/files/patch-kxkb_kcmlayout.cpp (nonexistent) +++ head/x11/kdebase3/files/patch-kxkb_kcmlayout.cpp (revision 116073) @@ -0,0 +1,83 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/kcmlayout.cpp,v +retrieving revision 1.82.2.1 +retrieving revision 1.86 +diff -u -p -r1.82.2.1 -r1.86 +--- kxkb/kcmlayout.cpp 2004/05/19 12:09:58 1.82.2.1 ++++ kxkb/kcmlayout.cpp 2004/06/28 14:19:03 1.86 +@@ -79,7 +79,8 @@ OptionListItem * OptionListItem::findChi + } + + LayoutConfig::LayoutConfig(QWidget *parent, const char *name) +- : KCModule(parent, name), m_rules(0) ++ : KCModule(parent, name), ++ m_rules(NULL) + { + QVBoxLayout *main = new QVBoxLayout(this, 0, KDialog::spacingHint()); + +@@ -122,7 +124,7 @@ LayoutConfig::LayoutConfig(QWidget *pare + #endif + + //Read rules - we _must_ read _before_ creating xkb-options comboboxes +- ruleChanged("xfree86"); ++ ruleChanged(); + + makeOptionsTab(); + +@@ -292,6 +294,8 @@ QWidget* LayoutConfig::makeOptionsTab() + connect(listView, SIGNAL(clicked(QListViewItem *)), SLOT(changed())); + connect(listView, SIGNAL(clicked(QListViewItem *)), SLOT(updateOptionsCommand())); + ++ connect(widget->chkEnableOptions, SIGNAL(toggled(bool)), SLOT(changed())); ++ + connect(widget->checkResetOld, SIGNAL(toggled(bool)), SLOT(changed())); + connect(widget->checkResetOld, SIGNAL(toggled(bool)), SLOT(updateOptionsCommand())); + +@@ -405,10 +409,10 @@ void LayoutConfig::load() + bool use = config->readBoolEntry( "Use", false ); + + // find out which rule applies +- QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); ++ //QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); + + // update other files +- ruleChanged(rule); ++ ruleChanged(); + + // find out about the model + QString model = config->readEntry("Model", "pc104"); +@@ -499,12 +506,12 @@ void LayoutConfig::load() + emit KCModule::changed( false ); + } + +-void LayoutConfig::ruleChanged(const QString &rule) ++void LayoutConfig::ruleChanged() + { +- if( rule == m_rule ) +- return; ++// if( rule == m_rule ) ++// return; + +- m_rule = rule; ++// m_rule = rule; + + QString model; //, layout; + if (m_rules) +@@ -514,7 +521,7 @@ void LayoutConfig::ruleChanged(const QSt + } + + delete m_rules; +- m_rules = new KeyRules(rule); ++ m_rules = new KeyRules(); + + QStringList tmp; + widget->comboModel->clear(); +@@ -672,7 +680,7 @@ void LayoutConfig::save() + void LayoutConfig::defaults() + { + widget->chkEnable->setChecked(false); +- ruleChanged("xfree86"); ++ ruleChanged(); + + widget->comboModel->setCurrentText("pc104"); + //layoutCombo->setCurrentText("us"); Property changes on: head/x11/kdebase3/files/patch-kxkb_kcmlayout.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kdebase3/files/patch-kxkb_kcmlayout.h =================================================================== --- head/x11/kdebase3/files/patch-kxkb_kcmlayout.h (nonexistent) +++ head/x11/kdebase3/files/patch-kxkb_kcmlayout.h (revision 116073) @@ -0,0 +1,25 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/kcmlayout.h,v +retrieving revision 1.22 +retrieving revision 1.23 +diff -u -p -r1.22 -r1.23 +--- kxkb/kcmlayout.h 2003/10/29 07:30:36 1.22 ++++ kxkb/kcmlayout.h 2004/06/28 14:19:03 1.23 +@@ -54,7 +54,7 @@ protected slots: + void variantChanged(); + void latinChanged(); + void layoutSelChanged(QListViewItem *); +- void ruleChanged(const QString &rule); ++ void ruleChanged(); + void updateLayoutCommand(); + void updateOptionsCommand(); + void add(); +@@ -71,7 +71,7 @@ private: + QDict m_optionGroups; + QDict m_variants; + QDict m_includes; +- QString m_rule; ++// QString m_rule; + KeyRules *m_rules; + + QWidget* makeOptionsTab(); Property changes on: head/x11/kdebase3/files/patch-kxkb_kcmlayout.h ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kdebase3/files/patch-kxkb_kxkb.cpp =================================================================== --- head/x11/kdebase3/files/patch-kxkb_kxkb.cpp (nonexistent) +++ head/x11/kdebase3/files/patch-kxkb_kxkb.cpp (revision 116073) @@ -0,0 +1,23 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/kxkb.cpp,v +retrieving revision 1.70 +retrieving revision 1.72 +diff -u -p -r1.70 -r1.72 +--- kxkb/kxkb.cpp 2003/10/30 18:58:11 1.70 ++++ kxkb/kxkb.cpp 2004/06/28 14:19:03 1.72 +@@ -222,12 +222,12 @@ bool KXKBApp::settingsRead() + } + } + +- QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); +- m_rules = new KeyRules( rule ); ++ m_rules = new KeyRules(); + m_model = config->readEntry("Model", "pc104"); + m_layout = config->readEntry("Layout", ""); + m_defaultLayout = m_layout; + ++ + m_list = config->readListEntry("Additional"); + if (!m_list.contains(m_layout)) + { + Property changes on: head/x11/kdebase3/files/patch-kxkb_kxkb.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kdebase3/files/patch-kxkb_rules.cpp =================================================================== --- head/x11/kdebase3/files/patch-kxkb_rules.cpp (nonexistent) +++ head/x11/kdebase3/files/patch-kxkb_rules.cpp (revision 116073) @@ -0,0 +1,85 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/rules.cpp,v +retrieving revision 1.37 +retrieving revision 1.38 +diff -u -p -r1.37 -r1.38 +--- kxkb/rules.cpp 2003/10/24 06:15:26 1.37 ++++ kxkb/rules.cpp 2004/06/28 14:19:03 1.38 +@@ -16,11 +16,23 @@ + + #include "rules.h" + +-const QString X11_DIR( "/usr/X11R6/lib/X11/" ); ++const char* X11DirList[2] = {"/usr/X11R6/lib/X11/", "/usr/local/X11R6/lib/X11/"}; ++const char* rulesFileList[2] = {"xkb/rules/xfree86", "xkb/rules/xorg"}; + +-KeyRules::KeyRules(QString rule): ++KeyRules::KeyRules(): + m_layouts(90) + { ++ for(int ii=0; ii<2; ii++) ++ if( QDir(X11DirList[ii]).exists() ) { ++ X11_DIR = X11DirList[ii]; ++ break; ++ } ++ ++ if( X11_DIR.isEmpty() ) { ++ kdDebug() << "Cannot find X11 directory!" << endl; ++ return; ++ } ++ + // ugly check for XFree 4.3 or older + if( QDir(X11_DIR + "xkb/symbols/pc").exists() ) { + m_xfree43 = true; +@@ -29,8 +41,20 @@ KeyRules::KeyRules(QString rule): + m_xfree43 = false; + } + +- loadRules(X11_DIR + QString("xkb/rules/%1").arg(rule)); +- loadOldLayouts(X11_DIR + QString("xkb/rules/xfree86")); ++ QString rulesFile; ++ for(int ii=0; ii<2; ii++) ++ if( QFile(X11_DIR + QString(rulesFileList[ii])).exists() ) { ++ rulesFile = X11_DIR + rulesFileList[ii]; ++ break; ++ } ++ ++ if( rulesFile.isEmpty() ) { ++ kdDebug() << "Cannot find rules file in " << X11_DIR << endl; ++ return; ++ } ++ ++ loadRules(rulesFile); ++ loadOldLayouts(rulesFile); + loadGroups(::locate("config", "kxkb_groups")); + } + +@@ -51,9 +75,7 @@ static struct { + { 0, 0 } + }; + +- XkbRF_RulesPtr rules; +- +- rules = XkbRF_Load(QFile::encodeName(file).data(), "", true, true); ++ XkbRF_RulesPtr rules = XkbRF_Load(QFile::encodeName(file).data(), "", true, true); + + if (rules == NULL) { + kdDebug() << "Unable to load rules" << endl; +@@ -176,7 +198,7 @@ unsigned int KeyRules::getGroup(const QS + return it == m_initialGroups.end() ? 0 : it.data(); + } + +- ++/* + QStringList KeyRules::rules(QString path) + { + QStringList result; +@@ -193,7 +215,7 @@ QStringList KeyRules::rules(QString path + + return result; + } +- ++*/ + + /* pretty simple algorithm - reads the layout file and + tries to find "xkb_symbols" Property changes on: head/x11/kdebase3/files/patch-kxkb_rules.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kdebase3/files/patch-kxkb_rules.h =================================================================== --- head/x11/kdebase3/files/patch-kxkb_rules.h (nonexistent) +++ head/x11/kdebase3/files/patch-kxkb_rules.h (revision 116073) @@ -0,0 +1,33 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/rules.h,v +retrieving revision 1.11 +retrieving revision 1.12 +diff -u -p -r1.11 -r1.12 +--- kxkb/rules.h 2003/08/24 04:02:38 1.11 ++++ kxkb/rules.h 2004/06/28 14:19:03 1.12 +@@ -10,14 +10,14 @@ class KeyRules + { + public: + +- KeyRules(QString rule="xfree86"); ++ KeyRules(); + + const QDict &models() const { return m_models; }; + const QDict &layouts() const { return m_layouts; }; + const QDict &options() const { return m_options; }; + + void parseVariants(const QStringList& vars, QDict& variants, bool chkVars=true); +- static QStringList rules(QString path = QString::null); ++// static QStringList rules(QString path = QString::null); + + QStringList getVariants(const QString& layout); + unsigned int getGroup(const QString& layout, const char* baseGr); +@@ -42,6 +42,8 @@ private: + QStringList m_oldLayouts; + QStringList m_nonLatinLayouts; + bool m_xfree43; ++ ++ QString X11_DIR; // pseudo-constant + }; + + Property changes on: head/x11/kdebase3/files/patch-kxkb_rules.h ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kdebase4/Makefile =================================================================== --- head/x11/kdebase4/Makefile (revision 116072) +++ head/x11/kdebase4/Makefile (revision 116073) @@ -1,88 +1,88 @@ # -*-mode: makefile-*- # New ports collection makefile for: kdebase3.1 # Date created: 29 November 2002 # Whom: kde@freebsd.org # # $FreeBSD$ # PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for the KDE system BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT} LIB_DEPENDS= smbclient:${PORTSDIR}/net/samba-libsmbclient USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} USE_OPENLDAP= yes USE_BZIP2= yes USE_GMAKE= yes USE_XPM= yes USE_REINPLACE= yes PKGMESSAGE= ${WRKDIR}/MESSAGE PKGINSTALL= ${WRKDIR}/INSTALL GNU_CONFIGURE= yes INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no CONFIGURE_ARGS+=--without-java \ --with-qt-dir=${X11BASE} \ --with-xdmdir=${X11BASE}/lib/X11/xdm OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ MOTIF "Support Netscape plugins, requires openmotif" on .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include .if !defined(WITHOUT_ARTSWRAPPER) RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper .endif .if !defined(WITHOUT_MOTIF) RUN_DEPENDS= nspluginviewer:${PORTSDIR}/www/konqueror-nsplugins .elseif defined(WITHOUT_MOTIF) CONFIGURE_ARGS+= --without-motif .endif post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv post-configure: ${REINPLACE_CMD} -e "s@^\s*Exec=.*\$$@Exec=ElectricEyes@" \ ${WRKSRC}/kappfinder/apps/Graphics/ElectricEyes.desktop ${REINPLACE_CMD} -e 's/444/644/g' \ ${WRKSRC}/kdesktop/init/Templates/Makefile post-build: @${CAT} ${PKGDIR}/pkg-message | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${PKGMESSAGE} @${CAT} ${PKGDIR}/pkg-install | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${PKGINSTALL} @${CAT} ${FILESDIR}/kdm.sh | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${WRKDIR}/kdm.sh post-install: ${RM} -f ${PREFIX}/share/apps/konsole/linux.desktop ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ ${CHMOD} g+s ${PREFIX}/bin/ksysguardd ${INSTALL_SCRIPT} ${WRKDIR}/kdm.sh ${PREFIX}/etc/rc.d .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif @${CAT} ${PKGMESSAGE} .include Property changes on: head/x11/kdebase4/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.141 \ No newline at end of property +1.142 \ No newline at end of property Index: head/x11/kdebase4/files/patch-kxkb_kcmlayout.cpp =================================================================== --- head/x11/kdebase4/files/patch-kxkb_kcmlayout.cpp (nonexistent) +++ head/x11/kdebase4/files/patch-kxkb_kcmlayout.cpp (revision 116073) @@ -0,0 +1,83 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/kcmlayout.cpp,v +retrieving revision 1.82.2.1 +retrieving revision 1.86 +diff -u -p -r1.82.2.1 -r1.86 +--- kxkb/kcmlayout.cpp 2004/05/19 12:09:58 1.82.2.1 ++++ kxkb/kcmlayout.cpp 2004/06/28 14:19:03 1.86 +@@ -79,7 +79,8 @@ OptionListItem * OptionListItem::findChi + } + + LayoutConfig::LayoutConfig(QWidget *parent, const char *name) +- : KCModule(parent, name), m_rules(0) ++ : KCModule(parent, name), ++ m_rules(NULL) + { + QVBoxLayout *main = new QVBoxLayout(this, 0, KDialog::spacingHint()); + +@@ -122,7 +124,7 @@ LayoutConfig::LayoutConfig(QWidget *pare + #endif + + //Read rules - we _must_ read _before_ creating xkb-options comboboxes +- ruleChanged("xfree86"); ++ ruleChanged(); + + makeOptionsTab(); + +@@ -292,6 +294,8 @@ QWidget* LayoutConfig::makeOptionsTab() + connect(listView, SIGNAL(clicked(QListViewItem *)), SLOT(changed())); + connect(listView, SIGNAL(clicked(QListViewItem *)), SLOT(updateOptionsCommand())); + ++ connect(widget->chkEnableOptions, SIGNAL(toggled(bool)), SLOT(changed())); ++ + connect(widget->checkResetOld, SIGNAL(toggled(bool)), SLOT(changed())); + connect(widget->checkResetOld, SIGNAL(toggled(bool)), SLOT(updateOptionsCommand())); + +@@ -405,10 +409,10 @@ void LayoutConfig::load() + bool use = config->readBoolEntry( "Use", false ); + + // find out which rule applies +- QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); ++ //QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); + + // update other files +- ruleChanged(rule); ++ ruleChanged(); + + // find out about the model + QString model = config->readEntry("Model", "pc104"); +@@ -499,12 +506,12 @@ void LayoutConfig::load() + emit KCModule::changed( false ); + } + +-void LayoutConfig::ruleChanged(const QString &rule) ++void LayoutConfig::ruleChanged() + { +- if( rule == m_rule ) +- return; ++// if( rule == m_rule ) ++// return; + +- m_rule = rule; ++// m_rule = rule; + + QString model; //, layout; + if (m_rules) +@@ -514,7 +521,7 @@ void LayoutConfig::ruleChanged(const QSt + } + + delete m_rules; +- m_rules = new KeyRules(rule); ++ m_rules = new KeyRules(); + + QStringList tmp; + widget->comboModel->clear(); +@@ -672,7 +680,7 @@ void LayoutConfig::save() + void LayoutConfig::defaults() + { + widget->chkEnable->setChecked(false); +- ruleChanged("xfree86"); ++ ruleChanged(); + + widget->comboModel->setCurrentText("pc104"); + //layoutCombo->setCurrentText("us"); Property changes on: head/x11/kdebase4/files/patch-kxkb_kcmlayout.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kdebase4/files/patch-kxkb_kcmlayout.h =================================================================== --- head/x11/kdebase4/files/patch-kxkb_kcmlayout.h (nonexistent) +++ head/x11/kdebase4/files/patch-kxkb_kcmlayout.h (revision 116073) @@ -0,0 +1,25 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/kcmlayout.h,v +retrieving revision 1.22 +retrieving revision 1.23 +diff -u -p -r1.22 -r1.23 +--- kxkb/kcmlayout.h 2003/10/29 07:30:36 1.22 ++++ kxkb/kcmlayout.h 2004/06/28 14:19:03 1.23 +@@ -54,7 +54,7 @@ protected slots: + void variantChanged(); + void latinChanged(); + void layoutSelChanged(QListViewItem *); +- void ruleChanged(const QString &rule); ++ void ruleChanged(); + void updateLayoutCommand(); + void updateOptionsCommand(); + void add(); +@@ -71,7 +71,7 @@ private: + QDict m_optionGroups; + QDict m_variants; + QDict m_includes; +- QString m_rule; ++// QString m_rule; + KeyRules *m_rules; + + QWidget* makeOptionsTab(); Property changes on: head/x11/kdebase4/files/patch-kxkb_kcmlayout.h ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kdebase4/files/patch-kxkb_kxkb.cpp =================================================================== --- head/x11/kdebase4/files/patch-kxkb_kxkb.cpp (nonexistent) +++ head/x11/kdebase4/files/patch-kxkb_kxkb.cpp (revision 116073) @@ -0,0 +1,23 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/kxkb.cpp,v +retrieving revision 1.70 +retrieving revision 1.72 +diff -u -p -r1.70 -r1.72 +--- kxkb/kxkb.cpp 2003/10/30 18:58:11 1.70 ++++ kxkb/kxkb.cpp 2004/06/28 14:19:03 1.72 +@@ -222,12 +222,12 @@ bool KXKBApp::settingsRead() + } + } + +- QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); +- m_rules = new KeyRules( rule ); ++ m_rules = new KeyRules(); + m_model = config->readEntry("Model", "pc104"); + m_layout = config->readEntry("Layout", ""); + m_defaultLayout = m_layout; + ++ + m_list = config->readListEntry("Additional"); + if (!m_list.contains(m_layout)) + { + Property changes on: head/x11/kdebase4/files/patch-kxkb_kxkb.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kdebase4/files/patch-kxkb_rules.cpp =================================================================== --- head/x11/kdebase4/files/patch-kxkb_rules.cpp (nonexistent) +++ head/x11/kdebase4/files/patch-kxkb_rules.cpp (revision 116073) @@ -0,0 +1,85 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/rules.cpp,v +retrieving revision 1.37 +retrieving revision 1.38 +diff -u -p -r1.37 -r1.38 +--- kxkb/rules.cpp 2003/10/24 06:15:26 1.37 ++++ kxkb/rules.cpp 2004/06/28 14:19:03 1.38 +@@ -16,11 +16,23 @@ + + #include "rules.h" + +-const QString X11_DIR( "/usr/X11R6/lib/X11/" ); ++const char* X11DirList[2] = {"/usr/X11R6/lib/X11/", "/usr/local/X11R6/lib/X11/"}; ++const char* rulesFileList[2] = {"xkb/rules/xfree86", "xkb/rules/xorg"}; + +-KeyRules::KeyRules(QString rule): ++KeyRules::KeyRules(): + m_layouts(90) + { ++ for(int ii=0; ii<2; ii++) ++ if( QDir(X11DirList[ii]).exists() ) { ++ X11_DIR = X11DirList[ii]; ++ break; ++ } ++ ++ if( X11_DIR.isEmpty() ) { ++ kdDebug() << "Cannot find X11 directory!" << endl; ++ return; ++ } ++ + // ugly check for XFree 4.3 or older + if( QDir(X11_DIR + "xkb/symbols/pc").exists() ) { + m_xfree43 = true; +@@ -29,8 +41,20 @@ KeyRules::KeyRules(QString rule): + m_xfree43 = false; + } + +- loadRules(X11_DIR + QString("xkb/rules/%1").arg(rule)); +- loadOldLayouts(X11_DIR + QString("xkb/rules/xfree86")); ++ QString rulesFile; ++ for(int ii=0; ii<2; ii++) ++ if( QFile(X11_DIR + QString(rulesFileList[ii])).exists() ) { ++ rulesFile = X11_DIR + rulesFileList[ii]; ++ break; ++ } ++ ++ if( rulesFile.isEmpty() ) { ++ kdDebug() << "Cannot find rules file in " << X11_DIR << endl; ++ return; ++ } ++ ++ loadRules(rulesFile); ++ loadOldLayouts(rulesFile); + loadGroups(::locate("config", "kxkb_groups")); + } + +@@ -51,9 +75,7 @@ static struct { + { 0, 0 } + }; + +- XkbRF_RulesPtr rules; +- +- rules = XkbRF_Load(QFile::encodeName(file).data(), "", true, true); ++ XkbRF_RulesPtr rules = XkbRF_Load(QFile::encodeName(file).data(), "", true, true); + + if (rules == NULL) { + kdDebug() << "Unable to load rules" << endl; +@@ -176,7 +198,7 @@ unsigned int KeyRules::getGroup(const QS + return it == m_initialGroups.end() ? 0 : it.data(); + } + +- ++/* + QStringList KeyRules::rules(QString path) + { + QStringList result; +@@ -193,7 +215,7 @@ QStringList KeyRules::rules(QString path + + return result; + } +- ++*/ + + /* pretty simple algorithm - reads the layout file and + tries to find "xkb_symbols" Property changes on: head/x11/kdebase4/files/patch-kxkb_rules.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kdebase4/files/patch-kxkb_rules.h =================================================================== --- head/x11/kdebase4/files/patch-kxkb_rules.h (nonexistent) +++ head/x11/kdebase4/files/patch-kxkb_rules.h (revision 116073) @@ -0,0 +1,33 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/rules.h,v +retrieving revision 1.11 +retrieving revision 1.12 +diff -u -p -r1.11 -r1.12 +--- kxkb/rules.h 2003/08/24 04:02:38 1.11 ++++ kxkb/rules.h 2004/06/28 14:19:03 1.12 +@@ -10,14 +10,14 @@ class KeyRules + { + public: + +- KeyRules(QString rule="xfree86"); ++ KeyRules(); + + const QDict &models() const { return m_models; }; + const QDict &layouts() const { return m_layouts; }; + const QDict &options() const { return m_options; }; + + void parseVariants(const QStringList& vars, QDict& variants, bool chkVars=true); +- static QStringList rules(QString path = QString::null); ++// static QStringList rules(QString path = QString::null); + + QStringList getVariants(const QString& layout); + unsigned int getGroup(const QString& layout, const char* baseGr); +@@ -42,6 +42,8 @@ private: + QStringList m_oldLayouts; + QStringList m_nonLatinLayouts; + bool m_xfree43; ++ ++ QString X11_DIR; // pseudo-constant + }; + + Property changes on: head/x11/kdebase4/files/patch-kxkb_rules.h ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kdebase4-runtime/Makefile =================================================================== --- head/x11/kdebase4-runtime/Makefile (revision 116072) +++ head/x11/kdebase4-runtime/Makefile (revision 116073) @@ -1,88 +1,88 @@ # -*-mode: makefile-*- # New ports collection makefile for: kdebase3.1 # Date created: 29 November 2002 # Whom: kde@freebsd.org # # $FreeBSD$ # PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for the KDE system BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT} LIB_DEPENDS= smbclient:${PORTSDIR}/net/samba-libsmbclient USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} USE_OPENLDAP= yes USE_BZIP2= yes USE_GMAKE= yes USE_XPM= yes USE_REINPLACE= yes PKGMESSAGE= ${WRKDIR}/MESSAGE PKGINSTALL= ${WRKDIR}/INSTALL GNU_CONFIGURE= yes INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no CONFIGURE_ARGS+=--without-java \ --with-qt-dir=${X11BASE} \ --with-xdmdir=${X11BASE}/lib/X11/xdm OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ MOTIF "Support Netscape plugins, requires openmotif" on .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include .if !defined(WITHOUT_ARTSWRAPPER) RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper .endif .if !defined(WITHOUT_MOTIF) RUN_DEPENDS= nspluginviewer:${PORTSDIR}/www/konqueror-nsplugins .elseif defined(WITHOUT_MOTIF) CONFIGURE_ARGS+= --without-motif .endif post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv post-configure: ${REINPLACE_CMD} -e "s@^\s*Exec=.*\$$@Exec=ElectricEyes@" \ ${WRKSRC}/kappfinder/apps/Graphics/ElectricEyes.desktop ${REINPLACE_CMD} -e 's/444/644/g' \ ${WRKSRC}/kdesktop/init/Templates/Makefile post-build: @${CAT} ${PKGDIR}/pkg-message | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${PKGMESSAGE} @${CAT} ${PKGDIR}/pkg-install | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${PKGINSTALL} @${CAT} ${FILESDIR}/kdm.sh | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${WRKDIR}/kdm.sh post-install: ${RM} -f ${PREFIX}/share/apps/konsole/linux.desktop ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ ${CHMOD} g+s ${PREFIX}/bin/ksysguardd ${INSTALL_SCRIPT} ${WRKDIR}/kdm.sh ${PREFIX}/etc/rc.d .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif @${CAT} ${PKGMESSAGE} .include Property changes on: head/x11/kdebase4-runtime/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.141 \ No newline at end of property +1.142 \ No newline at end of property Index: head/x11/kdebase4-runtime/files/patch-kxkb_kcmlayout.cpp =================================================================== --- head/x11/kdebase4-runtime/files/patch-kxkb_kcmlayout.cpp (nonexistent) +++ head/x11/kdebase4-runtime/files/patch-kxkb_kcmlayout.cpp (revision 116073) @@ -0,0 +1,83 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/kcmlayout.cpp,v +retrieving revision 1.82.2.1 +retrieving revision 1.86 +diff -u -p -r1.82.2.1 -r1.86 +--- kxkb/kcmlayout.cpp 2004/05/19 12:09:58 1.82.2.1 ++++ kxkb/kcmlayout.cpp 2004/06/28 14:19:03 1.86 +@@ -79,7 +79,8 @@ OptionListItem * OptionListItem::findChi + } + + LayoutConfig::LayoutConfig(QWidget *parent, const char *name) +- : KCModule(parent, name), m_rules(0) ++ : KCModule(parent, name), ++ m_rules(NULL) + { + QVBoxLayout *main = new QVBoxLayout(this, 0, KDialog::spacingHint()); + +@@ -122,7 +124,7 @@ LayoutConfig::LayoutConfig(QWidget *pare + #endif + + //Read rules - we _must_ read _before_ creating xkb-options comboboxes +- ruleChanged("xfree86"); ++ ruleChanged(); + + makeOptionsTab(); + +@@ -292,6 +294,8 @@ QWidget* LayoutConfig::makeOptionsTab() + connect(listView, SIGNAL(clicked(QListViewItem *)), SLOT(changed())); + connect(listView, SIGNAL(clicked(QListViewItem *)), SLOT(updateOptionsCommand())); + ++ connect(widget->chkEnableOptions, SIGNAL(toggled(bool)), SLOT(changed())); ++ + connect(widget->checkResetOld, SIGNAL(toggled(bool)), SLOT(changed())); + connect(widget->checkResetOld, SIGNAL(toggled(bool)), SLOT(updateOptionsCommand())); + +@@ -405,10 +409,10 @@ void LayoutConfig::load() + bool use = config->readBoolEntry( "Use", false ); + + // find out which rule applies +- QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); ++ //QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); + + // update other files +- ruleChanged(rule); ++ ruleChanged(); + + // find out about the model + QString model = config->readEntry("Model", "pc104"); +@@ -499,12 +506,12 @@ void LayoutConfig::load() + emit KCModule::changed( false ); + } + +-void LayoutConfig::ruleChanged(const QString &rule) ++void LayoutConfig::ruleChanged() + { +- if( rule == m_rule ) +- return; ++// if( rule == m_rule ) ++// return; + +- m_rule = rule; ++// m_rule = rule; + + QString model; //, layout; + if (m_rules) +@@ -514,7 +521,7 @@ void LayoutConfig::ruleChanged(const QSt + } + + delete m_rules; +- m_rules = new KeyRules(rule); ++ m_rules = new KeyRules(); + + QStringList tmp; + widget->comboModel->clear(); +@@ -672,7 +680,7 @@ void LayoutConfig::save() + void LayoutConfig::defaults() + { + widget->chkEnable->setChecked(false); +- ruleChanged("xfree86"); ++ ruleChanged(); + + widget->comboModel->setCurrentText("pc104"); + //layoutCombo->setCurrentText("us"); Property changes on: head/x11/kdebase4-runtime/files/patch-kxkb_kcmlayout.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kdebase4-runtime/files/patch-kxkb_kcmlayout.h =================================================================== --- head/x11/kdebase4-runtime/files/patch-kxkb_kcmlayout.h (nonexistent) +++ head/x11/kdebase4-runtime/files/patch-kxkb_kcmlayout.h (revision 116073) @@ -0,0 +1,25 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/kcmlayout.h,v +retrieving revision 1.22 +retrieving revision 1.23 +diff -u -p -r1.22 -r1.23 +--- kxkb/kcmlayout.h 2003/10/29 07:30:36 1.22 ++++ kxkb/kcmlayout.h 2004/06/28 14:19:03 1.23 +@@ -54,7 +54,7 @@ protected slots: + void variantChanged(); + void latinChanged(); + void layoutSelChanged(QListViewItem *); +- void ruleChanged(const QString &rule); ++ void ruleChanged(); + void updateLayoutCommand(); + void updateOptionsCommand(); + void add(); +@@ -71,7 +71,7 @@ private: + QDict m_optionGroups; + QDict m_variants; + QDict m_includes; +- QString m_rule; ++// QString m_rule; + KeyRules *m_rules; + + QWidget* makeOptionsTab(); Property changes on: head/x11/kdebase4-runtime/files/patch-kxkb_kcmlayout.h ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kdebase4-runtime/files/patch-kxkb_kxkb.cpp =================================================================== --- head/x11/kdebase4-runtime/files/patch-kxkb_kxkb.cpp (nonexistent) +++ head/x11/kdebase4-runtime/files/patch-kxkb_kxkb.cpp (revision 116073) @@ -0,0 +1,23 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/kxkb.cpp,v +retrieving revision 1.70 +retrieving revision 1.72 +diff -u -p -r1.70 -r1.72 +--- kxkb/kxkb.cpp 2003/10/30 18:58:11 1.70 ++++ kxkb/kxkb.cpp 2004/06/28 14:19:03 1.72 +@@ -222,12 +222,12 @@ bool KXKBApp::settingsRead() + } + } + +- QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); +- m_rules = new KeyRules( rule ); ++ m_rules = new KeyRules(); + m_model = config->readEntry("Model", "pc104"); + m_layout = config->readEntry("Layout", ""); + m_defaultLayout = m_layout; + ++ + m_list = config->readListEntry("Additional"); + if (!m_list.contains(m_layout)) + { + Property changes on: head/x11/kdebase4-runtime/files/patch-kxkb_kxkb.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kdebase4-runtime/files/patch-kxkb_rules.cpp =================================================================== --- head/x11/kdebase4-runtime/files/patch-kxkb_rules.cpp (nonexistent) +++ head/x11/kdebase4-runtime/files/patch-kxkb_rules.cpp (revision 116073) @@ -0,0 +1,85 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/rules.cpp,v +retrieving revision 1.37 +retrieving revision 1.38 +diff -u -p -r1.37 -r1.38 +--- kxkb/rules.cpp 2003/10/24 06:15:26 1.37 ++++ kxkb/rules.cpp 2004/06/28 14:19:03 1.38 +@@ -16,11 +16,23 @@ + + #include "rules.h" + +-const QString X11_DIR( "/usr/X11R6/lib/X11/" ); ++const char* X11DirList[2] = {"/usr/X11R6/lib/X11/", "/usr/local/X11R6/lib/X11/"}; ++const char* rulesFileList[2] = {"xkb/rules/xfree86", "xkb/rules/xorg"}; + +-KeyRules::KeyRules(QString rule): ++KeyRules::KeyRules(): + m_layouts(90) + { ++ for(int ii=0; ii<2; ii++) ++ if( QDir(X11DirList[ii]).exists() ) { ++ X11_DIR = X11DirList[ii]; ++ break; ++ } ++ ++ if( X11_DIR.isEmpty() ) { ++ kdDebug() << "Cannot find X11 directory!" << endl; ++ return; ++ } ++ + // ugly check for XFree 4.3 or older + if( QDir(X11_DIR + "xkb/symbols/pc").exists() ) { + m_xfree43 = true; +@@ -29,8 +41,20 @@ KeyRules::KeyRules(QString rule): + m_xfree43 = false; + } + +- loadRules(X11_DIR + QString("xkb/rules/%1").arg(rule)); +- loadOldLayouts(X11_DIR + QString("xkb/rules/xfree86")); ++ QString rulesFile; ++ for(int ii=0; ii<2; ii++) ++ if( QFile(X11_DIR + QString(rulesFileList[ii])).exists() ) { ++ rulesFile = X11_DIR + rulesFileList[ii]; ++ break; ++ } ++ ++ if( rulesFile.isEmpty() ) { ++ kdDebug() << "Cannot find rules file in " << X11_DIR << endl; ++ return; ++ } ++ ++ loadRules(rulesFile); ++ loadOldLayouts(rulesFile); + loadGroups(::locate("config", "kxkb_groups")); + } + +@@ -51,9 +75,7 @@ static struct { + { 0, 0 } + }; + +- XkbRF_RulesPtr rules; +- +- rules = XkbRF_Load(QFile::encodeName(file).data(), "", true, true); ++ XkbRF_RulesPtr rules = XkbRF_Load(QFile::encodeName(file).data(), "", true, true); + + if (rules == NULL) { + kdDebug() << "Unable to load rules" << endl; +@@ -176,7 +198,7 @@ unsigned int KeyRules::getGroup(const QS + return it == m_initialGroups.end() ? 0 : it.data(); + } + +- ++/* + QStringList KeyRules::rules(QString path) + { + QStringList result; +@@ -193,7 +215,7 @@ QStringList KeyRules::rules(QString path + + return result; + } +- ++*/ + + /* pretty simple algorithm - reads the layout file and + tries to find "xkb_symbols" Property changes on: head/x11/kdebase4-runtime/files/patch-kxkb_rules.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kdebase4-runtime/files/patch-kxkb_rules.h =================================================================== --- head/x11/kdebase4-runtime/files/patch-kxkb_rules.h (nonexistent) +++ head/x11/kdebase4-runtime/files/patch-kxkb_rules.h (revision 116073) @@ -0,0 +1,33 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/rules.h,v +retrieving revision 1.11 +retrieving revision 1.12 +diff -u -p -r1.11 -r1.12 +--- kxkb/rules.h 2003/08/24 04:02:38 1.11 ++++ kxkb/rules.h 2004/06/28 14:19:03 1.12 +@@ -10,14 +10,14 @@ class KeyRules + { + public: + +- KeyRules(QString rule="xfree86"); ++ KeyRules(); + + const QDict &models() const { return m_models; }; + const QDict &layouts() const { return m_layouts; }; + const QDict &options() const { return m_options; }; + + void parseVariants(const QStringList& vars, QDict& variants, bool chkVars=true); +- static QStringList rules(QString path = QString::null); ++// static QStringList rules(QString path = QString::null); + + QStringList getVariants(const QString& layout); + unsigned int getGroup(const QString& layout, const char* baseGr); +@@ -42,6 +42,8 @@ private: + QStringList m_oldLayouts; + QStringList m_nonLatinLayouts; + bool m_xfree43; ++ ++ QString X11_DIR; // pseudo-constant + }; + + Property changes on: head/x11/kdebase4-runtime/files/patch-kxkb_rules.h ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kdebase4-workspace/Makefile =================================================================== --- head/x11/kdebase4-workspace/Makefile (revision 116072) +++ head/x11/kdebase4-workspace/Makefile (revision 116073) @@ -1,88 +1,88 @@ # -*-mode: makefile-*- # New ports collection makefile for: kdebase3.1 # Date created: 29 November 2002 # Whom: kde@freebsd.org # # $FreeBSD$ # PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for the KDE system BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT} LIB_DEPENDS= smbclient:${PORTSDIR}/net/samba-libsmbclient USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} USE_OPENLDAP= yes USE_BZIP2= yes USE_GMAKE= yes USE_XPM= yes USE_REINPLACE= yes PKGMESSAGE= ${WRKDIR}/MESSAGE PKGINSTALL= ${WRKDIR}/INSTALL GNU_CONFIGURE= yes INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no CONFIGURE_ARGS+=--without-java \ --with-qt-dir=${X11BASE} \ --with-xdmdir=${X11BASE}/lib/X11/xdm OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ MOTIF "Support Netscape plugins, requires openmotif" on .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include .if !defined(WITHOUT_ARTSWRAPPER) RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper .endif .if !defined(WITHOUT_MOTIF) RUN_DEPENDS= nspluginviewer:${PORTSDIR}/www/konqueror-nsplugins .elseif defined(WITHOUT_MOTIF) CONFIGURE_ARGS+= --without-motif .endif post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv post-configure: ${REINPLACE_CMD} -e "s@^\s*Exec=.*\$$@Exec=ElectricEyes@" \ ${WRKSRC}/kappfinder/apps/Graphics/ElectricEyes.desktop ${REINPLACE_CMD} -e 's/444/644/g' \ ${WRKSRC}/kdesktop/init/Templates/Makefile post-build: @${CAT} ${PKGDIR}/pkg-message | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${PKGMESSAGE} @${CAT} ${PKGDIR}/pkg-install | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${PKGINSTALL} @${CAT} ${FILESDIR}/kdm.sh | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${WRKDIR}/kdm.sh post-install: ${RM} -f ${PREFIX}/share/apps/konsole/linux.desktop ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ ${CHMOD} g+s ${PREFIX}/bin/ksysguardd ${INSTALL_SCRIPT} ${WRKDIR}/kdm.sh ${PREFIX}/etc/rc.d .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif @${CAT} ${PKGMESSAGE} .include Property changes on: head/x11/kdebase4-workspace/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.141 \ No newline at end of property +1.142 \ No newline at end of property Index: head/x11/kdebase4-workspace/files/patch-kxkb_kcmlayout.cpp =================================================================== --- head/x11/kdebase4-workspace/files/patch-kxkb_kcmlayout.cpp (nonexistent) +++ head/x11/kdebase4-workspace/files/patch-kxkb_kcmlayout.cpp (revision 116073) @@ -0,0 +1,83 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/kcmlayout.cpp,v +retrieving revision 1.82.2.1 +retrieving revision 1.86 +diff -u -p -r1.82.2.1 -r1.86 +--- kxkb/kcmlayout.cpp 2004/05/19 12:09:58 1.82.2.1 ++++ kxkb/kcmlayout.cpp 2004/06/28 14:19:03 1.86 +@@ -79,7 +79,8 @@ OptionListItem * OptionListItem::findChi + } + + LayoutConfig::LayoutConfig(QWidget *parent, const char *name) +- : KCModule(parent, name), m_rules(0) ++ : KCModule(parent, name), ++ m_rules(NULL) + { + QVBoxLayout *main = new QVBoxLayout(this, 0, KDialog::spacingHint()); + +@@ -122,7 +124,7 @@ LayoutConfig::LayoutConfig(QWidget *pare + #endif + + //Read rules - we _must_ read _before_ creating xkb-options comboboxes +- ruleChanged("xfree86"); ++ ruleChanged(); + + makeOptionsTab(); + +@@ -292,6 +294,8 @@ QWidget* LayoutConfig::makeOptionsTab() + connect(listView, SIGNAL(clicked(QListViewItem *)), SLOT(changed())); + connect(listView, SIGNAL(clicked(QListViewItem *)), SLOT(updateOptionsCommand())); + ++ connect(widget->chkEnableOptions, SIGNAL(toggled(bool)), SLOT(changed())); ++ + connect(widget->checkResetOld, SIGNAL(toggled(bool)), SLOT(changed())); + connect(widget->checkResetOld, SIGNAL(toggled(bool)), SLOT(updateOptionsCommand())); + +@@ -405,10 +409,10 @@ void LayoutConfig::load() + bool use = config->readBoolEntry( "Use", false ); + + // find out which rule applies +- QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); ++ //QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); + + // update other files +- ruleChanged(rule); ++ ruleChanged(); + + // find out about the model + QString model = config->readEntry("Model", "pc104"); +@@ -499,12 +506,12 @@ void LayoutConfig::load() + emit KCModule::changed( false ); + } + +-void LayoutConfig::ruleChanged(const QString &rule) ++void LayoutConfig::ruleChanged() + { +- if( rule == m_rule ) +- return; ++// if( rule == m_rule ) ++// return; + +- m_rule = rule; ++// m_rule = rule; + + QString model; //, layout; + if (m_rules) +@@ -514,7 +521,7 @@ void LayoutConfig::ruleChanged(const QSt + } + + delete m_rules; +- m_rules = new KeyRules(rule); ++ m_rules = new KeyRules(); + + QStringList tmp; + widget->comboModel->clear(); +@@ -672,7 +680,7 @@ void LayoutConfig::save() + void LayoutConfig::defaults() + { + widget->chkEnable->setChecked(false); +- ruleChanged("xfree86"); ++ ruleChanged(); + + widget->comboModel->setCurrentText("pc104"); + //layoutCombo->setCurrentText("us"); Property changes on: head/x11/kdebase4-workspace/files/patch-kxkb_kcmlayout.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kdebase4-workspace/files/patch-kxkb_kcmlayout.h =================================================================== --- head/x11/kdebase4-workspace/files/patch-kxkb_kcmlayout.h (nonexistent) +++ head/x11/kdebase4-workspace/files/patch-kxkb_kcmlayout.h (revision 116073) @@ -0,0 +1,25 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/kcmlayout.h,v +retrieving revision 1.22 +retrieving revision 1.23 +diff -u -p -r1.22 -r1.23 +--- kxkb/kcmlayout.h 2003/10/29 07:30:36 1.22 ++++ kxkb/kcmlayout.h 2004/06/28 14:19:03 1.23 +@@ -54,7 +54,7 @@ protected slots: + void variantChanged(); + void latinChanged(); + void layoutSelChanged(QListViewItem *); +- void ruleChanged(const QString &rule); ++ void ruleChanged(); + void updateLayoutCommand(); + void updateOptionsCommand(); + void add(); +@@ -71,7 +71,7 @@ private: + QDict m_optionGroups; + QDict m_variants; + QDict m_includes; +- QString m_rule; ++// QString m_rule; + KeyRules *m_rules; + + QWidget* makeOptionsTab(); Property changes on: head/x11/kdebase4-workspace/files/patch-kxkb_kcmlayout.h ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kdebase4-workspace/files/patch-kxkb_kxkb.cpp =================================================================== --- head/x11/kdebase4-workspace/files/patch-kxkb_kxkb.cpp (nonexistent) +++ head/x11/kdebase4-workspace/files/patch-kxkb_kxkb.cpp (revision 116073) @@ -0,0 +1,23 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/kxkb.cpp,v +retrieving revision 1.70 +retrieving revision 1.72 +diff -u -p -r1.70 -r1.72 +--- kxkb/kxkb.cpp 2003/10/30 18:58:11 1.70 ++++ kxkb/kxkb.cpp 2004/06/28 14:19:03 1.72 +@@ -222,12 +222,12 @@ bool KXKBApp::settingsRead() + } + } + +- QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); +- m_rules = new KeyRules( rule ); ++ m_rules = new KeyRules(); + m_model = config->readEntry("Model", "pc104"); + m_layout = config->readEntry("Layout", ""); + m_defaultLayout = m_layout; + ++ + m_list = config->readListEntry("Additional"); + if (!m_list.contains(m_layout)) + { + Property changes on: head/x11/kdebase4-workspace/files/patch-kxkb_kxkb.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kdebase4-workspace/files/patch-kxkb_rules.cpp =================================================================== --- head/x11/kdebase4-workspace/files/patch-kxkb_rules.cpp (nonexistent) +++ head/x11/kdebase4-workspace/files/patch-kxkb_rules.cpp (revision 116073) @@ -0,0 +1,85 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/rules.cpp,v +retrieving revision 1.37 +retrieving revision 1.38 +diff -u -p -r1.37 -r1.38 +--- kxkb/rules.cpp 2003/10/24 06:15:26 1.37 ++++ kxkb/rules.cpp 2004/06/28 14:19:03 1.38 +@@ -16,11 +16,23 @@ + + #include "rules.h" + +-const QString X11_DIR( "/usr/X11R6/lib/X11/" ); ++const char* X11DirList[2] = {"/usr/X11R6/lib/X11/", "/usr/local/X11R6/lib/X11/"}; ++const char* rulesFileList[2] = {"xkb/rules/xfree86", "xkb/rules/xorg"}; + +-KeyRules::KeyRules(QString rule): ++KeyRules::KeyRules(): + m_layouts(90) + { ++ for(int ii=0; ii<2; ii++) ++ if( QDir(X11DirList[ii]).exists() ) { ++ X11_DIR = X11DirList[ii]; ++ break; ++ } ++ ++ if( X11_DIR.isEmpty() ) { ++ kdDebug() << "Cannot find X11 directory!" << endl; ++ return; ++ } ++ + // ugly check for XFree 4.3 or older + if( QDir(X11_DIR + "xkb/symbols/pc").exists() ) { + m_xfree43 = true; +@@ -29,8 +41,20 @@ KeyRules::KeyRules(QString rule): + m_xfree43 = false; + } + +- loadRules(X11_DIR + QString("xkb/rules/%1").arg(rule)); +- loadOldLayouts(X11_DIR + QString("xkb/rules/xfree86")); ++ QString rulesFile; ++ for(int ii=0; ii<2; ii++) ++ if( QFile(X11_DIR + QString(rulesFileList[ii])).exists() ) { ++ rulesFile = X11_DIR + rulesFileList[ii]; ++ break; ++ } ++ ++ if( rulesFile.isEmpty() ) { ++ kdDebug() << "Cannot find rules file in " << X11_DIR << endl; ++ return; ++ } ++ ++ loadRules(rulesFile); ++ loadOldLayouts(rulesFile); + loadGroups(::locate("config", "kxkb_groups")); + } + +@@ -51,9 +75,7 @@ static struct { + { 0, 0 } + }; + +- XkbRF_RulesPtr rules; +- +- rules = XkbRF_Load(QFile::encodeName(file).data(), "", true, true); ++ XkbRF_RulesPtr rules = XkbRF_Load(QFile::encodeName(file).data(), "", true, true); + + if (rules == NULL) { + kdDebug() << "Unable to load rules" << endl; +@@ -176,7 +198,7 @@ unsigned int KeyRules::getGroup(const QS + return it == m_initialGroups.end() ? 0 : it.data(); + } + +- ++/* + QStringList KeyRules::rules(QString path) + { + QStringList result; +@@ -193,7 +215,7 @@ QStringList KeyRules::rules(QString path + + return result; + } +- ++*/ + + /* pretty simple algorithm - reads the layout file and + tries to find "xkb_symbols" Property changes on: head/x11/kdebase4-workspace/files/patch-kxkb_rules.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kdebase4-workspace/files/patch-kxkb_rules.h =================================================================== --- head/x11/kdebase4-workspace/files/patch-kxkb_rules.h (nonexistent) +++ head/x11/kdebase4-workspace/files/patch-kxkb_rules.h (revision 116073) @@ -0,0 +1,33 @@ +=================================================================== +RCS file: /usr/repos/kde/kdebase/kxkb/rules.h,v +retrieving revision 1.11 +retrieving revision 1.12 +diff -u -p -r1.11 -r1.12 +--- kxkb/rules.h 2003/08/24 04:02:38 1.11 ++++ kxkb/rules.h 2004/06/28 14:19:03 1.12 +@@ -10,14 +10,14 @@ class KeyRules + { + public: + +- KeyRules(QString rule="xfree86"); ++ KeyRules(); + + const QDict &models() const { return m_models; }; + const QDict &layouts() const { return m_layouts; }; + const QDict &options() const { return m_options; }; + + void parseVariants(const QStringList& vars, QDict& variants, bool chkVars=true); +- static QStringList rules(QString path = QString::null); ++// static QStringList rules(QString path = QString::null); + + QStringList getVariants(const QString& layout); + unsigned int getGroup(const QString& layout, const char* baseGr); +@@ -42,6 +42,8 @@ private: + QStringList m_oldLayouts; + QStringList m_nonLatinLayouts; + bool m_xfree43; ++ ++ QString X11_DIR; // pseudo-constant + }; + + Property changes on: head/x11/kdebase4-workspace/files/patch-kxkb_rules.h ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kdelibs3/Makefile =================================================================== --- head/x11/kdelibs3/Makefile (revision 116072) +++ head/x11/kdelibs3/Makefile (revision 116073) @@ -1,81 +1,81 @@ # -*-mode: makefile-*- # New ports collection makefile for: KDE libraries 3 # Date created: 2 November 2001 # Whom: will@cvs.kde.org # # $FreeBSD$ # PORTNAME= kdelibs PORTVERSION= ${KDE_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Base set of libraries needed by KDE programs CONFLICTS= kdebase-3.[0-1] kdebase-3.0.* kdebase-3.1.* BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT} LIB_DEPENDS= art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \ artsc.0:${PORTSDIR}/audio/arts \ cups.2:${PORTSDIR}/print/cups-base \ fam.0:${PORTSDIR}/devel/fam \ idn:${PORTSDIR}/devel/libidn \ jasper:${PORTSDIR}/graphics/jasper \ tiff.4:${PORTSDIR}/graphics/tiff \ xml2.5:${PORTSDIR}/textproc/libxml2 \ xslt.2:${PORTSDIR}/textproc/libxslt \ pcre.0:${PORTSDIR}/devel/pcre RUN_DEPENDS= ${FONTSCALE}:${X_FONTS_TTF_PORT} \ ${FONTENCOD}:${X_FONTS_ENCODINGS_PORT} USE_GETTEXT= yes USE_QT_VER= 3 PREFIX= ${KDE_PREFIX} USE_OPENSSL= yes USE_OPENLDAP= yes USE_BZIP2= yes USE_GMAKE= yes USE_REINPLACE= yes INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 GNU_CONFIGURE= yes CONFIGURE_TARGET=# empty CONFIGURE_ARGS+=--disable-ltdl-install \ --enable-mt \ --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} FONTSCALE= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf FONTENCOD= ${X11BASE}/lib/X11/fonts/encodings/tcvn-0.enc .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include # bzip2 is required as a libdepend for the help: kioslave .if !exists(/usr/bin/bzip2) LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 .endif # !exists(/usr/bin/bzip2) pre-configure: ${REINPLACE_CMD} "s, kspell,,g" ${WRKSRC}/doc/Makefile.in ${REINPLACE_CMD} "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/kdecore/kidna.cpp post-configure: ${TOUCH} ${WRKSRC}/dcop/dcop-path.h.in ${TOUCH} ${WRKSRC}/kio/kssl/ksslconfig.h.in post-install: ${MKDIR} ${PREFIX}/etc/rc.d ${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${FILESDIR}/kdelibs.sh \ > ${PREFIX}/etc/rc.d/kdelibs.sh ${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/kdelibs.sh ${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/etc/rc.d/kdelibs.sh .include Property changes on: head/x11/kdelibs3/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.153 \ No newline at end of property +1.154 \ No newline at end of property Index: head/x11/kdelibs3/files/patch-dcop_dcopserver.cpp =================================================================== --- head/x11/kdelibs3/files/patch-dcop_dcopserver.cpp (nonexistent) +++ head/x11/kdelibs3/files/patch-dcop_dcopserver.cpp (revision 116073) @@ -0,0 +1,185 @@ +Index: dcopserver.cpp +=================================================================== +RCS file: /home/kde/kdelibs/dcop/dcopserver.cpp,v +retrieving revision 1.160.2.3 +diff -u -p -r1.160.2.3 dcopserver.cpp +--- dcop/dcopserver.cpp 30 Apr 2004 15:00:08 -0000 1.160.2.3 ++++ dcop/dcopserver.cpp 26 Jul 2004 09:03:06 -0000 +@@ -443,35 +443,78 @@ write_iceauth (FILE *addfp, IceAuthDataE + fprintf (addfp, "\n"); + } + ++#ifndef HAVE_MKSTEMPS ++#include ++#include + +-#ifndef HAVE_MKSTEMP +-static char *unique_filename (const char *path, const char *prefix) +-#else +-static char *unique_filename (const char *path, const char *prefix, int *pFd) +-#endif ++/* this is based on code taken from the GNU libc, distributed under the LGPL license */ ++ ++/* Generate a unique temporary file name from TEMPLATE. ++ ++ TEMPLATE has the form: ++ ++ /ccXXXXXX ++ ++ SUFFIX_LEN tells us how long is (it can be zero length). ++ ++ The last six characters of TEMPLATE before must be "XXXXXX"; ++ they are replaced with a string that makes the filename unique. ++ ++ Returns a file descriptor open on the file for reading and writing. */ ++ ++int mkstemps (char* _template, int suffix_len) + { +-#ifndef HAVE_MKSTEMP +-#ifndef X_NOT_POSIX +- return ((char *) tempnam (path, prefix)); +-#else +- char tempFile[PATH_MAX]; +- char *tmp; ++ static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; ++ char *XXXXXX; ++ int len; ++ int count; ++ int value; ++ ++ len = strlen (_template); ++ ++ if ((int) len < 6 + suffix_len || strncmp (&_template[len - 6 - suffix_len], "XXXXXX", 6)) ++ return -1; ++ ++ XXXXXX = &_template[len - 6 - suffix_len]; ++ ++ value = rand(); ++ for (count = 0; count < 256; ++count) ++ { ++ int v = value; ++ int fd; ++ ++ /* Fill in the random bits. */ ++ XXXXXX[0] = letters[v % 62]; ++ v /= 62; ++ XXXXXX[1] = letters[v % 62]; ++ v /= 62; ++ XXXXXX[2] = letters[v % 62]; ++ v /= 62; ++ XXXXXX[3] = letters[v % 62]; ++ v /= 62; ++ XXXXXX[4] = letters[v % 62]; ++ v /= 62; ++ XXXXXX[5] = letters[v % 62]; ++ ++ fd = open (_template, O_RDWR|O_CREAT|O_EXCL, 0600); ++ if (fd >= 0) ++ /* The file does not exist. */ ++ return fd; ++ ++ /* This is a random value. It is only necessary that the next ++ TMP_MAX values generated by adding 7777 to VALUE are different ++ with (module 2^32). */ ++ value += 7777; ++ } ++ /* We return the null string if we can't find a unique file name. */ ++ _template[0] = '\0'; ++ return -1; ++} + +- snprintf (tempFile, PATH_MAX, "%s/%sXXXXXX", path, prefix); +- tmp = (char *) mktemp (tempFile); +- if (tmp) +- { +- char *ptr = (char *) malloc (strlen (tmp) + 1); +- if (ptr != NULL) +- { +- strcpy (ptr, tmp); +- } +- return (ptr); +- } +- else +- return (NULL); + #endif +-#else ++ ++static char *unique_filename (const char *path, const char *prefix, int *pFd) ++{ + char tempFile[PATH_MAX]; + char *ptr; + +@@ -480,43 +523,10 @@ static char *unique_filename (const char + if (ptr != NULL) + { + strcpy(ptr, tempFile); +- *pFd = mkstemp(ptr); ++ *pFd = mkstemps(ptr, 0); + } + return ptr; +-#endif +-} +- +-#if 0 +-Status SetAuthentication_local (int count, IceListenObj *listenObjs) +-{ +- int i; +- for (i = 0; i < count; i ++) { +- char *prot = IceGetListenConnectionString(listenObjs[i]); +- if (!prot) continue; +- char *host = strchr(prot, '/'); +- char *sock = 0; +- if (host) { +- *host=0; +- host++; +- sock = strchr(host, ':'); +- if (sock) { +- *sock = 0; +- sock++; +- } +- } +-#ifndef NDEBUG +- qDebug("DCOPServer: SetAProc_loc: conn %d, prot=%s, file=%s", +- (unsigned)i, prot, sock); +-#endif +- if (sock && !strcmp(prot, "local")) { +- chmod(sock, 0700); +- } +- IceSetHostBasedAuthProc (listenObjs[i], HostBasedAuthProc); +- free(prot); +- } +- return 1; + } +-#endif + + #define MAGIC_COOKIE_LEN 16 + +@@ -529,28 +539,19 @@ SetAuthentication (int count, IceListenO + int original_umask; + int i; + QCString command; +-#ifdef HAVE_MKSTEMP + int fd; +-#endif + + original_umask = umask (0077); /* disallow non-owner access */ + + path = getenv ("DCOP_SAVE_DIR"); + if (!path) + path = "/tmp"; +-#ifndef HAVE_MKSTEMP +- if ((addAuthFile = unique_filename (path, "dcop")) == NULL) +- goto bad; + +- if (!(addfp = fopen (addAuthFile, "w"))) +- goto bad; +-#else + if ((addAuthFile = unique_filename (path, "dcop", &fd)) == NULL) + goto bad; + + if (!(addfp = fdopen(fd, "wb"))) + goto bad; +-#endif + + if ((*_authDataEntries = static_cast(malloc (count * 2 * sizeof (IceAuthDataEntry)))) == NULL) + goto bad; Property changes on: head/x11/kdelibs3/files/patch-dcop_dcopserver.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/kdelibs4/Makefile =================================================================== --- head/x11/kdelibs4/Makefile (revision 116072) +++ head/x11/kdelibs4/Makefile (revision 116073) @@ -1,81 +1,81 @@ # -*-mode: makefile-*- # New ports collection makefile for: KDE libraries 3 # Date created: 2 November 2001 # Whom: will@cvs.kde.org # # $FreeBSD$ # PORTNAME= kdelibs PORTVERSION= ${KDE_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Base set of libraries needed by KDE programs CONFLICTS= kdebase-3.[0-1] kdebase-3.0.* kdebase-3.1.* BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT} LIB_DEPENDS= art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \ artsc.0:${PORTSDIR}/audio/arts \ cups.2:${PORTSDIR}/print/cups-base \ fam.0:${PORTSDIR}/devel/fam \ idn:${PORTSDIR}/devel/libidn \ jasper:${PORTSDIR}/graphics/jasper \ tiff.4:${PORTSDIR}/graphics/tiff \ xml2.5:${PORTSDIR}/textproc/libxml2 \ xslt.2:${PORTSDIR}/textproc/libxslt \ pcre.0:${PORTSDIR}/devel/pcre RUN_DEPENDS= ${FONTSCALE}:${X_FONTS_TTF_PORT} \ ${FONTENCOD}:${X_FONTS_ENCODINGS_PORT} USE_GETTEXT= yes USE_QT_VER= 3 PREFIX= ${KDE_PREFIX} USE_OPENSSL= yes USE_OPENLDAP= yes USE_BZIP2= yes USE_GMAKE= yes USE_REINPLACE= yes INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 GNU_CONFIGURE= yes CONFIGURE_TARGET=# empty CONFIGURE_ARGS+=--disable-ltdl-install \ --enable-mt \ --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} FONTSCALE= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf FONTENCOD= ${X11BASE}/lib/X11/fonts/encodings/tcvn-0.enc .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include # bzip2 is required as a libdepend for the help: kioslave .if !exists(/usr/bin/bzip2) LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 .endif # !exists(/usr/bin/bzip2) pre-configure: ${REINPLACE_CMD} "s, kspell,,g" ${WRKSRC}/doc/Makefile.in ${REINPLACE_CMD} "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/kdecore/kidna.cpp post-configure: ${TOUCH} ${WRKSRC}/dcop/dcop-path.h.in ${TOUCH} ${WRKSRC}/kio/kssl/ksslconfig.h.in post-install: ${MKDIR} ${PREFIX}/etc/rc.d ${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${FILESDIR}/kdelibs.sh \ > ${PREFIX}/etc/rc.d/kdelibs.sh ${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/kdelibs.sh ${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/etc/rc.d/kdelibs.sh .include Property changes on: head/x11/kdelibs4/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.153 \ No newline at end of property +1.154 \ No newline at end of property Index: head/x11/kdelibs4/files/patch-dcop_dcopserver.cpp =================================================================== --- head/x11/kdelibs4/files/patch-dcop_dcopserver.cpp (nonexistent) +++ head/x11/kdelibs4/files/patch-dcop_dcopserver.cpp (revision 116073) @@ -0,0 +1,185 @@ +Index: dcopserver.cpp +=================================================================== +RCS file: /home/kde/kdelibs/dcop/dcopserver.cpp,v +retrieving revision 1.160.2.3 +diff -u -p -r1.160.2.3 dcopserver.cpp +--- dcop/dcopserver.cpp 30 Apr 2004 15:00:08 -0000 1.160.2.3 ++++ dcop/dcopserver.cpp 26 Jul 2004 09:03:06 -0000 +@@ -443,35 +443,78 @@ write_iceauth (FILE *addfp, IceAuthDataE + fprintf (addfp, "\n"); + } + ++#ifndef HAVE_MKSTEMPS ++#include ++#include + +-#ifndef HAVE_MKSTEMP +-static char *unique_filename (const char *path, const char *prefix) +-#else +-static char *unique_filename (const char *path, const char *prefix, int *pFd) +-#endif ++/* this is based on code taken from the GNU libc, distributed under the LGPL license */ ++ ++/* Generate a unique temporary file name from TEMPLATE. ++ ++ TEMPLATE has the form: ++ ++ /ccXXXXXX ++ ++ SUFFIX_LEN tells us how long is (it can be zero length). ++ ++ The last six characters of TEMPLATE before must be "XXXXXX"; ++ they are replaced with a string that makes the filename unique. ++ ++ Returns a file descriptor open on the file for reading and writing. */ ++ ++int mkstemps (char* _template, int suffix_len) + { +-#ifndef HAVE_MKSTEMP +-#ifndef X_NOT_POSIX +- return ((char *) tempnam (path, prefix)); +-#else +- char tempFile[PATH_MAX]; +- char *tmp; ++ static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; ++ char *XXXXXX; ++ int len; ++ int count; ++ int value; ++ ++ len = strlen (_template); ++ ++ if ((int) len < 6 + suffix_len || strncmp (&_template[len - 6 - suffix_len], "XXXXXX", 6)) ++ return -1; ++ ++ XXXXXX = &_template[len - 6 - suffix_len]; ++ ++ value = rand(); ++ for (count = 0; count < 256; ++count) ++ { ++ int v = value; ++ int fd; ++ ++ /* Fill in the random bits. */ ++ XXXXXX[0] = letters[v % 62]; ++ v /= 62; ++ XXXXXX[1] = letters[v % 62]; ++ v /= 62; ++ XXXXXX[2] = letters[v % 62]; ++ v /= 62; ++ XXXXXX[3] = letters[v % 62]; ++ v /= 62; ++ XXXXXX[4] = letters[v % 62]; ++ v /= 62; ++ XXXXXX[5] = letters[v % 62]; ++ ++ fd = open (_template, O_RDWR|O_CREAT|O_EXCL, 0600); ++ if (fd >= 0) ++ /* The file does not exist. */ ++ return fd; ++ ++ /* This is a random value. It is only necessary that the next ++ TMP_MAX values generated by adding 7777 to VALUE are different ++ with (module 2^32). */ ++ value += 7777; ++ } ++ /* We return the null string if we can't find a unique file name. */ ++ _template[0] = '\0'; ++ return -1; ++} + +- snprintf (tempFile, PATH_MAX, "%s/%sXXXXXX", path, prefix); +- tmp = (char *) mktemp (tempFile); +- if (tmp) +- { +- char *ptr = (char *) malloc (strlen (tmp) + 1); +- if (ptr != NULL) +- { +- strcpy (ptr, tmp); +- } +- return (ptr); +- } +- else +- return (NULL); + #endif +-#else ++ ++static char *unique_filename (const char *path, const char *prefix, int *pFd) ++{ + char tempFile[PATH_MAX]; + char *ptr; + +@@ -480,43 +523,10 @@ static char *unique_filename (const char + if (ptr != NULL) + { + strcpy(ptr, tempFile); +- *pFd = mkstemp(ptr); ++ *pFd = mkstemps(ptr, 0); + } + return ptr; +-#endif +-} +- +-#if 0 +-Status SetAuthentication_local (int count, IceListenObj *listenObjs) +-{ +- int i; +- for (i = 0; i < count; i ++) { +- char *prot = IceGetListenConnectionString(listenObjs[i]); +- if (!prot) continue; +- char *host = strchr(prot, '/'); +- char *sock = 0; +- if (host) { +- *host=0; +- host++; +- sock = strchr(host, ':'); +- if (sock) { +- *sock = 0; +- sock++; +- } +- } +-#ifndef NDEBUG +- qDebug("DCOPServer: SetAProc_loc: conn %d, prot=%s, file=%s", +- (unsigned)i, prot, sock); +-#endif +- if (sock && !strcmp(prot, "local")) { +- chmod(sock, 0700); +- } +- IceSetHostBasedAuthProc (listenObjs[i], HostBasedAuthProc); +- free(prot); +- } +- return 1; + } +-#endif + + #define MAGIC_COOKIE_LEN 16 + +@@ -529,28 +539,19 @@ SetAuthentication (int count, IceListenO + int original_umask; + int i; + QCString command; +-#ifdef HAVE_MKSTEMP + int fd; +-#endif + + original_umask = umask (0077); /* disallow non-owner access */ + + path = getenv ("DCOP_SAVE_DIR"); + if (!path) + path = "/tmp"; +-#ifndef HAVE_MKSTEMP +- if ((addAuthFile = unique_filename (path, "dcop")) == NULL) +- goto bad; + +- if (!(addfp = fopen (addAuthFile, "w"))) +- goto bad; +-#else + if ((addAuthFile = unique_filename (path, "dcop", &fd)) == NULL) + goto bad; + + if (!(addfp = fdopen(fd, "wb"))) + goto bad; +-#endif + + if ((*_authDataEntries = static_cast(malloc (count * 2 * sizeof (IceAuthDataEntry)))) == NULL) + goto bad; Property changes on: head/x11/kdelibs4/files/patch-dcop_dcopserver.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property