diff options
Diffstat (limited to 'x11')
54 files changed, 1923 insertions, 249 deletions
diff --git a/x11/kde2/Makefile b/x11/kde2/Makefile index e8b482b..fe065aa 100644 --- a/x11/kde2/Makefile +++ b/x11/kde2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kde -PORTVERSION= 2.0 +PORTVERSION= 2.0.1 CATEGORIES= x11 kde MASTER_SITES= # empty DISTFILES= # none diff --git a/x11/kde3/Makefile b/x11/kde3/Makefile index e8b482b..fe065aa 100644 --- a/x11/kde3/Makefile +++ b/x11/kde3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kde -PORTVERSION= 2.0 +PORTVERSION= 2.0.1 CATEGORIES= x11 kde MASTER_SITES= # empty DISTFILES= # none diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index 7cf8533..bbaa703 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdebase -PORTVERSION= 2.0 +PORTVERSION= 2.0.1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo index 04441e9..80f0c4c 100644 --- a/x11/kde4-baseapps/distinfo +++ b/x11/kde4-baseapps/distinfo @@ -1 +1 @@ -MD5 (kdebase-2.0.tar.bz2) = efdcb3c08b2f8f971b5b7ef077542269 +MD5 (kdebase-2.0.1.tar.bz2) = b138a67ae22fbda05def8e932820ac66 diff --git a/x11/kde4-baseapps/files/patch-TEPty.C b/x11/kde4-baseapps/files/patch-TEPty.C index 9a5ece3..9bfd5db 100644 --- a/x11/kde4-baseapps/files/patch-TEPty.C +++ b/x11/kde4-baseapps/files/patch-TEPty.C @@ -1,11 +1,88 @@ ---- konsole/src/TEPty.C Tue Oct 3 14:57:30 2000 -+++ konsole/src/TEPty.C.new Thu Nov 2 17:51:30 2000 -@@ -225,7 +225,7 @@ +--- konsole/src/TEPty.C.orig Fri Dec 8 11:51:24 2000 ++++ konsole/src/TEPty.C Fri Dec 8 11:52:51 2000 +@@ -180,27 +180,57 @@ + // param grant: 1 to grant, 0 to revoke + // returns 1 on success 0 on fail + { +- pid_t pid = fork(); +- if (pid < 0) +- { +- return 0; +- } +- if (pid == 0) +- { +- /* We pass the master pseudo terminal as file descriptor PTY_FILENO. */ +- if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0) exit(1); +- QString path = locate("exe", BASE_CHOWN); ++ pid_t pid; ++ int pstat; ++ struct sigaction ign; ++ struct sigaction intact; // interupt action ++ struct sigaction quitact; // quit action ++ sigset_t newsigblock, oldsigblock; ++ QString path; ++ ++ ign.sa_handler = SIG_IGN; ++ sigemptyset(&ign.sa_mask); ++ ign.sa_flags = 0; ++ sigaction(SIGINT, &ign, &intact); ++ sigaction(SIGQUIT, &ign, &quitact); ++ sigemptyset(&newsigblock); ++ sigaddset(&newsigblock, SIGCHLD); ++ sigprocmask(SIG_BLOCK, &newsigblock, &oldsigblock); ++ ++ switch (pid = fork()) { ++ case -1: ++ return(0); ++ break; ++ case 0: // child ++ if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0) ++ exit(1); ++ path = locate("exe", BASE_CHOWN); ++ ++ sigaction(SIGINT, &intact, NULL); ++ sigaction(SIGQUIT, &quitact, NULL); ++ sigprocmask(SIG_SETMASK, &oldsigblock, NULL); + execle(path.ascii(), BASE_CHOWN, grant?"--grant":"--revoke", NULL, NULL); +- exit(1); // should not be reached +- } +- if (pid > 0) +- { int w; +- retry: +- int rc = waitpid (pid, &w, 0); +- if ((rc == -1) && (errno == EINTR)) +- goto retry; +- return (rc != -1 && WIFEXITED(w) && WEXITSTATUS(w) == 0); ++ exit(1); ++ break; ++ default: ++ do { ++ pid = waitpid(pid, &pstat, 0); ++ } while (pid == -1 && errno == EINTR); ++ break; + } ++ sigaction(SIGINT, &intact, NULL); ++ sigaction(SIGQUIT, &quitact, NULL); ++ sigprocmask(SIG_SETMASK, &oldsigblock, NULL); ++ ++ if (pid == -1) { ++ return 0; ++ } ++ else if (WIFEXITED(pstat) && (WEXITSTATUS(pstat) == 0)) { ++ return 1; ++ } ++ else { ++ return 0; ++ } + return 0; //dummy. + } + +@@ -225,7 +255,7 @@ #ifdef HAVE_UTEMPTER removeLineFromUtmp(ttynam, fd); #elif defined(USE_LOGIN) - char *tty_name=ttyname(0); + char *tty_name=ttyname(fd); if (tty_name) - logout(tty_name); - #endif + { + if (strncmp(tty_name, "/dev/", 5) == 0) diff --git a/x11/kde4-baseapps/files/patch-konsole_grantpty.c b/x11/kde4-baseapps/files/patch-konsole_grantpty.c new file mode 100644 index 0000000..889d15b --- /dev/null +++ b/x11/kde4-baseapps/files/patch-konsole_grantpty.c @@ -0,0 +1,79 @@ +--- konsole/src/konsole_grantpty.c.orig Sat Jun 12 07:13:31 1999 ++++ konsole/src/konsole_grantpty.c Fri Dec 8 11:54:43 2000 +@@ -31,13 +31,15 @@ + #include <string.h> + #include <sys/stat.h> + #include <unistd.h> ++#include <dirent.h> ++#include <paths.h> + + #define PTY_FILENO 3 /* keep in sync with grantpty */ + #define TTY_GROUP "tty" + + int main (int argc, char *argv[]) + { +- char* pty; ++ char* pty = NULL; + struct stat st; + struct group* p; + gid_t gid; +@@ -81,6 +83,7 @@ + + /* get slave pty name from master pty file handle in PTY_FILENO *********/ + ++#if 0 + /* Check that PTY_FILENO is a valid master pseudo terminal. */ + pty = ttyname(PTY_FILENO); /* posix */ + if (pty == NULL) +@@ -89,6 +92,42 @@ + return 1; /* FAIL */ + } + close(PTY_FILENO); ++#else ++ /* The trouble with the ifdef'd-out portion above is that ttyname() ++ ** does not work correctly when not passed a valid tty, but a pseudotty ++ ** instead. All we're doing here is finding out what the name of ++ ** the associated pty is without having to pass it in on the command line. ++ ** Nothing complex. ++ */ ++ { ++ struct stat sb; ++ struct stat dsb; ++ struct dirent *dirp; ++ static char buf[sizeof(_PATH_DEV) + MAXNAMLEN] = _PATH_DEV; ++ DIR *dp; ++ ++ pty = NULL; ++ ++ if (fstat(PTY_FILENO, &sb)) ++ return 1; /* FAIL */ ++ if ((dp = opendir(_PATH_DEV)) == NULL) ++ return 1; /* FAIL */ ++ ++ while ((dirp = readdir(dp))) { ++ if (dirp->d_fileno != sb.st_ino) ++ continue; ++ bcopy(dirp->d_name, buf + sizeof(_PATH_DEV) - 1, dirp->d_namlen+1); ++ /*fprintf(stderr, "looking at %s\n", buf);*/ ++ if (stat(buf, &dsb) || sb.st_dev != dsb.st_dev || sb.st_ino != dsb.st_ino) ++ continue; ++ pty = buf; ++ } ++ closedir(dp); ++ if (pty == NULL) ++ return 1; /* FAIL */ ++ } ++ /*fprintf(stderr, "successful at finding %s\n", pty);*/ ++#endif + + /* matches /dev/pty?? */ + if (strlen(pty) < 8 || strncmp(pty,"/dev/pty",8)) +@@ -120,6 +159,8 @@ + fprintf(stderr,"%s: cannot chmod %s.\n",argv[0],tty); perror("Reason"); + return 1; /* FAIL */ + } ++ ++ /*fprintf(stderr, "made it here\n");*/ + + return 0; /* OK */ + } diff --git a/x11/kde4-baseapps/pkg-plist b/x11/kde4-baseapps/pkg-plist index a486bb3..7a8ef62 100644 --- a/x11/kde4-baseapps/pkg-plist +++ b/x11/kde4-baseapps/pkg-plist @@ -649,6 +649,7 @@ share/apps/kicker/applets/krunapplet.desktop share/apps/kicker/applets/ksystemtrayapplet.desktop share/apps/kicker/applets/ktaskbarapplet.desktop share/apps/kicker/applets/quicklauncher.desktop +share/apps/kicker/icons/locolor/16x16/actions/modified.png share/apps/kicker/pics/disk1.png share/apps/kicker/pics/disk2.png share/apps/kicker/pics/disk3.png @@ -970,9 +971,9 @@ share/doc/HTML/en/kcontrol/action.html share/doc/HTML/en/kcontrol/background.html share/doc/HTML/en/kcontrol/batmon.html share/doc/HTML/en/kcontrol/bell.html -share/doc/HTML/en/kcontrol/blockdev.html share/doc/HTML/en/kcontrol/borders.html share/doc/HTML/en/kcontrol/color.html +share/doc/HTML/en/kcontrol/common share/doc/HTML/en/kcontrol/control-center-exiting.html share/doc/HTML/en/kcontrol/control-center-menus.html share/doc/HTML/en/kcontrol/control-center-run-indiv.html @@ -990,6 +991,8 @@ share/doc/HTML/en/kcontrol/email.html share/doc/HTML/en/kcontrol/energy.html share/doc/HTML/en/kcontrol/file-assoc.html share/doc/HTML/en/kcontrol/file-manager.html +share/doc/HTML/en/kcontrol/kfileman1.png +share/doc/HTML/en/kcontrol/kfileman2.png share/doc/HTML/en/kcontrol/fonts.html share/doc/HTML/en/kcontrol/help-index.html share/doc/HTML/en/kcontrol/icons.html @@ -1099,11 +1102,13 @@ share/doc/HTML/en/kcontrol/user-agent.html share/doc/HTML/en/kcontrol/windows-shares.html share/doc/HTML/en/kcontrol/xserver.html share/doc/HTML/en/kdebugdialog/.anchors +share/doc/HTML/en/kdebugdialog/common share/doc/HTML/en/kdebugdialog/index.docbook share/doc/HTML/en/kdebugdialog/index.html share/doc/HTML/en/kdebugdialog/introduction.html share/doc/HTML/en/kdesu/.anchors share/doc/HTML/en/kdesu/author.html +share/doc/HTML/en/kdesu/common share/doc/HTML/en/kdesu/compiling.html share/doc/HTML/en/kdesu/configuration.html share/doc/HTML/en/kdesu/index.docbook @@ -1117,6 +1122,7 @@ share/doc/HTML/en/kdesu/sec-password-keeping.html share/doc/HTML/en/kdesu/using-kdesu.html share/doc/HTML/en/kdm/.anchors share/doc/HTML/en/kdm/building-and-installing-kdm.html +share/doc/HTML/en/kdm/common share/doc/HTML/en/kdm/configuring-kdm.html share/doc/HTML/en/kdm/configuring-your-system-for-kdm.html share/doc/HTML/en/kdm/credits.html @@ -1129,6 +1135,7 @@ share/doc/HTML/en/kdm/lilo.html share/doc/HTML/en/kdm/locale.html share/doc/HTML/en/kdm/other-information.html share/doc/HTML/en/khelpcenter/.anchors +share/doc/HTML/en/khelpcenter/common share/doc/HTML/en/khelpcenter/contact-developers.html share/doc/HTML/en/khelpcenter/contact-more-information.html share/doc/HTML/en/khelpcenter/contact-official.html @@ -1147,10 +1154,29 @@ share/doc/HTML/en/khelpcenter/interface-basics.html share/doc/HTML/en/khelpcenter/invoking-help.html share/doc/HTML/en/khelpcenter/links.docbook share/doc/HTML/en/khelpcenter/no-html.html +share/doc/HTML/en/khelpcenter/faq/about.html +share/doc/HTML/en/khelpcenter/faq/applications.html +share/doc/HTML/en/khelpcenter/faq/common +share/doc/HTML/en/khelpcenter/faq/configure.html +share/doc/HTML/en/khelpcenter/faq/contribute.html +share/doc/HTML/en/khelpcenter/faq/credits.html +share/doc/HTML/en/khelpcenter/faq/desktop.html +share/doc/HTML/en/khelpcenter/faq/filemanager.html +share/doc/HTML/en/khelpcenter/faq/getting-kde.html +share/doc/HTML/en/khelpcenter/faq/install.html +share/doc/HTML/en/khelpcenter/faq/introduction.html +share/doc/HTML/en/khelpcenter/faq/misc.html +share/doc/HTML/en/khelpcenter/faq/more-info.html +share/doc/HTML/en/khelpcenter/faq/non-kde-apps.html +share/doc/HTML/en/khelpcenter/faq/not-kde.html +share/doc/HTML/en/khelpcenter/faq/panel.html +share/doc/HTML/en/khelpcenter/faq/tips.html +share/doc/HTML/en/khelpcenter/faq/windowmanager.html share/doc/HTML/en/khelpcenter/quickstart/.anchors share/doc/HTML/en/khelpcenter/quickstart/advanced-topics.html share/doc/HTML/en/khelpcenter/quickstart/an-overview-of-kde.html share/doc/HTML/en/khelpcenter/quickstart/archives-and-networks.html +share/doc/HTML/en/khelpcenter/quickstart/common share/doc/HTML/en/khelpcenter/quickstart/configuration-modules.html share/doc/HTML/en/khelpcenter/quickstart/configure.html share/doc/HTML/en/khelpcenter/quickstart/credits.html @@ -1176,16 +1202,17 @@ share/doc/HTML/en/khelpcenter/userguide/about-this-preview.html share/doc/HTML/en/khelpcenter/userguide/adding-programs.html share/doc/HTML/en/khelpcenter/userguide/all-about-your-desktop.html share/doc/HTML/en/khelpcenter/userguide/background-of-kde.html +share/doc/HTML/en/khelpcenter/userguide/common share/doc/HTML/en/khelpcenter/userguide/creating-new-files-on-your-desktop.html share/doc/HTML/en/khelpcenter/userguide/desktop-components.html share/doc/HTML/en/khelpcenter/userguide/docu-staff.html -share/doc/HTML/en/khelpcenter/userguide/entertainmentapplications.html +share/doc/HTML/en/khelpcenter/userguide/entertainment-applications.html share/doc/HTML/en/khelpcenter/userguide/finding-your-lost-files.html share/doc/HTML/en/khelpcenter/userguide/first-impressions.html share/doc/HTML/en/khelpcenter/userguide/frequently-asked-questions.html share/doc/HTML/en/khelpcenter/userguide/getting-kde.html share/doc/HTML/en/khelpcenter/userguide/getting-started.html -share/doc/HTML/en/khelpcenter/userguide/graphicalapplications.html +share/doc/HTML/en/khelpcenter/userguide/graphical-applications.html share/doc/HTML/en/khelpcenter/userguide/index.docbook share/doc/HTML/en/khelpcenter/userguide/index.html share/doc/HTML/en/khelpcenter/userguide/installation.html @@ -1201,8 +1228,8 @@ share/doc/HTML/en/khelpcenter/userguide/linux-installing-rpms.html share/doc/HTML/en/khelpcenter/userguide/more-help.html share/doc/HTML/en/khelpcenter/userguide/mouse-techniques.html share/doc/HTML/en/khelpcenter/userguide/moving-files-with-drag-and-drop.html -share/doc/HTML/en/khelpcenter/userguide/multimediaapplications.html -share/doc/HTML/en/khelpcenter/userguide/networkapplications.html +share/doc/HTML/en/khelpcenter/userguide/multimedia-applications.html +share/doc/HTML/en/khelpcenter/userguide/network-applications.html share/doc/HTML/en/khelpcenter/userguide/quitting-kde.html share/doc/HTML/en/khelpcenter/userguide/shortcuts.html share/doc/HTML/en/khelpcenter/userguide/source-distribution.html @@ -1215,6 +1242,7 @@ share/doc/HTML/en/khelpcenter/userguide/using-the-trashcan.html share/doc/HTML/en/khelpcenter/userguide/utility-applications.html share/doc/HTML/en/khelpcenter/userguide/we-still-need-people.html share/doc/HTML/en/khelpcenter/visualdict/.anchors +share/doc/HTML/en/khelpcenter/visualdict/common share/doc/HTML/en/khelpcenter/visualdict/credits.html share/doc/HTML/en/khelpcenter/visualdict/index.docbook share/doc/HTML/en/khelpcenter/visualdict/index.html @@ -1251,6 +1279,7 @@ share/doc/HTML/en/kicker/.anchors share/doc/HTML/en/kicker/access_config.png share/doc/HTML/en/kicker/basic_icons.png share/doc/HTML/en/kicker/button-preferences.html +share/doc/HTML/en/kicker/common share/doc/HTML/en/kicker/config_window.png share/doc/HTML/en/kicker/configuration-adding-icons.html share/doc/HTML/en/kicker/configuration-config-window.html @@ -1287,6 +1316,7 @@ share/doc/HTML/en/kicker/qb_root.png share/doc/HTML/en/kicker/using-kicker.html share/doc/HTML/en/klipper/.anchors share/doc/HTML/en/klipper/actions.html +share/doc/HTML/en/klipper/common share/doc/HTML/en/klipper/compilation.html share/doc/HTML/en/klipper/configuration.html share/doc/HTML/en/klipper/credits.html @@ -1298,6 +1328,7 @@ share/doc/HTML/en/klipper/requirements.html share/doc/HTML/en/klipper/screenshot.png share/doc/HTML/en/klipper/using-klipper.html share/doc/HTML/en/kmenuedit/.anchors +share/doc/HTML/en/kmenuedit/common share/doc/HTML/en/kmenuedit/credits.html share/doc/HTML/en/kmenuedit/details-advanced.html share/doc/HTML/en/kmenuedit/glossary.html @@ -1316,20 +1347,25 @@ share/doc/HTML/en/kmenuedit/introduction.html share/doc/HTML/en/kmenuedit/menu-reference.html share/doc/HTML/en/kmenuedit/using-kmenuedit.html share/doc/HTML/en/konqueror/.anchors +share/doc/HTML/en/konqueror/autocomplete.html share/doc/HTML/en/konqueror/basics.html share/doc/HTML/en/konqueror/bookmarks.html share/doc/HTML/en/konqueror/browser.html share/doc/HTML/en/konqueror/bubble.html +share/doc/HTML/en/konqueror/common share/doc/HTML/en/konqueror/cmndline.png share/doc/HTML/en/konqueror/commandline.html share/doc/HTML/en/konqueror/commands.html share/doc/HTML/en/konqueror/config-prox.html share/doc/HTML/en/konqueror/config.html share/doc/HTML/en/konqueror/configure-bars.html +share/doc/HTML/en/konqueror/cook.html share/doc/HTML/en/konqueror/credits.html +share/doc/HTML/en/konqueror/crypto.html share/doc/HTML/en/konqueror/deleting.html share/doc/HTML/en/konqueror/dirtree.png share/doc/HTML/en/konqueror/dragdrop.png +share/doc/HTML/en/konqueror/faq.html share/doc/HTML/en/konqueror/fileassoc.html share/doc/HTML/en/konqueror/filemanager.html share/doc/HTML/en/konqueror/filetype1.png @@ -1340,9 +1376,6 @@ share/doc/HTML/en/konqueror/index.docbook share/doc/HTML/en/konqueror/index.html share/doc/HTML/en/konqueror/installation.html share/doc/HTML/en/konqueror/introduction.html -share/doc/HTML/en/konqueror/kfind.png -share/doc/HTML/en/konqueror/konqdoc5.png -share/doc/HTML/en/konqueror/konqdoc9.png share/doc/HTML/en/konqueror/konqorg.png share/doc/HTML/en/konqueror/lmbmmb.html share/doc/HTML/en/konqueror/making.html @@ -1358,15 +1391,18 @@ share/doc/HTML/en/konqueror/rmb-menus.html share/doc/HTML/en/konqueror/samba.html share/doc/HTML/en/konqueror/samba.png share/doc/HTML/en/konqueror/save-print-web.html +share/doc/HTML/en/konqueror/saveset.html share/doc/HTML/en/konqueror/surf.html share/doc/HTML/en/konsole/.anchors share/doc/HTML/en/konsole/command-line-options.html +share/doc/HTML/en/konsole/common share/doc/HTML/en/konsole/credits.html share/doc/HTML/en/konsole/history-option.html share/doc/HTML/en/konsole/index.docbook share/doc/HTML/en/konsole/index.html share/doc/HTML/en/konsole/installation.html share/doc/HTML/en/konsole/introduction.html +share/doc/HTML/en/konsole/konsole.png share/doc/HTML/en/konsole/konsole1.gif share/doc/HTML/en/konsole/konsole2.gif share/doc/HTML/en/konsole/menubar.html @@ -1377,6 +1413,7 @@ share/doc/HTML/en/konsole/use-of-konsole.html share/doc/HTML/en/konsole/vt100.gif share/doc/HTML/en/kpager/.anchors share/doc/HTML/en/kpager/commands.html +share/doc/HTML/en/kpager/common share/doc/HTML/en/kpager/compilation.html share/doc/HTML/en/kpager/credits.html share/doc/HTML/en/kpager/faq.html @@ -1390,6 +1427,7 @@ share/doc/HTML/en/kpager/screenshot.png share/doc/HTML/en/kpager/settings.png share/doc/HTML/en/kpager/using-kapp.html share/doc/HTML/en/ksysguard/.anchors +share/doc/HTML/en/ksysguard/common share/doc/HTML/en/ksysguard/compilationandinstallation.html share/doc/HTML/en/ksysguard/credits-and-licenses.html share/doc/HTML/en/ksysguard/index.docbook @@ -1402,6 +1440,7 @@ share/doc/HTML/en/ksysguard/the-workspace.html share/doc/HTML/en/ksysguard/usingtheksysguard.html share/doc/HTML/en/kwrite/.anchors share/doc/HTML/en/kwrite/command-line-options.html +share/doc/HTML/en/kwrite/common share/doc/HTML/en/kwrite/credits.html share/doc/HTML/en/kwrite/edit.html share/doc/HTML/en/kwrite/go.html @@ -1411,9 +1450,9 @@ share/doc/HTML/en/kwrite/index.html share/doc/HTML/en/kwrite/introduction.html share/doc/HTML/en/kwrite/keybindings.html share/doc/HTML/en/kwrite/on-screen-fundamentals.html -share/doc/HTML/en/kwrite/other-preferences.html share/doc/HTML/en/kwrite/pref-dialog.html share/doc/HTML/en/kwrite/pref-edit.html +share/doc/HTML/en/kwrite/pref-highlighting.html share/doc/HTML/en/kwrite/pref-indent.html share/doc/HTML/en/kwrite/pref-select.html share/doc/HTML/en/kwrite/prefspellchecker.html @@ -2170,6 +2209,7 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/ksysguard/icons/locolor/16x16/apps @dirrm share/apps/ksysguard/icons/locolor/16x16 @dirrm share/apps/ksysguard/icons/locolor +@dirrm share/apps/ksysguard/icons @dirrm share/apps/ksysguard @dirrm share/apps/ksplash/pics @dirrm share/apps/ksplash @@ -2180,8 +2220,14 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/konqueror/profiles @dirrm share/apps/konqueror/pics @dirrm share/apps/konqueror/icons/locolor/16x16/actions +@dirrm share/apps/konqueror/icons/locolor/16x16 +@dirrm share/apps/konqueror/icons/locolor @dirrm share/apps/konqueror/icons/hicolor/32x32/actions +@dirrm share/apps/konqueror/icons/hicolor/32x32 @dirrm share/apps/konqueror/icons/hicolor/22x22/actions +@dirrm share/apps/konqueror/icons/hicolor/22x22 +@dirrm share/apps/konqueror/icons/hicolor +@dirrm share/apps/konqueror/icons @dirrm share/apps/konqueror/dirtree/remote/web @dirrm share/apps/konqueror/dirtree/remote/ftp @dirrm share/apps/konqueror/dirtree/remote @@ -2197,17 +2243,25 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/kmenuedit/icons/hicolor/22x22/actions @dirrm share/apps/kmenuedit/icons/hicolor/22x22 @dirrm share/apps/kmenuedit/icons/hicolor +@dirrm share/apps/kmenuedit/icons @dirrm share/apps/kmenuedit -@dirrm share/apps/klaptopdaemon/icons/locolor/16x16/actions @dirrm share/apps/kio_info @dirrm share/apps/kicker/wallpapers @dirrm share/apps/kicker/tiles @dirrm share/apps/kicker/pics +@dirrm share/apps/kicker/icons/locolor/16x16/actions +@dirrm share/apps/kicker/icons/locolor/16x16 +@dirrm share/apps/kicker/icons/locolor +@dirrm share/apps/kicker/icons @dirrm share/apps/kicker/applets @dirrm share/apps/kicker @dirrm share/apps/khelpcenter/plugins/Tutorials +@dirrm share/apps/khelpcenter/plugins @dirrm share/apps/khelpcenter/pics @dirrm share/apps/khelpcenter/icons/locolor/16x16/apps +@dirrm share/apps/khelpcenter/icons/locolor/16x16 +@dirrm share/apps/khelpcenter/icons/locolor +@dirrm share/apps/khelpcenter/icons @dirrm share/apps/khelpcenter/en @dirrm share/apps/khelpcenter @dirrm share/apps/kdm/pics/users diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index 7cf8533..bbaa703 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdebase -PORTVERSION= 2.0 +PORTVERSION= 2.0.1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo index 04441e9..80f0c4c 100644 --- a/x11/kde4-runtime/distinfo +++ b/x11/kde4-runtime/distinfo @@ -1 +1 @@ -MD5 (kdebase-2.0.tar.bz2) = efdcb3c08b2f8f971b5b7ef077542269 +MD5 (kdebase-2.0.1.tar.bz2) = b138a67ae22fbda05def8e932820ac66 diff --git a/x11/kde4-runtime/files/patch-TEPty.C b/x11/kde4-runtime/files/patch-TEPty.C index 9a5ece3..9bfd5db 100644 --- a/x11/kde4-runtime/files/patch-TEPty.C +++ b/x11/kde4-runtime/files/patch-TEPty.C @@ -1,11 +1,88 @@ ---- konsole/src/TEPty.C Tue Oct 3 14:57:30 2000 -+++ konsole/src/TEPty.C.new Thu Nov 2 17:51:30 2000 -@@ -225,7 +225,7 @@ +--- konsole/src/TEPty.C.orig Fri Dec 8 11:51:24 2000 ++++ konsole/src/TEPty.C Fri Dec 8 11:52:51 2000 +@@ -180,27 +180,57 @@ + // param grant: 1 to grant, 0 to revoke + // returns 1 on success 0 on fail + { +- pid_t pid = fork(); +- if (pid < 0) +- { +- return 0; +- } +- if (pid == 0) +- { +- /* We pass the master pseudo terminal as file descriptor PTY_FILENO. */ +- if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0) exit(1); +- QString path = locate("exe", BASE_CHOWN); ++ pid_t pid; ++ int pstat; ++ struct sigaction ign; ++ struct sigaction intact; // interupt action ++ struct sigaction quitact; // quit action ++ sigset_t newsigblock, oldsigblock; ++ QString path; ++ ++ ign.sa_handler = SIG_IGN; ++ sigemptyset(&ign.sa_mask); ++ ign.sa_flags = 0; ++ sigaction(SIGINT, &ign, &intact); ++ sigaction(SIGQUIT, &ign, &quitact); ++ sigemptyset(&newsigblock); ++ sigaddset(&newsigblock, SIGCHLD); ++ sigprocmask(SIG_BLOCK, &newsigblock, &oldsigblock); ++ ++ switch (pid = fork()) { ++ case -1: ++ return(0); ++ break; ++ case 0: // child ++ if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0) ++ exit(1); ++ path = locate("exe", BASE_CHOWN); ++ ++ sigaction(SIGINT, &intact, NULL); ++ sigaction(SIGQUIT, &quitact, NULL); ++ sigprocmask(SIG_SETMASK, &oldsigblock, NULL); + execle(path.ascii(), BASE_CHOWN, grant?"--grant":"--revoke", NULL, NULL); +- exit(1); // should not be reached +- } +- if (pid > 0) +- { int w; +- retry: +- int rc = waitpid (pid, &w, 0); +- if ((rc == -1) && (errno == EINTR)) +- goto retry; +- return (rc != -1 && WIFEXITED(w) && WEXITSTATUS(w) == 0); ++ exit(1); ++ break; ++ default: ++ do { ++ pid = waitpid(pid, &pstat, 0); ++ } while (pid == -1 && errno == EINTR); ++ break; + } ++ sigaction(SIGINT, &intact, NULL); ++ sigaction(SIGQUIT, &quitact, NULL); ++ sigprocmask(SIG_SETMASK, &oldsigblock, NULL); ++ ++ if (pid == -1) { ++ return 0; ++ } ++ else if (WIFEXITED(pstat) && (WEXITSTATUS(pstat) == 0)) { ++ return 1; ++ } ++ else { ++ return 0; ++ } + return 0; //dummy. + } + +@@ -225,7 +255,7 @@ #ifdef HAVE_UTEMPTER removeLineFromUtmp(ttynam, fd); #elif defined(USE_LOGIN) - char *tty_name=ttyname(0); + char *tty_name=ttyname(fd); if (tty_name) - logout(tty_name); - #endif + { + if (strncmp(tty_name, "/dev/", 5) == 0) diff --git a/x11/kde4-runtime/files/patch-konsole_grantpty.c b/x11/kde4-runtime/files/patch-konsole_grantpty.c new file mode 100644 index 0000000..889d15b --- /dev/null +++ b/x11/kde4-runtime/files/patch-konsole_grantpty.c @@ -0,0 +1,79 @@ +--- konsole/src/konsole_grantpty.c.orig Sat Jun 12 07:13:31 1999 ++++ konsole/src/konsole_grantpty.c Fri Dec 8 11:54:43 2000 +@@ -31,13 +31,15 @@ + #include <string.h> + #include <sys/stat.h> + #include <unistd.h> ++#include <dirent.h> ++#include <paths.h> + + #define PTY_FILENO 3 /* keep in sync with grantpty */ + #define TTY_GROUP "tty" + + int main (int argc, char *argv[]) + { +- char* pty; ++ char* pty = NULL; + struct stat st; + struct group* p; + gid_t gid; +@@ -81,6 +83,7 @@ + + /* get slave pty name from master pty file handle in PTY_FILENO *********/ + ++#if 0 + /* Check that PTY_FILENO is a valid master pseudo terminal. */ + pty = ttyname(PTY_FILENO); /* posix */ + if (pty == NULL) +@@ -89,6 +92,42 @@ + return 1; /* FAIL */ + } + close(PTY_FILENO); ++#else ++ /* The trouble with the ifdef'd-out portion above is that ttyname() ++ ** does not work correctly when not passed a valid tty, but a pseudotty ++ ** instead. All we're doing here is finding out what the name of ++ ** the associated pty is without having to pass it in on the command line. ++ ** Nothing complex. ++ */ ++ { ++ struct stat sb; ++ struct stat dsb; ++ struct dirent *dirp; ++ static char buf[sizeof(_PATH_DEV) + MAXNAMLEN] = _PATH_DEV; ++ DIR *dp; ++ ++ pty = NULL; ++ ++ if (fstat(PTY_FILENO, &sb)) ++ return 1; /* FAIL */ ++ if ((dp = opendir(_PATH_DEV)) == NULL) ++ return 1; /* FAIL */ ++ ++ while ((dirp = readdir(dp))) { ++ if (dirp->d_fileno != sb.st_ino) ++ continue; ++ bcopy(dirp->d_name, buf + sizeof(_PATH_DEV) - 1, dirp->d_namlen+1); ++ /*fprintf(stderr, "looking at %s\n", buf);*/ ++ if (stat(buf, &dsb) || sb.st_dev != dsb.st_dev || sb.st_ino != dsb.st_ino) ++ continue; ++ pty = buf; ++ } ++ closedir(dp); ++ if (pty == NULL) ++ return 1; /* FAIL */ ++ } ++ /*fprintf(stderr, "successful at finding %s\n", pty);*/ ++#endif + + /* matches /dev/pty?? */ + if (strlen(pty) < 8 || strncmp(pty,"/dev/pty",8)) +@@ -120,6 +159,8 @@ + fprintf(stderr,"%s: cannot chmod %s.\n",argv[0],tty); perror("Reason"); + return 1; /* FAIL */ + } ++ ++ /*fprintf(stderr, "made it here\n");*/ + + return 0; /* OK */ + } diff --git a/x11/kde4-runtime/pkg-plist b/x11/kde4-runtime/pkg-plist index a486bb3..7a8ef62 100644 --- a/x11/kde4-runtime/pkg-plist +++ b/x11/kde4-runtime/pkg-plist @@ -649,6 +649,7 @@ share/apps/kicker/applets/krunapplet.desktop share/apps/kicker/applets/ksystemtrayapplet.desktop share/apps/kicker/applets/ktaskbarapplet.desktop share/apps/kicker/applets/quicklauncher.desktop +share/apps/kicker/icons/locolor/16x16/actions/modified.png share/apps/kicker/pics/disk1.png share/apps/kicker/pics/disk2.png share/apps/kicker/pics/disk3.png @@ -970,9 +971,9 @@ share/doc/HTML/en/kcontrol/action.html share/doc/HTML/en/kcontrol/background.html share/doc/HTML/en/kcontrol/batmon.html share/doc/HTML/en/kcontrol/bell.html -share/doc/HTML/en/kcontrol/blockdev.html share/doc/HTML/en/kcontrol/borders.html share/doc/HTML/en/kcontrol/color.html +share/doc/HTML/en/kcontrol/common share/doc/HTML/en/kcontrol/control-center-exiting.html share/doc/HTML/en/kcontrol/control-center-menus.html share/doc/HTML/en/kcontrol/control-center-run-indiv.html @@ -990,6 +991,8 @@ share/doc/HTML/en/kcontrol/email.html share/doc/HTML/en/kcontrol/energy.html share/doc/HTML/en/kcontrol/file-assoc.html share/doc/HTML/en/kcontrol/file-manager.html +share/doc/HTML/en/kcontrol/kfileman1.png +share/doc/HTML/en/kcontrol/kfileman2.png share/doc/HTML/en/kcontrol/fonts.html share/doc/HTML/en/kcontrol/help-index.html share/doc/HTML/en/kcontrol/icons.html @@ -1099,11 +1102,13 @@ share/doc/HTML/en/kcontrol/user-agent.html share/doc/HTML/en/kcontrol/windows-shares.html share/doc/HTML/en/kcontrol/xserver.html share/doc/HTML/en/kdebugdialog/.anchors +share/doc/HTML/en/kdebugdialog/common share/doc/HTML/en/kdebugdialog/index.docbook share/doc/HTML/en/kdebugdialog/index.html share/doc/HTML/en/kdebugdialog/introduction.html share/doc/HTML/en/kdesu/.anchors share/doc/HTML/en/kdesu/author.html +share/doc/HTML/en/kdesu/common share/doc/HTML/en/kdesu/compiling.html share/doc/HTML/en/kdesu/configuration.html share/doc/HTML/en/kdesu/index.docbook @@ -1117,6 +1122,7 @@ share/doc/HTML/en/kdesu/sec-password-keeping.html share/doc/HTML/en/kdesu/using-kdesu.html share/doc/HTML/en/kdm/.anchors share/doc/HTML/en/kdm/building-and-installing-kdm.html +share/doc/HTML/en/kdm/common share/doc/HTML/en/kdm/configuring-kdm.html share/doc/HTML/en/kdm/configuring-your-system-for-kdm.html share/doc/HTML/en/kdm/credits.html @@ -1129,6 +1135,7 @@ share/doc/HTML/en/kdm/lilo.html share/doc/HTML/en/kdm/locale.html share/doc/HTML/en/kdm/other-information.html share/doc/HTML/en/khelpcenter/.anchors +share/doc/HTML/en/khelpcenter/common share/doc/HTML/en/khelpcenter/contact-developers.html share/doc/HTML/en/khelpcenter/contact-more-information.html share/doc/HTML/en/khelpcenter/contact-official.html @@ -1147,10 +1154,29 @@ share/doc/HTML/en/khelpcenter/interface-basics.html share/doc/HTML/en/khelpcenter/invoking-help.html share/doc/HTML/en/khelpcenter/links.docbook share/doc/HTML/en/khelpcenter/no-html.html +share/doc/HTML/en/khelpcenter/faq/about.html +share/doc/HTML/en/khelpcenter/faq/applications.html +share/doc/HTML/en/khelpcenter/faq/common +share/doc/HTML/en/khelpcenter/faq/configure.html +share/doc/HTML/en/khelpcenter/faq/contribute.html +share/doc/HTML/en/khelpcenter/faq/credits.html +share/doc/HTML/en/khelpcenter/faq/desktop.html +share/doc/HTML/en/khelpcenter/faq/filemanager.html +share/doc/HTML/en/khelpcenter/faq/getting-kde.html +share/doc/HTML/en/khelpcenter/faq/install.html +share/doc/HTML/en/khelpcenter/faq/introduction.html +share/doc/HTML/en/khelpcenter/faq/misc.html +share/doc/HTML/en/khelpcenter/faq/more-info.html +share/doc/HTML/en/khelpcenter/faq/non-kde-apps.html +share/doc/HTML/en/khelpcenter/faq/not-kde.html +share/doc/HTML/en/khelpcenter/faq/panel.html +share/doc/HTML/en/khelpcenter/faq/tips.html +share/doc/HTML/en/khelpcenter/faq/windowmanager.html share/doc/HTML/en/khelpcenter/quickstart/.anchors share/doc/HTML/en/khelpcenter/quickstart/advanced-topics.html share/doc/HTML/en/khelpcenter/quickstart/an-overview-of-kde.html share/doc/HTML/en/khelpcenter/quickstart/archives-and-networks.html +share/doc/HTML/en/khelpcenter/quickstart/common share/doc/HTML/en/khelpcenter/quickstart/configuration-modules.html share/doc/HTML/en/khelpcenter/quickstart/configure.html share/doc/HTML/en/khelpcenter/quickstart/credits.html @@ -1176,16 +1202,17 @@ share/doc/HTML/en/khelpcenter/userguide/about-this-preview.html share/doc/HTML/en/khelpcenter/userguide/adding-programs.html share/doc/HTML/en/khelpcenter/userguide/all-about-your-desktop.html share/doc/HTML/en/khelpcenter/userguide/background-of-kde.html +share/doc/HTML/en/khelpcenter/userguide/common share/doc/HTML/en/khelpcenter/userguide/creating-new-files-on-your-desktop.html share/doc/HTML/en/khelpcenter/userguide/desktop-components.html share/doc/HTML/en/khelpcenter/userguide/docu-staff.html -share/doc/HTML/en/khelpcenter/userguide/entertainmentapplications.html +share/doc/HTML/en/khelpcenter/userguide/entertainment-applications.html share/doc/HTML/en/khelpcenter/userguide/finding-your-lost-files.html share/doc/HTML/en/khelpcenter/userguide/first-impressions.html share/doc/HTML/en/khelpcenter/userguide/frequently-asked-questions.html share/doc/HTML/en/khelpcenter/userguide/getting-kde.html share/doc/HTML/en/khelpcenter/userguide/getting-started.html -share/doc/HTML/en/khelpcenter/userguide/graphicalapplications.html +share/doc/HTML/en/khelpcenter/userguide/graphical-applications.html share/doc/HTML/en/khelpcenter/userguide/index.docbook share/doc/HTML/en/khelpcenter/userguide/index.html share/doc/HTML/en/khelpcenter/userguide/installation.html @@ -1201,8 +1228,8 @@ share/doc/HTML/en/khelpcenter/userguide/linux-installing-rpms.html share/doc/HTML/en/khelpcenter/userguide/more-help.html share/doc/HTML/en/khelpcenter/userguide/mouse-techniques.html share/doc/HTML/en/khelpcenter/userguide/moving-files-with-drag-and-drop.html -share/doc/HTML/en/khelpcenter/userguide/multimediaapplications.html -share/doc/HTML/en/khelpcenter/userguide/networkapplications.html +share/doc/HTML/en/khelpcenter/userguide/multimedia-applications.html +share/doc/HTML/en/khelpcenter/userguide/network-applications.html share/doc/HTML/en/khelpcenter/userguide/quitting-kde.html share/doc/HTML/en/khelpcenter/userguide/shortcuts.html share/doc/HTML/en/khelpcenter/userguide/source-distribution.html @@ -1215,6 +1242,7 @@ share/doc/HTML/en/khelpcenter/userguide/using-the-trashcan.html share/doc/HTML/en/khelpcenter/userguide/utility-applications.html share/doc/HTML/en/khelpcenter/userguide/we-still-need-people.html share/doc/HTML/en/khelpcenter/visualdict/.anchors +share/doc/HTML/en/khelpcenter/visualdict/common share/doc/HTML/en/khelpcenter/visualdict/credits.html share/doc/HTML/en/khelpcenter/visualdict/index.docbook share/doc/HTML/en/khelpcenter/visualdict/index.html @@ -1251,6 +1279,7 @@ share/doc/HTML/en/kicker/.anchors share/doc/HTML/en/kicker/access_config.png share/doc/HTML/en/kicker/basic_icons.png share/doc/HTML/en/kicker/button-preferences.html +share/doc/HTML/en/kicker/common share/doc/HTML/en/kicker/config_window.png share/doc/HTML/en/kicker/configuration-adding-icons.html share/doc/HTML/en/kicker/configuration-config-window.html @@ -1287,6 +1316,7 @@ share/doc/HTML/en/kicker/qb_root.png share/doc/HTML/en/kicker/using-kicker.html share/doc/HTML/en/klipper/.anchors share/doc/HTML/en/klipper/actions.html +share/doc/HTML/en/klipper/common share/doc/HTML/en/klipper/compilation.html share/doc/HTML/en/klipper/configuration.html share/doc/HTML/en/klipper/credits.html @@ -1298,6 +1328,7 @@ share/doc/HTML/en/klipper/requirements.html share/doc/HTML/en/klipper/screenshot.png share/doc/HTML/en/klipper/using-klipper.html share/doc/HTML/en/kmenuedit/.anchors +share/doc/HTML/en/kmenuedit/common share/doc/HTML/en/kmenuedit/credits.html share/doc/HTML/en/kmenuedit/details-advanced.html share/doc/HTML/en/kmenuedit/glossary.html @@ -1316,20 +1347,25 @@ share/doc/HTML/en/kmenuedit/introduction.html share/doc/HTML/en/kmenuedit/menu-reference.html share/doc/HTML/en/kmenuedit/using-kmenuedit.html share/doc/HTML/en/konqueror/.anchors +share/doc/HTML/en/konqueror/autocomplete.html share/doc/HTML/en/konqueror/basics.html share/doc/HTML/en/konqueror/bookmarks.html share/doc/HTML/en/konqueror/browser.html share/doc/HTML/en/konqueror/bubble.html +share/doc/HTML/en/konqueror/common share/doc/HTML/en/konqueror/cmndline.png share/doc/HTML/en/konqueror/commandline.html share/doc/HTML/en/konqueror/commands.html share/doc/HTML/en/konqueror/config-prox.html share/doc/HTML/en/konqueror/config.html share/doc/HTML/en/konqueror/configure-bars.html +share/doc/HTML/en/konqueror/cook.html share/doc/HTML/en/konqueror/credits.html +share/doc/HTML/en/konqueror/crypto.html share/doc/HTML/en/konqueror/deleting.html share/doc/HTML/en/konqueror/dirtree.png share/doc/HTML/en/konqueror/dragdrop.png +share/doc/HTML/en/konqueror/faq.html share/doc/HTML/en/konqueror/fileassoc.html share/doc/HTML/en/konqueror/filemanager.html share/doc/HTML/en/konqueror/filetype1.png @@ -1340,9 +1376,6 @@ share/doc/HTML/en/konqueror/index.docbook share/doc/HTML/en/konqueror/index.html share/doc/HTML/en/konqueror/installation.html share/doc/HTML/en/konqueror/introduction.html -share/doc/HTML/en/konqueror/kfind.png -share/doc/HTML/en/konqueror/konqdoc5.png -share/doc/HTML/en/konqueror/konqdoc9.png share/doc/HTML/en/konqueror/konqorg.png share/doc/HTML/en/konqueror/lmbmmb.html share/doc/HTML/en/konqueror/making.html @@ -1358,15 +1391,18 @@ share/doc/HTML/en/konqueror/rmb-menus.html share/doc/HTML/en/konqueror/samba.html share/doc/HTML/en/konqueror/samba.png share/doc/HTML/en/konqueror/save-print-web.html +share/doc/HTML/en/konqueror/saveset.html share/doc/HTML/en/konqueror/surf.html share/doc/HTML/en/konsole/.anchors share/doc/HTML/en/konsole/command-line-options.html +share/doc/HTML/en/konsole/common share/doc/HTML/en/konsole/credits.html share/doc/HTML/en/konsole/history-option.html share/doc/HTML/en/konsole/index.docbook share/doc/HTML/en/konsole/index.html share/doc/HTML/en/konsole/installation.html share/doc/HTML/en/konsole/introduction.html +share/doc/HTML/en/konsole/konsole.png share/doc/HTML/en/konsole/konsole1.gif share/doc/HTML/en/konsole/konsole2.gif share/doc/HTML/en/konsole/menubar.html @@ -1377,6 +1413,7 @@ share/doc/HTML/en/konsole/use-of-konsole.html share/doc/HTML/en/konsole/vt100.gif share/doc/HTML/en/kpager/.anchors share/doc/HTML/en/kpager/commands.html +share/doc/HTML/en/kpager/common share/doc/HTML/en/kpager/compilation.html share/doc/HTML/en/kpager/credits.html share/doc/HTML/en/kpager/faq.html @@ -1390,6 +1427,7 @@ share/doc/HTML/en/kpager/screenshot.png share/doc/HTML/en/kpager/settings.png share/doc/HTML/en/kpager/using-kapp.html share/doc/HTML/en/ksysguard/.anchors +share/doc/HTML/en/ksysguard/common share/doc/HTML/en/ksysguard/compilationandinstallation.html share/doc/HTML/en/ksysguard/credits-and-licenses.html share/doc/HTML/en/ksysguard/index.docbook @@ -1402,6 +1440,7 @@ share/doc/HTML/en/ksysguard/the-workspace.html share/doc/HTML/en/ksysguard/usingtheksysguard.html share/doc/HTML/en/kwrite/.anchors share/doc/HTML/en/kwrite/command-line-options.html +share/doc/HTML/en/kwrite/common share/doc/HTML/en/kwrite/credits.html share/doc/HTML/en/kwrite/edit.html share/doc/HTML/en/kwrite/go.html @@ -1411,9 +1450,9 @@ share/doc/HTML/en/kwrite/index.html share/doc/HTML/en/kwrite/introduction.html share/doc/HTML/en/kwrite/keybindings.html share/doc/HTML/en/kwrite/on-screen-fundamentals.html -share/doc/HTML/en/kwrite/other-preferences.html share/doc/HTML/en/kwrite/pref-dialog.html share/doc/HTML/en/kwrite/pref-edit.html +share/doc/HTML/en/kwrite/pref-highlighting.html share/doc/HTML/en/kwrite/pref-indent.html share/doc/HTML/en/kwrite/pref-select.html share/doc/HTML/en/kwrite/prefspellchecker.html @@ -2170,6 +2209,7 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/ksysguard/icons/locolor/16x16/apps @dirrm share/apps/ksysguard/icons/locolor/16x16 @dirrm share/apps/ksysguard/icons/locolor +@dirrm share/apps/ksysguard/icons @dirrm share/apps/ksysguard @dirrm share/apps/ksplash/pics @dirrm share/apps/ksplash @@ -2180,8 +2220,14 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/konqueror/profiles @dirrm share/apps/konqueror/pics @dirrm share/apps/konqueror/icons/locolor/16x16/actions +@dirrm share/apps/konqueror/icons/locolor/16x16 +@dirrm share/apps/konqueror/icons/locolor @dirrm share/apps/konqueror/icons/hicolor/32x32/actions +@dirrm share/apps/konqueror/icons/hicolor/32x32 @dirrm share/apps/konqueror/icons/hicolor/22x22/actions +@dirrm share/apps/konqueror/icons/hicolor/22x22 +@dirrm share/apps/konqueror/icons/hicolor +@dirrm share/apps/konqueror/icons @dirrm share/apps/konqueror/dirtree/remote/web @dirrm share/apps/konqueror/dirtree/remote/ftp @dirrm share/apps/konqueror/dirtree/remote @@ -2197,17 +2243,25 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/kmenuedit/icons/hicolor/22x22/actions @dirrm share/apps/kmenuedit/icons/hicolor/22x22 @dirrm share/apps/kmenuedit/icons/hicolor +@dirrm share/apps/kmenuedit/icons @dirrm share/apps/kmenuedit -@dirrm share/apps/klaptopdaemon/icons/locolor/16x16/actions @dirrm share/apps/kio_info @dirrm share/apps/kicker/wallpapers @dirrm share/apps/kicker/tiles @dirrm share/apps/kicker/pics +@dirrm share/apps/kicker/icons/locolor/16x16/actions +@dirrm share/apps/kicker/icons/locolor/16x16 +@dirrm share/apps/kicker/icons/locolor +@dirrm share/apps/kicker/icons @dirrm share/apps/kicker/applets @dirrm share/apps/kicker @dirrm share/apps/khelpcenter/plugins/Tutorials +@dirrm share/apps/khelpcenter/plugins @dirrm share/apps/khelpcenter/pics @dirrm share/apps/khelpcenter/icons/locolor/16x16/apps +@dirrm share/apps/khelpcenter/icons/locolor/16x16 +@dirrm share/apps/khelpcenter/icons/locolor +@dirrm share/apps/khelpcenter/icons @dirrm share/apps/khelpcenter/en @dirrm share/apps/khelpcenter @dirrm share/apps/kdm/pics/users diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 7cf8533..bbaa703 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdebase -PORTVERSION= 2.0 +PORTVERSION= 2.0.1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo index 04441e9..80f0c4c 100644 --- a/x11/kde4-workspace/distinfo +++ b/x11/kde4-workspace/distinfo @@ -1 +1 @@ -MD5 (kdebase-2.0.tar.bz2) = efdcb3c08b2f8f971b5b7ef077542269 +MD5 (kdebase-2.0.1.tar.bz2) = b138a67ae22fbda05def8e932820ac66 diff --git a/x11/kde4-workspace/files/patch-TEPty.C b/x11/kde4-workspace/files/patch-TEPty.C index 9a5ece3..9bfd5db 100644 --- a/x11/kde4-workspace/files/patch-TEPty.C +++ b/x11/kde4-workspace/files/patch-TEPty.C @@ -1,11 +1,88 @@ ---- konsole/src/TEPty.C Tue Oct 3 14:57:30 2000 -+++ konsole/src/TEPty.C.new Thu Nov 2 17:51:30 2000 -@@ -225,7 +225,7 @@ +--- konsole/src/TEPty.C.orig Fri Dec 8 11:51:24 2000 ++++ konsole/src/TEPty.C Fri Dec 8 11:52:51 2000 +@@ -180,27 +180,57 @@ + // param grant: 1 to grant, 0 to revoke + // returns 1 on success 0 on fail + { +- pid_t pid = fork(); +- if (pid < 0) +- { +- return 0; +- } +- if (pid == 0) +- { +- /* We pass the master pseudo terminal as file descriptor PTY_FILENO. */ +- if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0) exit(1); +- QString path = locate("exe", BASE_CHOWN); ++ pid_t pid; ++ int pstat; ++ struct sigaction ign; ++ struct sigaction intact; // interupt action ++ struct sigaction quitact; // quit action ++ sigset_t newsigblock, oldsigblock; ++ QString path; ++ ++ ign.sa_handler = SIG_IGN; ++ sigemptyset(&ign.sa_mask); ++ ign.sa_flags = 0; ++ sigaction(SIGINT, &ign, &intact); ++ sigaction(SIGQUIT, &ign, &quitact); ++ sigemptyset(&newsigblock); ++ sigaddset(&newsigblock, SIGCHLD); ++ sigprocmask(SIG_BLOCK, &newsigblock, &oldsigblock); ++ ++ switch (pid = fork()) { ++ case -1: ++ return(0); ++ break; ++ case 0: // child ++ if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0) ++ exit(1); ++ path = locate("exe", BASE_CHOWN); ++ ++ sigaction(SIGINT, &intact, NULL); ++ sigaction(SIGQUIT, &quitact, NULL); ++ sigprocmask(SIG_SETMASK, &oldsigblock, NULL); + execle(path.ascii(), BASE_CHOWN, grant?"--grant":"--revoke", NULL, NULL); +- exit(1); // should not be reached +- } +- if (pid > 0) +- { int w; +- retry: +- int rc = waitpid (pid, &w, 0); +- if ((rc == -1) && (errno == EINTR)) +- goto retry; +- return (rc != -1 && WIFEXITED(w) && WEXITSTATUS(w) == 0); ++ exit(1); ++ break; ++ default: ++ do { ++ pid = waitpid(pid, &pstat, 0); ++ } while (pid == -1 && errno == EINTR); ++ break; + } ++ sigaction(SIGINT, &intact, NULL); ++ sigaction(SIGQUIT, &quitact, NULL); ++ sigprocmask(SIG_SETMASK, &oldsigblock, NULL); ++ ++ if (pid == -1) { ++ return 0; ++ } ++ else if (WIFEXITED(pstat) && (WEXITSTATUS(pstat) == 0)) { ++ return 1; ++ } ++ else { ++ return 0; ++ } + return 0; //dummy. + } + +@@ -225,7 +255,7 @@ #ifdef HAVE_UTEMPTER removeLineFromUtmp(ttynam, fd); #elif defined(USE_LOGIN) - char *tty_name=ttyname(0); + char *tty_name=ttyname(fd); if (tty_name) - logout(tty_name); - #endif + { + if (strncmp(tty_name, "/dev/", 5) == 0) diff --git a/x11/kde4-workspace/files/patch-konsole_grantpty.c b/x11/kde4-workspace/files/patch-konsole_grantpty.c new file mode 100644 index 0000000..889d15b --- /dev/null +++ b/x11/kde4-workspace/files/patch-konsole_grantpty.c @@ -0,0 +1,79 @@ +--- konsole/src/konsole_grantpty.c.orig Sat Jun 12 07:13:31 1999 ++++ konsole/src/konsole_grantpty.c Fri Dec 8 11:54:43 2000 +@@ -31,13 +31,15 @@ + #include <string.h> + #include <sys/stat.h> + #include <unistd.h> ++#include <dirent.h> ++#include <paths.h> + + #define PTY_FILENO 3 /* keep in sync with grantpty */ + #define TTY_GROUP "tty" + + int main (int argc, char *argv[]) + { +- char* pty; ++ char* pty = NULL; + struct stat st; + struct group* p; + gid_t gid; +@@ -81,6 +83,7 @@ + + /* get slave pty name from master pty file handle in PTY_FILENO *********/ + ++#if 0 + /* Check that PTY_FILENO is a valid master pseudo terminal. */ + pty = ttyname(PTY_FILENO); /* posix */ + if (pty == NULL) +@@ -89,6 +92,42 @@ + return 1; /* FAIL */ + } + close(PTY_FILENO); ++#else ++ /* The trouble with the ifdef'd-out portion above is that ttyname() ++ ** does not work correctly when not passed a valid tty, but a pseudotty ++ ** instead. All we're doing here is finding out what the name of ++ ** the associated pty is without having to pass it in on the command line. ++ ** Nothing complex. ++ */ ++ { ++ struct stat sb; ++ struct stat dsb; ++ struct dirent *dirp; ++ static char buf[sizeof(_PATH_DEV) + MAXNAMLEN] = _PATH_DEV; ++ DIR *dp; ++ ++ pty = NULL; ++ ++ if (fstat(PTY_FILENO, &sb)) ++ return 1; /* FAIL */ ++ if ((dp = opendir(_PATH_DEV)) == NULL) ++ return 1; /* FAIL */ ++ ++ while ((dirp = readdir(dp))) { ++ if (dirp->d_fileno != sb.st_ino) ++ continue; ++ bcopy(dirp->d_name, buf + sizeof(_PATH_DEV) - 1, dirp->d_namlen+1); ++ /*fprintf(stderr, "looking at %s\n", buf);*/ ++ if (stat(buf, &dsb) || sb.st_dev != dsb.st_dev || sb.st_ino != dsb.st_ino) ++ continue; ++ pty = buf; ++ } ++ closedir(dp); ++ if (pty == NULL) ++ return 1; /* FAIL */ ++ } ++ /*fprintf(stderr, "successful at finding %s\n", pty);*/ ++#endif + + /* matches /dev/pty?? */ + if (strlen(pty) < 8 || strncmp(pty,"/dev/pty",8)) +@@ -120,6 +159,8 @@ + fprintf(stderr,"%s: cannot chmod %s.\n",argv[0],tty); perror("Reason"); + return 1; /* FAIL */ + } ++ ++ /*fprintf(stderr, "made it here\n");*/ + + return 0; /* OK */ + } diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist index a486bb3..7a8ef62 100644 --- a/x11/kde4-workspace/pkg-plist +++ b/x11/kde4-workspace/pkg-plist @@ -649,6 +649,7 @@ share/apps/kicker/applets/krunapplet.desktop share/apps/kicker/applets/ksystemtrayapplet.desktop share/apps/kicker/applets/ktaskbarapplet.desktop share/apps/kicker/applets/quicklauncher.desktop +share/apps/kicker/icons/locolor/16x16/actions/modified.png share/apps/kicker/pics/disk1.png share/apps/kicker/pics/disk2.png share/apps/kicker/pics/disk3.png @@ -970,9 +971,9 @@ share/doc/HTML/en/kcontrol/action.html share/doc/HTML/en/kcontrol/background.html share/doc/HTML/en/kcontrol/batmon.html share/doc/HTML/en/kcontrol/bell.html -share/doc/HTML/en/kcontrol/blockdev.html share/doc/HTML/en/kcontrol/borders.html share/doc/HTML/en/kcontrol/color.html +share/doc/HTML/en/kcontrol/common share/doc/HTML/en/kcontrol/control-center-exiting.html share/doc/HTML/en/kcontrol/control-center-menus.html share/doc/HTML/en/kcontrol/control-center-run-indiv.html @@ -990,6 +991,8 @@ share/doc/HTML/en/kcontrol/email.html share/doc/HTML/en/kcontrol/energy.html share/doc/HTML/en/kcontrol/file-assoc.html share/doc/HTML/en/kcontrol/file-manager.html +share/doc/HTML/en/kcontrol/kfileman1.png +share/doc/HTML/en/kcontrol/kfileman2.png share/doc/HTML/en/kcontrol/fonts.html share/doc/HTML/en/kcontrol/help-index.html share/doc/HTML/en/kcontrol/icons.html @@ -1099,11 +1102,13 @@ share/doc/HTML/en/kcontrol/user-agent.html share/doc/HTML/en/kcontrol/windows-shares.html share/doc/HTML/en/kcontrol/xserver.html share/doc/HTML/en/kdebugdialog/.anchors +share/doc/HTML/en/kdebugdialog/common share/doc/HTML/en/kdebugdialog/index.docbook share/doc/HTML/en/kdebugdialog/index.html share/doc/HTML/en/kdebugdialog/introduction.html share/doc/HTML/en/kdesu/.anchors share/doc/HTML/en/kdesu/author.html +share/doc/HTML/en/kdesu/common share/doc/HTML/en/kdesu/compiling.html share/doc/HTML/en/kdesu/configuration.html share/doc/HTML/en/kdesu/index.docbook @@ -1117,6 +1122,7 @@ share/doc/HTML/en/kdesu/sec-password-keeping.html share/doc/HTML/en/kdesu/using-kdesu.html share/doc/HTML/en/kdm/.anchors share/doc/HTML/en/kdm/building-and-installing-kdm.html +share/doc/HTML/en/kdm/common share/doc/HTML/en/kdm/configuring-kdm.html share/doc/HTML/en/kdm/configuring-your-system-for-kdm.html share/doc/HTML/en/kdm/credits.html @@ -1129,6 +1135,7 @@ share/doc/HTML/en/kdm/lilo.html share/doc/HTML/en/kdm/locale.html share/doc/HTML/en/kdm/other-information.html share/doc/HTML/en/khelpcenter/.anchors +share/doc/HTML/en/khelpcenter/common share/doc/HTML/en/khelpcenter/contact-developers.html share/doc/HTML/en/khelpcenter/contact-more-information.html share/doc/HTML/en/khelpcenter/contact-official.html @@ -1147,10 +1154,29 @@ share/doc/HTML/en/khelpcenter/interface-basics.html share/doc/HTML/en/khelpcenter/invoking-help.html share/doc/HTML/en/khelpcenter/links.docbook share/doc/HTML/en/khelpcenter/no-html.html +share/doc/HTML/en/khelpcenter/faq/about.html +share/doc/HTML/en/khelpcenter/faq/applications.html +share/doc/HTML/en/khelpcenter/faq/common +share/doc/HTML/en/khelpcenter/faq/configure.html +share/doc/HTML/en/khelpcenter/faq/contribute.html +share/doc/HTML/en/khelpcenter/faq/credits.html +share/doc/HTML/en/khelpcenter/faq/desktop.html +share/doc/HTML/en/khelpcenter/faq/filemanager.html +share/doc/HTML/en/khelpcenter/faq/getting-kde.html +share/doc/HTML/en/khelpcenter/faq/install.html +share/doc/HTML/en/khelpcenter/faq/introduction.html +share/doc/HTML/en/khelpcenter/faq/misc.html +share/doc/HTML/en/khelpcenter/faq/more-info.html +share/doc/HTML/en/khelpcenter/faq/non-kde-apps.html +share/doc/HTML/en/khelpcenter/faq/not-kde.html +share/doc/HTML/en/khelpcenter/faq/panel.html +share/doc/HTML/en/khelpcenter/faq/tips.html +share/doc/HTML/en/khelpcenter/faq/windowmanager.html share/doc/HTML/en/khelpcenter/quickstart/.anchors share/doc/HTML/en/khelpcenter/quickstart/advanced-topics.html share/doc/HTML/en/khelpcenter/quickstart/an-overview-of-kde.html share/doc/HTML/en/khelpcenter/quickstart/archives-and-networks.html +share/doc/HTML/en/khelpcenter/quickstart/common share/doc/HTML/en/khelpcenter/quickstart/configuration-modules.html share/doc/HTML/en/khelpcenter/quickstart/configure.html share/doc/HTML/en/khelpcenter/quickstart/credits.html @@ -1176,16 +1202,17 @@ share/doc/HTML/en/khelpcenter/userguide/about-this-preview.html share/doc/HTML/en/khelpcenter/userguide/adding-programs.html share/doc/HTML/en/khelpcenter/userguide/all-about-your-desktop.html share/doc/HTML/en/khelpcenter/userguide/background-of-kde.html +share/doc/HTML/en/khelpcenter/userguide/common share/doc/HTML/en/khelpcenter/userguide/creating-new-files-on-your-desktop.html share/doc/HTML/en/khelpcenter/userguide/desktop-components.html share/doc/HTML/en/khelpcenter/userguide/docu-staff.html -share/doc/HTML/en/khelpcenter/userguide/entertainmentapplications.html +share/doc/HTML/en/khelpcenter/userguide/entertainment-applications.html share/doc/HTML/en/khelpcenter/userguide/finding-your-lost-files.html share/doc/HTML/en/khelpcenter/userguide/first-impressions.html share/doc/HTML/en/khelpcenter/userguide/frequently-asked-questions.html share/doc/HTML/en/khelpcenter/userguide/getting-kde.html share/doc/HTML/en/khelpcenter/userguide/getting-started.html -share/doc/HTML/en/khelpcenter/userguide/graphicalapplications.html +share/doc/HTML/en/khelpcenter/userguide/graphical-applications.html share/doc/HTML/en/khelpcenter/userguide/index.docbook share/doc/HTML/en/khelpcenter/userguide/index.html share/doc/HTML/en/khelpcenter/userguide/installation.html @@ -1201,8 +1228,8 @@ share/doc/HTML/en/khelpcenter/userguide/linux-installing-rpms.html share/doc/HTML/en/khelpcenter/userguide/more-help.html share/doc/HTML/en/khelpcenter/userguide/mouse-techniques.html share/doc/HTML/en/khelpcenter/userguide/moving-files-with-drag-and-drop.html -share/doc/HTML/en/khelpcenter/userguide/multimediaapplications.html -share/doc/HTML/en/khelpcenter/userguide/networkapplications.html +share/doc/HTML/en/khelpcenter/userguide/multimedia-applications.html +share/doc/HTML/en/khelpcenter/userguide/network-applications.html share/doc/HTML/en/khelpcenter/userguide/quitting-kde.html share/doc/HTML/en/khelpcenter/userguide/shortcuts.html share/doc/HTML/en/khelpcenter/userguide/source-distribution.html @@ -1215,6 +1242,7 @@ share/doc/HTML/en/khelpcenter/userguide/using-the-trashcan.html share/doc/HTML/en/khelpcenter/userguide/utility-applications.html share/doc/HTML/en/khelpcenter/userguide/we-still-need-people.html share/doc/HTML/en/khelpcenter/visualdict/.anchors +share/doc/HTML/en/khelpcenter/visualdict/common share/doc/HTML/en/khelpcenter/visualdict/credits.html share/doc/HTML/en/khelpcenter/visualdict/index.docbook share/doc/HTML/en/khelpcenter/visualdict/index.html @@ -1251,6 +1279,7 @@ share/doc/HTML/en/kicker/.anchors share/doc/HTML/en/kicker/access_config.png share/doc/HTML/en/kicker/basic_icons.png share/doc/HTML/en/kicker/button-preferences.html +share/doc/HTML/en/kicker/common share/doc/HTML/en/kicker/config_window.png share/doc/HTML/en/kicker/configuration-adding-icons.html share/doc/HTML/en/kicker/configuration-config-window.html @@ -1287,6 +1316,7 @@ share/doc/HTML/en/kicker/qb_root.png share/doc/HTML/en/kicker/using-kicker.html share/doc/HTML/en/klipper/.anchors share/doc/HTML/en/klipper/actions.html +share/doc/HTML/en/klipper/common share/doc/HTML/en/klipper/compilation.html share/doc/HTML/en/klipper/configuration.html share/doc/HTML/en/klipper/credits.html @@ -1298,6 +1328,7 @@ share/doc/HTML/en/klipper/requirements.html share/doc/HTML/en/klipper/screenshot.png share/doc/HTML/en/klipper/using-klipper.html share/doc/HTML/en/kmenuedit/.anchors +share/doc/HTML/en/kmenuedit/common share/doc/HTML/en/kmenuedit/credits.html share/doc/HTML/en/kmenuedit/details-advanced.html share/doc/HTML/en/kmenuedit/glossary.html @@ -1316,20 +1347,25 @@ share/doc/HTML/en/kmenuedit/introduction.html share/doc/HTML/en/kmenuedit/menu-reference.html share/doc/HTML/en/kmenuedit/using-kmenuedit.html share/doc/HTML/en/konqueror/.anchors +share/doc/HTML/en/konqueror/autocomplete.html share/doc/HTML/en/konqueror/basics.html share/doc/HTML/en/konqueror/bookmarks.html share/doc/HTML/en/konqueror/browser.html share/doc/HTML/en/konqueror/bubble.html +share/doc/HTML/en/konqueror/common share/doc/HTML/en/konqueror/cmndline.png share/doc/HTML/en/konqueror/commandline.html share/doc/HTML/en/konqueror/commands.html share/doc/HTML/en/konqueror/config-prox.html share/doc/HTML/en/konqueror/config.html share/doc/HTML/en/konqueror/configure-bars.html +share/doc/HTML/en/konqueror/cook.html share/doc/HTML/en/konqueror/credits.html +share/doc/HTML/en/konqueror/crypto.html share/doc/HTML/en/konqueror/deleting.html share/doc/HTML/en/konqueror/dirtree.png share/doc/HTML/en/konqueror/dragdrop.png +share/doc/HTML/en/konqueror/faq.html share/doc/HTML/en/konqueror/fileassoc.html share/doc/HTML/en/konqueror/filemanager.html share/doc/HTML/en/konqueror/filetype1.png @@ -1340,9 +1376,6 @@ share/doc/HTML/en/konqueror/index.docbook share/doc/HTML/en/konqueror/index.html share/doc/HTML/en/konqueror/installation.html share/doc/HTML/en/konqueror/introduction.html -share/doc/HTML/en/konqueror/kfind.png -share/doc/HTML/en/konqueror/konqdoc5.png -share/doc/HTML/en/konqueror/konqdoc9.png share/doc/HTML/en/konqueror/konqorg.png share/doc/HTML/en/konqueror/lmbmmb.html share/doc/HTML/en/konqueror/making.html @@ -1358,15 +1391,18 @@ share/doc/HTML/en/konqueror/rmb-menus.html share/doc/HTML/en/konqueror/samba.html share/doc/HTML/en/konqueror/samba.png share/doc/HTML/en/konqueror/save-print-web.html +share/doc/HTML/en/konqueror/saveset.html share/doc/HTML/en/konqueror/surf.html share/doc/HTML/en/konsole/.anchors share/doc/HTML/en/konsole/command-line-options.html +share/doc/HTML/en/konsole/common share/doc/HTML/en/konsole/credits.html share/doc/HTML/en/konsole/history-option.html share/doc/HTML/en/konsole/index.docbook share/doc/HTML/en/konsole/index.html share/doc/HTML/en/konsole/installation.html share/doc/HTML/en/konsole/introduction.html +share/doc/HTML/en/konsole/konsole.png share/doc/HTML/en/konsole/konsole1.gif share/doc/HTML/en/konsole/konsole2.gif share/doc/HTML/en/konsole/menubar.html @@ -1377,6 +1413,7 @@ share/doc/HTML/en/konsole/use-of-konsole.html share/doc/HTML/en/konsole/vt100.gif share/doc/HTML/en/kpager/.anchors share/doc/HTML/en/kpager/commands.html +share/doc/HTML/en/kpager/common share/doc/HTML/en/kpager/compilation.html share/doc/HTML/en/kpager/credits.html share/doc/HTML/en/kpager/faq.html @@ -1390,6 +1427,7 @@ share/doc/HTML/en/kpager/screenshot.png share/doc/HTML/en/kpager/settings.png share/doc/HTML/en/kpager/using-kapp.html share/doc/HTML/en/ksysguard/.anchors +share/doc/HTML/en/ksysguard/common share/doc/HTML/en/ksysguard/compilationandinstallation.html share/doc/HTML/en/ksysguard/credits-and-licenses.html share/doc/HTML/en/ksysguard/index.docbook @@ -1402,6 +1440,7 @@ share/doc/HTML/en/ksysguard/the-workspace.html share/doc/HTML/en/ksysguard/usingtheksysguard.html share/doc/HTML/en/kwrite/.anchors share/doc/HTML/en/kwrite/command-line-options.html +share/doc/HTML/en/kwrite/common share/doc/HTML/en/kwrite/credits.html share/doc/HTML/en/kwrite/edit.html share/doc/HTML/en/kwrite/go.html @@ -1411,9 +1450,9 @@ share/doc/HTML/en/kwrite/index.html share/doc/HTML/en/kwrite/introduction.html share/doc/HTML/en/kwrite/keybindings.html share/doc/HTML/en/kwrite/on-screen-fundamentals.html -share/doc/HTML/en/kwrite/other-preferences.html share/doc/HTML/en/kwrite/pref-dialog.html share/doc/HTML/en/kwrite/pref-edit.html +share/doc/HTML/en/kwrite/pref-highlighting.html share/doc/HTML/en/kwrite/pref-indent.html share/doc/HTML/en/kwrite/pref-select.html share/doc/HTML/en/kwrite/prefspellchecker.html @@ -2170,6 +2209,7 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/ksysguard/icons/locolor/16x16/apps @dirrm share/apps/ksysguard/icons/locolor/16x16 @dirrm share/apps/ksysguard/icons/locolor +@dirrm share/apps/ksysguard/icons @dirrm share/apps/ksysguard @dirrm share/apps/ksplash/pics @dirrm share/apps/ksplash @@ -2180,8 +2220,14 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/konqueror/profiles @dirrm share/apps/konqueror/pics @dirrm share/apps/konqueror/icons/locolor/16x16/actions +@dirrm share/apps/konqueror/icons/locolor/16x16 +@dirrm share/apps/konqueror/icons/locolor @dirrm share/apps/konqueror/icons/hicolor/32x32/actions +@dirrm share/apps/konqueror/icons/hicolor/32x32 @dirrm share/apps/konqueror/icons/hicolor/22x22/actions +@dirrm share/apps/konqueror/icons/hicolor/22x22 +@dirrm share/apps/konqueror/icons/hicolor +@dirrm share/apps/konqueror/icons @dirrm share/apps/konqueror/dirtree/remote/web @dirrm share/apps/konqueror/dirtree/remote/ftp @dirrm share/apps/konqueror/dirtree/remote @@ -2197,17 +2243,25 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/kmenuedit/icons/hicolor/22x22/actions @dirrm share/apps/kmenuedit/icons/hicolor/22x22 @dirrm share/apps/kmenuedit/icons/hicolor +@dirrm share/apps/kmenuedit/icons @dirrm share/apps/kmenuedit -@dirrm share/apps/klaptopdaemon/icons/locolor/16x16/actions @dirrm share/apps/kio_info @dirrm share/apps/kicker/wallpapers @dirrm share/apps/kicker/tiles @dirrm share/apps/kicker/pics +@dirrm share/apps/kicker/icons/locolor/16x16/actions +@dirrm share/apps/kicker/icons/locolor/16x16 +@dirrm share/apps/kicker/icons/locolor +@dirrm share/apps/kicker/icons @dirrm share/apps/kicker/applets @dirrm share/apps/kicker @dirrm share/apps/khelpcenter/plugins/Tutorials +@dirrm share/apps/khelpcenter/plugins @dirrm share/apps/khelpcenter/pics @dirrm share/apps/khelpcenter/icons/locolor/16x16/apps +@dirrm share/apps/khelpcenter/icons/locolor/16x16 +@dirrm share/apps/khelpcenter/icons/locolor +@dirrm share/apps/khelpcenter/icons @dirrm share/apps/khelpcenter/en @dirrm share/apps/khelpcenter @dirrm share/apps/kdm/pics/users diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile index e8b482b..fe065aa 100644 --- a/x11/kde4/Makefile +++ b/x11/kde4/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kde -PORTVERSION= 2.0 +PORTVERSION= 2.0.1 CATEGORIES= x11 kde MASTER_SITES= # empty DISTFILES= # none diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile index 7cf8533..bbaa703 100644 --- a/x11/kdebase2/Makefile +++ b/x11/kdebase2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdebase -PORTVERSION= 2.0 +PORTVERSION= 2.0.1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src diff --git a/x11/kdebase2/distinfo b/x11/kdebase2/distinfo index 04441e9..80f0c4c 100644 --- a/x11/kdebase2/distinfo +++ b/x11/kdebase2/distinfo @@ -1 +1 @@ -MD5 (kdebase-2.0.tar.bz2) = efdcb3c08b2f8f971b5b7ef077542269 +MD5 (kdebase-2.0.1.tar.bz2) = b138a67ae22fbda05def8e932820ac66 diff --git a/x11/kdebase2/files/patch-TEPty.C b/x11/kdebase2/files/patch-TEPty.C index 9a5ece3..9bfd5db 100644 --- a/x11/kdebase2/files/patch-TEPty.C +++ b/x11/kdebase2/files/patch-TEPty.C @@ -1,11 +1,88 @@ ---- konsole/src/TEPty.C Tue Oct 3 14:57:30 2000 -+++ konsole/src/TEPty.C.new Thu Nov 2 17:51:30 2000 -@@ -225,7 +225,7 @@ +--- konsole/src/TEPty.C.orig Fri Dec 8 11:51:24 2000 ++++ konsole/src/TEPty.C Fri Dec 8 11:52:51 2000 +@@ -180,27 +180,57 @@ + // param grant: 1 to grant, 0 to revoke + // returns 1 on success 0 on fail + { +- pid_t pid = fork(); +- if (pid < 0) +- { +- return 0; +- } +- if (pid == 0) +- { +- /* We pass the master pseudo terminal as file descriptor PTY_FILENO. */ +- if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0) exit(1); +- QString path = locate("exe", BASE_CHOWN); ++ pid_t pid; ++ int pstat; ++ struct sigaction ign; ++ struct sigaction intact; // interupt action ++ struct sigaction quitact; // quit action ++ sigset_t newsigblock, oldsigblock; ++ QString path; ++ ++ ign.sa_handler = SIG_IGN; ++ sigemptyset(&ign.sa_mask); ++ ign.sa_flags = 0; ++ sigaction(SIGINT, &ign, &intact); ++ sigaction(SIGQUIT, &ign, &quitact); ++ sigemptyset(&newsigblock); ++ sigaddset(&newsigblock, SIGCHLD); ++ sigprocmask(SIG_BLOCK, &newsigblock, &oldsigblock); ++ ++ switch (pid = fork()) { ++ case -1: ++ return(0); ++ break; ++ case 0: // child ++ if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0) ++ exit(1); ++ path = locate("exe", BASE_CHOWN); ++ ++ sigaction(SIGINT, &intact, NULL); ++ sigaction(SIGQUIT, &quitact, NULL); ++ sigprocmask(SIG_SETMASK, &oldsigblock, NULL); + execle(path.ascii(), BASE_CHOWN, grant?"--grant":"--revoke", NULL, NULL); +- exit(1); // should not be reached +- } +- if (pid > 0) +- { int w; +- retry: +- int rc = waitpid (pid, &w, 0); +- if ((rc == -1) && (errno == EINTR)) +- goto retry; +- return (rc != -1 && WIFEXITED(w) && WEXITSTATUS(w) == 0); ++ exit(1); ++ break; ++ default: ++ do { ++ pid = waitpid(pid, &pstat, 0); ++ } while (pid == -1 && errno == EINTR); ++ break; + } ++ sigaction(SIGINT, &intact, NULL); ++ sigaction(SIGQUIT, &quitact, NULL); ++ sigprocmask(SIG_SETMASK, &oldsigblock, NULL); ++ ++ if (pid == -1) { ++ return 0; ++ } ++ else if (WIFEXITED(pstat) && (WEXITSTATUS(pstat) == 0)) { ++ return 1; ++ } ++ else { ++ return 0; ++ } + return 0; //dummy. + } + +@@ -225,7 +255,7 @@ #ifdef HAVE_UTEMPTER removeLineFromUtmp(ttynam, fd); #elif defined(USE_LOGIN) - char *tty_name=ttyname(0); + char *tty_name=ttyname(fd); if (tty_name) - logout(tty_name); - #endif + { + if (strncmp(tty_name, "/dev/", 5) == 0) diff --git a/x11/kdebase2/files/patch-konsole_grantpty.c b/x11/kdebase2/files/patch-konsole_grantpty.c new file mode 100644 index 0000000..889d15b --- /dev/null +++ b/x11/kdebase2/files/patch-konsole_grantpty.c @@ -0,0 +1,79 @@ +--- konsole/src/konsole_grantpty.c.orig Sat Jun 12 07:13:31 1999 ++++ konsole/src/konsole_grantpty.c Fri Dec 8 11:54:43 2000 +@@ -31,13 +31,15 @@ + #include <string.h> + #include <sys/stat.h> + #include <unistd.h> ++#include <dirent.h> ++#include <paths.h> + + #define PTY_FILENO 3 /* keep in sync with grantpty */ + #define TTY_GROUP "tty" + + int main (int argc, char *argv[]) + { +- char* pty; ++ char* pty = NULL; + struct stat st; + struct group* p; + gid_t gid; +@@ -81,6 +83,7 @@ + + /* get slave pty name from master pty file handle in PTY_FILENO *********/ + ++#if 0 + /* Check that PTY_FILENO is a valid master pseudo terminal. */ + pty = ttyname(PTY_FILENO); /* posix */ + if (pty == NULL) +@@ -89,6 +92,42 @@ + return 1; /* FAIL */ + } + close(PTY_FILENO); ++#else ++ /* The trouble with the ifdef'd-out portion above is that ttyname() ++ ** does not work correctly when not passed a valid tty, but a pseudotty ++ ** instead. All we're doing here is finding out what the name of ++ ** the associated pty is without having to pass it in on the command line. ++ ** Nothing complex. ++ */ ++ { ++ struct stat sb; ++ struct stat dsb; ++ struct dirent *dirp; ++ static char buf[sizeof(_PATH_DEV) + MAXNAMLEN] = _PATH_DEV; ++ DIR *dp; ++ ++ pty = NULL; ++ ++ if (fstat(PTY_FILENO, &sb)) ++ return 1; /* FAIL */ ++ if ((dp = opendir(_PATH_DEV)) == NULL) ++ return 1; /* FAIL */ ++ ++ while ((dirp = readdir(dp))) { ++ if (dirp->d_fileno != sb.st_ino) ++ continue; ++ bcopy(dirp->d_name, buf + sizeof(_PATH_DEV) - 1, dirp->d_namlen+1); ++ /*fprintf(stderr, "looking at %s\n", buf);*/ ++ if (stat(buf, &dsb) || sb.st_dev != dsb.st_dev || sb.st_ino != dsb.st_ino) ++ continue; ++ pty = buf; ++ } ++ closedir(dp); ++ if (pty == NULL) ++ return 1; /* FAIL */ ++ } ++ /*fprintf(stderr, "successful at finding %s\n", pty);*/ ++#endif + + /* matches /dev/pty?? */ + if (strlen(pty) < 8 || strncmp(pty,"/dev/pty",8)) +@@ -120,6 +159,8 @@ + fprintf(stderr,"%s: cannot chmod %s.\n",argv[0],tty); perror("Reason"); + return 1; /* FAIL */ + } ++ ++ /*fprintf(stderr, "made it here\n");*/ + + return 0; /* OK */ + } diff --git a/x11/kdebase2/pkg-plist b/x11/kdebase2/pkg-plist index a486bb3..7a8ef62 100644 --- a/x11/kdebase2/pkg-plist +++ b/x11/kdebase2/pkg-plist @@ -649,6 +649,7 @@ share/apps/kicker/applets/krunapplet.desktop share/apps/kicker/applets/ksystemtrayapplet.desktop share/apps/kicker/applets/ktaskbarapplet.desktop share/apps/kicker/applets/quicklauncher.desktop +share/apps/kicker/icons/locolor/16x16/actions/modified.png share/apps/kicker/pics/disk1.png share/apps/kicker/pics/disk2.png share/apps/kicker/pics/disk3.png @@ -970,9 +971,9 @@ share/doc/HTML/en/kcontrol/action.html share/doc/HTML/en/kcontrol/background.html share/doc/HTML/en/kcontrol/batmon.html share/doc/HTML/en/kcontrol/bell.html -share/doc/HTML/en/kcontrol/blockdev.html share/doc/HTML/en/kcontrol/borders.html share/doc/HTML/en/kcontrol/color.html +share/doc/HTML/en/kcontrol/common share/doc/HTML/en/kcontrol/control-center-exiting.html share/doc/HTML/en/kcontrol/control-center-menus.html share/doc/HTML/en/kcontrol/control-center-run-indiv.html @@ -990,6 +991,8 @@ share/doc/HTML/en/kcontrol/email.html share/doc/HTML/en/kcontrol/energy.html share/doc/HTML/en/kcontrol/file-assoc.html share/doc/HTML/en/kcontrol/file-manager.html +share/doc/HTML/en/kcontrol/kfileman1.png +share/doc/HTML/en/kcontrol/kfileman2.png share/doc/HTML/en/kcontrol/fonts.html share/doc/HTML/en/kcontrol/help-index.html share/doc/HTML/en/kcontrol/icons.html @@ -1099,11 +1102,13 @@ share/doc/HTML/en/kcontrol/user-agent.html share/doc/HTML/en/kcontrol/windows-shares.html share/doc/HTML/en/kcontrol/xserver.html share/doc/HTML/en/kdebugdialog/.anchors +share/doc/HTML/en/kdebugdialog/common share/doc/HTML/en/kdebugdialog/index.docbook share/doc/HTML/en/kdebugdialog/index.html share/doc/HTML/en/kdebugdialog/introduction.html share/doc/HTML/en/kdesu/.anchors share/doc/HTML/en/kdesu/author.html +share/doc/HTML/en/kdesu/common share/doc/HTML/en/kdesu/compiling.html share/doc/HTML/en/kdesu/configuration.html share/doc/HTML/en/kdesu/index.docbook @@ -1117,6 +1122,7 @@ share/doc/HTML/en/kdesu/sec-password-keeping.html share/doc/HTML/en/kdesu/using-kdesu.html share/doc/HTML/en/kdm/.anchors share/doc/HTML/en/kdm/building-and-installing-kdm.html +share/doc/HTML/en/kdm/common share/doc/HTML/en/kdm/configuring-kdm.html share/doc/HTML/en/kdm/configuring-your-system-for-kdm.html share/doc/HTML/en/kdm/credits.html @@ -1129,6 +1135,7 @@ share/doc/HTML/en/kdm/lilo.html share/doc/HTML/en/kdm/locale.html share/doc/HTML/en/kdm/other-information.html share/doc/HTML/en/khelpcenter/.anchors +share/doc/HTML/en/khelpcenter/common share/doc/HTML/en/khelpcenter/contact-developers.html share/doc/HTML/en/khelpcenter/contact-more-information.html share/doc/HTML/en/khelpcenter/contact-official.html @@ -1147,10 +1154,29 @@ share/doc/HTML/en/khelpcenter/interface-basics.html share/doc/HTML/en/khelpcenter/invoking-help.html share/doc/HTML/en/khelpcenter/links.docbook share/doc/HTML/en/khelpcenter/no-html.html +share/doc/HTML/en/khelpcenter/faq/about.html +share/doc/HTML/en/khelpcenter/faq/applications.html +share/doc/HTML/en/khelpcenter/faq/common +share/doc/HTML/en/khelpcenter/faq/configure.html +share/doc/HTML/en/khelpcenter/faq/contribute.html +share/doc/HTML/en/khelpcenter/faq/credits.html +share/doc/HTML/en/khelpcenter/faq/desktop.html +share/doc/HTML/en/khelpcenter/faq/filemanager.html +share/doc/HTML/en/khelpcenter/faq/getting-kde.html +share/doc/HTML/en/khelpcenter/faq/install.html +share/doc/HTML/en/khelpcenter/faq/introduction.html +share/doc/HTML/en/khelpcenter/faq/misc.html +share/doc/HTML/en/khelpcenter/faq/more-info.html +share/doc/HTML/en/khelpcenter/faq/non-kde-apps.html +share/doc/HTML/en/khelpcenter/faq/not-kde.html +share/doc/HTML/en/khelpcenter/faq/panel.html +share/doc/HTML/en/khelpcenter/faq/tips.html +share/doc/HTML/en/khelpcenter/faq/windowmanager.html share/doc/HTML/en/khelpcenter/quickstart/.anchors share/doc/HTML/en/khelpcenter/quickstart/advanced-topics.html share/doc/HTML/en/khelpcenter/quickstart/an-overview-of-kde.html share/doc/HTML/en/khelpcenter/quickstart/archives-and-networks.html +share/doc/HTML/en/khelpcenter/quickstart/common share/doc/HTML/en/khelpcenter/quickstart/configuration-modules.html share/doc/HTML/en/khelpcenter/quickstart/configure.html share/doc/HTML/en/khelpcenter/quickstart/credits.html @@ -1176,16 +1202,17 @@ share/doc/HTML/en/khelpcenter/userguide/about-this-preview.html share/doc/HTML/en/khelpcenter/userguide/adding-programs.html share/doc/HTML/en/khelpcenter/userguide/all-about-your-desktop.html share/doc/HTML/en/khelpcenter/userguide/background-of-kde.html +share/doc/HTML/en/khelpcenter/userguide/common share/doc/HTML/en/khelpcenter/userguide/creating-new-files-on-your-desktop.html share/doc/HTML/en/khelpcenter/userguide/desktop-components.html share/doc/HTML/en/khelpcenter/userguide/docu-staff.html -share/doc/HTML/en/khelpcenter/userguide/entertainmentapplications.html +share/doc/HTML/en/khelpcenter/userguide/entertainment-applications.html share/doc/HTML/en/khelpcenter/userguide/finding-your-lost-files.html share/doc/HTML/en/khelpcenter/userguide/first-impressions.html share/doc/HTML/en/khelpcenter/userguide/frequently-asked-questions.html share/doc/HTML/en/khelpcenter/userguide/getting-kde.html share/doc/HTML/en/khelpcenter/userguide/getting-started.html -share/doc/HTML/en/khelpcenter/userguide/graphicalapplications.html +share/doc/HTML/en/khelpcenter/userguide/graphical-applications.html share/doc/HTML/en/khelpcenter/userguide/index.docbook share/doc/HTML/en/khelpcenter/userguide/index.html share/doc/HTML/en/khelpcenter/userguide/installation.html @@ -1201,8 +1228,8 @@ share/doc/HTML/en/khelpcenter/userguide/linux-installing-rpms.html share/doc/HTML/en/khelpcenter/userguide/more-help.html share/doc/HTML/en/khelpcenter/userguide/mouse-techniques.html share/doc/HTML/en/khelpcenter/userguide/moving-files-with-drag-and-drop.html -share/doc/HTML/en/khelpcenter/userguide/multimediaapplications.html -share/doc/HTML/en/khelpcenter/userguide/networkapplications.html +share/doc/HTML/en/khelpcenter/userguide/multimedia-applications.html +share/doc/HTML/en/khelpcenter/userguide/network-applications.html share/doc/HTML/en/khelpcenter/userguide/quitting-kde.html share/doc/HTML/en/khelpcenter/userguide/shortcuts.html share/doc/HTML/en/khelpcenter/userguide/source-distribution.html @@ -1215,6 +1242,7 @@ share/doc/HTML/en/khelpcenter/userguide/using-the-trashcan.html share/doc/HTML/en/khelpcenter/userguide/utility-applications.html share/doc/HTML/en/khelpcenter/userguide/we-still-need-people.html share/doc/HTML/en/khelpcenter/visualdict/.anchors +share/doc/HTML/en/khelpcenter/visualdict/common share/doc/HTML/en/khelpcenter/visualdict/credits.html share/doc/HTML/en/khelpcenter/visualdict/index.docbook share/doc/HTML/en/khelpcenter/visualdict/index.html @@ -1251,6 +1279,7 @@ share/doc/HTML/en/kicker/.anchors share/doc/HTML/en/kicker/access_config.png share/doc/HTML/en/kicker/basic_icons.png share/doc/HTML/en/kicker/button-preferences.html +share/doc/HTML/en/kicker/common share/doc/HTML/en/kicker/config_window.png share/doc/HTML/en/kicker/configuration-adding-icons.html share/doc/HTML/en/kicker/configuration-config-window.html @@ -1287,6 +1316,7 @@ share/doc/HTML/en/kicker/qb_root.png share/doc/HTML/en/kicker/using-kicker.html share/doc/HTML/en/klipper/.anchors share/doc/HTML/en/klipper/actions.html +share/doc/HTML/en/klipper/common share/doc/HTML/en/klipper/compilation.html share/doc/HTML/en/klipper/configuration.html share/doc/HTML/en/klipper/credits.html @@ -1298,6 +1328,7 @@ share/doc/HTML/en/klipper/requirements.html share/doc/HTML/en/klipper/screenshot.png share/doc/HTML/en/klipper/using-klipper.html share/doc/HTML/en/kmenuedit/.anchors +share/doc/HTML/en/kmenuedit/common share/doc/HTML/en/kmenuedit/credits.html share/doc/HTML/en/kmenuedit/details-advanced.html share/doc/HTML/en/kmenuedit/glossary.html @@ -1316,20 +1347,25 @@ share/doc/HTML/en/kmenuedit/introduction.html share/doc/HTML/en/kmenuedit/menu-reference.html share/doc/HTML/en/kmenuedit/using-kmenuedit.html share/doc/HTML/en/konqueror/.anchors +share/doc/HTML/en/konqueror/autocomplete.html share/doc/HTML/en/konqueror/basics.html share/doc/HTML/en/konqueror/bookmarks.html share/doc/HTML/en/konqueror/browser.html share/doc/HTML/en/konqueror/bubble.html +share/doc/HTML/en/konqueror/common share/doc/HTML/en/konqueror/cmndline.png share/doc/HTML/en/konqueror/commandline.html share/doc/HTML/en/konqueror/commands.html share/doc/HTML/en/konqueror/config-prox.html share/doc/HTML/en/konqueror/config.html share/doc/HTML/en/konqueror/configure-bars.html +share/doc/HTML/en/konqueror/cook.html share/doc/HTML/en/konqueror/credits.html +share/doc/HTML/en/konqueror/crypto.html share/doc/HTML/en/konqueror/deleting.html share/doc/HTML/en/konqueror/dirtree.png share/doc/HTML/en/konqueror/dragdrop.png +share/doc/HTML/en/konqueror/faq.html share/doc/HTML/en/konqueror/fileassoc.html share/doc/HTML/en/konqueror/filemanager.html share/doc/HTML/en/konqueror/filetype1.png @@ -1340,9 +1376,6 @@ share/doc/HTML/en/konqueror/index.docbook share/doc/HTML/en/konqueror/index.html share/doc/HTML/en/konqueror/installation.html share/doc/HTML/en/konqueror/introduction.html -share/doc/HTML/en/konqueror/kfind.png -share/doc/HTML/en/konqueror/konqdoc5.png -share/doc/HTML/en/konqueror/konqdoc9.png share/doc/HTML/en/konqueror/konqorg.png share/doc/HTML/en/konqueror/lmbmmb.html share/doc/HTML/en/konqueror/making.html @@ -1358,15 +1391,18 @@ share/doc/HTML/en/konqueror/rmb-menus.html share/doc/HTML/en/konqueror/samba.html share/doc/HTML/en/konqueror/samba.png share/doc/HTML/en/konqueror/save-print-web.html +share/doc/HTML/en/konqueror/saveset.html share/doc/HTML/en/konqueror/surf.html share/doc/HTML/en/konsole/.anchors share/doc/HTML/en/konsole/command-line-options.html +share/doc/HTML/en/konsole/common share/doc/HTML/en/konsole/credits.html share/doc/HTML/en/konsole/history-option.html share/doc/HTML/en/konsole/index.docbook share/doc/HTML/en/konsole/index.html share/doc/HTML/en/konsole/installation.html share/doc/HTML/en/konsole/introduction.html +share/doc/HTML/en/konsole/konsole.png share/doc/HTML/en/konsole/konsole1.gif share/doc/HTML/en/konsole/konsole2.gif share/doc/HTML/en/konsole/menubar.html @@ -1377,6 +1413,7 @@ share/doc/HTML/en/konsole/use-of-konsole.html share/doc/HTML/en/konsole/vt100.gif share/doc/HTML/en/kpager/.anchors share/doc/HTML/en/kpager/commands.html +share/doc/HTML/en/kpager/common share/doc/HTML/en/kpager/compilation.html share/doc/HTML/en/kpager/credits.html share/doc/HTML/en/kpager/faq.html @@ -1390,6 +1427,7 @@ share/doc/HTML/en/kpager/screenshot.png share/doc/HTML/en/kpager/settings.png share/doc/HTML/en/kpager/using-kapp.html share/doc/HTML/en/ksysguard/.anchors +share/doc/HTML/en/ksysguard/common share/doc/HTML/en/ksysguard/compilationandinstallation.html share/doc/HTML/en/ksysguard/credits-and-licenses.html share/doc/HTML/en/ksysguard/index.docbook @@ -1402,6 +1440,7 @@ share/doc/HTML/en/ksysguard/the-workspace.html share/doc/HTML/en/ksysguard/usingtheksysguard.html share/doc/HTML/en/kwrite/.anchors share/doc/HTML/en/kwrite/command-line-options.html +share/doc/HTML/en/kwrite/common share/doc/HTML/en/kwrite/credits.html share/doc/HTML/en/kwrite/edit.html share/doc/HTML/en/kwrite/go.html @@ -1411,9 +1450,9 @@ share/doc/HTML/en/kwrite/index.html share/doc/HTML/en/kwrite/introduction.html share/doc/HTML/en/kwrite/keybindings.html share/doc/HTML/en/kwrite/on-screen-fundamentals.html -share/doc/HTML/en/kwrite/other-preferences.html share/doc/HTML/en/kwrite/pref-dialog.html share/doc/HTML/en/kwrite/pref-edit.html +share/doc/HTML/en/kwrite/pref-highlighting.html share/doc/HTML/en/kwrite/pref-indent.html share/doc/HTML/en/kwrite/pref-select.html share/doc/HTML/en/kwrite/prefspellchecker.html @@ -2170,6 +2209,7 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/ksysguard/icons/locolor/16x16/apps @dirrm share/apps/ksysguard/icons/locolor/16x16 @dirrm share/apps/ksysguard/icons/locolor +@dirrm share/apps/ksysguard/icons @dirrm share/apps/ksysguard @dirrm share/apps/ksplash/pics @dirrm share/apps/ksplash @@ -2180,8 +2220,14 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/konqueror/profiles @dirrm share/apps/konqueror/pics @dirrm share/apps/konqueror/icons/locolor/16x16/actions +@dirrm share/apps/konqueror/icons/locolor/16x16 +@dirrm share/apps/konqueror/icons/locolor @dirrm share/apps/konqueror/icons/hicolor/32x32/actions +@dirrm share/apps/konqueror/icons/hicolor/32x32 @dirrm share/apps/konqueror/icons/hicolor/22x22/actions +@dirrm share/apps/konqueror/icons/hicolor/22x22 +@dirrm share/apps/konqueror/icons/hicolor +@dirrm share/apps/konqueror/icons @dirrm share/apps/konqueror/dirtree/remote/web @dirrm share/apps/konqueror/dirtree/remote/ftp @dirrm share/apps/konqueror/dirtree/remote @@ -2197,17 +2243,25 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/kmenuedit/icons/hicolor/22x22/actions @dirrm share/apps/kmenuedit/icons/hicolor/22x22 @dirrm share/apps/kmenuedit/icons/hicolor +@dirrm share/apps/kmenuedit/icons @dirrm share/apps/kmenuedit -@dirrm share/apps/klaptopdaemon/icons/locolor/16x16/actions @dirrm share/apps/kio_info @dirrm share/apps/kicker/wallpapers @dirrm share/apps/kicker/tiles @dirrm share/apps/kicker/pics +@dirrm share/apps/kicker/icons/locolor/16x16/actions +@dirrm share/apps/kicker/icons/locolor/16x16 +@dirrm share/apps/kicker/icons/locolor +@dirrm share/apps/kicker/icons @dirrm share/apps/kicker/applets @dirrm share/apps/kicker @dirrm share/apps/khelpcenter/plugins/Tutorials +@dirrm share/apps/khelpcenter/plugins @dirrm share/apps/khelpcenter/pics @dirrm share/apps/khelpcenter/icons/locolor/16x16/apps +@dirrm share/apps/khelpcenter/icons/locolor/16x16 +@dirrm share/apps/khelpcenter/icons/locolor +@dirrm share/apps/khelpcenter/icons @dirrm share/apps/khelpcenter/en @dirrm share/apps/khelpcenter @dirrm share/apps/kdm/pics/users diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 7cf8533..bbaa703 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdebase -PORTVERSION= 2.0 +PORTVERSION= 2.0.1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo index 04441e9..80f0c4c 100644 --- a/x11/kdebase3/distinfo +++ b/x11/kdebase3/distinfo @@ -1 +1 @@ -MD5 (kdebase-2.0.tar.bz2) = efdcb3c08b2f8f971b5b7ef077542269 +MD5 (kdebase-2.0.1.tar.bz2) = b138a67ae22fbda05def8e932820ac66 diff --git a/x11/kdebase3/files/patch-TEPty.C b/x11/kdebase3/files/patch-TEPty.C index 9a5ece3..9bfd5db 100644 --- a/x11/kdebase3/files/patch-TEPty.C +++ b/x11/kdebase3/files/patch-TEPty.C @@ -1,11 +1,88 @@ ---- konsole/src/TEPty.C Tue Oct 3 14:57:30 2000 -+++ konsole/src/TEPty.C.new Thu Nov 2 17:51:30 2000 -@@ -225,7 +225,7 @@ +--- konsole/src/TEPty.C.orig Fri Dec 8 11:51:24 2000 ++++ konsole/src/TEPty.C Fri Dec 8 11:52:51 2000 +@@ -180,27 +180,57 @@ + // param grant: 1 to grant, 0 to revoke + // returns 1 on success 0 on fail + { +- pid_t pid = fork(); +- if (pid < 0) +- { +- return 0; +- } +- if (pid == 0) +- { +- /* We pass the master pseudo terminal as file descriptor PTY_FILENO. */ +- if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0) exit(1); +- QString path = locate("exe", BASE_CHOWN); ++ pid_t pid; ++ int pstat; ++ struct sigaction ign; ++ struct sigaction intact; // interupt action ++ struct sigaction quitact; // quit action ++ sigset_t newsigblock, oldsigblock; ++ QString path; ++ ++ ign.sa_handler = SIG_IGN; ++ sigemptyset(&ign.sa_mask); ++ ign.sa_flags = 0; ++ sigaction(SIGINT, &ign, &intact); ++ sigaction(SIGQUIT, &ign, &quitact); ++ sigemptyset(&newsigblock); ++ sigaddset(&newsigblock, SIGCHLD); ++ sigprocmask(SIG_BLOCK, &newsigblock, &oldsigblock); ++ ++ switch (pid = fork()) { ++ case -1: ++ return(0); ++ break; ++ case 0: // child ++ if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0) ++ exit(1); ++ path = locate("exe", BASE_CHOWN); ++ ++ sigaction(SIGINT, &intact, NULL); ++ sigaction(SIGQUIT, &quitact, NULL); ++ sigprocmask(SIG_SETMASK, &oldsigblock, NULL); + execle(path.ascii(), BASE_CHOWN, grant?"--grant":"--revoke", NULL, NULL); +- exit(1); // should not be reached +- } +- if (pid > 0) +- { int w; +- retry: +- int rc = waitpid (pid, &w, 0); +- if ((rc == -1) && (errno == EINTR)) +- goto retry; +- return (rc != -1 && WIFEXITED(w) && WEXITSTATUS(w) == 0); ++ exit(1); ++ break; ++ default: ++ do { ++ pid = waitpid(pid, &pstat, 0); ++ } while (pid == -1 && errno == EINTR); ++ break; + } ++ sigaction(SIGINT, &intact, NULL); ++ sigaction(SIGQUIT, &quitact, NULL); ++ sigprocmask(SIG_SETMASK, &oldsigblock, NULL); ++ ++ if (pid == -1) { ++ return 0; ++ } ++ else if (WIFEXITED(pstat) && (WEXITSTATUS(pstat) == 0)) { ++ return 1; ++ } ++ else { ++ return 0; ++ } + return 0; //dummy. + } + +@@ -225,7 +255,7 @@ #ifdef HAVE_UTEMPTER removeLineFromUtmp(ttynam, fd); #elif defined(USE_LOGIN) - char *tty_name=ttyname(0); + char *tty_name=ttyname(fd); if (tty_name) - logout(tty_name); - #endif + { + if (strncmp(tty_name, "/dev/", 5) == 0) diff --git a/x11/kdebase3/files/patch-konsole_grantpty.c b/x11/kdebase3/files/patch-konsole_grantpty.c new file mode 100644 index 0000000..889d15b --- /dev/null +++ b/x11/kdebase3/files/patch-konsole_grantpty.c @@ -0,0 +1,79 @@ +--- konsole/src/konsole_grantpty.c.orig Sat Jun 12 07:13:31 1999 ++++ konsole/src/konsole_grantpty.c Fri Dec 8 11:54:43 2000 +@@ -31,13 +31,15 @@ + #include <string.h> + #include <sys/stat.h> + #include <unistd.h> ++#include <dirent.h> ++#include <paths.h> + + #define PTY_FILENO 3 /* keep in sync with grantpty */ + #define TTY_GROUP "tty" + + int main (int argc, char *argv[]) + { +- char* pty; ++ char* pty = NULL; + struct stat st; + struct group* p; + gid_t gid; +@@ -81,6 +83,7 @@ + + /* get slave pty name from master pty file handle in PTY_FILENO *********/ + ++#if 0 + /* Check that PTY_FILENO is a valid master pseudo terminal. */ + pty = ttyname(PTY_FILENO); /* posix */ + if (pty == NULL) +@@ -89,6 +92,42 @@ + return 1; /* FAIL */ + } + close(PTY_FILENO); ++#else ++ /* The trouble with the ifdef'd-out portion above is that ttyname() ++ ** does not work correctly when not passed a valid tty, but a pseudotty ++ ** instead. All we're doing here is finding out what the name of ++ ** the associated pty is without having to pass it in on the command line. ++ ** Nothing complex. ++ */ ++ { ++ struct stat sb; ++ struct stat dsb; ++ struct dirent *dirp; ++ static char buf[sizeof(_PATH_DEV) + MAXNAMLEN] = _PATH_DEV; ++ DIR *dp; ++ ++ pty = NULL; ++ ++ if (fstat(PTY_FILENO, &sb)) ++ return 1; /* FAIL */ ++ if ((dp = opendir(_PATH_DEV)) == NULL) ++ return 1; /* FAIL */ ++ ++ while ((dirp = readdir(dp))) { ++ if (dirp->d_fileno != sb.st_ino) ++ continue; ++ bcopy(dirp->d_name, buf + sizeof(_PATH_DEV) - 1, dirp->d_namlen+1); ++ /*fprintf(stderr, "looking at %s\n", buf);*/ ++ if (stat(buf, &dsb) || sb.st_dev != dsb.st_dev || sb.st_ino != dsb.st_ino) ++ continue; ++ pty = buf; ++ } ++ closedir(dp); ++ if (pty == NULL) ++ return 1; /* FAIL */ ++ } ++ /*fprintf(stderr, "successful at finding %s\n", pty);*/ ++#endif + + /* matches /dev/pty?? */ + if (strlen(pty) < 8 || strncmp(pty,"/dev/pty",8)) +@@ -120,6 +159,8 @@ + fprintf(stderr,"%s: cannot chmod %s.\n",argv[0],tty); perror("Reason"); + return 1; /* FAIL */ + } ++ ++ /*fprintf(stderr, "made it here\n");*/ + + return 0; /* OK */ + } diff --git a/x11/kdebase3/pkg-plist b/x11/kdebase3/pkg-plist index a486bb3..7a8ef62 100644 --- a/x11/kdebase3/pkg-plist +++ b/x11/kdebase3/pkg-plist @@ -649,6 +649,7 @@ share/apps/kicker/applets/krunapplet.desktop share/apps/kicker/applets/ksystemtrayapplet.desktop share/apps/kicker/applets/ktaskbarapplet.desktop share/apps/kicker/applets/quicklauncher.desktop +share/apps/kicker/icons/locolor/16x16/actions/modified.png share/apps/kicker/pics/disk1.png share/apps/kicker/pics/disk2.png share/apps/kicker/pics/disk3.png @@ -970,9 +971,9 @@ share/doc/HTML/en/kcontrol/action.html share/doc/HTML/en/kcontrol/background.html share/doc/HTML/en/kcontrol/batmon.html share/doc/HTML/en/kcontrol/bell.html -share/doc/HTML/en/kcontrol/blockdev.html share/doc/HTML/en/kcontrol/borders.html share/doc/HTML/en/kcontrol/color.html +share/doc/HTML/en/kcontrol/common share/doc/HTML/en/kcontrol/control-center-exiting.html share/doc/HTML/en/kcontrol/control-center-menus.html share/doc/HTML/en/kcontrol/control-center-run-indiv.html @@ -990,6 +991,8 @@ share/doc/HTML/en/kcontrol/email.html share/doc/HTML/en/kcontrol/energy.html share/doc/HTML/en/kcontrol/file-assoc.html share/doc/HTML/en/kcontrol/file-manager.html +share/doc/HTML/en/kcontrol/kfileman1.png +share/doc/HTML/en/kcontrol/kfileman2.png share/doc/HTML/en/kcontrol/fonts.html share/doc/HTML/en/kcontrol/help-index.html share/doc/HTML/en/kcontrol/icons.html @@ -1099,11 +1102,13 @@ share/doc/HTML/en/kcontrol/user-agent.html share/doc/HTML/en/kcontrol/windows-shares.html share/doc/HTML/en/kcontrol/xserver.html share/doc/HTML/en/kdebugdialog/.anchors +share/doc/HTML/en/kdebugdialog/common share/doc/HTML/en/kdebugdialog/index.docbook share/doc/HTML/en/kdebugdialog/index.html share/doc/HTML/en/kdebugdialog/introduction.html share/doc/HTML/en/kdesu/.anchors share/doc/HTML/en/kdesu/author.html +share/doc/HTML/en/kdesu/common share/doc/HTML/en/kdesu/compiling.html share/doc/HTML/en/kdesu/configuration.html share/doc/HTML/en/kdesu/index.docbook @@ -1117,6 +1122,7 @@ share/doc/HTML/en/kdesu/sec-password-keeping.html share/doc/HTML/en/kdesu/using-kdesu.html share/doc/HTML/en/kdm/.anchors share/doc/HTML/en/kdm/building-and-installing-kdm.html +share/doc/HTML/en/kdm/common share/doc/HTML/en/kdm/configuring-kdm.html share/doc/HTML/en/kdm/configuring-your-system-for-kdm.html share/doc/HTML/en/kdm/credits.html @@ -1129,6 +1135,7 @@ share/doc/HTML/en/kdm/lilo.html share/doc/HTML/en/kdm/locale.html share/doc/HTML/en/kdm/other-information.html share/doc/HTML/en/khelpcenter/.anchors +share/doc/HTML/en/khelpcenter/common share/doc/HTML/en/khelpcenter/contact-developers.html share/doc/HTML/en/khelpcenter/contact-more-information.html share/doc/HTML/en/khelpcenter/contact-official.html @@ -1147,10 +1154,29 @@ share/doc/HTML/en/khelpcenter/interface-basics.html share/doc/HTML/en/khelpcenter/invoking-help.html share/doc/HTML/en/khelpcenter/links.docbook share/doc/HTML/en/khelpcenter/no-html.html +share/doc/HTML/en/khelpcenter/faq/about.html +share/doc/HTML/en/khelpcenter/faq/applications.html +share/doc/HTML/en/khelpcenter/faq/common +share/doc/HTML/en/khelpcenter/faq/configure.html +share/doc/HTML/en/khelpcenter/faq/contribute.html +share/doc/HTML/en/khelpcenter/faq/credits.html +share/doc/HTML/en/khelpcenter/faq/desktop.html +share/doc/HTML/en/khelpcenter/faq/filemanager.html +share/doc/HTML/en/khelpcenter/faq/getting-kde.html +share/doc/HTML/en/khelpcenter/faq/install.html +share/doc/HTML/en/khelpcenter/faq/introduction.html +share/doc/HTML/en/khelpcenter/faq/misc.html +share/doc/HTML/en/khelpcenter/faq/more-info.html +share/doc/HTML/en/khelpcenter/faq/non-kde-apps.html +share/doc/HTML/en/khelpcenter/faq/not-kde.html +share/doc/HTML/en/khelpcenter/faq/panel.html +share/doc/HTML/en/khelpcenter/faq/tips.html +share/doc/HTML/en/khelpcenter/faq/windowmanager.html share/doc/HTML/en/khelpcenter/quickstart/.anchors share/doc/HTML/en/khelpcenter/quickstart/advanced-topics.html share/doc/HTML/en/khelpcenter/quickstart/an-overview-of-kde.html share/doc/HTML/en/khelpcenter/quickstart/archives-and-networks.html +share/doc/HTML/en/khelpcenter/quickstart/common share/doc/HTML/en/khelpcenter/quickstart/configuration-modules.html share/doc/HTML/en/khelpcenter/quickstart/configure.html share/doc/HTML/en/khelpcenter/quickstart/credits.html @@ -1176,16 +1202,17 @@ share/doc/HTML/en/khelpcenter/userguide/about-this-preview.html share/doc/HTML/en/khelpcenter/userguide/adding-programs.html share/doc/HTML/en/khelpcenter/userguide/all-about-your-desktop.html share/doc/HTML/en/khelpcenter/userguide/background-of-kde.html +share/doc/HTML/en/khelpcenter/userguide/common share/doc/HTML/en/khelpcenter/userguide/creating-new-files-on-your-desktop.html share/doc/HTML/en/khelpcenter/userguide/desktop-components.html share/doc/HTML/en/khelpcenter/userguide/docu-staff.html -share/doc/HTML/en/khelpcenter/userguide/entertainmentapplications.html +share/doc/HTML/en/khelpcenter/userguide/entertainment-applications.html share/doc/HTML/en/khelpcenter/userguide/finding-your-lost-files.html share/doc/HTML/en/khelpcenter/userguide/first-impressions.html share/doc/HTML/en/khelpcenter/userguide/frequently-asked-questions.html share/doc/HTML/en/khelpcenter/userguide/getting-kde.html share/doc/HTML/en/khelpcenter/userguide/getting-started.html -share/doc/HTML/en/khelpcenter/userguide/graphicalapplications.html +share/doc/HTML/en/khelpcenter/userguide/graphical-applications.html share/doc/HTML/en/khelpcenter/userguide/index.docbook share/doc/HTML/en/khelpcenter/userguide/index.html share/doc/HTML/en/khelpcenter/userguide/installation.html @@ -1201,8 +1228,8 @@ share/doc/HTML/en/khelpcenter/userguide/linux-installing-rpms.html share/doc/HTML/en/khelpcenter/userguide/more-help.html share/doc/HTML/en/khelpcenter/userguide/mouse-techniques.html share/doc/HTML/en/khelpcenter/userguide/moving-files-with-drag-and-drop.html -share/doc/HTML/en/khelpcenter/userguide/multimediaapplications.html -share/doc/HTML/en/khelpcenter/userguide/networkapplications.html +share/doc/HTML/en/khelpcenter/userguide/multimedia-applications.html +share/doc/HTML/en/khelpcenter/userguide/network-applications.html share/doc/HTML/en/khelpcenter/userguide/quitting-kde.html share/doc/HTML/en/khelpcenter/userguide/shortcuts.html share/doc/HTML/en/khelpcenter/userguide/source-distribution.html @@ -1215,6 +1242,7 @@ share/doc/HTML/en/khelpcenter/userguide/using-the-trashcan.html share/doc/HTML/en/khelpcenter/userguide/utility-applications.html share/doc/HTML/en/khelpcenter/userguide/we-still-need-people.html share/doc/HTML/en/khelpcenter/visualdict/.anchors +share/doc/HTML/en/khelpcenter/visualdict/common share/doc/HTML/en/khelpcenter/visualdict/credits.html share/doc/HTML/en/khelpcenter/visualdict/index.docbook share/doc/HTML/en/khelpcenter/visualdict/index.html @@ -1251,6 +1279,7 @@ share/doc/HTML/en/kicker/.anchors share/doc/HTML/en/kicker/access_config.png share/doc/HTML/en/kicker/basic_icons.png share/doc/HTML/en/kicker/button-preferences.html +share/doc/HTML/en/kicker/common share/doc/HTML/en/kicker/config_window.png share/doc/HTML/en/kicker/configuration-adding-icons.html share/doc/HTML/en/kicker/configuration-config-window.html @@ -1287,6 +1316,7 @@ share/doc/HTML/en/kicker/qb_root.png share/doc/HTML/en/kicker/using-kicker.html share/doc/HTML/en/klipper/.anchors share/doc/HTML/en/klipper/actions.html +share/doc/HTML/en/klipper/common share/doc/HTML/en/klipper/compilation.html share/doc/HTML/en/klipper/configuration.html share/doc/HTML/en/klipper/credits.html @@ -1298,6 +1328,7 @@ share/doc/HTML/en/klipper/requirements.html share/doc/HTML/en/klipper/screenshot.png share/doc/HTML/en/klipper/using-klipper.html share/doc/HTML/en/kmenuedit/.anchors +share/doc/HTML/en/kmenuedit/common share/doc/HTML/en/kmenuedit/credits.html share/doc/HTML/en/kmenuedit/details-advanced.html share/doc/HTML/en/kmenuedit/glossary.html @@ -1316,20 +1347,25 @@ share/doc/HTML/en/kmenuedit/introduction.html share/doc/HTML/en/kmenuedit/menu-reference.html share/doc/HTML/en/kmenuedit/using-kmenuedit.html share/doc/HTML/en/konqueror/.anchors +share/doc/HTML/en/konqueror/autocomplete.html share/doc/HTML/en/konqueror/basics.html share/doc/HTML/en/konqueror/bookmarks.html share/doc/HTML/en/konqueror/browser.html share/doc/HTML/en/konqueror/bubble.html +share/doc/HTML/en/konqueror/common share/doc/HTML/en/konqueror/cmndline.png share/doc/HTML/en/konqueror/commandline.html share/doc/HTML/en/konqueror/commands.html share/doc/HTML/en/konqueror/config-prox.html share/doc/HTML/en/konqueror/config.html share/doc/HTML/en/konqueror/configure-bars.html +share/doc/HTML/en/konqueror/cook.html share/doc/HTML/en/konqueror/credits.html +share/doc/HTML/en/konqueror/crypto.html share/doc/HTML/en/konqueror/deleting.html share/doc/HTML/en/konqueror/dirtree.png share/doc/HTML/en/konqueror/dragdrop.png +share/doc/HTML/en/konqueror/faq.html share/doc/HTML/en/konqueror/fileassoc.html share/doc/HTML/en/konqueror/filemanager.html share/doc/HTML/en/konqueror/filetype1.png @@ -1340,9 +1376,6 @@ share/doc/HTML/en/konqueror/index.docbook share/doc/HTML/en/konqueror/index.html share/doc/HTML/en/konqueror/installation.html share/doc/HTML/en/konqueror/introduction.html -share/doc/HTML/en/konqueror/kfind.png -share/doc/HTML/en/konqueror/konqdoc5.png -share/doc/HTML/en/konqueror/konqdoc9.png share/doc/HTML/en/konqueror/konqorg.png share/doc/HTML/en/konqueror/lmbmmb.html share/doc/HTML/en/konqueror/making.html @@ -1358,15 +1391,18 @@ share/doc/HTML/en/konqueror/rmb-menus.html share/doc/HTML/en/konqueror/samba.html share/doc/HTML/en/konqueror/samba.png share/doc/HTML/en/konqueror/save-print-web.html +share/doc/HTML/en/konqueror/saveset.html share/doc/HTML/en/konqueror/surf.html share/doc/HTML/en/konsole/.anchors share/doc/HTML/en/konsole/command-line-options.html +share/doc/HTML/en/konsole/common share/doc/HTML/en/konsole/credits.html share/doc/HTML/en/konsole/history-option.html share/doc/HTML/en/konsole/index.docbook share/doc/HTML/en/konsole/index.html share/doc/HTML/en/konsole/installation.html share/doc/HTML/en/konsole/introduction.html +share/doc/HTML/en/konsole/konsole.png share/doc/HTML/en/konsole/konsole1.gif share/doc/HTML/en/konsole/konsole2.gif share/doc/HTML/en/konsole/menubar.html @@ -1377,6 +1413,7 @@ share/doc/HTML/en/konsole/use-of-konsole.html share/doc/HTML/en/konsole/vt100.gif share/doc/HTML/en/kpager/.anchors share/doc/HTML/en/kpager/commands.html +share/doc/HTML/en/kpager/common share/doc/HTML/en/kpager/compilation.html share/doc/HTML/en/kpager/credits.html share/doc/HTML/en/kpager/faq.html @@ -1390,6 +1427,7 @@ share/doc/HTML/en/kpager/screenshot.png share/doc/HTML/en/kpager/settings.png share/doc/HTML/en/kpager/using-kapp.html share/doc/HTML/en/ksysguard/.anchors +share/doc/HTML/en/ksysguard/common share/doc/HTML/en/ksysguard/compilationandinstallation.html share/doc/HTML/en/ksysguard/credits-and-licenses.html share/doc/HTML/en/ksysguard/index.docbook @@ -1402,6 +1440,7 @@ share/doc/HTML/en/ksysguard/the-workspace.html share/doc/HTML/en/ksysguard/usingtheksysguard.html share/doc/HTML/en/kwrite/.anchors share/doc/HTML/en/kwrite/command-line-options.html +share/doc/HTML/en/kwrite/common share/doc/HTML/en/kwrite/credits.html share/doc/HTML/en/kwrite/edit.html share/doc/HTML/en/kwrite/go.html @@ -1411,9 +1450,9 @@ share/doc/HTML/en/kwrite/index.html share/doc/HTML/en/kwrite/introduction.html share/doc/HTML/en/kwrite/keybindings.html share/doc/HTML/en/kwrite/on-screen-fundamentals.html -share/doc/HTML/en/kwrite/other-preferences.html share/doc/HTML/en/kwrite/pref-dialog.html share/doc/HTML/en/kwrite/pref-edit.html +share/doc/HTML/en/kwrite/pref-highlighting.html share/doc/HTML/en/kwrite/pref-indent.html share/doc/HTML/en/kwrite/pref-select.html share/doc/HTML/en/kwrite/prefspellchecker.html @@ -2170,6 +2209,7 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/ksysguard/icons/locolor/16x16/apps @dirrm share/apps/ksysguard/icons/locolor/16x16 @dirrm share/apps/ksysguard/icons/locolor +@dirrm share/apps/ksysguard/icons @dirrm share/apps/ksysguard @dirrm share/apps/ksplash/pics @dirrm share/apps/ksplash @@ -2180,8 +2220,14 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/konqueror/profiles @dirrm share/apps/konqueror/pics @dirrm share/apps/konqueror/icons/locolor/16x16/actions +@dirrm share/apps/konqueror/icons/locolor/16x16 +@dirrm share/apps/konqueror/icons/locolor @dirrm share/apps/konqueror/icons/hicolor/32x32/actions +@dirrm share/apps/konqueror/icons/hicolor/32x32 @dirrm share/apps/konqueror/icons/hicolor/22x22/actions +@dirrm share/apps/konqueror/icons/hicolor/22x22 +@dirrm share/apps/konqueror/icons/hicolor +@dirrm share/apps/konqueror/icons @dirrm share/apps/konqueror/dirtree/remote/web @dirrm share/apps/konqueror/dirtree/remote/ftp @dirrm share/apps/konqueror/dirtree/remote @@ -2197,17 +2243,25 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/kmenuedit/icons/hicolor/22x22/actions @dirrm share/apps/kmenuedit/icons/hicolor/22x22 @dirrm share/apps/kmenuedit/icons/hicolor +@dirrm share/apps/kmenuedit/icons @dirrm share/apps/kmenuedit -@dirrm share/apps/klaptopdaemon/icons/locolor/16x16/actions @dirrm share/apps/kio_info @dirrm share/apps/kicker/wallpapers @dirrm share/apps/kicker/tiles @dirrm share/apps/kicker/pics +@dirrm share/apps/kicker/icons/locolor/16x16/actions +@dirrm share/apps/kicker/icons/locolor/16x16 +@dirrm share/apps/kicker/icons/locolor +@dirrm share/apps/kicker/icons @dirrm share/apps/kicker/applets @dirrm share/apps/kicker @dirrm share/apps/khelpcenter/plugins/Tutorials +@dirrm share/apps/khelpcenter/plugins @dirrm share/apps/khelpcenter/pics @dirrm share/apps/khelpcenter/icons/locolor/16x16/apps +@dirrm share/apps/khelpcenter/icons/locolor/16x16 +@dirrm share/apps/khelpcenter/icons/locolor +@dirrm share/apps/khelpcenter/icons @dirrm share/apps/khelpcenter/en @dirrm share/apps/khelpcenter @dirrm share/apps/kdm/pics/users diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index 7cf8533..bbaa703 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdebase -PORTVERSION= 2.0 +PORTVERSION= 2.0.1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src diff --git a/x11/kdebase4-runtime/distinfo b/x11/kdebase4-runtime/distinfo index 04441e9..80f0c4c 100644 --- a/x11/kdebase4-runtime/distinfo +++ b/x11/kdebase4-runtime/distinfo @@ -1 +1 @@ -MD5 (kdebase-2.0.tar.bz2) = efdcb3c08b2f8f971b5b7ef077542269 +MD5 (kdebase-2.0.1.tar.bz2) = b138a67ae22fbda05def8e932820ac66 diff --git a/x11/kdebase4-runtime/files/patch-TEPty.C b/x11/kdebase4-runtime/files/patch-TEPty.C index 9a5ece3..9bfd5db 100644 --- a/x11/kdebase4-runtime/files/patch-TEPty.C +++ b/x11/kdebase4-runtime/files/patch-TEPty.C @@ -1,11 +1,88 @@ ---- konsole/src/TEPty.C Tue Oct 3 14:57:30 2000 -+++ konsole/src/TEPty.C.new Thu Nov 2 17:51:30 2000 -@@ -225,7 +225,7 @@ +--- konsole/src/TEPty.C.orig Fri Dec 8 11:51:24 2000 ++++ konsole/src/TEPty.C Fri Dec 8 11:52:51 2000 +@@ -180,27 +180,57 @@ + // param grant: 1 to grant, 0 to revoke + // returns 1 on success 0 on fail + { +- pid_t pid = fork(); +- if (pid < 0) +- { +- return 0; +- } +- if (pid == 0) +- { +- /* We pass the master pseudo terminal as file descriptor PTY_FILENO. */ +- if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0) exit(1); +- QString path = locate("exe", BASE_CHOWN); ++ pid_t pid; ++ int pstat; ++ struct sigaction ign; ++ struct sigaction intact; // interupt action ++ struct sigaction quitact; // quit action ++ sigset_t newsigblock, oldsigblock; ++ QString path; ++ ++ ign.sa_handler = SIG_IGN; ++ sigemptyset(&ign.sa_mask); ++ ign.sa_flags = 0; ++ sigaction(SIGINT, &ign, &intact); ++ sigaction(SIGQUIT, &ign, &quitact); ++ sigemptyset(&newsigblock); ++ sigaddset(&newsigblock, SIGCHLD); ++ sigprocmask(SIG_BLOCK, &newsigblock, &oldsigblock); ++ ++ switch (pid = fork()) { ++ case -1: ++ return(0); ++ break; ++ case 0: // child ++ if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0) ++ exit(1); ++ path = locate("exe", BASE_CHOWN); ++ ++ sigaction(SIGINT, &intact, NULL); ++ sigaction(SIGQUIT, &quitact, NULL); ++ sigprocmask(SIG_SETMASK, &oldsigblock, NULL); + execle(path.ascii(), BASE_CHOWN, grant?"--grant":"--revoke", NULL, NULL); +- exit(1); // should not be reached +- } +- if (pid > 0) +- { int w; +- retry: +- int rc = waitpid (pid, &w, 0); +- if ((rc == -1) && (errno == EINTR)) +- goto retry; +- return (rc != -1 && WIFEXITED(w) && WEXITSTATUS(w) == 0); ++ exit(1); ++ break; ++ default: ++ do { ++ pid = waitpid(pid, &pstat, 0); ++ } while (pid == -1 && errno == EINTR); ++ break; + } ++ sigaction(SIGINT, &intact, NULL); ++ sigaction(SIGQUIT, &quitact, NULL); ++ sigprocmask(SIG_SETMASK, &oldsigblock, NULL); ++ ++ if (pid == -1) { ++ return 0; ++ } ++ else if (WIFEXITED(pstat) && (WEXITSTATUS(pstat) == 0)) { ++ return 1; ++ } ++ else { ++ return 0; ++ } + return 0; //dummy. + } + +@@ -225,7 +255,7 @@ #ifdef HAVE_UTEMPTER removeLineFromUtmp(ttynam, fd); #elif defined(USE_LOGIN) - char *tty_name=ttyname(0); + char *tty_name=ttyname(fd); if (tty_name) - logout(tty_name); - #endif + { + if (strncmp(tty_name, "/dev/", 5) == 0) diff --git a/x11/kdebase4-runtime/files/patch-konsole_grantpty.c b/x11/kdebase4-runtime/files/patch-konsole_grantpty.c new file mode 100644 index 0000000..889d15b --- /dev/null +++ b/x11/kdebase4-runtime/files/patch-konsole_grantpty.c @@ -0,0 +1,79 @@ +--- konsole/src/konsole_grantpty.c.orig Sat Jun 12 07:13:31 1999 ++++ konsole/src/konsole_grantpty.c Fri Dec 8 11:54:43 2000 +@@ -31,13 +31,15 @@ + #include <string.h> + #include <sys/stat.h> + #include <unistd.h> ++#include <dirent.h> ++#include <paths.h> + + #define PTY_FILENO 3 /* keep in sync with grantpty */ + #define TTY_GROUP "tty" + + int main (int argc, char *argv[]) + { +- char* pty; ++ char* pty = NULL; + struct stat st; + struct group* p; + gid_t gid; +@@ -81,6 +83,7 @@ + + /* get slave pty name from master pty file handle in PTY_FILENO *********/ + ++#if 0 + /* Check that PTY_FILENO is a valid master pseudo terminal. */ + pty = ttyname(PTY_FILENO); /* posix */ + if (pty == NULL) +@@ -89,6 +92,42 @@ + return 1; /* FAIL */ + } + close(PTY_FILENO); ++#else ++ /* The trouble with the ifdef'd-out portion above is that ttyname() ++ ** does not work correctly when not passed a valid tty, but a pseudotty ++ ** instead. All we're doing here is finding out what the name of ++ ** the associated pty is without having to pass it in on the command line. ++ ** Nothing complex. ++ */ ++ { ++ struct stat sb; ++ struct stat dsb; ++ struct dirent *dirp; ++ static char buf[sizeof(_PATH_DEV) + MAXNAMLEN] = _PATH_DEV; ++ DIR *dp; ++ ++ pty = NULL; ++ ++ if (fstat(PTY_FILENO, &sb)) ++ return 1; /* FAIL */ ++ if ((dp = opendir(_PATH_DEV)) == NULL) ++ return 1; /* FAIL */ ++ ++ while ((dirp = readdir(dp))) { ++ if (dirp->d_fileno != sb.st_ino) ++ continue; ++ bcopy(dirp->d_name, buf + sizeof(_PATH_DEV) - 1, dirp->d_namlen+1); ++ /*fprintf(stderr, "looking at %s\n", buf);*/ ++ if (stat(buf, &dsb) || sb.st_dev != dsb.st_dev || sb.st_ino != dsb.st_ino) ++ continue; ++ pty = buf; ++ } ++ closedir(dp); ++ if (pty == NULL) ++ return 1; /* FAIL */ ++ } ++ /*fprintf(stderr, "successful at finding %s\n", pty);*/ ++#endif + + /* matches /dev/pty?? */ + if (strlen(pty) < 8 || strncmp(pty,"/dev/pty",8)) +@@ -120,6 +159,8 @@ + fprintf(stderr,"%s: cannot chmod %s.\n",argv[0],tty); perror("Reason"); + return 1; /* FAIL */ + } ++ ++ /*fprintf(stderr, "made it here\n");*/ + + return 0; /* OK */ + } diff --git a/x11/kdebase4-runtime/pkg-plist b/x11/kdebase4-runtime/pkg-plist index a486bb3..7a8ef62 100644 --- a/x11/kdebase4-runtime/pkg-plist +++ b/x11/kdebase4-runtime/pkg-plist @@ -649,6 +649,7 @@ share/apps/kicker/applets/krunapplet.desktop share/apps/kicker/applets/ksystemtrayapplet.desktop share/apps/kicker/applets/ktaskbarapplet.desktop share/apps/kicker/applets/quicklauncher.desktop +share/apps/kicker/icons/locolor/16x16/actions/modified.png share/apps/kicker/pics/disk1.png share/apps/kicker/pics/disk2.png share/apps/kicker/pics/disk3.png @@ -970,9 +971,9 @@ share/doc/HTML/en/kcontrol/action.html share/doc/HTML/en/kcontrol/background.html share/doc/HTML/en/kcontrol/batmon.html share/doc/HTML/en/kcontrol/bell.html -share/doc/HTML/en/kcontrol/blockdev.html share/doc/HTML/en/kcontrol/borders.html share/doc/HTML/en/kcontrol/color.html +share/doc/HTML/en/kcontrol/common share/doc/HTML/en/kcontrol/control-center-exiting.html share/doc/HTML/en/kcontrol/control-center-menus.html share/doc/HTML/en/kcontrol/control-center-run-indiv.html @@ -990,6 +991,8 @@ share/doc/HTML/en/kcontrol/email.html share/doc/HTML/en/kcontrol/energy.html share/doc/HTML/en/kcontrol/file-assoc.html share/doc/HTML/en/kcontrol/file-manager.html +share/doc/HTML/en/kcontrol/kfileman1.png +share/doc/HTML/en/kcontrol/kfileman2.png share/doc/HTML/en/kcontrol/fonts.html share/doc/HTML/en/kcontrol/help-index.html share/doc/HTML/en/kcontrol/icons.html @@ -1099,11 +1102,13 @@ share/doc/HTML/en/kcontrol/user-agent.html share/doc/HTML/en/kcontrol/windows-shares.html share/doc/HTML/en/kcontrol/xserver.html share/doc/HTML/en/kdebugdialog/.anchors +share/doc/HTML/en/kdebugdialog/common share/doc/HTML/en/kdebugdialog/index.docbook share/doc/HTML/en/kdebugdialog/index.html share/doc/HTML/en/kdebugdialog/introduction.html share/doc/HTML/en/kdesu/.anchors share/doc/HTML/en/kdesu/author.html +share/doc/HTML/en/kdesu/common share/doc/HTML/en/kdesu/compiling.html share/doc/HTML/en/kdesu/configuration.html share/doc/HTML/en/kdesu/index.docbook @@ -1117,6 +1122,7 @@ share/doc/HTML/en/kdesu/sec-password-keeping.html share/doc/HTML/en/kdesu/using-kdesu.html share/doc/HTML/en/kdm/.anchors share/doc/HTML/en/kdm/building-and-installing-kdm.html +share/doc/HTML/en/kdm/common share/doc/HTML/en/kdm/configuring-kdm.html share/doc/HTML/en/kdm/configuring-your-system-for-kdm.html share/doc/HTML/en/kdm/credits.html @@ -1129,6 +1135,7 @@ share/doc/HTML/en/kdm/lilo.html share/doc/HTML/en/kdm/locale.html share/doc/HTML/en/kdm/other-information.html share/doc/HTML/en/khelpcenter/.anchors +share/doc/HTML/en/khelpcenter/common share/doc/HTML/en/khelpcenter/contact-developers.html share/doc/HTML/en/khelpcenter/contact-more-information.html share/doc/HTML/en/khelpcenter/contact-official.html @@ -1147,10 +1154,29 @@ share/doc/HTML/en/khelpcenter/interface-basics.html share/doc/HTML/en/khelpcenter/invoking-help.html share/doc/HTML/en/khelpcenter/links.docbook share/doc/HTML/en/khelpcenter/no-html.html +share/doc/HTML/en/khelpcenter/faq/about.html +share/doc/HTML/en/khelpcenter/faq/applications.html +share/doc/HTML/en/khelpcenter/faq/common +share/doc/HTML/en/khelpcenter/faq/configure.html +share/doc/HTML/en/khelpcenter/faq/contribute.html +share/doc/HTML/en/khelpcenter/faq/credits.html +share/doc/HTML/en/khelpcenter/faq/desktop.html +share/doc/HTML/en/khelpcenter/faq/filemanager.html +share/doc/HTML/en/khelpcenter/faq/getting-kde.html +share/doc/HTML/en/khelpcenter/faq/install.html +share/doc/HTML/en/khelpcenter/faq/introduction.html +share/doc/HTML/en/khelpcenter/faq/misc.html +share/doc/HTML/en/khelpcenter/faq/more-info.html +share/doc/HTML/en/khelpcenter/faq/non-kde-apps.html +share/doc/HTML/en/khelpcenter/faq/not-kde.html +share/doc/HTML/en/khelpcenter/faq/panel.html +share/doc/HTML/en/khelpcenter/faq/tips.html +share/doc/HTML/en/khelpcenter/faq/windowmanager.html share/doc/HTML/en/khelpcenter/quickstart/.anchors share/doc/HTML/en/khelpcenter/quickstart/advanced-topics.html share/doc/HTML/en/khelpcenter/quickstart/an-overview-of-kde.html share/doc/HTML/en/khelpcenter/quickstart/archives-and-networks.html +share/doc/HTML/en/khelpcenter/quickstart/common share/doc/HTML/en/khelpcenter/quickstart/configuration-modules.html share/doc/HTML/en/khelpcenter/quickstart/configure.html share/doc/HTML/en/khelpcenter/quickstart/credits.html @@ -1176,16 +1202,17 @@ share/doc/HTML/en/khelpcenter/userguide/about-this-preview.html share/doc/HTML/en/khelpcenter/userguide/adding-programs.html share/doc/HTML/en/khelpcenter/userguide/all-about-your-desktop.html share/doc/HTML/en/khelpcenter/userguide/background-of-kde.html +share/doc/HTML/en/khelpcenter/userguide/common share/doc/HTML/en/khelpcenter/userguide/creating-new-files-on-your-desktop.html share/doc/HTML/en/khelpcenter/userguide/desktop-components.html share/doc/HTML/en/khelpcenter/userguide/docu-staff.html -share/doc/HTML/en/khelpcenter/userguide/entertainmentapplications.html +share/doc/HTML/en/khelpcenter/userguide/entertainment-applications.html share/doc/HTML/en/khelpcenter/userguide/finding-your-lost-files.html share/doc/HTML/en/khelpcenter/userguide/first-impressions.html share/doc/HTML/en/khelpcenter/userguide/frequently-asked-questions.html share/doc/HTML/en/khelpcenter/userguide/getting-kde.html share/doc/HTML/en/khelpcenter/userguide/getting-started.html -share/doc/HTML/en/khelpcenter/userguide/graphicalapplications.html +share/doc/HTML/en/khelpcenter/userguide/graphical-applications.html share/doc/HTML/en/khelpcenter/userguide/index.docbook share/doc/HTML/en/khelpcenter/userguide/index.html share/doc/HTML/en/khelpcenter/userguide/installation.html @@ -1201,8 +1228,8 @@ share/doc/HTML/en/khelpcenter/userguide/linux-installing-rpms.html share/doc/HTML/en/khelpcenter/userguide/more-help.html share/doc/HTML/en/khelpcenter/userguide/mouse-techniques.html share/doc/HTML/en/khelpcenter/userguide/moving-files-with-drag-and-drop.html -share/doc/HTML/en/khelpcenter/userguide/multimediaapplications.html -share/doc/HTML/en/khelpcenter/userguide/networkapplications.html +share/doc/HTML/en/khelpcenter/userguide/multimedia-applications.html +share/doc/HTML/en/khelpcenter/userguide/network-applications.html share/doc/HTML/en/khelpcenter/userguide/quitting-kde.html share/doc/HTML/en/khelpcenter/userguide/shortcuts.html share/doc/HTML/en/khelpcenter/userguide/source-distribution.html @@ -1215,6 +1242,7 @@ share/doc/HTML/en/khelpcenter/userguide/using-the-trashcan.html share/doc/HTML/en/khelpcenter/userguide/utility-applications.html share/doc/HTML/en/khelpcenter/userguide/we-still-need-people.html share/doc/HTML/en/khelpcenter/visualdict/.anchors +share/doc/HTML/en/khelpcenter/visualdict/common share/doc/HTML/en/khelpcenter/visualdict/credits.html share/doc/HTML/en/khelpcenter/visualdict/index.docbook share/doc/HTML/en/khelpcenter/visualdict/index.html @@ -1251,6 +1279,7 @@ share/doc/HTML/en/kicker/.anchors share/doc/HTML/en/kicker/access_config.png share/doc/HTML/en/kicker/basic_icons.png share/doc/HTML/en/kicker/button-preferences.html +share/doc/HTML/en/kicker/common share/doc/HTML/en/kicker/config_window.png share/doc/HTML/en/kicker/configuration-adding-icons.html share/doc/HTML/en/kicker/configuration-config-window.html @@ -1287,6 +1316,7 @@ share/doc/HTML/en/kicker/qb_root.png share/doc/HTML/en/kicker/using-kicker.html share/doc/HTML/en/klipper/.anchors share/doc/HTML/en/klipper/actions.html +share/doc/HTML/en/klipper/common share/doc/HTML/en/klipper/compilation.html share/doc/HTML/en/klipper/configuration.html share/doc/HTML/en/klipper/credits.html @@ -1298,6 +1328,7 @@ share/doc/HTML/en/klipper/requirements.html share/doc/HTML/en/klipper/screenshot.png share/doc/HTML/en/klipper/using-klipper.html share/doc/HTML/en/kmenuedit/.anchors +share/doc/HTML/en/kmenuedit/common share/doc/HTML/en/kmenuedit/credits.html share/doc/HTML/en/kmenuedit/details-advanced.html share/doc/HTML/en/kmenuedit/glossary.html @@ -1316,20 +1347,25 @@ share/doc/HTML/en/kmenuedit/introduction.html share/doc/HTML/en/kmenuedit/menu-reference.html share/doc/HTML/en/kmenuedit/using-kmenuedit.html share/doc/HTML/en/konqueror/.anchors +share/doc/HTML/en/konqueror/autocomplete.html share/doc/HTML/en/konqueror/basics.html share/doc/HTML/en/konqueror/bookmarks.html share/doc/HTML/en/konqueror/browser.html share/doc/HTML/en/konqueror/bubble.html +share/doc/HTML/en/konqueror/common share/doc/HTML/en/konqueror/cmndline.png share/doc/HTML/en/konqueror/commandline.html share/doc/HTML/en/konqueror/commands.html share/doc/HTML/en/konqueror/config-prox.html share/doc/HTML/en/konqueror/config.html share/doc/HTML/en/konqueror/configure-bars.html +share/doc/HTML/en/konqueror/cook.html share/doc/HTML/en/konqueror/credits.html +share/doc/HTML/en/konqueror/crypto.html share/doc/HTML/en/konqueror/deleting.html share/doc/HTML/en/konqueror/dirtree.png share/doc/HTML/en/konqueror/dragdrop.png +share/doc/HTML/en/konqueror/faq.html share/doc/HTML/en/konqueror/fileassoc.html share/doc/HTML/en/konqueror/filemanager.html share/doc/HTML/en/konqueror/filetype1.png @@ -1340,9 +1376,6 @@ share/doc/HTML/en/konqueror/index.docbook share/doc/HTML/en/konqueror/index.html share/doc/HTML/en/konqueror/installation.html share/doc/HTML/en/konqueror/introduction.html -share/doc/HTML/en/konqueror/kfind.png -share/doc/HTML/en/konqueror/konqdoc5.png -share/doc/HTML/en/konqueror/konqdoc9.png share/doc/HTML/en/konqueror/konqorg.png share/doc/HTML/en/konqueror/lmbmmb.html share/doc/HTML/en/konqueror/making.html @@ -1358,15 +1391,18 @@ share/doc/HTML/en/konqueror/rmb-menus.html share/doc/HTML/en/konqueror/samba.html share/doc/HTML/en/konqueror/samba.png share/doc/HTML/en/konqueror/save-print-web.html +share/doc/HTML/en/konqueror/saveset.html share/doc/HTML/en/konqueror/surf.html share/doc/HTML/en/konsole/.anchors share/doc/HTML/en/konsole/command-line-options.html +share/doc/HTML/en/konsole/common share/doc/HTML/en/konsole/credits.html share/doc/HTML/en/konsole/history-option.html share/doc/HTML/en/konsole/index.docbook share/doc/HTML/en/konsole/index.html share/doc/HTML/en/konsole/installation.html share/doc/HTML/en/konsole/introduction.html +share/doc/HTML/en/konsole/konsole.png share/doc/HTML/en/konsole/konsole1.gif share/doc/HTML/en/konsole/konsole2.gif share/doc/HTML/en/konsole/menubar.html @@ -1377,6 +1413,7 @@ share/doc/HTML/en/konsole/use-of-konsole.html share/doc/HTML/en/konsole/vt100.gif share/doc/HTML/en/kpager/.anchors share/doc/HTML/en/kpager/commands.html +share/doc/HTML/en/kpager/common share/doc/HTML/en/kpager/compilation.html share/doc/HTML/en/kpager/credits.html share/doc/HTML/en/kpager/faq.html @@ -1390,6 +1427,7 @@ share/doc/HTML/en/kpager/screenshot.png share/doc/HTML/en/kpager/settings.png share/doc/HTML/en/kpager/using-kapp.html share/doc/HTML/en/ksysguard/.anchors +share/doc/HTML/en/ksysguard/common share/doc/HTML/en/ksysguard/compilationandinstallation.html share/doc/HTML/en/ksysguard/credits-and-licenses.html share/doc/HTML/en/ksysguard/index.docbook @@ -1402,6 +1440,7 @@ share/doc/HTML/en/ksysguard/the-workspace.html share/doc/HTML/en/ksysguard/usingtheksysguard.html share/doc/HTML/en/kwrite/.anchors share/doc/HTML/en/kwrite/command-line-options.html +share/doc/HTML/en/kwrite/common share/doc/HTML/en/kwrite/credits.html share/doc/HTML/en/kwrite/edit.html share/doc/HTML/en/kwrite/go.html @@ -1411,9 +1450,9 @@ share/doc/HTML/en/kwrite/index.html share/doc/HTML/en/kwrite/introduction.html share/doc/HTML/en/kwrite/keybindings.html share/doc/HTML/en/kwrite/on-screen-fundamentals.html -share/doc/HTML/en/kwrite/other-preferences.html share/doc/HTML/en/kwrite/pref-dialog.html share/doc/HTML/en/kwrite/pref-edit.html +share/doc/HTML/en/kwrite/pref-highlighting.html share/doc/HTML/en/kwrite/pref-indent.html share/doc/HTML/en/kwrite/pref-select.html share/doc/HTML/en/kwrite/prefspellchecker.html @@ -2170,6 +2209,7 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/ksysguard/icons/locolor/16x16/apps @dirrm share/apps/ksysguard/icons/locolor/16x16 @dirrm share/apps/ksysguard/icons/locolor +@dirrm share/apps/ksysguard/icons @dirrm share/apps/ksysguard @dirrm share/apps/ksplash/pics @dirrm share/apps/ksplash @@ -2180,8 +2220,14 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/konqueror/profiles @dirrm share/apps/konqueror/pics @dirrm share/apps/konqueror/icons/locolor/16x16/actions +@dirrm share/apps/konqueror/icons/locolor/16x16 +@dirrm share/apps/konqueror/icons/locolor @dirrm share/apps/konqueror/icons/hicolor/32x32/actions +@dirrm share/apps/konqueror/icons/hicolor/32x32 @dirrm share/apps/konqueror/icons/hicolor/22x22/actions +@dirrm share/apps/konqueror/icons/hicolor/22x22 +@dirrm share/apps/konqueror/icons/hicolor +@dirrm share/apps/konqueror/icons @dirrm share/apps/konqueror/dirtree/remote/web @dirrm share/apps/konqueror/dirtree/remote/ftp @dirrm share/apps/konqueror/dirtree/remote @@ -2197,17 +2243,25 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/kmenuedit/icons/hicolor/22x22/actions @dirrm share/apps/kmenuedit/icons/hicolor/22x22 @dirrm share/apps/kmenuedit/icons/hicolor +@dirrm share/apps/kmenuedit/icons @dirrm share/apps/kmenuedit -@dirrm share/apps/klaptopdaemon/icons/locolor/16x16/actions @dirrm share/apps/kio_info @dirrm share/apps/kicker/wallpapers @dirrm share/apps/kicker/tiles @dirrm share/apps/kicker/pics +@dirrm share/apps/kicker/icons/locolor/16x16/actions +@dirrm share/apps/kicker/icons/locolor/16x16 +@dirrm share/apps/kicker/icons/locolor +@dirrm share/apps/kicker/icons @dirrm share/apps/kicker/applets @dirrm share/apps/kicker @dirrm share/apps/khelpcenter/plugins/Tutorials +@dirrm share/apps/khelpcenter/plugins @dirrm share/apps/khelpcenter/pics @dirrm share/apps/khelpcenter/icons/locolor/16x16/apps +@dirrm share/apps/khelpcenter/icons/locolor/16x16 +@dirrm share/apps/khelpcenter/icons/locolor +@dirrm share/apps/khelpcenter/icons @dirrm share/apps/khelpcenter/en @dirrm share/apps/khelpcenter @dirrm share/apps/kdm/pics/users diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index 7cf8533..bbaa703 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdebase -PORTVERSION= 2.0 +PORTVERSION= 2.0.1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo index 04441e9..80f0c4c 100644 --- a/x11/kdebase4-workspace/distinfo +++ b/x11/kdebase4-workspace/distinfo @@ -1 +1 @@ -MD5 (kdebase-2.0.tar.bz2) = efdcb3c08b2f8f971b5b7ef077542269 +MD5 (kdebase-2.0.1.tar.bz2) = b138a67ae22fbda05def8e932820ac66 diff --git a/x11/kdebase4-workspace/files/patch-TEPty.C b/x11/kdebase4-workspace/files/patch-TEPty.C index 9a5ece3..9bfd5db 100644 --- a/x11/kdebase4-workspace/files/patch-TEPty.C +++ b/x11/kdebase4-workspace/files/patch-TEPty.C @@ -1,11 +1,88 @@ ---- konsole/src/TEPty.C Tue Oct 3 14:57:30 2000 -+++ konsole/src/TEPty.C.new Thu Nov 2 17:51:30 2000 -@@ -225,7 +225,7 @@ +--- konsole/src/TEPty.C.orig Fri Dec 8 11:51:24 2000 ++++ konsole/src/TEPty.C Fri Dec 8 11:52:51 2000 +@@ -180,27 +180,57 @@ + // param grant: 1 to grant, 0 to revoke + // returns 1 on success 0 on fail + { +- pid_t pid = fork(); +- if (pid < 0) +- { +- return 0; +- } +- if (pid == 0) +- { +- /* We pass the master pseudo terminal as file descriptor PTY_FILENO. */ +- if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0) exit(1); +- QString path = locate("exe", BASE_CHOWN); ++ pid_t pid; ++ int pstat; ++ struct sigaction ign; ++ struct sigaction intact; // interupt action ++ struct sigaction quitact; // quit action ++ sigset_t newsigblock, oldsigblock; ++ QString path; ++ ++ ign.sa_handler = SIG_IGN; ++ sigemptyset(&ign.sa_mask); ++ ign.sa_flags = 0; ++ sigaction(SIGINT, &ign, &intact); ++ sigaction(SIGQUIT, &ign, &quitact); ++ sigemptyset(&newsigblock); ++ sigaddset(&newsigblock, SIGCHLD); ++ sigprocmask(SIG_BLOCK, &newsigblock, &oldsigblock); ++ ++ switch (pid = fork()) { ++ case -1: ++ return(0); ++ break; ++ case 0: // child ++ if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0) ++ exit(1); ++ path = locate("exe", BASE_CHOWN); ++ ++ sigaction(SIGINT, &intact, NULL); ++ sigaction(SIGQUIT, &quitact, NULL); ++ sigprocmask(SIG_SETMASK, &oldsigblock, NULL); + execle(path.ascii(), BASE_CHOWN, grant?"--grant":"--revoke", NULL, NULL); +- exit(1); // should not be reached +- } +- if (pid > 0) +- { int w; +- retry: +- int rc = waitpid (pid, &w, 0); +- if ((rc == -1) && (errno == EINTR)) +- goto retry; +- return (rc != -1 && WIFEXITED(w) && WEXITSTATUS(w) == 0); ++ exit(1); ++ break; ++ default: ++ do { ++ pid = waitpid(pid, &pstat, 0); ++ } while (pid == -1 && errno == EINTR); ++ break; + } ++ sigaction(SIGINT, &intact, NULL); ++ sigaction(SIGQUIT, &quitact, NULL); ++ sigprocmask(SIG_SETMASK, &oldsigblock, NULL); ++ ++ if (pid == -1) { ++ return 0; ++ } ++ else if (WIFEXITED(pstat) && (WEXITSTATUS(pstat) == 0)) { ++ return 1; ++ } ++ else { ++ return 0; ++ } + return 0; //dummy. + } + +@@ -225,7 +255,7 @@ #ifdef HAVE_UTEMPTER removeLineFromUtmp(ttynam, fd); #elif defined(USE_LOGIN) - char *tty_name=ttyname(0); + char *tty_name=ttyname(fd); if (tty_name) - logout(tty_name); - #endif + { + if (strncmp(tty_name, "/dev/", 5) == 0) diff --git a/x11/kdebase4-workspace/files/patch-konsole_grantpty.c b/x11/kdebase4-workspace/files/patch-konsole_grantpty.c new file mode 100644 index 0000000..889d15b --- /dev/null +++ b/x11/kdebase4-workspace/files/patch-konsole_grantpty.c @@ -0,0 +1,79 @@ +--- konsole/src/konsole_grantpty.c.orig Sat Jun 12 07:13:31 1999 ++++ konsole/src/konsole_grantpty.c Fri Dec 8 11:54:43 2000 +@@ -31,13 +31,15 @@ + #include <string.h> + #include <sys/stat.h> + #include <unistd.h> ++#include <dirent.h> ++#include <paths.h> + + #define PTY_FILENO 3 /* keep in sync with grantpty */ + #define TTY_GROUP "tty" + + int main (int argc, char *argv[]) + { +- char* pty; ++ char* pty = NULL; + struct stat st; + struct group* p; + gid_t gid; +@@ -81,6 +83,7 @@ + + /* get slave pty name from master pty file handle in PTY_FILENO *********/ + ++#if 0 + /* Check that PTY_FILENO is a valid master pseudo terminal. */ + pty = ttyname(PTY_FILENO); /* posix */ + if (pty == NULL) +@@ -89,6 +92,42 @@ + return 1; /* FAIL */ + } + close(PTY_FILENO); ++#else ++ /* The trouble with the ifdef'd-out portion above is that ttyname() ++ ** does not work correctly when not passed a valid tty, but a pseudotty ++ ** instead. All we're doing here is finding out what the name of ++ ** the associated pty is without having to pass it in on the command line. ++ ** Nothing complex. ++ */ ++ { ++ struct stat sb; ++ struct stat dsb; ++ struct dirent *dirp; ++ static char buf[sizeof(_PATH_DEV) + MAXNAMLEN] = _PATH_DEV; ++ DIR *dp; ++ ++ pty = NULL; ++ ++ if (fstat(PTY_FILENO, &sb)) ++ return 1; /* FAIL */ ++ if ((dp = opendir(_PATH_DEV)) == NULL) ++ return 1; /* FAIL */ ++ ++ while ((dirp = readdir(dp))) { ++ if (dirp->d_fileno != sb.st_ino) ++ continue; ++ bcopy(dirp->d_name, buf + sizeof(_PATH_DEV) - 1, dirp->d_namlen+1); ++ /*fprintf(stderr, "looking at %s\n", buf);*/ ++ if (stat(buf, &dsb) || sb.st_dev != dsb.st_dev || sb.st_ino != dsb.st_ino) ++ continue; ++ pty = buf; ++ } ++ closedir(dp); ++ if (pty == NULL) ++ return 1; /* FAIL */ ++ } ++ /*fprintf(stderr, "successful at finding %s\n", pty);*/ ++#endif + + /* matches /dev/pty?? */ + if (strlen(pty) < 8 || strncmp(pty,"/dev/pty",8)) +@@ -120,6 +159,8 @@ + fprintf(stderr,"%s: cannot chmod %s.\n",argv[0],tty); perror("Reason"); + return 1; /* FAIL */ + } ++ ++ /*fprintf(stderr, "made it here\n");*/ + + return 0; /* OK */ + } diff --git a/x11/kdebase4-workspace/pkg-plist b/x11/kdebase4-workspace/pkg-plist index a486bb3..7a8ef62 100644 --- a/x11/kdebase4-workspace/pkg-plist +++ b/x11/kdebase4-workspace/pkg-plist @@ -649,6 +649,7 @@ share/apps/kicker/applets/krunapplet.desktop share/apps/kicker/applets/ksystemtrayapplet.desktop share/apps/kicker/applets/ktaskbarapplet.desktop share/apps/kicker/applets/quicklauncher.desktop +share/apps/kicker/icons/locolor/16x16/actions/modified.png share/apps/kicker/pics/disk1.png share/apps/kicker/pics/disk2.png share/apps/kicker/pics/disk3.png @@ -970,9 +971,9 @@ share/doc/HTML/en/kcontrol/action.html share/doc/HTML/en/kcontrol/background.html share/doc/HTML/en/kcontrol/batmon.html share/doc/HTML/en/kcontrol/bell.html -share/doc/HTML/en/kcontrol/blockdev.html share/doc/HTML/en/kcontrol/borders.html share/doc/HTML/en/kcontrol/color.html +share/doc/HTML/en/kcontrol/common share/doc/HTML/en/kcontrol/control-center-exiting.html share/doc/HTML/en/kcontrol/control-center-menus.html share/doc/HTML/en/kcontrol/control-center-run-indiv.html @@ -990,6 +991,8 @@ share/doc/HTML/en/kcontrol/email.html share/doc/HTML/en/kcontrol/energy.html share/doc/HTML/en/kcontrol/file-assoc.html share/doc/HTML/en/kcontrol/file-manager.html +share/doc/HTML/en/kcontrol/kfileman1.png +share/doc/HTML/en/kcontrol/kfileman2.png share/doc/HTML/en/kcontrol/fonts.html share/doc/HTML/en/kcontrol/help-index.html share/doc/HTML/en/kcontrol/icons.html @@ -1099,11 +1102,13 @@ share/doc/HTML/en/kcontrol/user-agent.html share/doc/HTML/en/kcontrol/windows-shares.html share/doc/HTML/en/kcontrol/xserver.html share/doc/HTML/en/kdebugdialog/.anchors +share/doc/HTML/en/kdebugdialog/common share/doc/HTML/en/kdebugdialog/index.docbook share/doc/HTML/en/kdebugdialog/index.html share/doc/HTML/en/kdebugdialog/introduction.html share/doc/HTML/en/kdesu/.anchors share/doc/HTML/en/kdesu/author.html +share/doc/HTML/en/kdesu/common share/doc/HTML/en/kdesu/compiling.html share/doc/HTML/en/kdesu/configuration.html share/doc/HTML/en/kdesu/index.docbook @@ -1117,6 +1122,7 @@ share/doc/HTML/en/kdesu/sec-password-keeping.html share/doc/HTML/en/kdesu/using-kdesu.html share/doc/HTML/en/kdm/.anchors share/doc/HTML/en/kdm/building-and-installing-kdm.html +share/doc/HTML/en/kdm/common share/doc/HTML/en/kdm/configuring-kdm.html share/doc/HTML/en/kdm/configuring-your-system-for-kdm.html share/doc/HTML/en/kdm/credits.html @@ -1129,6 +1135,7 @@ share/doc/HTML/en/kdm/lilo.html share/doc/HTML/en/kdm/locale.html share/doc/HTML/en/kdm/other-information.html share/doc/HTML/en/khelpcenter/.anchors +share/doc/HTML/en/khelpcenter/common share/doc/HTML/en/khelpcenter/contact-developers.html share/doc/HTML/en/khelpcenter/contact-more-information.html share/doc/HTML/en/khelpcenter/contact-official.html @@ -1147,10 +1154,29 @@ share/doc/HTML/en/khelpcenter/interface-basics.html share/doc/HTML/en/khelpcenter/invoking-help.html share/doc/HTML/en/khelpcenter/links.docbook share/doc/HTML/en/khelpcenter/no-html.html +share/doc/HTML/en/khelpcenter/faq/about.html +share/doc/HTML/en/khelpcenter/faq/applications.html +share/doc/HTML/en/khelpcenter/faq/common +share/doc/HTML/en/khelpcenter/faq/configure.html +share/doc/HTML/en/khelpcenter/faq/contribute.html +share/doc/HTML/en/khelpcenter/faq/credits.html +share/doc/HTML/en/khelpcenter/faq/desktop.html +share/doc/HTML/en/khelpcenter/faq/filemanager.html +share/doc/HTML/en/khelpcenter/faq/getting-kde.html +share/doc/HTML/en/khelpcenter/faq/install.html +share/doc/HTML/en/khelpcenter/faq/introduction.html +share/doc/HTML/en/khelpcenter/faq/misc.html +share/doc/HTML/en/khelpcenter/faq/more-info.html +share/doc/HTML/en/khelpcenter/faq/non-kde-apps.html +share/doc/HTML/en/khelpcenter/faq/not-kde.html +share/doc/HTML/en/khelpcenter/faq/panel.html +share/doc/HTML/en/khelpcenter/faq/tips.html +share/doc/HTML/en/khelpcenter/faq/windowmanager.html share/doc/HTML/en/khelpcenter/quickstart/.anchors share/doc/HTML/en/khelpcenter/quickstart/advanced-topics.html share/doc/HTML/en/khelpcenter/quickstart/an-overview-of-kde.html share/doc/HTML/en/khelpcenter/quickstart/archives-and-networks.html +share/doc/HTML/en/khelpcenter/quickstart/common share/doc/HTML/en/khelpcenter/quickstart/configuration-modules.html share/doc/HTML/en/khelpcenter/quickstart/configure.html share/doc/HTML/en/khelpcenter/quickstart/credits.html @@ -1176,16 +1202,17 @@ share/doc/HTML/en/khelpcenter/userguide/about-this-preview.html share/doc/HTML/en/khelpcenter/userguide/adding-programs.html share/doc/HTML/en/khelpcenter/userguide/all-about-your-desktop.html share/doc/HTML/en/khelpcenter/userguide/background-of-kde.html +share/doc/HTML/en/khelpcenter/userguide/common share/doc/HTML/en/khelpcenter/userguide/creating-new-files-on-your-desktop.html share/doc/HTML/en/khelpcenter/userguide/desktop-components.html share/doc/HTML/en/khelpcenter/userguide/docu-staff.html -share/doc/HTML/en/khelpcenter/userguide/entertainmentapplications.html +share/doc/HTML/en/khelpcenter/userguide/entertainment-applications.html share/doc/HTML/en/khelpcenter/userguide/finding-your-lost-files.html share/doc/HTML/en/khelpcenter/userguide/first-impressions.html share/doc/HTML/en/khelpcenter/userguide/frequently-asked-questions.html share/doc/HTML/en/khelpcenter/userguide/getting-kde.html share/doc/HTML/en/khelpcenter/userguide/getting-started.html -share/doc/HTML/en/khelpcenter/userguide/graphicalapplications.html +share/doc/HTML/en/khelpcenter/userguide/graphical-applications.html share/doc/HTML/en/khelpcenter/userguide/index.docbook share/doc/HTML/en/khelpcenter/userguide/index.html share/doc/HTML/en/khelpcenter/userguide/installation.html @@ -1201,8 +1228,8 @@ share/doc/HTML/en/khelpcenter/userguide/linux-installing-rpms.html share/doc/HTML/en/khelpcenter/userguide/more-help.html share/doc/HTML/en/khelpcenter/userguide/mouse-techniques.html share/doc/HTML/en/khelpcenter/userguide/moving-files-with-drag-and-drop.html -share/doc/HTML/en/khelpcenter/userguide/multimediaapplications.html -share/doc/HTML/en/khelpcenter/userguide/networkapplications.html +share/doc/HTML/en/khelpcenter/userguide/multimedia-applications.html +share/doc/HTML/en/khelpcenter/userguide/network-applications.html share/doc/HTML/en/khelpcenter/userguide/quitting-kde.html share/doc/HTML/en/khelpcenter/userguide/shortcuts.html share/doc/HTML/en/khelpcenter/userguide/source-distribution.html @@ -1215,6 +1242,7 @@ share/doc/HTML/en/khelpcenter/userguide/using-the-trashcan.html share/doc/HTML/en/khelpcenter/userguide/utility-applications.html share/doc/HTML/en/khelpcenter/userguide/we-still-need-people.html share/doc/HTML/en/khelpcenter/visualdict/.anchors +share/doc/HTML/en/khelpcenter/visualdict/common share/doc/HTML/en/khelpcenter/visualdict/credits.html share/doc/HTML/en/khelpcenter/visualdict/index.docbook share/doc/HTML/en/khelpcenter/visualdict/index.html @@ -1251,6 +1279,7 @@ share/doc/HTML/en/kicker/.anchors share/doc/HTML/en/kicker/access_config.png share/doc/HTML/en/kicker/basic_icons.png share/doc/HTML/en/kicker/button-preferences.html +share/doc/HTML/en/kicker/common share/doc/HTML/en/kicker/config_window.png share/doc/HTML/en/kicker/configuration-adding-icons.html share/doc/HTML/en/kicker/configuration-config-window.html @@ -1287,6 +1316,7 @@ share/doc/HTML/en/kicker/qb_root.png share/doc/HTML/en/kicker/using-kicker.html share/doc/HTML/en/klipper/.anchors share/doc/HTML/en/klipper/actions.html +share/doc/HTML/en/klipper/common share/doc/HTML/en/klipper/compilation.html share/doc/HTML/en/klipper/configuration.html share/doc/HTML/en/klipper/credits.html @@ -1298,6 +1328,7 @@ share/doc/HTML/en/klipper/requirements.html share/doc/HTML/en/klipper/screenshot.png share/doc/HTML/en/klipper/using-klipper.html share/doc/HTML/en/kmenuedit/.anchors +share/doc/HTML/en/kmenuedit/common share/doc/HTML/en/kmenuedit/credits.html share/doc/HTML/en/kmenuedit/details-advanced.html share/doc/HTML/en/kmenuedit/glossary.html @@ -1316,20 +1347,25 @@ share/doc/HTML/en/kmenuedit/introduction.html share/doc/HTML/en/kmenuedit/menu-reference.html share/doc/HTML/en/kmenuedit/using-kmenuedit.html share/doc/HTML/en/konqueror/.anchors +share/doc/HTML/en/konqueror/autocomplete.html share/doc/HTML/en/konqueror/basics.html share/doc/HTML/en/konqueror/bookmarks.html share/doc/HTML/en/konqueror/browser.html share/doc/HTML/en/konqueror/bubble.html +share/doc/HTML/en/konqueror/common share/doc/HTML/en/konqueror/cmndline.png share/doc/HTML/en/konqueror/commandline.html share/doc/HTML/en/konqueror/commands.html share/doc/HTML/en/konqueror/config-prox.html share/doc/HTML/en/konqueror/config.html share/doc/HTML/en/konqueror/configure-bars.html +share/doc/HTML/en/konqueror/cook.html share/doc/HTML/en/konqueror/credits.html +share/doc/HTML/en/konqueror/crypto.html share/doc/HTML/en/konqueror/deleting.html share/doc/HTML/en/konqueror/dirtree.png share/doc/HTML/en/konqueror/dragdrop.png +share/doc/HTML/en/konqueror/faq.html share/doc/HTML/en/konqueror/fileassoc.html share/doc/HTML/en/konqueror/filemanager.html share/doc/HTML/en/konqueror/filetype1.png @@ -1340,9 +1376,6 @@ share/doc/HTML/en/konqueror/index.docbook share/doc/HTML/en/konqueror/index.html share/doc/HTML/en/konqueror/installation.html share/doc/HTML/en/konqueror/introduction.html -share/doc/HTML/en/konqueror/kfind.png -share/doc/HTML/en/konqueror/konqdoc5.png -share/doc/HTML/en/konqueror/konqdoc9.png share/doc/HTML/en/konqueror/konqorg.png share/doc/HTML/en/konqueror/lmbmmb.html share/doc/HTML/en/konqueror/making.html @@ -1358,15 +1391,18 @@ share/doc/HTML/en/konqueror/rmb-menus.html share/doc/HTML/en/konqueror/samba.html share/doc/HTML/en/konqueror/samba.png share/doc/HTML/en/konqueror/save-print-web.html +share/doc/HTML/en/konqueror/saveset.html share/doc/HTML/en/konqueror/surf.html share/doc/HTML/en/konsole/.anchors share/doc/HTML/en/konsole/command-line-options.html +share/doc/HTML/en/konsole/common share/doc/HTML/en/konsole/credits.html share/doc/HTML/en/konsole/history-option.html share/doc/HTML/en/konsole/index.docbook share/doc/HTML/en/konsole/index.html share/doc/HTML/en/konsole/installation.html share/doc/HTML/en/konsole/introduction.html +share/doc/HTML/en/konsole/konsole.png share/doc/HTML/en/konsole/konsole1.gif share/doc/HTML/en/konsole/konsole2.gif share/doc/HTML/en/konsole/menubar.html @@ -1377,6 +1413,7 @@ share/doc/HTML/en/konsole/use-of-konsole.html share/doc/HTML/en/konsole/vt100.gif share/doc/HTML/en/kpager/.anchors share/doc/HTML/en/kpager/commands.html +share/doc/HTML/en/kpager/common share/doc/HTML/en/kpager/compilation.html share/doc/HTML/en/kpager/credits.html share/doc/HTML/en/kpager/faq.html @@ -1390,6 +1427,7 @@ share/doc/HTML/en/kpager/screenshot.png share/doc/HTML/en/kpager/settings.png share/doc/HTML/en/kpager/using-kapp.html share/doc/HTML/en/ksysguard/.anchors +share/doc/HTML/en/ksysguard/common share/doc/HTML/en/ksysguard/compilationandinstallation.html share/doc/HTML/en/ksysguard/credits-and-licenses.html share/doc/HTML/en/ksysguard/index.docbook @@ -1402,6 +1440,7 @@ share/doc/HTML/en/ksysguard/the-workspace.html share/doc/HTML/en/ksysguard/usingtheksysguard.html share/doc/HTML/en/kwrite/.anchors share/doc/HTML/en/kwrite/command-line-options.html +share/doc/HTML/en/kwrite/common share/doc/HTML/en/kwrite/credits.html share/doc/HTML/en/kwrite/edit.html share/doc/HTML/en/kwrite/go.html @@ -1411,9 +1450,9 @@ share/doc/HTML/en/kwrite/index.html share/doc/HTML/en/kwrite/introduction.html share/doc/HTML/en/kwrite/keybindings.html share/doc/HTML/en/kwrite/on-screen-fundamentals.html -share/doc/HTML/en/kwrite/other-preferences.html share/doc/HTML/en/kwrite/pref-dialog.html share/doc/HTML/en/kwrite/pref-edit.html +share/doc/HTML/en/kwrite/pref-highlighting.html share/doc/HTML/en/kwrite/pref-indent.html share/doc/HTML/en/kwrite/pref-select.html share/doc/HTML/en/kwrite/prefspellchecker.html @@ -2170,6 +2209,7 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/ksysguard/icons/locolor/16x16/apps @dirrm share/apps/ksysguard/icons/locolor/16x16 @dirrm share/apps/ksysguard/icons/locolor +@dirrm share/apps/ksysguard/icons @dirrm share/apps/ksysguard @dirrm share/apps/ksplash/pics @dirrm share/apps/ksplash @@ -2180,8 +2220,14 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/konqueror/profiles @dirrm share/apps/konqueror/pics @dirrm share/apps/konqueror/icons/locolor/16x16/actions +@dirrm share/apps/konqueror/icons/locolor/16x16 +@dirrm share/apps/konqueror/icons/locolor @dirrm share/apps/konqueror/icons/hicolor/32x32/actions +@dirrm share/apps/konqueror/icons/hicolor/32x32 @dirrm share/apps/konqueror/icons/hicolor/22x22/actions +@dirrm share/apps/konqueror/icons/hicolor/22x22 +@dirrm share/apps/konqueror/icons/hicolor +@dirrm share/apps/konqueror/icons @dirrm share/apps/konqueror/dirtree/remote/web @dirrm share/apps/konqueror/dirtree/remote/ftp @dirrm share/apps/konqueror/dirtree/remote @@ -2197,17 +2243,25 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/kmenuedit/icons/hicolor/22x22/actions @dirrm share/apps/kmenuedit/icons/hicolor/22x22 @dirrm share/apps/kmenuedit/icons/hicolor +@dirrm share/apps/kmenuedit/icons @dirrm share/apps/kmenuedit -@dirrm share/apps/klaptopdaemon/icons/locolor/16x16/actions @dirrm share/apps/kio_info @dirrm share/apps/kicker/wallpapers @dirrm share/apps/kicker/tiles @dirrm share/apps/kicker/pics +@dirrm share/apps/kicker/icons/locolor/16x16/actions +@dirrm share/apps/kicker/icons/locolor/16x16 +@dirrm share/apps/kicker/icons/locolor +@dirrm share/apps/kicker/icons @dirrm share/apps/kicker/applets @dirrm share/apps/kicker @dirrm share/apps/khelpcenter/plugins/Tutorials +@dirrm share/apps/khelpcenter/plugins @dirrm share/apps/khelpcenter/pics @dirrm share/apps/khelpcenter/icons/locolor/16x16/apps +@dirrm share/apps/khelpcenter/icons/locolor/16x16 +@dirrm share/apps/khelpcenter/icons/locolor +@dirrm share/apps/khelpcenter/icons @dirrm share/apps/khelpcenter/en @dirrm share/apps/khelpcenter @dirrm share/apps/kdm/pics/users diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index 7cf8533..bbaa703 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdebase -PORTVERSION= 2.0 +PORTVERSION= 2.0.1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo index 04441e9..80f0c4c 100644 --- a/x11/kdebase4/distinfo +++ b/x11/kdebase4/distinfo @@ -1 +1 @@ -MD5 (kdebase-2.0.tar.bz2) = efdcb3c08b2f8f971b5b7ef077542269 +MD5 (kdebase-2.0.1.tar.bz2) = b138a67ae22fbda05def8e932820ac66 diff --git a/x11/kdebase4/files/patch-TEPty.C b/x11/kdebase4/files/patch-TEPty.C index 9a5ece3..9bfd5db 100644 --- a/x11/kdebase4/files/patch-TEPty.C +++ b/x11/kdebase4/files/patch-TEPty.C @@ -1,11 +1,88 @@ ---- konsole/src/TEPty.C Tue Oct 3 14:57:30 2000 -+++ konsole/src/TEPty.C.new Thu Nov 2 17:51:30 2000 -@@ -225,7 +225,7 @@ +--- konsole/src/TEPty.C.orig Fri Dec 8 11:51:24 2000 ++++ konsole/src/TEPty.C Fri Dec 8 11:52:51 2000 +@@ -180,27 +180,57 @@ + // param grant: 1 to grant, 0 to revoke + // returns 1 on success 0 on fail + { +- pid_t pid = fork(); +- if (pid < 0) +- { +- return 0; +- } +- if (pid == 0) +- { +- /* We pass the master pseudo terminal as file descriptor PTY_FILENO. */ +- if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0) exit(1); +- QString path = locate("exe", BASE_CHOWN); ++ pid_t pid; ++ int pstat; ++ struct sigaction ign; ++ struct sigaction intact; // interupt action ++ struct sigaction quitact; // quit action ++ sigset_t newsigblock, oldsigblock; ++ QString path; ++ ++ ign.sa_handler = SIG_IGN; ++ sigemptyset(&ign.sa_mask); ++ ign.sa_flags = 0; ++ sigaction(SIGINT, &ign, &intact); ++ sigaction(SIGQUIT, &ign, &quitact); ++ sigemptyset(&newsigblock); ++ sigaddset(&newsigblock, SIGCHLD); ++ sigprocmask(SIG_BLOCK, &newsigblock, &oldsigblock); ++ ++ switch (pid = fork()) { ++ case -1: ++ return(0); ++ break; ++ case 0: // child ++ if (fd != PTY_FILENO && dup2(fd, PTY_FILENO) < 0) ++ exit(1); ++ path = locate("exe", BASE_CHOWN); ++ ++ sigaction(SIGINT, &intact, NULL); ++ sigaction(SIGQUIT, &quitact, NULL); ++ sigprocmask(SIG_SETMASK, &oldsigblock, NULL); + execle(path.ascii(), BASE_CHOWN, grant?"--grant":"--revoke", NULL, NULL); +- exit(1); // should not be reached +- } +- if (pid > 0) +- { int w; +- retry: +- int rc = waitpid (pid, &w, 0); +- if ((rc == -1) && (errno == EINTR)) +- goto retry; +- return (rc != -1 && WIFEXITED(w) && WEXITSTATUS(w) == 0); ++ exit(1); ++ break; ++ default: ++ do { ++ pid = waitpid(pid, &pstat, 0); ++ } while (pid == -1 && errno == EINTR); ++ break; + } ++ sigaction(SIGINT, &intact, NULL); ++ sigaction(SIGQUIT, &quitact, NULL); ++ sigprocmask(SIG_SETMASK, &oldsigblock, NULL); ++ ++ if (pid == -1) { ++ return 0; ++ } ++ else if (WIFEXITED(pstat) && (WEXITSTATUS(pstat) == 0)) { ++ return 1; ++ } ++ else { ++ return 0; ++ } + return 0; //dummy. + } + +@@ -225,7 +255,7 @@ #ifdef HAVE_UTEMPTER removeLineFromUtmp(ttynam, fd); #elif defined(USE_LOGIN) - char *tty_name=ttyname(0); + char *tty_name=ttyname(fd); if (tty_name) - logout(tty_name); - #endif + { + if (strncmp(tty_name, "/dev/", 5) == 0) diff --git a/x11/kdebase4/files/patch-konsole_grantpty.c b/x11/kdebase4/files/patch-konsole_grantpty.c new file mode 100644 index 0000000..889d15b --- /dev/null +++ b/x11/kdebase4/files/patch-konsole_grantpty.c @@ -0,0 +1,79 @@ +--- konsole/src/konsole_grantpty.c.orig Sat Jun 12 07:13:31 1999 ++++ konsole/src/konsole_grantpty.c Fri Dec 8 11:54:43 2000 +@@ -31,13 +31,15 @@ + #include <string.h> + #include <sys/stat.h> + #include <unistd.h> ++#include <dirent.h> ++#include <paths.h> + + #define PTY_FILENO 3 /* keep in sync with grantpty */ + #define TTY_GROUP "tty" + + int main (int argc, char *argv[]) + { +- char* pty; ++ char* pty = NULL; + struct stat st; + struct group* p; + gid_t gid; +@@ -81,6 +83,7 @@ + + /* get slave pty name from master pty file handle in PTY_FILENO *********/ + ++#if 0 + /* Check that PTY_FILENO is a valid master pseudo terminal. */ + pty = ttyname(PTY_FILENO); /* posix */ + if (pty == NULL) +@@ -89,6 +92,42 @@ + return 1; /* FAIL */ + } + close(PTY_FILENO); ++#else ++ /* The trouble with the ifdef'd-out portion above is that ttyname() ++ ** does not work correctly when not passed a valid tty, but a pseudotty ++ ** instead. All we're doing here is finding out what the name of ++ ** the associated pty is without having to pass it in on the command line. ++ ** Nothing complex. ++ */ ++ { ++ struct stat sb; ++ struct stat dsb; ++ struct dirent *dirp; ++ static char buf[sizeof(_PATH_DEV) + MAXNAMLEN] = _PATH_DEV; ++ DIR *dp; ++ ++ pty = NULL; ++ ++ if (fstat(PTY_FILENO, &sb)) ++ return 1; /* FAIL */ ++ if ((dp = opendir(_PATH_DEV)) == NULL) ++ return 1; /* FAIL */ ++ ++ while ((dirp = readdir(dp))) { ++ if (dirp->d_fileno != sb.st_ino) ++ continue; ++ bcopy(dirp->d_name, buf + sizeof(_PATH_DEV) - 1, dirp->d_namlen+1); ++ /*fprintf(stderr, "looking at %s\n", buf);*/ ++ if (stat(buf, &dsb) || sb.st_dev != dsb.st_dev || sb.st_ino != dsb.st_ino) ++ continue; ++ pty = buf; ++ } ++ closedir(dp); ++ if (pty == NULL) ++ return 1; /* FAIL */ ++ } ++ /*fprintf(stderr, "successful at finding %s\n", pty);*/ ++#endif + + /* matches /dev/pty?? */ + if (strlen(pty) < 8 || strncmp(pty,"/dev/pty",8)) +@@ -120,6 +159,8 @@ + fprintf(stderr,"%s: cannot chmod %s.\n",argv[0],tty); perror("Reason"); + return 1; /* FAIL */ + } ++ ++ /*fprintf(stderr, "made it here\n");*/ + + return 0; /* OK */ + } diff --git a/x11/kdebase4/pkg-plist b/x11/kdebase4/pkg-plist index a486bb3..7a8ef62 100644 --- a/x11/kdebase4/pkg-plist +++ b/x11/kdebase4/pkg-plist @@ -649,6 +649,7 @@ share/apps/kicker/applets/krunapplet.desktop share/apps/kicker/applets/ksystemtrayapplet.desktop share/apps/kicker/applets/ktaskbarapplet.desktop share/apps/kicker/applets/quicklauncher.desktop +share/apps/kicker/icons/locolor/16x16/actions/modified.png share/apps/kicker/pics/disk1.png share/apps/kicker/pics/disk2.png share/apps/kicker/pics/disk3.png @@ -970,9 +971,9 @@ share/doc/HTML/en/kcontrol/action.html share/doc/HTML/en/kcontrol/background.html share/doc/HTML/en/kcontrol/batmon.html share/doc/HTML/en/kcontrol/bell.html -share/doc/HTML/en/kcontrol/blockdev.html share/doc/HTML/en/kcontrol/borders.html share/doc/HTML/en/kcontrol/color.html +share/doc/HTML/en/kcontrol/common share/doc/HTML/en/kcontrol/control-center-exiting.html share/doc/HTML/en/kcontrol/control-center-menus.html share/doc/HTML/en/kcontrol/control-center-run-indiv.html @@ -990,6 +991,8 @@ share/doc/HTML/en/kcontrol/email.html share/doc/HTML/en/kcontrol/energy.html share/doc/HTML/en/kcontrol/file-assoc.html share/doc/HTML/en/kcontrol/file-manager.html +share/doc/HTML/en/kcontrol/kfileman1.png +share/doc/HTML/en/kcontrol/kfileman2.png share/doc/HTML/en/kcontrol/fonts.html share/doc/HTML/en/kcontrol/help-index.html share/doc/HTML/en/kcontrol/icons.html @@ -1099,11 +1102,13 @@ share/doc/HTML/en/kcontrol/user-agent.html share/doc/HTML/en/kcontrol/windows-shares.html share/doc/HTML/en/kcontrol/xserver.html share/doc/HTML/en/kdebugdialog/.anchors +share/doc/HTML/en/kdebugdialog/common share/doc/HTML/en/kdebugdialog/index.docbook share/doc/HTML/en/kdebugdialog/index.html share/doc/HTML/en/kdebugdialog/introduction.html share/doc/HTML/en/kdesu/.anchors share/doc/HTML/en/kdesu/author.html +share/doc/HTML/en/kdesu/common share/doc/HTML/en/kdesu/compiling.html share/doc/HTML/en/kdesu/configuration.html share/doc/HTML/en/kdesu/index.docbook @@ -1117,6 +1122,7 @@ share/doc/HTML/en/kdesu/sec-password-keeping.html share/doc/HTML/en/kdesu/using-kdesu.html share/doc/HTML/en/kdm/.anchors share/doc/HTML/en/kdm/building-and-installing-kdm.html +share/doc/HTML/en/kdm/common share/doc/HTML/en/kdm/configuring-kdm.html share/doc/HTML/en/kdm/configuring-your-system-for-kdm.html share/doc/HTML/en/kdm/credits.html @@ -1129,6 +1135,7 @@ share/doc/HTML/en/kdm/lilo.html share/doc/HTML/en/kdm/locale.html share/doc/HTML/en/kdm/other-information.html share/doc/HTML/en/khelpcenter/.anchors +share/doc/HTML/en/khelpcenter/common share/doc/HTML/en/khelpcenter/contact-developers.html share/doc/HTML/en/khelpcenter/contact-more-information.html share/doc/HTML/en/khelpcenter/contact-official.html @@ -1147,10 +1154,29 @@ share/doc/HTML/en/khelpcenter/interface-basics.html share/doc/HTML/en/khelpcenter/invoking-help.html share/doc/HTML/en/khelpcenter/links.docbook share/doc/HTML/en/khelpcenter/no-html.html +share/doc/HTML/en/khelpcenter/faq/about.html +share/doc/HTML/en/khelpcenter/faq/applications.html +share/doc/HTML/en/khelpcenter/faq/common +share/doc/HTML/en/khelpcenter/faq/configure.html +share/doc/HTML/en/khelpcenter/faq/contribute.html +share/doc/HTML/en/khelpcenter/faq/credits.html +share/doc/HTML/en/khelpcenter/faq/desktop.html +share/doc/HTML/en/khelpcenter/faq/filemanager.html +share/doc/HTML/en/khelpcenter/faq/getting-kde.html +share/doc/HTML/en/khelpcenter/faq/install.html +share/doc/HTML/en/khelpcenter/faq/introduction.html +share/doc/HTML/en/khelpcenter/faq/misc.html +share/doc/HTML/en/khelpcenter/faq/more-info.html +share/doc/HTML/en/khelpcenter/faq/non-kde-apps.html +share/doc/HTML/en/khelpcenter/faq/not-kde.html +share/doc/HTML/en/khelpcenter/faq/panel.html +share/doc/HTML/en/khelpcenter/faq/tips.html +share/doc/HTML/en/khelpcenter/faq/windowmanager.html share/doc/HTML/en/khelpcenter/quickstart/.anchors share/doc/HTML/en/khelpcenter/quickstart/advanced-topics.html share/doc/HTML/en/khelpcenter/quickstart/an-overview-of-kde.html share/doc/HTML/en/khelpcenter/quickstart/archives-and-networks.html +share/doc/HTML/en/khelpcenter/quickstart/common share/doc/HTML/en/khelpcenter/quickstart/configuration-modules.html share/doc/HTML/en/khelpcenter/quickstart/configure.html share/doc/HTML/en/khelpcenter/quickstart/credits.html @@ -1176,16 +1202,17 @@ share/doc/HTML/en/khelpcenter/userguide/about-this-preview.html share/doc/HTML/en/khelpcenter/userguide/adding-programs.html share/doc/HTML/en/khelpcenter/userguide/all-about-your-desktop.html share/doc/HTML/en/khelpcenter/userguide/background-of-kde.html +share/doc/HTML/en/khelpcenter/userguide/common share/doc/HTML/en/khelpcenter/userguide/creating-new-files-on-your-desktop.html share/doc/HTML/en/khelpcenter/userguide/desktop-components.html share/doc/HTML/en/khelpcenter/userguide/docu-staff.html -share/doc/HTML/en/khelpcenter/userguide/entertainmentapplications.html +share/doc/HTML/en/khelpcenter/userguide/entertainment-applications.html share/doc/HTML/en/khelpcenter/userguide/finding-your-lost-files.html share/doc/HTML/en/khelpcenter/userguide/first-impressions.html share/doc/HTML/en/khelpcenter/userguide/frequently-asked-questions.html share/doc/HTML/en/khelpcenter/userguide/getting-kde.html share/doc/HTML/en/khelpcenter/userguide/getting-started.html -share/doc/HTML/en/khelpcenter/userguide/graphicalapplications.html +share/doc/HTML/en/khelpcenter/userguide/graphical-applications.html share/doc/HTML/en/khelpcenter/userguide/index.docbook share/doc/HTML/en/khelpcenter/userguide/index.html share/doc/HTML/en/khelpcenter/userguide/installation.html @@ -1201,8 +1228,8 @@ share/doc/HTML/en/khelpcenter/userguide/linux-installing-rpms.html share/doc/HTML/en/khelpcenter/userguide/more-help.html share/doc/HTML/en/khelpcenter/userguide/mouse-techniques.html share/doc/HTML/en/khelpcenter/userguide/moving-files-with-drag-and-drop.html -share/doc/HTML/en/khelpcenter/userguide/multimediaapplications.html -share/doc/HTML/en/khelpcenter/userguide/networkapplications.html +share/doc/HTML/en/khelpcenter/userguide/multimedia-applications.html +share/doc/HTML/en/khelpcenter/userguide/network-applications.html share/doc/HTML/en/khelpcenter/userguide/quitting-kde.html share/doc/HTML/en/khelpcenter/userguide/shortcuts.html share/doc/HTML/en/khelpcenter/userguide/source-distribution.html @@ -1215,6 +1242,7 @@ share/doc/HTML/en/khelpcenter/userguide/using-the-trashcan.html share/doc/HTML/en/khelpcenter/userguide/utility-applications.html share/doc/HTML/en/khelpcenter/userguide/we-still-need-people.html share/doc/HTML/en/khelpcenter/visualdict/.anchors +share/doc/HTML/en/khelpcenter/visualdict/common share/doc/HTML/en/khelpcenter/visualdict/credits.html share/doc/HTML/en/khelpcenter/visualdict/index.docbook share/doc/HTML/en/khelpcenter/visualdict/index.html @@ -1251,6 +1279,7 @@ share/doc/HTML/en/kicker/.anchors share/doc/HTML/en/kicker/access_config.png share/doc/HTML/en/kicker/basic_icons.png share/doc/HTML/en/kicker/button-preferences.html +share/doc/HTML/en/kicker/common share/doc/HTML/en/kicker/config_window.png share/doc/HTML/en/kicker/configuration-adding-icons.html share/doc/HTML/en/kicker/configuration-config-window.html @@ -1287,6 +1316,7 @@ share/doc/HTML/en/kicker/qb_root.png share/doc/HTML/en/kicker/using-kicker.html share/doc/HTML/en/klipper/.anchors share/doc/HTML/en/klipper/actions.html +share/doc/HTML/en/klipper/common share/doc/HTML/en/klipper/compilation.html share/doc/HTML/en/klipper/configuration.html share/doc/HTML/en/klipper/credits.html @@ -1298,6 +1328,7 @@ share/doc/HTML/en/klipper/requirements.html share/doc/HTML/en/klipper/screenshot.png share/doc/HTML/en/klipper/using-klipper.html share/doc/HTML/en/kmenuedit/.anchors +share/doc/HTML/en/kmenuedit/common share/doc/HTML/en/kmenuedit/credits.html share/doc/HTML/en/kmenuedit/details-advanced.html share/doc/HTML/en/kmenuedit/glossary.html @@ -1316,20 +1347,25 @@ share/doc/HTML/en/kmenuedit/introduction.html share/doc/HTML/en/kmenuedit/menu-reference.html share/doc/HTML/en/kmenuedit/using-kmenuedit.html share/doc/HTML/en/konqueror/.anchors +share/doc/HTML/en/konqueror/autocomplete.html share/doc/HTML/en/konqueror/basics.html share/doc/HTML/en/konqueror/bookmarks.html share/doc/HTML/en/konqueror/browser.html share/doc/HTML/en/konqueror/bubble.html +share/doc/HTML/en/konqueror/common share/doc/HTML/en/konqueror/cmndline.png share/doc/HTML/en/konqueror/commandline.html share/doc/HTML/en/konqueror/commands.html share/doc/HTML/en/konqueror/config-prox.html share/doc/HTML/en/konqueror/config.html share/doc/HTML/en/konqueror/configure-bars.html +share/doc/HTML/en/konqueror/cook.html share/doc/HTML/en/konqueror/credits.html +share/doc/HTML/en/konqueror/crypto.html share/doc/HTML/en/konqueror/deleting.html share/doc/HTML/en/konqueror/dirtree.png share/doc/HTML/en/konqueror/dragdrop.png +share/doc/HTML/en/konqueror/faq.html share/doc/HTML/en/konqueror/fileassoc.html share/doc/HTML/en/konqueror/filemanager.html share/doc/HTML/en/konqueror/filetype1.png @@ -1340,9 +1376,6 @@ share/doc/HTML/en/konqueror/index.docbook share/doc/HTML/en/konqueror/index.html share/doc/HTML/en/konqueror/installation.html share/doc/HTML/en/konqueror/introduction.html -share/doc/HTML/en/konqueror/kfind.png -share/doc/HTML/en/konqueror/konqdoc5.png -share/doc/HTML/en/konqueror/konqdoc9.png share/doc/HTML/en/konqueror/konqorg.png share/doc/HTML/en/konqueror/lmbmmb.html share/doc/HTML/en/konqueror/making.html @@ -1358,15 +1391,18 @@ share/doc/HTML/en/konqueror/rmb-menus.html share/doc/HTML/en/konqueror/samba.html share/doc/HTML/en/konqueror/samba.png share/doc/HTML/en/konqueror/save-print-web.html +share/doc/HTML/en/konqueror/saveset.html share/doc/HTML/en/konqueror/surf.html share/doc/HTML/en/konsole/.anchors share/doc/HTML/en/konsole/command-line-options.html +share/doc/HTML/en/konsole/common share/doc/HTML/en/konsole/credits.html share/doc/HTML/en/konsole/history-option.html share/doc/HTML/en/konsole/index.docbook share/doc/HTML/en/konsole/index.html share/doc/HTML/en/konsole/installation.html share/doc/HTML/en/konsole/introduction.html +share/doc/HTML/en/konsole/konsole.png share/doc/HTML/en/konsole/konsole1.gif share/doc/HTML/en/konsole/konsole2.gif share/doc/HTML/en/konsole/menubar.html @@ -1377,6 +1413,7 @@ share/doc/HTML/en/konsole/use-of-konsole.html share/doc/HTML/en/konsole/vt100.gif share/doc/HTML/en/kpager/.anchors share/doc/HTML/en/kpager/commands.html +share/doc/HTML/en/kpager/common share/doc/HTML/en/kpager/compilation.html share/doc/HTML/en/kpager/credits.html share/doc/HTML/en/kpager/faq.html @@ -1390,6 +1427,7 @@ share/doc/HTML/en/kpager/screenshot.png share/doc/HTML/en/kpager/settings.png share/doc/HTML/en/kpager/using-kapp.html share/doc/HTML/en/ksysguard/.anchors +share/doc/HTML/en/ksysguard/common share/doc/HTML/en/ksysguard/compilationandinstallation.html share/doc/HTML/en/ksysguard/credits-and-licenses.html share/doc/HTML/en/ksysguard/index.docbook @@ -1402,6 +1440,7 @@ share/doc/HTML/en/ksysguard/the-workspace.html share/doc/HTML/en/ksysguard/usingtheksysguard.html share/doc/HTML/en/kwrite/.anchors share/doc/HTML/en/kwrite/command-line-options.html +share/doc/HTML/en/kwrite/common share/doc/HTML/en/kwrite/credits.html share/doc/HTML/en/kwrite/edit.html share/doc/HTML/en/kwrite/go.html @@ -1411,9 +1450,9 @@ share/doc/HTML/en/kwrite/index.html share/doc/HTML/en/kwrite/introduction.html share/doc/HTML/en/kwrite/keybindings.html share/doc/HTML/en/kwrite/on-screen-fundamentals.html -share/doc/HTML/en/kwrite/other-preferences.html share/doc/HTML/en/kwrite/pref-dialog.html share/doc/HTML/en/kwrite/pref-edit.html +share/doc/HTML/en/kwrite/pref-highlighting.html share/doc/HTML/en/kwrite/pref-indent.html share/doc/HTML/en/kwrite/pref-select.html share/doc/HTML/en/kwrite/prefspellchecker.html @@ -2170,6 +2209,7 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/ksysguard/icons/locolor/16x16/apps @dirrm share/apps/ksysguard/icons/locolor/16x16 @dirrm share/apps/ksysguard/icons/locolor +@dirrm share/apps/ksysguard/icons @dirrm share/apps/ksysguard @dirrm share/apps/ksplash/pics @dirrm share/apps/ksplash @@ -2180,8 +2220,14 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/konqueror/profiles @dirrm share/apps/konqueror/pics @dirrm share/apps/konqueror/icons/locolor/16x16/actions +@dirrm share/apps/konqueror/icons/locolor/16x16 +@dirrm share/apps/konqueror/icons/locolor @dirrm share/apps/konqueror/icons/hicolor/32x32/actions +@dirrm share/apps/konqueror/icons/hicolor/32x32 @dirrm share/apps/konqueror/icons/hicolor/22x22/actions +@dirrm share/apps/konqueror/icons/hicolor/22x22 +@dirrm share/apps/konqueror/icons/hicolor +@dirrm share/apps/konqueror/icons @dirrm share/apps/konqueror/dirtree/remote/web @dirrm share/apps/konqueror/dirtree/remote/ftp @dirrm share/apps/konqueror/dirtree/remote @@ -2197,17 +2243,25 @@ share/wallpapers/vegetative_fog.jpg @dirrm share/apps/kmenuedit/icons/hicolor/22x22/actions @dirrm share/apps/kmenuedit/icons/hicolor/22x22 @dirrm share/apps/kmenuedit/icons/hicolor +@dirrm share/apps/kmenuedit/icons @dirrm share/apps/kmenuedit -@dirrm share/apps/klaptopdaemon/icons/locolor/16x16/actions @dirrm share/apps/kio_info @dirrm share/apps/kicker/wallpapers @dirrm share/apps/kicker/tiles @dirrm share/apps/kicker/pics +@dirrm share/apps/kicker/icons/locolor/16x16/actions +@dirrm share/apps/kicker/icons/locolor/16x16 +@dirrm share/apps/kicker/icons/locolor +@dirrm share/apps/kicker/icons @dirrm share/apps/kicker/applets @dirrm share/apps/kicker @dirrm share/apps/khelpcenter/plugins/Tutorials +@dirrm share/apps/khelpcenter/plugins @dirrm share/apps/khelpcenter/pics @dirrm share/apps/khelpcenter/icons/locolor/16x16/apps +@dirrm share/apps/khelpcenter/icons/locolor/16x16 +@dirrm share/apps/khelpcenter/icons/locolor +@dirrm share/apps/khelpcenter/icons @dirrm share/apps/khelpcenter/en @dirrm share/apps/khelpcenter @dirrm share/apps/kdm/pics/users diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile index 90ad5e7..2c79caa 100644 --- a/x11/kdelibs2/Makefile +++ b/x11/kdelibs2/Makefile @@ -6,16 +6,14 @@ # PORTNAME= kdelibs -PORTVERSION= 2.0 +PORTVERSION= 2.0.1 CATEGORIES= x11 x11-toolkits MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= kevlo@FreeBSD.org -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - png.4:${PORTSDIR}/graphics/png \ - tiff.4:${PORTSDIR}/graphics/tiff \ +LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ audiofile.0:${PORTSDIR}/audio/libaudiofile \ mimelib.3:${PORTSDIR}/converters/kdesupport2 @@ -28,8 +26,7 @@ USE_BZIP2= yes USE_NEWGCC= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} --enable-shared \ - --with-qt-includes=${X11BASE}/include/qt2 \ +CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \ diff --git a/x11/kdelibs2/distinfo b/x11/kdelibs2/distinfo index c7a142a..763aa8c 100644 --- a/x11/kdelibs2/distinfo +++ b/x11/kdelibs2/distinfo @@ -1 +1 @@ -MD5 (kdelibs-2.0.tar.bz2) = 7376ddd726b8f77223bf08a7de2dfb3d +MD5 (kdelibs-2.0.1.tar.bz2) = 563d6b24a216a32be2f55f5b1c14e14c diff --git a/x11/kdelibs2/files/patch-global.cpp b/x11/kdelibs2/files/patch-global.cpp index 80b4cb4..13636e3 100644 --- a/x11/kdelibs2/files/patch-global.cpp +++ b/x11/kdelibs2/files/patch-global.cpp @@ -1,5 +1,5 @@ ---- kio/global.cpp.orig Mon Sep 18 07:24:44 2000 -+++ kio/global.cpp Thu Nov 2 11:37:24 2000 +--- kio/global.cpp.orig Thu Dec 7 14:52:15 2000 ++++ kio/global.cpp Thu Dec 7 14:52:29 2000 @@ -28,6 +28,12 @@ #include <string.h> #include <unistd.h> @@ -52,4 +52,3 @@ return result; } - diff --git a/x11/kdelibs2/files/patch-kcharsets.cpp b/x11/kdelibs2/files/patch-kcharsets.cpp deleted file mode 100644 index 9d31d51..0000000 --- a/x11/kdelibs2/files/patch-kcharsets.cpp +++ /dev/null @@ -1,38 +0,0 @@ ---- kdecore/kcharsets.cpp.orig Mon Oct 16 19:06:25 2000 -+++ kdecore/kcharsets.cpp Wed Nov 22 14:30:14 2000 -@@ -66,7 +66,7 @@ - "set-gbk", - "set-zh", - "set-zh-tw", -- "set-big5", -+ "big5", - "tscii", - "utf-8", - "utf-16", -@@ -101,7 +101,7 @@ - "tis620.2533-1", - "gb2312.1980-0", - "gb2312.1980-0", -- "big5-0", -+ "cns11643.1986-*", - "big5-0", - "tscii-0", - "utf8", -@@ -136,8 +136,8 @@ - QFont::Set_Th_TH, - QFont::Set_GBK, - QFont::Set_Zh, -- QFont::Set_Big5, - QFont::Set_Zh_TW, -+ QFont::Set_Big5, - QFont::TSCII, - QFont::Unicode, - QFont::Unicode, -@@ -552,6 +552,7 @@ - case QFont::Set_Zh: - return "set-gbk"; - case QFont::Set_Zh_TW: -+ return "cns11643.1986-*"; - case QFont::Set_Big5: - return "big5-0"; - case QFont::AnyCharSet: diff --git a/x11/kdelibs2/pkg-plist b/x11/kdelibs2/pkg-plist index 92e2cb1..23caf2f 100644 --- a/x11/kdelibs2/pkg-plist +++ b/x11/kdelibs2/pkg-plist @@ -160,6 +160,7 @@ include/kdesu/defaults.h include/kdesu/kcookie.h include/kdesu/kdesu_pty.h include/kdesu/process.h +include/kdesu/pty.h include/kdesu/ssh.h include/kdesu/stub.h include/kdesu/su.h @@ -383,20 +384,6 @@ include/progressbase.h include/qconfigDB.h include/qxembed.h include/statusbarprogress.h -lib/Arts/Synth_ADD.mcopclass -lib/Arts/Synth_AMAN_PLAY.mcopclass -lib/Arts/Synth_AMAN_RECORD.mcopclass -lib/Arts/Synth_BUS_DOWNLINK.mcopclass -lib/Arts/Synth_BUS_UPLINK.mcopclass -lib/Arts/Synth_FREQUENCY.mcopclass -lib/Arts/Synth_MUL.mcopclass -lib/Arts/Synth_MULTI_ADD.mcopclass -lib/Arts/Synth_PLAY.mcopclass -lib/Arts/Synth_PLAY_WAV.mcopclass -lib/Arts/Synth_RECORD.mcopclass -lib/Arts/Synth_WAVE_SIN.mcopclass -lib/Arts/WavPlayObject.mcopclass -lib/Arts/X11GlobalComm.mcopclass lib/b3style.la lib/b3style.so lib/basicstyle.la @@ -480,7 +467,6 @@ lib/libkdeui.so.4 lib/libkfile.la lib/libkfile.so lib/libkfile.so.4 -lib/libkformula.so lib/libkhtml.la lib/libkhtml.so lib/libkhtml.so.4 @@ -526,6 +512,20 @@ lib/libsoundserver_idl.so.0 lib/libx11globalcomm.la lib/libx11globalcomm.so lib/libx11globalcomm.so.0 +lib/mcop/Arts/Synth_ADD.mcopclass +lib/mcop/Arts/Synth_AMAN_PLAY.mcopclass +lib/mcop/Arts/Synth_AMAN_RECORD.mcopclass +lib/mcop/Arts/Synth_BUS_DOWNLINK.mcopclass +lib/mcop/Arts/Synth_BUS_UPLINK.mcopclass +lib/mcop/Arts/Synth_FREQUENCY.mcopclass +lib/mcop/Arts/Synth_MUL.mcopclass +lib/mcop/Arts/Synth_MULTI_ADD.mcopclass +lib/mcop/Arts/Synth_PLAY.mcopclass +lib/mcop/Arts/Synth_PLAY_WAV.mcopclass +lib/mcop/Arts/Synth_RECORD.mcopclass +lib/mcop/Arts/Synth_WAVE_SIN.mcopclass +lib/mcop/Arts/WavPlayObject.mcopclass +lib/mcop/Arts/X11GlobalComm.mcopclass share/apps/LICENSES/ARTISTIC share/apps/LICENSES/BSD share/apps/LICENSES/GPL_V2 @@ -1087,6 +1087,7 @@ share/doc/HTML/en/common/warning.png share/doc/HTML/en/common/x11-licence.html share/doc/HTML/en/common/xml.dcl share/doc/HTML/en/kspell/.anchors +share/doc/HTML/en/kspell/common share/doc/HTML/en/kspell/configuration-dialog-.html share/doc/HTML/en/kspell/contact-information.html share/doc/HTML/en/kspell/encodings.html @@ -2094,6 +2095,7 @@ share/servicetypes/krop.desktop share/servicetypes/krwp.desktop share/servicetypes/ktexteditor.desktop share/servicetypes/kurifilterplugin.desktop +@dirrm share/doc/HTML/en/kspell @dirrm share/apps/kstyle/themes @dirrm share/apps/kstyle/pixmaps @dirrm share/apps/kstyle @@ -2152,18 +2154,30 @@ share/servicetypes/kurifilterplugin.desktop @dirrm share/apps/ksgmltools/ca/entities @dirrm share/apps/ksgmltools/ca @dirrm share/apps/ksgmltools +@dirrm share/apps/kssl @dirrm share/apps/kjava @dirrm share/apps/kio_uiserver/icons/locolor/16x16/apps +@dirrm share/apps/kio_uiserver/icons/locolor/16x16 +@dirrm share/apps/kio_uiserver/icons/locolor +@dirrm share/apps/kio_uiserver/icons +@dirrm share/apps/kio_uiserver @dirrm share/apps/khtml/icons/locolor/16x16/actions +@dirrm share/apps/khtml/icons/locolor/16x16 +@dirrm share/apps/khtml/icons/locolor @dirrm share/apps/khtml/icons/hicolor/32x32/actions +@dirrm share/apps/khtml/icons/hicolor/32x32 @dirrm share/apps/khtml/icons/hicolor/22x22/actions +@dirrm share/apps/khtml/icons/hicolor/22x22 +@dirrm share/apps/khtml/icons/hicolor +@dirrm share/apps/khtml/icons @dirrm share/apps/khtml/css @dirrm share/apps/khtml @dirrm share/apps/kdeui/pics @dirrm share/apps/kdeui @dirrm share/apps/kab @dirrm share/apps/LICENSES -@dirrm lib/Arts +@dirrm lib/mcop/Arts +@dirrm lib/mcop @dirrm include/libkmid @dirrm include/kparts @dirrm include/kjs diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 90ad5e7..2c79caa 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -6,16 +6,14 @@ # PORTNAME= kdelibs -PORTVERSION= 2.0 +PORTVERSION= 2.0.1 CATEGORIES= x11 x11-toolkits MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= kevlo@FreeBSD.org -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - png.4:${PORTSDIR}/graphics/png \ - tiff.4:${PORTSDIR}/graphics/tiff \ +LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ audiofile.0:${PORTSDIR}/audio/libaudiofile \ mimelib.3:${PORTSDIR}/converters/kdesupport2 @@ -28,8 +26,7 @@ USE_BZIP2= yes USE_NEWGCC= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} --enable-shared \ - --with-qt-includes=${X11BASE}/include/qt2 \ +CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \ diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo index c7a142a..763aa8c 100644 --- a/x11/kdelibs3/distinfo +++ b/x11/kdelibs3/distinfo @@ -1 +1 @@ -MD5 (kdelibs-2.0.tar.bz2) = 7376ddd726b8f77223bf08a7de2dfb3d +MD5 (kdelibs-2.0.1.tar.bz2) = 563d6b24a216a32be2f55f5b1c14e14c diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist index 92e2cb1..23caf2f 100644 --- a/x11/kdelibs3/pkg-plist +++ b/x11/kdelibs3/pkg-plist @@ -160,6 +160,7 @@ include/kdesu/defaults.h include/kdesu/kcookie.h include/kdesu/kdesu_pty.h include/kdesu/process.h +include/kdesu/pty.h include/kdesu/ssh.h include/kdesu/stub.h include/kdesu/su.h @@ -383,20 +384,6 @@ include/progressbase.h include/qconfigDB.h include/qxembed.h include/statusbarprogress.h -lib/Arts/Synth_ADD.mcopclass -lib/Arts/Synth_AMAN_PLAY.mcopclass -lib/Arts/Synth_AMAN_RECORD.mcopclass -lib/Arts/Synth_BUS_DOWNLINK.mcopclass -lib/Arts/Synth_BUS_UPLINK.mcopclass -lib/Arts/Synth_FREQUENCY.mcopclass -lib/Arts/Synth_MUL.mcopclass -lib/Arts/Synth_MULTI_ADD.mcopclass -lib/Arts/Synth_PLAY.mcopclass -lib/Arts/Synth_PLAY_WAV.mcopclass -lib/Arts/Synth_RECORD.mcopclass -lib/Arts/Synth_WAVE_SIN.mcopclass -lib/Arts/WavPlayObject.mcopclass -lib/Arts/X11GlobalComm.mcopclass lib/b3style.la lib/b3style.so lib/basicstyle.la @@ -480,7 +467,6 @@ lib/libkdeui.so.4 lib/libkfile.la lib/libkfile.so lib/libkfile.so.4 -lib/libkformula.so lib/libkhtml.la lib/libkhtml.so lib/libkhtml.so.4 @@ -526,6 +512,20 @@ lib/libsoundserver_idl.so.0 lib/libx11globalcomm.la lib/libx11globalcomm.so lib/libx11globalcomm.so.0 +lib/mcop/Arts/Synth_ADD.mcopclass +lib/mcop/Arts/Synth_AMAN_PLAY.mcopclass +lib/mcop/Arts/Synth_AMAN_RECORD.mcopclass +lib/mcop/Arts/Synth_BUS_DOWNLINK.mcopclass +lib/mcop/Arts/Synth_BUS_UPLINK.mcopclass +lib/mcop/Arts/Synth_FREQUENCY.mcopclass +lib/mcop/Arts/Synth_MUL.mcopclass +lib/mcop/Arts/Synth_MULTI_ADD.mcopclass +lib/mcop/Arts/Synth_PLAY.mcopclass +lib/mcop/Arts/Synth_PLAY_WAV.mcopclass +lib/mcop/Arts/Synth_RECORD.mcopclass +lib/mcop/Arts/Synth_WAVE_SIN.mcopclass +lib/mcop/Arts/WavPlayObject.mcopclass +lib/mcop/Arts/X11GlobalComm.mcopclass share/apps/LICENSES/ARTISTIC share/apps/LICENSES/BSD share/apps/LICENSES/GPL_V2 @@ -1087,6 +1087,7 @@ share/doc/HTML/en/common/warning.png share/doc/HTML/en/common/x11-licence.html share/doc/HTML/en/common/xml.dcl share/doc/HTML/en/kspell/.anchors +share/doc/HTML/en/kspell/common share/doc/HTML/en/kspell/configuration-dialog-.html share/doc/HTML/en/kspell/contact-information.html share/doc/HTML/en/kspell/encodings.html @@ -2094,6 +2095,7 @@ share/servicetypes/krop.desktop share/servicetypes/krwp.desktop share/servicetypes/ktexteditor.desktop share/servicetypes/kurifilterplugin.desktop +@dirrm share/doc/HTML/en/kspell @dirrm share/apps/kstyle/themes @dirrm share/apps/kstyle/pixmaps @dirrm share/apps/kstyle @@ -2152,18 +2154,30 @@ share/servicetypes/kurifilterplugin.desktop @dirrm share/apps/ksgmltools/ca/entities @dirrm share/apps/ksgmltools/ca @dirrm share/apps/ksgmltools +@dirrm share/apps/kssl @dirrm share/apps/kjava @dirrm share/apps/kio_uiserver/icons/locolor/16x16/apps +@dirrm share/apps/kio_uiserver/icons/locolor/16x16 +@dirrm share/apps/kio_uiserver/icons/locolor +@dirrm share/apps/kio_uiserver/icons +@dirrm share/apps/kio_uiserver @dirrm share/apps/khtml/icons/locolor/16x16/actions +@dirrm share/apps/khtml/icons/locolor/16x16 +@dirrm share/apps/khtml/icons/locolor @dirrm share/apps/khtml/icons/hicolor/32x32/actions +@dirrm share/apps/khtml/icons/hicolor/32x32 @dirrm share/apps/khtml/icons/hicolor/22x22/actions +@dirrm share/apps/khtml/icons/hicolor/22x22 +@dirrm share/apps/khtml/icons/hicolor +@dirrm share/apps/khtml/icons @dirrm share/apps/khtml/css @dirrm share/apps/khtml @dirrm share/apps/kdeui/pics @dirrm share/apps/kdeui @dirrm share/apps/kab @dirrm share/apps/LICENSES -@dirrm lib/Arts +@dirrm lib/mcop/Arts +@dirrm lib/mcop @dirrm include/libkmid @dirrm include/kparts @dirrm include/kjs diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 90ad5e7..2c79caa 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -6,16 +6,14 @@ # PORTNAME= kdelibs -PORTVERSION= 2.0 +PORTVERSION= 2.0.1 CATEGORIES= x11 x11-toolkits MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src MAINTAINER= kevlo@FreeBSD.org -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - png.4:${PORTSDIR}/graphics/png \ - tiff.4:${PORTSDIR}/graphics/tiff \ +LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ audiofile.0:${PORTSDIR}/audio/libaudiofile \ mimelib.3:${PORTSDIR}/converters/kdesupport2 @@ -28,8 +26,7 @@ USE_BZIP2= yes USE_NEWGCC= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} --enable-shared \ - --with-qt-includes=${X11BASE}/include/qt2 \ +CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \ diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo index c7a142a..763aa8c 100644 --- a/x11/kdelibs4/distinfo +++ b/x11/kdelibs4/distinfo @@ -1 +1 @@ -MD5 (kdelibs-2.0.tar.bz2) = 7376ddd726b8f77223bf08a7de2dfb3d +MD5 (kdelibs-2.0.1.tar.bz2) = 563d6b24a216a32be2f55f5b1c14e14c diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist index 92e2cb1..23caf2f 100644 --- a/x11/kdelibs4/pkg-plist +++ b/x11/kdelibs4/pkg-plist @@ -160,6 +160,7 @@ include/kdesu/defaults.h include/kdesu/kcookie.h include/kdesu/kdesu_pty.h include/kdesu/process.h +include/kdesu/pty.h include/kdesu/ssh.h include/kdesu/stub.h include/kdesu/su.h @@ -383,20 +384,6 @@ include/progressbase.h include/qconfigDB.h include/qxembed.h include/statusbarprogress.h -lib/Arts/Synth_ADD.mcopclass -lib/Arts/Synth_AMAN_PLAY.mcopclass -lib/Arts/Synth_AMAN_RECORD.mcopclass -lib/Arts/Synth_BUS_DOWNLINK.mcopclass -lib/Arts/Synth_BUS_UPLINK.mcopclass -lib/Arts/Synth_FREQUENCY.mcopclass -lib/Arts/Synth_MUL.mcopclass -lib/Arts/Synth_MULTI_ADD.mcopclass -lib/Arts/Synth_PLAY.mcopclass -lib/Arts/Synth_PLAY_WAV.mcopclass -lib/Arts/Synth_RECORD.mcopclass -lib/Arts/Synth_WAVE_SIN.mcopclass -lib/Arts/WavPlayObject.mcopclass -lib/Arts/X11GlobalComm.mcopclass lib/b3style.la lib/b3style.so lib/basicstyle.la @@ -480,7 +467,6 @@ lib/libkdeui.so.4 lib/libkfile.la lib/libkfile.so lib/libkfile.so.4 -lib/libkformula.so lib/libkhtml.la lib/libkhtml.so lib/libkhtml.so.4 @@ -526,6 +512,20 @@ lib/libsoundserver_idl.so.0 lib/libx11globalcomm.la lib/libx11globalcomm.so lib/libx11globalcomm.so.0 +lib/mcop/Arts/Synth_ADD.mcopclass +lib/mcop/Arts/Synth_AMAN_PLAY.mcopclass +lib/mcop/Arts/Synth_AMAN_RECORD.mcopclass +lib/mcop/Arts/Synth_BUS_DOWNLINK.mcopclass +lib/mcop/Arts/Synth_BUS_UPLINK.mcopclass +lib/mcop/Arts/Synth_FREQUENCY.mcopclass +lib/mcop/Arts/Synth_MUL.mcopclass +lib/mcop/Arts/Synth_MULTI_ADD.mcopclass +lib/mcop/Arts/Synth_PLAY.mcopclass +lib/mcop/Arts/Synth_PLAY_WAV.mcopclass +lib/mcop/Arts/Synth_RECORD.mcopclass +lib/mcop/Arts/Synth_WAVE_SIN.mcopclass +lib/mcop/Arts/WavPlayObject.mcopclass +lib/mcop/Arts/X11GlobalComm.mcopclass share/apps/LICENSES/ARTISTIC share/apps/LICENSES/BSD share/apps/LICENSES/GPL_V2 @@ -1087,6 +1087,7 @@ share/doc/HTML/en/common/warning.png share/doc/HTML/en/common/x11-licence.html share/doc/HTML/en/common/xml.dcl share/doc/HTML/en/kspell/.anchors +share/doc/HTML/en/kspell/common share/doc/HTML/en/kspell/configuration-dialog-.html share/doc/HTML/en/kspell/contact-information.html share/doc/HTML/en/kspell/encodings.html @@ -2094,6 +2095,7 @@ share/servicetypes/krop.desktop share/servicetypes/krwp.desktop share/servicetypes/ktexteditor.desktop share/servicetypes/kurifilterplugin.desktop +@dirrm share/doc/HTML/en/kspell @dirrm share/apps/kstyle/themes @dirrm share/apps/kstyle/pixmaps @dirrm share/apps/kstyle @@ -2152,18 +2154,30 @@ share/servicetypes/kurifilterplugin.desktop @dirrm share/apps/ksgmltools/ca/entities @dirrm share/apps/ksgmltools/ca @dirrm share/apps/ksgmltools +@dirrm share/apps/kssl @dirrm share/apps/kjava @dirrm share/apps/kio_uiserver/icons/locolor/16x16/apps +@dirrm share/apps/kio_uiserver/icons/locolor/16x16 +@dirrm share/apps/kio_uiserver/icons/locolor +@dirrm share/apps/kio_uiserver/icons +@dirrm share/apps/kio_uiserver @dirrm share/apps/khtml/icons/locolor/16x16/actions +@dirrm share/apps/khtml/icons/locolor/16x16 +@dirrm share/apps/khtml/icons/locolor @dirrm share/apps/khtml/icons/hicolor/32x32/actions +@dirrm share/apps/khtml/icons/hicolor/32x32 @dirrm share/apps/khtml/icons/hicolor/22x22/actions +@dirrm share/apps/khtml/icons/hicolor/22x22 +@dirrm share/apps/khtml/icons/hicolor +@dirrm share/apps/khtml/icons @dirrm share/apps/khtml/css @dirrm share/apps/khtml @dirrm share/apps/kdeui/pics @dirrm share/apps/kdeui @dirrm share/apps/kab @dirrm share/apps/LICENSES -@dirrm lib/Arts +@dirrm lib/mcop/Arts +@dirrm lib/mcop @dirrm include/libkmid @dirrm include/kparts @dirrm include/kjs |
