diff options
author | skrll <skrll@pkgsrc.org> | 2003-01-20 10:03:40 +0000 |
---|---|---|
committer | skrll <skrll@pkgsrc.org> | 2003-01-20 10:03:40 +0000 |
commit | 55966f3f8441576d4c8ac402e42f81a73587c4fa (patch) | |
tree | 281d4eb4b00f6fc47b7b11e966102e98cddc72a2 /x11 | |
parent | f05976d42617e7ea6d8f6f57b9553b5b0aa6ecad (diff) | |
download | pkgsrc-55966f3f8441576d4c8ac402e42f81a73587c4fa.tar.gz |
The result of my recent KDE fiddlings
- Build all packages with a --disable-static libtool. This is how the
packages should be built and means that we don't get a load of useless
static libraries.
- Use x11/kde3/files/foo_main.cpp instead of creating N copies with
patches.
- Some other PLIST fixes
- Fix PR 19848. kspell doesn't find dictionaries.
Diffstat (limited to 'x11')
41 files changed, 94 insertions, 1282 deletions
diff --git a/x11/kde3/Makefile.foo_main b/x11/kde3/Makefile.foo_main new file mode 100644 index 00000000000..d0cd734cdaf --- /dev/null +++ b/x11/kde3/Makefile.foo_main @@ -0,0 +1,11 @@ +# $NetBSD: Makefile.foo_main,v 1.1 2003/01/20 10:04:01 skrll Exp $ +# +# This Makefile fragment is included in a KDE package Makefile to +# create foo_main.cpp files needed to fix the linking modules into +# binaries/libraries problem that affects a.out platforms. + +post-patch: + @for f in ${FOO_MAIN_FILES}; do \ + ${LN} -s ${.CURDIR}/../../x11/kde3/files/foo_main.cpp \ + ${WRKSRC}/$${f}; \ + done diff --git a/x11/kde3/Makefile.kde3 b/x11/kde3/Makefile.kde3 index fb8c2d3bb5a..29cf71ab29e 100644 --- a/x11/kde3/Makefile.kde3 +++ b/x11/kde3/Makefile.kde3 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.kde3,v 1.7 2003/01/02 23:17:58 wiz Exp $ +# $NetBSD: Makefile.kde3,v 1.8 2003/01/20 10:04:01 skrll Exp $ # # This Makefile fragment is included at the top of package Makefiles for # KDE3-distributed packages (they all share common configure and build @@ -18,4 +18,4 @@ HOMEPAGE?= http://www.kde.org/ USE_GMAKE= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index c7846709cd3..31e52048846 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2003/01/19 09:35:26 skrll Exp $ +# $NetBSD: Makefile,v 1.15 2003/01/20 10:04:02 skrll Exp $ DISTNAME= kdebase-3.0.5a PKGREVISION= 2 @@ -56,6 +56,31 @@ PLIST_SRC+= ${PKGDIR}/PLIST ICONDIR= share/kde/icons +FOO_MAIN_FILES= \ + kate/app/dummy_main.cpp \ + kcontrol/access/kaccess_main.cpp \ + kcontrol/kcontrol/kcminit_main.cpp \ + kcontrol/kcontrol/kcmshell_main.cpp \ + kcontrol/kcontrol/kcontrol_main.cpp \ + kdeprint/kjobviewer/kjobviewer_main.cpp \ + kdesktop/kdesktop_main.cc \ + khotkeys/khotkeys/khotkeys_main.cpp \ + kicker/kicker_main.cpp \ + kicker/proxy/appletproxy_main.cpp \ + kicker/proxy/extensionproxy_main.cpp \ + klipper/klipper_main.cpp \ + kmenuedit/kmenuedit_main.cpp \ + konqueror/client/kfmclient_main.cc \ + konqueror/keditbookmarks/keditbookmarks_main.cpp \ + konqueror/konqueror_main.cc \ + konsole/konsole/konsole_main.cpp \ + konsole/konsole/kwrited_main.cpp \ + ksmserver/ksmserver_main.cpp \ + kxkb/kxkb_main.cpp \ + legacyimport/klegacyimport_main.cpp + +.include "../../x11/kde3/Makefile.foo_main" + # Several programs need to be setuid-root, but due to the way that KDE3 # finds executables, the files must have their read bit set so that # KStandardDir::findResource() will find them. diff --git a/x11/kdebase3/PLIST b/x11/kdebase3/PLIST index b22e2c9bb05..78924c0a43a 100644 --- a/x11/kdebase3/PLIST +++ b/x11/kdebase3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2002/12/09 16:01:58 tron Exp $ +@comment $NetBSD: PLIST,v 1.8 2003/01/20 10:04:02 skrll Exp $ bin/appletproxy bin/chooser bin/conttest @@ -106,595 +106,425 @@ include/kwin/client.h include/kwin/kwinbutton.h include/kwin/options.h include/kwin/workspace.h -lib/appletproxy.a lib/appletproxy.la lib/appletproxy.so -lib/extensionproxy.a lib/extensionproxy.la lib/extensionproxy.so -lib/kaccess.a lib/kaccess.la lib/kaccess.so -lib/kate.a lib/kate.la lib/kate.so -lib/kcminit.a lib/kcminit.la lib/kcminit.so -lib/kcmshell.a lib/kcmshell.la lib/kcmshell.so -lib/kcontrol.a lib/kcontrol.la lib/kcontrol.so -lib/kde3/childpanel_panelextension.a lib/kde3/childpanel_panelextension.la lib/kde3/childpanel_panelextension.so lib/kde3/childpanel_panelextension.so.1 lib/kde3/childpanel_panelextension.so.1.0 -lib/kde3/clock_panelapplet.a lib/kde3/clock_panelapplet.la lib/kde3/clock_panelapplet.so lib/kde3/clock_panelapplet.so.1 lib/kde3/clock_panelapplet.so.1.0 -lib/kde3/dockbar_panelextension.a lib/kde3/dockbar_panelextension.la lib/kde3/dockbar_panelextension.so lib/kde3/dockbar_panelextension.so.1 lib/kde3/dockbar_panelextension.so.1.0 -lib/kde3/gsthumbnail.a lib/kde3/gsthumbnail.la lib/kde3/gsthumbnail.so -lib/kde3/htmlthumbnail.a lib/kde3/htmlthumbnail.la lib/kde3/htmlthumbnail.so -lib/kde3/imagethumbnail.a lib/kde3/imagethumbnail.la lib/kde3/imagethumbnail.so -lib/kde3/kasbar_panelextension.a lib/kde3/kasbar_panelextension.la lib/kde3/kasbar_panelextension.so lib/kde3/kasbar_panelextension.so.1 lib/kde3/kasbar_panelextension.so.1.0 -lib/kde3/kcm_access.a lib/kde3/kcm_access.la lib/kde3/kcm_access.so -lib/kde3/kcm_arts.a lib/kde3/kcm_arts.la lib/kde3/kcm_arts.so -lib/kde3/kcm_background.a lib/kde3/kcm_background.la lib/kde3/kcm_background.so -lib/kde3/kcm_bell.a lib/kde3/kcm_bell.la lib/kde3/kcm_bell.so -lib/kde3/kcm_clock.a lib/kde3/kcm_clock.la lib/kde3/kcm_clock.so -lib/kde3/kcm_colors.a lib/kde3/kcm_colors.la lib/kde3/kcm_colors.so -lib/kde3/kcm_crypto.a lib/kde3/kcm_crypto.la lib/kde3/kcm_crypto.so -lib/kde3/kcm_css.a lib/kde3/kcm_css.la lib/kde3/kcm_css.so -lib/kde3/kcm_email.a lib/kde3/kcm_email.la lib/kde3/kcm_email.so -lib/kde3/kcm_energy.a lib/kde3/kcm_energy.la lib/kde3/kcm_energy.so -lib/kde3/kcm_filetypes.a lib/kde3/kcm_filetypes.la lib/kde3/kcm_filetypes.so -lib/kde3/kcm_fontinst.a lib/kde3/kcm_fontinst.la lib/kde3/kcm_fontinst.so -lib/kde3/kcm_fonts.a lib/kde3/kcm_fonts.la lib/kde3/kcm_fonts.so -lib/kde3/kcm_icons.a lib/kde3/kcm_icons.la lib/kde3/kcm_icons.so -lib/kde3/kcm_info.a lib/kde3/kcm_info.la lib/kde3/kcm_info.so -lib/kde3/kcm_input.a lib/kde3/kcm_input.la lib/kde3/kcm_input.so -lib/kde3/kcm_ioslaveinfo.a lib/kde3/kcm_ioslaveinfo.la lib/kde3/kcm_ioslaveinfo.so -lib/kde3/kcm_kdm.a lib/kde3/kcm_kdm.la lib/kde3/kcm_kdm.so -lib/kde3/kcm_keyboard.a lib/kde3/kcm_keyboard.la lib/kde3/kcm_keyboard.so -lib/kde3/kcm_keys.a lib/kde3/kcm_keys.la lib/kde3/kcm_keys.so -lib/kde3/kcm_khotkeys.a lib/kde3/kcm_khotkeys.la lib/kde3/kcm_khotkeys.so -lib/kde3/kcm_kicker.a lib/kde3/kcm_kicker.la lib/kde3/kcm_kicker.so -lib/kde3/kcm_kio.a lib/kde3/kcm_kio.la lib/kde3/kcm_kio.so -lib/kde3/kcm_knotify.a lib/kde3/kcm_knotify.la lib/kde3/kcm_knotify.so -lib/kde3/kcm_konq.a lib/kde3/kcm_konq.la lib/kde3/kcm_konq.so -lib/kde3/kcm_konqhtml.a lib/kde3/kcm_konqhtml.la lib/kde3/kcm_konqhtml.so -lib/kde3/kcm_konsole.a lib/kde3/kcm_konsole.la lib/kde3/kcm_konsole.so -lib/kde3/kcm_kurifilt.a lib/kde3/kcm_kurifilt.la lib/kde3/kcm_kurifilt.so -lib/kde3/kcm_kwindecoration.a lib/kde3/kcm_kwindecoration.la lib/kde3/kcm_kwindecoration.so -lib/kde3/kcm_kwinoptions.a lib/kde3/kcm_kwinoptions.la lib/kde3/kcm_kwinoptions.so -lib/kde3/kcm_launch.a lib/kde3/kcm_launch.la lib/kde3/kcm_launch.so -lib/kde3/kcm_locale.a lib/kde3/kcm_locale.la lib/kde3/kcm_locale.so -lib/kde3/kcm_midi.a lib/kde3/kcm_midi.la lib/kde3/kcm_midi.so -lib/kde3/kcm_nic.a lib/kde3/kcm_nic.la lib/kde3/kcm_nic.so -lib/kde3/kcm_passwords.a lib/kde3/kcm_passwords.la lib/kde3/kcm_passwords.so -lib/kde3/kcm_printmgr.a lib/kde3/kcm_printmgr.la lib/kde3/kcm_printmgr.so -lib/kde3/kcm_samba.a lib/kde3/kcm_samba.la lib/kde3/kcm_samba.so -lib/kde3/kcm_screensaver.a lib/kde3/kcm_screensaver.la lib/kde3/kcm_screensaver.so -lib/kde3/kcm_smserver.a lib/kde3/kcm_smserver.la lib/kde3/kcm_smserver.so -lib/kde3/kcm_socks.a lib/kde3/kcm_socks.la lib/kde3/kcm_socks.so -lib/kde3/kcm_spellchecking.a lib/kde3/kcm_spellchecking.la lib/kde3/kcm_spellchecking.so -lib/kde3/kcm_style.a lib/kde3/kcm_style.la lib/kde3/kcm_style.so -lib/kde3/kcm_taskbar.a lib/kde3/kcm_taskbar.la lib/kde3/kcm_taskbar.so -lib/kde3/kcm_themes.a lib/kde3/kcm_themes.la lib/kde3/kcm_themes.so -lib/kde3/kcm_usb.a lib/kde3/kcm_usb.la lib/kde3/kcm_usb.so -lib/kde3/kded_favicons.a lib/kde3/kded_favicons.la lib/kde3/kded_favicons.so -lib/kde3/khelpcenter.a lib/kde3/khelpcenter.la lib/kde3/khelpcenter.so -lib/kde3/kickermenu_kdeprint.a lib/kde3/kickermenu_kdeprint.la lib/kde3/kickermenu_kdeprint.so -lib/kde3/kio_filter.a lib/kde3/kio_filter.la lib/kde3/kio_filter.so -lib/kde3/kio_finger.a lib/kde3/kio_finger.la lib/kde3/kio_finger.so -lib/kde3/kio_floppy.a lib/kde3/kio_floppy.la lib/kde3/kio_floppy.so -lib/kde3/kio_imap4.a lib/kde3/kio_imap4.la lib/kde3/kio_imap4.so -lib/kde3/kio_info.a lib/kde3/kio_info.la lib/kde3/kio_info.so -lib/kde3/kio_ldap.a lib/kde3/kio_ldap.la lib/kde3/kio_ldap.so -lib/kde3/kio_man.a lib/kde3/kio_man.la lib/kde3/kio_man.so -lib/kde3/kio_nfs.a lib/kde3/kio_nfs.la lib/kde3/kio_nfs.so -lib/kde3/kio_nntp.a lib/kde3/kio_nntp.la lib/kde3/kio_nntp.so -lib/kde3/kio_pop3.a lib/kde3/kio_pop3.la lib/kde3/kio_pop3.so -lib/kde3/kio_print.a lib/kde3/kio_print.la lib/kde3/kio_print.so -lib/kde3/kio_sftp.a lib/kde3/kio_sftp.la lib/kde3/kio_sftp.so -lib/kde3/kio_smb.a lib/kde3/kio_smb.la lib/kde3/kio_smb.so -lib/kde3/kio_smtp.a lib/kde3/kio_smtp.la lib/kde3/kio_smtp.so -lib/kde3/kio_tar.a lib/kde3/kio_tar.la lib/kde3/kio_tar.so -lib/kde3/kio_thumbnail.a lib/kde3/kio_thumbnail.la lib/kde3/kio_thumbnail.so -lib/kde3/klipper_panelapplet.a lib/kde3/klipper_panelapplet.la lib/kde3/klipper_panelapplet.so -lib/kde3/konq_aboutpage.a lib/kde3/konq_aboutpage.la lib/kde3/konq_aboutpage.so -lib/kde3/konq_iconview.a lib/kde3/konq_iconview.la lib/kde3/konq_iconview.so -lib/kde3/konq_listview.a lib/kde3/konq_listview.la lib/kde3/konq_listview.so -lib/kde3/konq_shellcmdplugin.a lib/kde3/konq_shellcmdplugin.la lib/kde3/konq_shellcmdplugin.so -lib/kde3/konq_sidebar.a lib/kde3/konq_sidebar.la lib/kde3/konq_sidebar.so -lib/kde3/konq_sidebartree_bookmarks.a lib/kde3/konq_sidebartree_bookmarks.la lib/kde3/konq_sidebartree_bookmarks.so -lib/kde3/konq_sidebartree_dirtree.a lib/kde3/konq_sidebartree_dirtree.la lib/kde3/konq_sidebartree_dirtree.so -lib/kde3/konq_sidebartree_history.a lib/kde3/konq_sidebartree_history.la lib/kde3/konq_sidebartree_history.so -lib/kde3/konq_sound.a lib/kde3/konq_sound.la lib/kde3/konq_sound.so -lib/kde3/konqsidebar_tree.a lib/kde3/konqsidebar_tree.la lib/kde3/konqsidebar_tree.so -lib/kde3/kwin_b2.a lib/kde3/kwin_b2.la lib/kde3/kwin_b2.so -lib/kde3/kwin_b2_config.a lib/kde3/kwin_b2_config.la lib/kde3/kwin_b2_config.so -lib/kde3/kwin_default.a lib/kde3/kwin_default.la lib/kde3/kwin_default.so -lib/kde3/kwin_default_config.a lib/kde3/kwin_default_config.la lib/kde3/kwin_default_config.so -lib/kde3/kwin_icewm.a lib/kde3/kwin_icewm.la lib/kde3/kwin_icewm.so -lib/kde3/kwin_icewm_config.a lib/kde3/kwin_icewm_config.la lib/kde3/kwin_icewm_config.so -lib/kde3/kwin_kde1.a lib/kde3/kwin_kde1.la lib/kde3/kwin_kde1.so -lib/kde3/kwin_kstep.a lib/kde3/kwin_kstep.la lib/kde3/kwin_kstep.so -lib/kde3/kwin_kwmtheme.a lib/kde3/kwin_kwmtheme.la lib/kde3/kwin_kwmtheme.so -lib/kde3/kwin_laptop.a lib/kde3/kwin_laptop.la lib/kde3/kwin_laptop.so -lib/kde3/kwin_modernsys.a lib/kde3/kwin_modernsys.la lib/kde3/kwin_modernsys.so -lib/kde3/kwin_modernsys_config.a lib/kde3/kwin_modernsys_config.la lib/kde3/kwin_modernsys_config.so -lib/kde3/kwin_quartz.a lib/kde3/kwin_quartz.la lib/kde3/kwin_quartz.so -lib/kde3/kwin_quartz_config.a lib/kde3/kwin_quartz_config.la lib/kde3/kwin_quartz_config.so -lib/kde3/kwin_redmond.a lib/kde3/kwin_redmond.la lib/kde3/kwin_redmond.so -lib/kde3/kwin_riscos.a lib/kde3/kwin_riscos.la lib/kde3/kwin_riscos.so -lib/kde3/kwin_system.a lib/kde3/kwin_system.la lib/kde3/kwin_system.so -lib/kde3/kwin_web.a lib/kde3/kwin_web.la lib/kde3/kwin_web.so -lib/kde3/launcher_panelapplet.a lib/kde3/launcher_panelapplet.la lib/kde3/launcher_panelapplet.so lib/kde3/launcher_panelapplet.so.1 lib/kde3/launcher_panelapplet.so.1.0 -lib/kde3/libkdeprint_part.a lib/kde3/libkdeprint_part.la lib/kde3/libkdeprint_part.so -lib/kde3/libkhelpcenterpart.a lib/kde3/libkhelpcenterpart.la lib/kde3/libkhelpcenterpart.so -lib/kde3/libkshorturifilter.a lib/kde3/libkshorturifilter.la lib/kde3/libkshorturifilter.so -lib/kde3/libkuriikwsfilter.a lib/kde3/libkuriikwsfilter.la lib/kde3/libkuriikwsfilter.so -lib/kde3/libkurisearchfilter.a lib/kde3/libkurisearchfilter.la lib/kde3/libkurisearchfilter.so -lib/kde3/lockout_panelapplet.a lib/kde3/lockout_panelapplet.la lib/kde3/lockout_panelapplet.so lib/kde3/lockout_panelapplet.so.0 lib/kde3/lockout_panelapplet.so.0.0 -lib/kde3/minipager_panelapplet.a lib/kde3/minipager_panelapplet.la lib/kde3/minipager_panelapplet.so lib/kde3/minipager_panelapplet.so.1 lib/kde3/minipager_panelapplet.so.1.0 -lib/kde3/naughty_panelapplet.a lib/kde3/naughty_panelapplet.la lib/kde3/naughty_panelapplet.so lib/kde3/naughty_panelapplet.so.1 lib/kde3/naughty_panelapplet.so.1.0 -lib/kde3/run_panelapplet.a lib/kde3/run_panelapplet.la lib/kde3/run_panelapplet.so lib/kde3/run_panelapplet.so.1 lib/kde3/run_panelapplet.so.1.0 -lib/kde3/sysguard_panelapplet.a lib/kde3/sysguard_panelapplet.la lib/kde3/sysguard_panelapplet.so lib/kde3/sysguard_panelapplet.so.1 lib/kde3/sysguard_panelapplet.so.1.0 -lib/kde3/systemtray_panelapplet.a lib/kde3/systemtray_panelapplet.la lib/kde3/systemtray_panelapplet.so lib/kde3/systemtray_panelapplet.so.1 lib/kde3/systemtray_panelapplet.so.1.0 -lib/kde3/taskbar_panelapplet.a lib/kde3/taskbar_panelapplet.la lib/kde3/taskbar_panelapplet.so lib/kde3/taskbar_panelapplet.so.1 lib/kde3/taskbar_panelapplet.so.1.0 -lib/kde3/taskbar_panelextension.a lib/kde3/taskbar_panelextension.la lib/kde3/taskbar_panelextension.so lib/kde3/taskbar_panelextension.so.1 lib/kde3/taskbar_panelextension.so.1.0 -lib/kde3/textthumbnail.a lib/kde3/textthumbnail.la lib/kde3/textthumbnail.so -lib/kdesktop.a lib/kdesktop.la lib/kdesktop.so -lib/keditbookmarks.a lib/keditbookmarks.la lib/keditbookmarks.so -lib/kfmclient.a lib/kfmclient.la lib/kfmclient.so -lib/khotkeys.a lib/khotkeys.la lib/khotkeys.so -lib/kicker.a lib/kicker.la lib/kicker.so -lib/kjobviewer.a lib/kjobviewer.la lib/kjobviewer.so -lib/klipper.a lib/klipper.la lib/klipper.so -lib/kmenuedit.a lib/kmenuedit.la lib/kmenuedit.so -lib/konqueror.a lib/konqueror.la lib/konqueror.so -lib/konsole.a lib/konsole.la lib/konsole.so -lib/ksmserver.a lib/ksmserver.la lib/ksmserver.so -lib/kwin.a lib/kwin.la lib/kwin.so -lib/kwrite.a lib/kwrite.la lib/kwrite.so -lib/kwrited.a lib/kwrited.la lib/kwrited.so -lib/kxkb.a lib/kxkb.la lib/kxkb.so -lib/libappletproxy_main.a lib/libappletproxy_main.la lib/libappletproxy_main.so lib/libappletproxy_main.so.0 lib/libappletproxy_main.so.0.0 lib/libccont.a -lib/libextensionproxy_main.a lib/libextensionproxy_main.la lib/libextensionproxy_main.so lib/libextensionproxy_main.so.0 lib/libextensionproxy_main.so.0.0 -lib/libkaccess_main.a lib/libkaccess_main.la lib/libkaccess_main.so lib/libkaccess_main.so.0 lib/libkaccess_main.so.0.0 -lib/libkate_main.a lib/libkate_main.la lib/libkate_main.so lib/libkate_main.so.0 lib/libkate_main.so.0.0 -lib/libkateinterfaces.a lib/libkateinterfaces.la lib/libkateinterfaces.so lib/libkateinterfaces.so.0 lib/libkateinterfaces.so.0.0 -lib/libkcminit_main.a lib/libkcminit_main.la lib/libkcminit_main.so lib/libkcminit_main.so.0 lib/libkcminit_main.so.0.0 -lib/libkcmshell_main.a lib/libkcmshell_main.la lib/libkcmshell_main.so lib/libkcmshell_main.so.0 lib/libkcmshell_main.so.0.0 -lib/libkcontrol_main.a lib/libkcontrol_main.la lib/libkcontrol_main.so lib/libkcontrol_main.so.0 lib/libkcontrol_main.so.0.0 -lib/libkdesktop_main.a lib/libkdesktop_main.la lib/libkdesktop_main.so lib/libkdesktop_main.so.0 lib/libkdesktop_main.so.0.0 -lib/libkeditbookmarks_main.a lib/libkeditbookmarks_main.la lib/libkeditbookmarks_main.so lib/libkeditbookmarks_main.so.0 lib/libkeditbookmarks_main.so.0.0 -lib/libkfindpart.a lib/libkfindpart.la lib/libkfindpart.so -lib/libkfmclient_main.a lib/libkfmclient_main.la lib/libkfmclient_main.so lib/libkfmclient_main.so.0 lib/libkfmclient_main.so.0.0 -lib/libkhotkeys_main.a lib/libkhotkeys_main.la lib/libkhotkeys_main.so lib/libkhotkeys_main.so.0 lib/libkhotkeys_main.so.0.0 -lib/libkicker_main.a lib/libkicker_main.la lib/libkicker_main.so -lib/libkickermain.a lib/libkickermain.la lib/libkickermain.so lib/libkickermain.so.1 lib/libkickermain.so.1.0 -lib/libkjobviewer_main.a lib/libkjobviewer_main.la lib/libkjobviewer_main.so lib/libkjobviewer_main.so.0 lib/libkjobviewer_main.so.0.0 -lib/libklipper_main.a lib/libklipper_main.la lib/libklipper_main.so lib/libklipper_main.so.0 lib/libklipper_main.so.0.0 -lib/libkmenuedit_main.a lib/libkmenuedit_main.la lib/libkmenuedit_main.so lib/libkmenuedit_main.so.0 lib/libkmenuedit_main.so.0.0 -lib/libkonq.a lib/libkonq.la lib/libkonq.so lib/libkonq.so.4 lib/libkonq.so.4.0 -lib/libkonq_sidebar_tree.a lib/libkonq_sidebar_tree.la lib/libkonq_sidebar_tree.so -lib/libkonqsidebarplugin.a lib/libkonqsidebarplugin.la lib/libkonqsidebarplugin.so lib/libkonqsidebarplugin.so.0 lib/libkonqsidebarplugin.so.0.0 -lib/libkonqueror_main.a lib/libkonqueror_main.la lib/libkonqueror_main.so -lib/libkonsole_main.a lib/libkonsole_main.la lib/libkonsole_main.so lib/libkonsole_main.so.0 lib/libkonsole_main.so.0.0 -lib/libkonsolepart.a lib/libkonsolepart.la lib/libkonsolepart.so -lib/libksgrd.a lib/libksgrd.la lib/libksgrd.so lib/libksgrd.so.0 lib/libksgrd.so.0.0 -lib/libksmserver_main.a lib/libksmserver_main.la lib/libksmserver_main.so lib/libksmserver_main.so.0 lib/libksmserver_main.so.0.0 -lib/libkwin.a lib/libkwin.la lib/libkwin.so lib/libkwin.so.0 lib/libkwin.so.0.0 -lib/libkwrite_main.a lib/libkwrite_main.la lib/libkwrite_main.so lib/libkwrite_main.so.0 lib/libkwrite_main.so.0.0 -lib/libkwrited_main.a lib/libkwrited_main.la lib/libkwrited_main.so lib/libkwrited_main.so.0 lib/libkwrited_main.so.0.0 -lib/libkxkb_main.a lib/libkxkb_main.la lib/libkxkb_main.so lib/libkxkb_main.so.0 lib/libkxkb_main.so.0.0 -lib/libsensordisplays.a lib/libsensordisplays.la lib/libsensordisplays.so lib/libsensordisplays.so.0 lib/libsensordisplays.so.0.0 -lib/libtaskbar.a lib/libtaskbar.la lib/libtaskbar.so lib/libtaskbar.so.1 lib/libtaskbar.so.1.0 -lib/libtaskmanager.a lib/libtaskmanager.la lib/libtaskmanager.so lib/libtaskmanager.so.1 diff --git a/x11/kdebase3/PLIST.nsplugins b/x11/kdebase3/PLIST.nsplugins index ddc08e3090f..855ca81667f 100644 --- a/x11/kdebase3/PLIST.nsplugins +++ b/x11/kdebase3/PLIST.nsplugins @@ -1,10 +1,8 @@ -@comment $NetBSD: PLIST.nsplugins,v 1.3 2002/11/08 10:10:18 skrll Exp $ +@comment $NetBSD: PLIST.nsplugins,v 1.4 2003/01/20 10:04:03 skrll Exp $ bin/nspluginscan bin/nspluginviewer -lib/kde3/libkcm_nsplugin.a lib/kde3/libkcm_nsplugin.la lib/kde3/libkcm_nsplugin.so -lib/libnsplugin.a lib/libnsplugin.la lib/libnsplugin.so lib/libnsplugin.so.1 diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo index 05545633097..b4564fe424e 100644 --- a/x11/kdebase3/distinfo +++ b/x11/kdebase3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2003/01/19 17:00:18 chris Exp $ +$NetBSD: distinfo,v 1.17 2003/01/20 10:04:03 skrll Exp $ SHA1 (kdebase-3.0.5a.tar.bz2) = 8d30538e4d84f805bffcd0eb6583f2fee5ce2da1 Size (kdebase-3.0.5a.tar.bz2) = 13117676 bytes @@ -9,37 +9,28 @@ Size (Daemon.README) = 2191 bytes SHA1 (patch-aa) = dfbbe1ab8010e17dacee5008b2f91822d98231f6 SHA1 (patch-ab) = 803bd6397d5cbc08f52cea51977cf62af0bfbd9e SHA1 (patch-ac) = 5ea63b6fb0562439742b3bc14418cc1230ef4e7b -SHA1 (patch-ad) = ea5e10b969d9b9d9f0db1a75b582d11bbc5efaf1 SHA1 (patch-ae) = 5ff81a4237c17c73e04d36519972b167638b4fdd SHA1 (patch-af) = df818f3fb40ed58bed493552519548930a644af1 -SHA1 (patch-ag) = 10618ca30e36b45446f66854a33d4c05b1f355e6 SHA1 (patch-ah) = 3a07da7a6be10cd429c5c3472491084ce6595ec5 SHA1 (patch-ai) = d924b1d75422c9c35cd9f1931ea482b22a8730f9 -SHA1 (patch-aj) = 0a1b96448c4372bd8cea70b8c72016148a824cd6 SHA1 (patch-ak) = 1bb9e60a0bd31e0d9d53f883541a906a971fd3ed SHA1 (patch-al) = ee1f5c7500af18e9583ae3d63093f9eef6fe60bc SHA1 (patch-am) = 45858098fd0231132ac2efdaab37b292fca0a1ef SHA1 (patch-an) = c5d74fc960875ce6171608556a5dcac1d9e8d221 SHA1 (patch-ao) = 492b70c4420b8ee50277720aa264a10d2046c80b SHA1 (patch-ap) = 0ca89f037da734856e4ba7156b6fcbb68aaeb8b2 -SHA1 (patch-aq) = 393e1ce9e2b0488df3a0e5144e740caf0161ec53 SHA1 (patch-ar) = 994458dd8a423d4098abbc5ce7c8ca212aee0a3d -SHA1 (patch-as) = 8577b2ecae105913dd887054e6dd30b13d988b16 -SHA1 (patch-at) = 06ae1f4fcd5c66eeca25061a15b02ebe35b9354b SHA1 (patch-au) = 887c7869d43175874df0f55e76538db888c85610 SHA1 (patch-av) = 244206ebd238d2df3e2acdfd5b6819ff46becd5d SHA1 (patch-aw) = f9c604f2524a452d7b233c8de2ce8237469d2a6b -SHA1 (patch-ax) = 97242be8ca133f7fac767e9c474736e6aeaaad91 SHA1 (patch-ay) = fb41177da4b3bbefd02c56cd34a9e6049f4c8ce2 SHA1 (patch-az) = f4878ae808e47270fcb1329a34c1424abcbc84a5 SHA1 (patch-ba) = 0258d4d4a41748df51648878f4e53cd05f67eb7d SHA1 (patch-bb) = dc7f8209712d34f757a9573017142d7c671df10a SHA1 (patch-bc) = 2d54d0700b30f5471eb60d104148ecf5ac835f58 -SHA1 (patch-bd) = fae5c175149c25f12e37f84f661b3c3e5e8cf16b SHA1 (patch-be) = b1e13c107d045fe79088feccc665f77c8d255786 SHA1 (patch-bf) = 1b218b34aa4b64d115bb1270783197e827725fb5 SHA1 (patch-bg) = 6df462d4c521d327b6a50c8b73be547c469a0ed0 -SHA1 (patch-bh) = f3f506d69261536eb1dbe552e1382639f95ad7d8 SHA1 (patch-bi) = 1a8f2f79a24f2ba75accf83252677b830afde164 SHA1 (patch-bj) = 56046bc920beba28a7f21364c1f46d9061697105 SHA1 (patch-bk) = 7e961c42269c3593db06c3165629fbbf6a962a1a @@ -48,43 +39,32 @@ SHA1 (patch-bm) = 40c32f182882dbf58cb94450aa21a83888d5e2c3 SHA1 (patch-bn) = b33aa4f73315a93506b36a20be2a3cabfcdd16ef SHA1 (patch-bo) = 9c3108d7f9a1de3c82f2e4d78a0e9f5dbe3478f0 SHA1 (patch-bp) = 615ddb599e26f123cb8f21700c3f0528bc37c99c -SHA1 (patch-bq) = 247b8babfab3a2e99fd5cee47d94b7fbe528d1d8 SHA1 (patch-br) = 778a94f6e7e5900c3036ed0e9c8fd92a78b13c21 SHA1 (patch-bs) = 9ee2903934e50c8786a2b45854255f8022e31524 SHA1 (patch-bt) = 724c0c7aa50b5f600746a86e744b44501207939a -SHA1 (patch-bu) = 2db9e62de48fa7bb6d60bdea44d7bee2eddff4e3 SHA1 (patch-bv) = 0664e2420988fa50c1d96dfea09c121c89c70e16 -SHA1 (patch-bw) = cb212ff65b55b8e190f3d1feef4986906bf9a7e6 SHA1 (patch-bx) = dcdec38d984452032176946bafddc9a6614b2b6f SHA1 (patch-by) = 6196da890587636881baac5ac477c850773618e3 SHA1 (patch-bz) = ef63ef3ea3c28898e5d8cef4631866854998d41c -SHA1 (patch-ca) = 21f45e1498c5a61838d844ad5b53189400f97355 SHA1 (patch-cb) = 39f6feb39dbacb5a193ab7b20b365576a5bec43b SHA1 (patch-cc) = 12e515c4517a59c3c5f529162ea66c44cbcdd69c SHA1 (patch-cd) = 9b21211aef51f94d20c10fbdfda878df7fe77764 -SHA1 (patch-ce) = 4437e1fd02a3ef4b623e590bd41e9c695a5c9de6 SHA1 (patch-cf) = f5448151bc1ca0afaceb6aac5ab0865b2a1c8c1e SHA1 (patch-cg) = fb7cf305bec67a5cbb80afa9799b3937989910a5 SHA1 (patch-ch) = c7204694b08da0579c978575b0792b2ff2fb5b1b SHA1 (patch-ci) = 07f5c0bfae64c180ce954c5eb07a7e425d98a9b2 SHA1 (patch-cj) = d45347d84fd0cade1fd6e8e2700bdc0280f520ea SHA1 (patch-ck) = b3e6e7ab1a2217a757842cc05aaa94301b74a0dd -SHA1 (patch-cl) = 1e95bee0a8cb7cfb27958ccc1479abc01fe9f0a1 SHA1 (patch-cm) = 0e2a608749547ac42000a8ce8222303837cd834a SHA1 (patch-cn) = fc363f836b2acde2ad9bc01759460e997e34aa96 -SHA1 (patch-co) = 7640d199e0391afe6aa9b0d917b88dfd4a213090 SHA1 (patch-cp) = 0624d4a11fdd617309dcb711d9beabb6d7d78b36 SHA1 (patch-cq) = f0c6b4323601a1a4906feefd1e1588b6d0b9a01f -SHA1 (patch-cr) = ebbd1bafaf17691084ef835ef2f08866c6815924 SHA1 (patch-cs) = 39e69b9d7d4b4a4d28b6532c175b2c8afa1dd1a6 SHA1 (patch-ct) = e38c308944f34572cbad4e3caa664d6566990b6e -SHA1 (patch-cu) = 470db728e7853edefda9731fac174bf04c7fd5aa SHA1 (patch-cv) = 52611f6a834fe7eb92e80dfd41b89b0b0d871cbf -SHA1 (patch-cw) = 79703f08c6f5c1690fe23b94b26ebb8c6908b29f SHA1 (patch-cx) = 8a2d029f56481c1b3d1626c82096fda36700cf00 SHA1 (patch-cy) = 05a6cebbd223e79c44d6714c78be841ebd63fd8f SHA1 (patch-cz) = bb88de51bdb08d37d0c77d90509ac7cc6ae17854 -SHA1 (patch-da) = ad54da1bc81cfd6cecebaa57f5a0c0a56d6d589f SHA1 (patch-db) = 9af64d1118aa30d99202430efc2921c731ae4a81 SHA1 (patch-dc) = ae7d541d91bd466142984b3680cc1e40834f528d SHA1 (patch-dd) = 2e9da1069c86ccafd19dbd0ed2b4594c5a4e2f71 @@ -121,9 +101,7 @@ SHA1 (patch-eh) = 94aa1dd47b86ec9ee7a9f4ac715dceecb8aa3c82 SHA1 (patch-ei) = 69312f1e54ba35908dfe7650ba92686acead542b SHA1 (patch-ej) = 0838deb8434d7f5867d5947bcd3733246ecac4c6 SHA1 (patch-ek) = 004a6c7933c90e1bcbd9d271708e4432f79a8986 -SHA1 (patch-el) = 00629891dbd5c668162213f0bcd5183878e7baf4 SHA1 (patch-em) = 2e42263d67e5e44035bed13dc3e5245fc3a86709 -SHA1 (patch-en) = f755e2ddf16eb6df6c2f4498f4193a61509dc45f SHA1 (patch-eo) = d62ed8023ced4637a874b8c5ee3fcd8cac49a3e1 SHA1 (patch-ep) = 77d65151a6e74adcfc1143ced2cb393d08029b2c SHA1 (patch-eq) = e83191cdc198b4e36cc50cbd14adbe4c3c7e9e8a diff --git a/x11/kdebase3/patches/patch-ad b/x11/kdebase3/patches/patch-ad deleted file mode 100644 index 042f7038123..00000000000 --- a/x11/kdebase3/patches/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2002/08/25 19:23:36 jlam Exp $ - ---- kate/app/dummy_main.cpp.orig Thu May 30 09:59:32 2002 -+++ kate/app/dummy_main.cpp -@@ -0,0 +1,6 @@ -+extern "C" { int kdemain(int, char *[]); } -+ -+int main(int c, char *v[]) -+{ -+ return kdemain(c,v); -+} diff --git a/x11/kdebase3/patches/patch-ag b/x11/kdebase3/patches/patch-ag deleted file mode 100644 index ae23d0291ab..00000000000 --- a/x11/kdebase3/patches/patch-ag +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-ag,v 1.2 2002/08/25 19:23:36 jlam Exp $ - ---- kate_main.cpp.orig Thu May 30 09:59:34 2002 -+++ kate_main.cpp -@@ -0,0 +1,28 @@ -+/* -+ * -+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+extern "C" int kdemain(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kdemain(argc, argv); -+} diff --git a/x11/kdebase3/patches/patch-aj b/x11/kdebase3/patches/patch-aj deleted file mode 100644 index 476ac94dcb9..00000000000 --- a/x11/kdebase3/patches/patch-aj +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-aj,v 1.2 2002/08/25 19:23:36 jlam Exp $ - ---- kcontrol/access/kaccess_main.cpp.orig Thu May 30 09:59:35 2002 -+++ kcontrol/access/kaccess_main.cpp -@@ -0,0 +1,28 @@ -+/* -+ * -+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+extern "C" int kdemain(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kdemain(argc, argv); -+} diff --git a/x11/kdebase3/patches/patch-aq b/x11/kdebase3/patches/patch-aq deleted file mode 100644 index 205b14c8d8c..00000000000 --- a/x11/kdebase3/patches/patch-aq +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-aq,v 1.2 2002/08/25 19:23:37 jlam Exp $ - ---- kcontrol/kcontrol/kcminit_main.cpp.orig Thu May 30 09:59:38 2002 -+++ kcontrol/kcontrol/kcminit_main.cpp -@@ -0,0 +1,28 @@ -+/* -+ * -+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+extern "C" int kdemain(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kdemain(argc, argv); -+} diff --git a/x11/kdebase3/patches/patch-as b/x11/kdebase3/patches/patch-as deleted file mode 100644 index 3fffb756061..00000000000 --- a/x11/kdebase3/patches/patch-as +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-as,v 1.2 2002/08/25 19:23:37 jlam Exp $ - ---- kcontrol/kcontrol/kcmshell_main.cpp.orig Thu May 30 09:59:39 2002 -+++ kcontrol/kcontrol/kcmshell_main.cpp -@@ -0,0 +1,28 @@ -+/* -+ * -+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+extern "C" int kdemain(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kdemain(argc, argv); -+} diff --git a/x11/kdebase3/patches/patch-at b/x11/kdebase3/patches/patch-at deleted file mode 100644 index 91e65f7d97f..00000000000 --- a/x11/kdebase3/patches/patch-at +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-at,v 1.2 2002/08/25 19:23:37 jlam Exp $ - ---- kcontrol/kcontrol/kcontrol_main.cpp.orig Thu May 30 09:59:39 2002 -+++ kcontrol/kcontrol/kcontrol_main.cpp -@@ -0,0 +1,28 @@ -+/* -+ * -+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+extern "C" int kdemain(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kdemain(argc, argv); -+} diff --git a/x11/kdebase3/patches/patch-ax b/x11/kdebase3/patches/patch-ax deleted file mode 100644 index b9162320abc..00000000000 --- a/x11/kdebase3/patches/patch-ax +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-ax,v 1.2 2002/08/25 19:23:38 jlam Exp $ - ---- kdeprint/kjobviewer/kjobviewer_main.cpp.orig Thu May 30 09:59:42 2002 -+++ kdeprint/kjobviewer/kjobviewer_main.cpp -@@ -0,0 +1,28 @@ -+/* -+ * -+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+extern "C" int kdemain(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kdemain(argc, argv); -+} diff --git a/x11/kdebase3/patches/patch-bd b/x11/kdebase3/patches/patch-bd deleted file mode 100644 index 7eb61275ed2..00000000000 --- a/x11/kdebase3/patches/patch-bd +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-bd,v 1.2 2002/08/25 19:23:38 jlam Exp $ - ---- kdesktop/kdesktop_main.cc.orig Thu May 30 09:59:45 2002 -+++ kdesktop/kdesktop_main.cc -@@ -0,0 +1,28 @@ -+/* -+ * -+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+extern "C" int kdemain(int, char **); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kdemain(argc, argv); -+} diff --git a/x11/kdebase3/patches/patch-bh b/x11/kdebase3/patches/patch-bh deleted file mode 100644 index b339f1c4109..00000000000 --- a/x11/kdebase3/patches/patch-bh +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-bh,v 1.2 2002/08/25 19:23:38 jlam Exp $ - ---- khotkeys/khotkeys/khotkeys_main.cpp.orig Thu May 30 09:59:46 2002 -+++ khotkeys/khotkeys/khotkeys_main.cpp -@@ -0,0 +1,28 @@ -+/* -+ * -+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+extern "C" int kdemain(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kdemain(argc, argv); -+} diff --git a/x11/kdebase3/patches/patch-bq b/x11/kdebase3/patches/patch-bq deleted file mode 100644 index 77816aa48d4..00000000000 --- a/x11/kdebase3/patches/patch-bq +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-bq,v 1.2 2002/08/25 19:23:39 jlam Exp $ - ---- kicker/kicker_main.cpp.orig Thu May 30 09:59:49 2002 -+++ kicker/kicker_main.cpp -@@ -0,0 +1,28 @@ -+/* -+ * -+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+extern "C" int kdemain(int, char **); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kdemain(argc, argv); -+} diff --git a/x11/kdebase3/patches/patch-bu b/x11/kdebase3/patches/patch-bu deleted file mode 100644 index 5a128bf3213..00000000000 --- a/x11/kdebase3/patches/patch-bu +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-bu,v 1.2 2002/08/25 19:23:40 jlam Exp $ - ---- kicker/proxy/appletproxy_main.cpp.orig Thu May 30 09:59:50 2002 -+++ kicker/proxy/appletproxy_main.cpp -@@ -0,0 +1,28 @@ -+/* -+ * -+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+extern "C" int kdemain(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kdemain(argc, argv); -+} diff --git a/x11/kdebase3/patches/patch-bw b/x11/kdebase3/patches/patch-bw deleted file mode 100644 index 0890f87e5ab..00000000000 --- a/x11/kdebase3/patches/patch-bw +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-bw,v 1.2 2002/08/25 19:23:40 jlam Exp $ - ---- kicker/proxy/extensionproxy_main.cpp.orig Thu May 30 09:59:50 2002 -+++ kicker/proxy/extensionproxy_main.cpp -@@ -0,0 +1,28 @@ -+/* -+ * -+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+extern "C" int kdemain(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kdemain(argc, argv); -+} diff --git a/x11/kdebase3/patches/patch-ca b/x11/kdebase3/patches/patch-ca deleted file mode 100644 index c1eff03867c..00000000000 --- a/x11/kdebase3/patches/patch-ca +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-ca,v 1.2 2002/08/25 19:23:40 jlam Exp $ - ---- klipper/klipper_main.cpp.orig Thu May 30 09:59:52 2002 -+++ klipper/klipper_main.cpp -@@ -0,0 +1,28 @@ -+/* -+ * -+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+extern "C" int kdemain(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kdemain(argc, argv); -+} diff --git a/x11/kdebase3/patches/patch-ce b/x11/kdebase3/patches/patch-ce deleted file mode 100644 index c4a6b1749a1..00000000000 --- a/x11/kdebase3/patches/patch-ce +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-ce,v 1.2 2002/08/25 19:23:41 jlam Exp $ - ---- kmenuedit/kmenuedit_main.cpp.orig Thu May 30 09:59:53 2002 -+++ kmenuedit/kmenuedit_main.cpp -@@ -0,0 +1,28 @@ -+/* -+ * -+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+extern "C" int kdemain(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kdemain(argc, argv); -+} diff --git a/x11/kdebase3/patches/patch-cl b/x11/kdebase3/patches/patch-cl deleted file mode 100644 index 60be521145b..00000000000 --- a/x11/kdebase3/patches/patch-cl +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-cl,v 1.2 2002/08/25 19:23:42 jlam Exp $ - ---- konqueror/client/kfmclient_main.cc.orig Thu May 30 09:59:56 2002 -+++ konqueror/client/kfmclient_main.cc -@@ -0,0 +1,28 @@ -+/* -+ * -+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+extern "C" int kdemain(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kdemain(argc, argv); -+} diff --git a/x11/kdebase3/patches/patch-co b/x11/kdebase3/patches/patch-co deleted file mode 100644 index fe23bb2a702..00000000000 --- a/x11/kdebase3/patches/patch-co +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-co,v 1.2 2002/08/25 19:23:42 jlam Exp $ - ---- konqueror/keditbookmarks/keditbookmarks_main.cpp.orig Thu May 30 09:59:58 2002 -+++ konqueror/keditbookmarks/keditbookmarks_main.cpp -@@ -0,0 +1,28 @@ -+/* -+ * -+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+extern "C" int kdemain(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kdemain(argc, argv); -+} diff --git a/x11/kdebase3/patches/patch-cr b/x11/kdebase3/patches/patch-cr deleted file mode 100644 index 7a820bc9daa..00000000000 --- a/x11/kdebase3/patches/patch-cr +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-cr,v 1.2 2002/08/25 19:23:42 jlam Exp $ - ---- konqueror/konqueror_main.cc.orig Thu May 30 10:00:00 2002 -+++ konqueror/konqueror_main.cc -@@ -0,0 +1,28 @@ -+/* -+ * -+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+extern "C" int kdemain(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kdemain(argc, argv); -+} diff --git a/x11/kdebase3/patches/patch-cu b/x11/kdebase3/patches/patch-cu deleted file mode 100644 index 18c497cd25a..00000000000 --- a/x11/kdebase3/patches/patch-cu +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-cu,v 1.2 2002/08/25 19:23:43 jlam Exp $ - ---- konsole/konsole/konsole_main.cpp.orig Thu May 30 10:00:02 2002 -+++ konsole/konsole/konsole_main.cpp -@@ -0,0 +1,28 @@ -+/* -+ * -+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+extern "C" int kdemain(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kdemain(argc, argv); -+} diff --git a/x11/kdebase3/patches/patch-cw b/x11/kdebase3/patches/patch-cw deleted file mode 100644 index c29c47f9194..00000000000 --- a/x11/kdebase3/patches/patch-cw +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-cw,v 1.2 2002/08/25 19:23:43 jlam Exp $ - ---- konsole/konsole/kwrited_main.cpp.orig Thu May 30 10:00:03 2002 -+++ konsole/konsole/kwrited_main.cpp -@@ -0,0 +1,28 @@ -+/* -+ * -+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+extern "C" int kdemain(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kdemain(argc, argv); -+} diff --git a/x11/kdebase3/patches/patch-da b/x11/kdebase3/patches/patch-da deleted file mode 100644 index e1d9fd299ea..00000000000 --- a/x11/kdebase3/patches/patch-da +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-da,v 1.2 2002/08/25 19:23:44 jlam Exp $ - ---- ksmserver/ksmserver_main.cpp.orig Thu May 30 10:00:04 2002 -+++ ksmserver/ksmserver_main.cpp -@@ -0,0 +1,28 @@ -+/* -+ * -+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+extern "C" int kdemain(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kdemain(argc, argv); -+} diff --git a/x11/kdebase3/patches/patch-el b/x11/kdebase3/patches/patch-el deleted file mode 100644 index b71071f1c23..00000000000 --- a/x11/kdebase3/patches/patch-el +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-el,v 1.2 2002/08/25 19:23:48 jlam Exp $ - ---- kxkb/kxkb_main.cpp.orig Thu May 30 10:00:15 2002 -+++ kxkb/kxkb_main.cpp -@@ -0,0 +1,28 @@ -+/* -+ * -+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+extern "C" int kdemain(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kdemain(argc, argv); -+} diff --git a/x11/kdebase3/patches/patch-en b/x11/kdebase3/patches/patch-en deleted file mode 100644 index a26085a943d..00000000000 --- a/x11/kdebase3/patches/patch-en +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-en,v 1.2 2002/08/25 19:23:48 jlam Exp $ - ---- legacyimport/klegacyimport_main.cpp.orig Thu May 30 10:00:16 2002 -+++ legacyimport/klegacyimport_main.cpp -@@ -0,0 +1,28 @@ -+/* -+ * -+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+extern "C" int kdemain(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kdemain(argc, argv); -+} diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 63b0013cb07..8b49489783c 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2003/01/17 03:20:58 markd Exp $ +# $NetBSD: Makefile,v 1.20 2003/01/20 10:04:18 skrll Exp $ DISTNAME= kdelibs-3.0.5a CATEGORIES= x11 @@ -31,6 +31,30 @@ REPLACE_PERL= \ PLIST_SRC= ${WRKDIR}/PLIST UNLIMIT_RESOURCES= datasize memorysize +FOO_MAIN_FILES= \ + arts/knotify/knotify_main.cpp \ + dcop/dcopserver_main.cpp \ + kconf_update/kconf_update_main.cpp \ + kded/kbuildsycoca_main.cpp \ + kded/kded_main.cpp \ + kdeprint/management/kaddprinterwizard_main.cpp \ + kio/misc/kio_uiserver_main.cpp \ + kioslave/http/http_cache_cleaner_main.cpp \ + kioslave/http/kcookiejar/kcookiejar_main.cpp + +.include "../../x11/kde3/Makefile.foo_main" + +FIXUP_FILES= \ + kspell/ksconfig.cpp + +pre-configure: + @for i in ${FIXUP_FILES}; do \ + ${SED} -e 's:@LOCALBASE@:${LOCALBASE}:g' \ + ${WRKSRC}/$${i} > ${WRKSRC}/$${i}.fixup && \ + ${MV} ${WRKSRC}/$${i}.fixup ${WRKSRC}/$${i}; \ + done + + .if defined(USE_CUPS) && (${USE_CUPS} == "YES") .include "../../print/cups/buildlink2.mk" BUILD_DEFS+= USE_CUPS diff --git a/x11/kdelibs3/PLIST b/x11/kdelibs3/PLIST index 22d70cd194f..8f38e30d350 100644 --- a/x11/kdelibs3/PLIST +++ b/x11/kdelibs3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2002/08/25 19:23:49 jlam Exp $ +@comment $NetBSD: PLIST,v 1.8 2003/01/20 10:04:19 skrll Exp $ bin/artsmessage bin/checkXML ${CUPS}bin/cupsdconf @@ -505,282 +505,210 @@ include/renamedlgplugin.h include/scriptclientinterface.h include/scriptinterface.h include/scriptmanager.h -lib/dcopserver.a lib/dcopserver.la lib/dcopserver.so -lib/kaddprinterwizard.a lib/kaddprinterwizard.la lib/kaddprinterwizard.so -lib/kbuildsycoca.a lib/kbuildsycoca.la lib/kbuildsycoca.so -lib/kconf_update.a lib/kconf_update.la lib/kconf_update.so -lib/kcookiejar.a lib/kcookiejar.la lib/kcookiejar.so -lib/kde3/kbzip2filter.a lib/kde3/kbzip2filter.la lib/kde3/kbzip2filter.so -lib/kde3/kded_kdeprintd.a lib/kde3/kded_kdeprintd.la lib/kde3/kded_kdeprintd.so -lib/kde3/kded_kssld.a lib/kde3/kded_kssld.la lib/kde3/kded_kssld.so -${CUPS}lib/kde3/kdeprint_cups.a ${CUPS}lib/kde3/kdeprint_cups.la ${CUPS}lib/kde3/kdeprint_cups.so -lib/kde3/kdeprint_ext.a lib/kde3/kdeprint_ext.la lib/kde3/kdeprint_ext.so -lib/kde3/kdeprint_lpdunix.a lib/kde3/kdeprint_lpdunix.la lib/kde3/kdeprint_lpdunix.so -lib/kde3/kdeprint_lpr.a lib/kde3/kdeprint_lpr.la lib/kde3/kdeprint_lpr.so -lib/kde3/kdeprint_rlpr.a lib/kde3/kdeprint_rlpr.la lib/kde3/kdeprint_rlpr.so -lib/kde3/kgzipfilter.a lib/kde3/kgzipfilter.la lib/kde3/kgzipfilter.so -lib/kde3/khtmlimagepart.a lib/kde3/khtmlimagepart.la lib/kde3/khtmlimagepart.so -lib/kde3/kimg_eps.a lib/kde3/kimg_eps.la lib/kde3/kimg_eps.so -lib/kde3/kimg_g3.a lib/kde3/kimg_g3.la lib/kde3/kimg_g3.so -lib/kde3/kimg_ico.a lib/kde3/kimg_ico.la lib/kde3/kimg_ico.so -lib/kde3/kimg_krl.a lib/kde3/kimg_krl.la lib/kde3/kimg_krl.so -lib/kde3/kimg_tiff.a lib/kde3/kimg_tiff.la lib/kde3/kimg_tiff.so -lib/kde3/kimg_xview.a lib/kde3/kimg_xview.la lib/kde3/kimg_xview.so -lib/kde3/kio_file.a lib/kde3/kio_file.la lib/kde3/kio_file.so -lib/kde3/kio_ftp.a lib/kde3/kio_ftp.la lib/kde3/kio_ftp.so -lib/kde3/kio_help.a lib/kde3/kio_help.la lib/kde3/kio_help.so -lib/kde3/kio_http.a lib/kde3/kio_http.la lib/kde3/kio_http.so -lib/kde3/kjs_html.a lib/kde3/kjs_html.la lib/kde3/kjs_html.so -lib/kde3/libkpac.a lib/kde3/libkpac.la lib/kde3/libkpac.so -lib/kde3/plugins/designer/kdewidgets.a lib/kde3/plugins/designer/kdewidgets.la lib/kde3/plugins/designer/kdewidgets.so -lib/kde3/plugins/styles/highcolor.a lib/kde3/plugins/styles/highcolor.la lib/kde3/plugins/styles/highcolor.so -lib/kde3/plugins/styles/kthemestyle.a lib/kde3/plugins/styles/kthemestyle.la lib/kde3/plugins/styles/kthemestyle.so -lib/kde3/plugins/styles/light.a lib/kde3/plugins/styles/light.la lib/kde3/plugins/styles/light.so -${KDED_WORKAROUND}lib/kded.a ${KDED_WORKAROUND}lib/kded.la ${KDED_WORKAROUND}lib/kded.so -lib/kio_http_cache_cleaner.a lib/kio_http_cache_cleaner.la lib/kio_http_cache_cleaner.so -lib/kio_uiserver.a lib/kio_uiserver.la lib/kio_uiserver.so -lib/klauncher.a lib/klauncher.la lib/klauncher.so -lib/knotify.a lib/knotify.la lib/knotify.so -lib/libDCOP.a lib/libDCOP.la lib/libDCOP.so lib/libDCOP.so.4 lib/libDCOP.so.4.0 -lib/libartskde.a lib/libartskde.la lib/libartskde.so lib/libartskde.so.1 lib/libartskde.so.1.0 -${CUPS}lib/libcupsdconf.a ${CUPS}lib/libcupsdconf.la ${CUPS}lib/libcupsdconf.so -lib/libdcopserver_main.a lib/libdcopserver_main.la lib/libdcopserver_main.so lib/libdcopserver_main.so.0 lib/libdcopserver_main.so.0.0 -lib/libkabc.a lib/libkabc.la lib/libkabc.so lib/libkabc.so.1 lib/libkabc.so.1.0 -lib/libkaddprinterwizard_main.a lib/libkaddprinterwizard_main.la lib/libkaddprinterwizard_main.so -lib/libkatepart.a lib/libkatepart.la lib/libkatepart.so -lib/libkatepartinterfaces.a lib/libkatepartinterfaces.la lib/libkatepartinterfaces.so lib/libkatepartinterfaces.so.0 lib/libkatepartinterfaces.so.0.0 -lib/libkbuildsycoca_main.a lib/libkbuildsycoca_main.la lib/libkbuildsycoca_main.so lib/libkbuildsycoca_main.so.0 lib/libkbuildsycoca_main.so.0.0 -lib/libkcertpart.a lib/libkcertpart.la lib/libkcertpart.so -lib/libkconf_update_main.a lib/libkconf_update_main.la lib/libkconf_update_main.so lib/libkconf_update_main.so.0 lib/libkconf_update_main.so.0.0 -lib/libkcookiejar_main.a lib/libkcookiejar_main.la lib/libkcookiejar_main.so lib/libkcookiejar_main.so.0 lib/libkcookiejar_main.so.0.0 -lib/libkdecore.a lib/libkdecore.la lib/libkdecore.so lib/libkdecore.so.4 lib/libkdecore.so.4.0 -lib/libkded_main.a lib/libkded_main.la lib/libkded_main.so lib/libkded_main.so.0 lib/libkded_main.so.0.0 -lib/libkdefakes.a lib/libkdefakes.la lib/libkdefakes.so lib/libkdefakes.so.4 lib/libkdefakes.so.4.0 -lib/libkdefx.a lib/libkdefx.la lib/libkdefx.so lib/libkdefx.so.4 lib/libkdefx.so.4.0 -lib/libkdeprint.a lib/libkdeprint.la lib/libkdeprint.so lib/libkdeprint.so.4 lib/libkdeprint.so.4.0 -lib/libkdeprint_management.a lib/libkdeprint_management.la lib/libkdeprint_management.so lib/libkdeprint_management.so.4 lib/libkdeprint_management.so.4.0 -lib/libkdesasl.a lib/libkdesasl.la lib/libkdesasl.so lib/libkdesasl.so.1 lib/libkdesasl.so.1.0 -lib/libkdesu.a lib/libkdesu.la lib/libkdesu.so lib/libkdesu.so.4 lib/libkdesu.so.4.0 -lib/libkdeui.a lib/libkdeui.la lib/libkdeui.so lib/libkdeui.so.4 lib/libkdeui.so.4.0 -lib/libkhtml.a lib/libkhtml.la lib/libkhtml.so lib/libkhtml.so.4 lib/libkhtml.so.4.0 -lib/libkio.a lib/libkio.la lib/libkio.so lib/libkio.so.4 lib/libkio.so.4.0 -lib/libkio_http_cache_cleaner_main.a lib/libkio_http_cache_cleaner_main.la lib/libkio_http_cache_cleaner_main.so lib/libkio_http_cache_cleaner_main.so.0 lib/libkio_http_cache_cleaner_main.so.0.0 -lib/libkio_uiserver_main.a lib/libkio_uiserver_main.la lib/libkio_uiserver_main.so lib/libkio_uiserver_main.so.0 lib/libkio_uiserver_main.so.0.0 -lib/libkjava.a lib/libkjava.la lib/libkjava.so lib/libkjava.so.1 lib/libkjava.so.1.0 -lib/libkjs.a lib/libkjs.la lib/libkjs.so lib/libkjs.so.1 lib/libkjs.so.1.0 -lib/libkmid.a lib/libkmid.la lib/libkmid.so lib/libkmid.so.0 lib/libkmid.so.0.95 -lib/libknotify_main.a lib/libknotify_main.la lib/libknotify_main.so lib/libknotify_main.so.0 lib/libknotify_main.so.0.0 -lib/libkparts.a lib/libkparts.la lib/libkparts.so lib/libkparts.so.2 lib/libkparts.so.2.0 -lib/libkscreensaver.a lib/libkscreensaver.la lib/libkscreensaver.so lib/libkscreensaver.so.4 lib/libkscreensaver.so.4.0 -lib/libkscript.a lib/libkscript.la lib/libkscript.so lib/libkscript.so.0 lib/libkscript.so.0.0 -lib/libkspell.a lib/libkspell.la lib/libkspell.so lib/libkspell.so.4 lib/libkspell.so.4.0 -lib/libktexteditor.a lib/libktexteditor.la lib/libktexteditor.so lib/libktexteditor.so.0 lib/libktexteditor.so.0.0 -lib/libshellscript.a lib/libshellscript.la lib/libshellscript.so lib/libshellscript.so.0 lib/libshellscript.so.0.0 -lib/libvcard.a lib/libvcard.la lib/libvcard.so lib/libvcard.so.0 @@ -3330,6 +3258,8 @@ share/kde/servicetypes/scriptinterface.desktop @dirrm share/kde/mimelnk/application @dirrm share/kde/mimelnk/all @dirrm share/kde/mimelnk +@exec ${MKDIR} %D/share/kde/locale +@dirrm share/kde/locale @dirrm share/kde/config/ui @dirrm share/kde/config/colors @dirrm share/kde/config diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo index 246621a0b09..0fbf65280a6 100644 --- a/x11/kdelibs3/distinfo +++ b/x11/kdelibs3/distinfo @@ -1,31 +1,25 @@ -$NetBSD: distinfo,v 1.13 2003/01/17 02:59:52 markd Exp $ +$NetBSD: distinfo,v 1.14 2003/01/20 10:04:19 skrll Exp $ SHA1 (kdelibs-3.0.5a.tar.bz2) = 2ebc2927eb724bcf570a781fcfb8f988bc2681ad Size (kdelibs-3.0.5a.tar.bz2) = 7647507 bytes SHA1 (patch-aa) = dc26c7d5f845e881d313745b25ef9e90ead5707f SHA1 (patch-ab) = 526a52e39d4ce89b875383b8d9b8574a2494715b SHA1 (patch-ac) = 491ef6e556b7ce55e9c92b2dd641e20f9c94912e -SHA1 (patch-ad) = 60557b5cd8381a5e23a50d90561ff7ca8a552813 SHA1 (patch-ae) = 98b5adaab83f292d0b0b8e0363798e5de7b8aa8c SHA1 (patch-af) = ea4e54130fa31f3c1036e050503f68734106f4be SHA1 (patch-ag) = 8d783e53c168dc035c79646e30f3757c0954d589 SHA1 (patch-ah) = 4c1cd440290d6e099e5bf03a6d19ab09af82cedd -SHA1 (patch-ai) = b64ba773ca70375ed2c850b61f6f039614aff8e7 SHA1 (patch-aj) = 22a5b302970d76b745cb46ec69b65741461e05b3 SHA1 (patch-ak) = 2f83b7bbdc0b54c48ef97532e2c3577edd66b3fe SHA1 (patch-al) = b1d460761ca0665178606989ab4f7427fd0cb901 -SHA1 (patch-am) = 504d05365a43ad4b05d60195f4ff4e7d1e26e069 SHA1 (patch-an) = fe81b0dc9790c3b4ca4e71510db0939b3184f9ab SHA1 (patch-ao) = 45b265d56e6d793e53dc06237162652903c9423d SHA1 (patch-ap) = 360978cb8119a6e1c554e46ad5fcbf01a00f2685 SHA1 (patch-aq) = 802405c2384f3fdaa7f4085dca002d2f879c32fe -SHA1 (patch-ar) = 54990b359e3b50eb96673c30a7326c55f2a322eb SHA1 (patch-as) = 08fdae42a30233d6a88806d2aaa4368cadd3a988 -SHA1 (patch-at) = 1f78c48ad6b73882b4ee74900b8312c297b4bdaa SHA1 (patch-au) = 12a8a9613c2836077f29bb633db1c2489d3bb8a1 SHA1 (patch-av) = 4281c59ff129748c6cb8565157d9babd1067799f SHA1 (patch-aw) = 127a6d0175cb0acfd735f2f37a7973b2e0997620 -SHA1 (patch-ax) = fc9bf7709741c08a0853c6e81c7a2b425d01dbd3 SHA1 (patch-ay) = 0bce01d2cafe991fa6fe07ddf9f2e6cec88df5f0 SHA1 (patch-az) = a22457bc50360ae45c202469b6bb279ace249c61 SHA1 (patch-ba) = 219351243956e93f3601641e0c88938270e63599 @@ -36,19 +30,17 @@ SHA1 (patch-be) = 55db94a53b4a5ef10b3294b468c2844a84926d5b SHA1 (patch-bf) = 05280cdb86c11ccbe880721364598ca1a8a24ea6 SHA1 (patch-bg) = 317baf5edff5e9489c8c38b58a6948cfcfc736f7 SHA1 (patch-bh) = 6fafdedc00aaa70e7a32be6ae4d0e0d8dc1ce60e -SHA1 (patch-bi) = fbfe9a8fb2d1be40c03beebce1bfde20f3b9f9f7 SHA1 (patch-bj) = 36f1e6e2b4dc8be210d7e1cd8e0f80bec08f6a93 SHA1 (patch-bk) = 62b9f296f7e0a0001c38daf3d862b35ba055e7eb SHA1 (patch-bl) = 9d4fbc90cb5a638739c3748fbedf74707e96d342 SHA1 (patch-bm) = 3d9cc7de58f13aa55a5035153174a73aad082ff3 SHA1 (patch-bn) = 7f6d0faf310ae168a44821dabb948f210694f123 SHA1 (patch-bo) = 5be3545572b4b9ba703f09fd65dfcd3357307e20 -SHA1 (patch-bp) = f63f0d5bbcf632bc11d28c8cf8034ec9549cd8e2 SHA1 (patch-bq) = f2aaa203c1c2b968530ea0e2b1c0d2767769093b SHA1 (patch-br) = e89409ec2cbb7a2b567f85f2de9f8a7a14469c3b -SHA1 (patch-bs) = 97857ea3a7f43ce73b327e2a2fe10a0e4a5ce1c8 SHA1 (patch-bt) = 8849d373460f275ab8fdc736f558d8b8daa653a5 SHA1 (patch-bu) = 65aca46f30be04c0d8177498eac149437b21ba56 SHA1 (patch-bv) = d4c53ba2add053db87a8d382080535ce1c536cbb SHA1 (patch-ca) = ee31a9cfe62d9dd4f269bf95f2721bfb289d5d51 SHA1 (patch-cb) = 1db71d0236955d07c3b246f1c4810a9378eace3f +SHA1 (patch-cc) = f0154cf753a61271366ec3f57d62c1cf21bffc14 diff --git a/x11/kdelibs3/patches/patch-ad b/x11/kdelibs3/patches/patch-ad deleted file mode 100644 index 40d7103d69f..00000000000 --- a/x11/kdelibs3/patches/patch-ad +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2002/08/25 19:23:51 jlam Exp $ - ---- arts/knotify/knotify_main.cpp.orig Thu May 30 09:48:48 2002 -+++ arts/knotify/knotify_main.cpp -@@ -0,0 +1,27 @@ -+/* -+ * -+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+extern "C" int kdemain(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kdemain(argc, argv); -+} diff --git a/x11/kdelibs3/patches/patch-ai b/x11/kdelibs3/patches/patch-ai deleted file mode 100644 index fc80b3419a9..00000000000 --- a/x11/kdelibs3/patches/patch-ai +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-ai,v 1.2 2002/08/25 19:23:51 jlam Exp $ - ---- dcop/dcopserver_main.cpp.orig Thu May 30 09:48:50 2002 -+++ dcop/dcopserver_main.cpp -@@ -0,0 +1,29 @@ -+/* -+ * -+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ * -+ */ -+ -+extern "C" int kdemain(int argc, char* argv[]); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kdemain(argc, argv); -+} diff --git a/x11/kdelibs3/patches/patch-am b/x11/kdelibs3/patches/patch-am deleted file mode 100644 index cfdf7e09202..00000000000 --- a/x11/kdelibs3/patches/patch-am +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-am,v 1.2 2002/08/25 19:23:52 jlam Exp $ - ---- kconf_update/kconf_update_main.cpp.orig Thu May 30 09:48:50 2002 -+++ kconf_update/kconf_update_main.cpp -@@ -0,0 +1,28 @@ -+/* -+ * -+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+extern "C" int kdemain(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kdemain(argc, argv); -+} diff --git a/x11/kdelibs3/patches/patch-ar b/x11/kdelibs3/patches/patch-ar deleted file mode 100644 index a323686025a..00000000000 --- a/x11/kdelibs3/patches/patch-ar +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-ar,v 1.2 2002/08/25 19:23:52 jlam Exp $ - ---- kded/kbuildsycoca_main.cpp.orig Thu May 30 09:48:50 2002 -+++ kded/kbuildsycoca_main.cpp -@@ -0,0 +1,27 @@ -+/* -+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+extern "C" int kdemain(int, char* []); -+ -+int main(int argc, char *argv[]) -+{ -+ return kdemain(argc, argv); -+} diff --git a/x11/kdelibs3/patches/patch-at b/x11/kdelibs3/patches/patch-at deleted file mode 100644 index 3ffa16379af..00000000000 --- a/x11/kdelibs3/patches/patch-at +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-at,v 1.2 2002/08/25 19:23:52 jlam Exp $ - ---- kded/kded_main.cpp.orig Thu May 30 09:48:51 2002 -+++ kded/kded_main.cpp -@@ -0,0 +1,27 @@ -+/* -+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+extern "C" int kdemain(int, char* []); -+ -+int main(int argc, char *argv[]) -+{ -+ return kdemain(argc, argv); -+} diff --git a/x11/kdelibs3/patches/patch-ax b/x11/kdelibs3/patches/patch-ax deleted file mode 100644 index fb8817b52fb..00000000000 --- a/x11/kdelibs3/patches/patch-ax +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-ax,v 1.2 2002/08/25 19:23:53 jlam Exp $ - ---- kdeprint/management/kaddprinterwizard_main.cpp.orig Thu May 30 09:48:52 2002 -+++ kdeprint/management/kaddprinterwizard_main.cpp -@@ -0,0 +1,27 @@ -+/* -+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+extern "C" int kdemain(int, char* []); -+ -+int main(int argc, char *argv[]) -+{ -+ return kdemain(argc, argv); -+} diff --git a/x11/kdelibs3/patches/patch-bi b/x11/kdelibs3/patches/patch-bi deleted file mode 100644 index b8cd03fdc22..00000000000 --- a/x11/kdelibs3/patches/patch-bi +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-bi,v 1.2 2002/08/25 19:23:54 jlam Exp $ - ---- kio/misc/kio_uiserver_main.cpp.orig Thu May 30 09:48:54 2002 -+++ kio/misc/kio_uiserver_main.cpp -@@ -0,0 +1,27 @@ -+/* -+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+extern "C" int kdemain(int, char* []); -+ -+int main(int argc, char *argv[]) -+{ -+ return kdemain(argc, argv); -+} diff --git a/x11/kdelibs3/patches/patch-bp b/x11/kdelibs3/patches/patch-bp deleted file mode 100644 index f1c7f2abed9..00000000000 --- a/x11/kdelibs3/patches/patch-bp +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-bp,v 1.2 2002/08/25 19:23:55 jlam Exp $ - ---- kioslave/http/http_cache_cleaner_main.cpp.orig Thu May 30 09:48:55 2002 -+++ kioslave/http/http_cache_cleaner_main.cpp -@@ -0,0 +1,29 @@ -+/* -+ * This file is part of KDE -+ * -+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> -+ -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+extern "C" int kdemain(int, char **); -+ -+int main(int argc, char **argv) -+{ -+ return kdemain(argc, argv); -+} diff --git a/x11/kdelibs3/patches/patch-bs b/x11/kdelibs3/patches/patch-bs deleted file mode 100644 index fedee546142..00000000000 --- a/x11/kdelibs3/patches/patch-bs +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-bs,v 1.2 2002/08/25 19:23:55 jlam Exp $ - ---- kioslave/http/kcookiejar/kcookiejar_main.cpp.orig Thu May 30 09:48:55 2002 -+++ kioslave/http/kcookiejar/kcookiejar_main.cpp -@@ -0,0 +1,28 @@ -+/* -+ * -+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a copy -+ * of this software and associated documentation files (the "Software"), to deal -+ * in the Software without restriction, including without limitation the rights -+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+ * copies of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+extern "C" int kdemain(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kdemain(argc, argv); -+} diff --git a/x11/kdelibs3/patches/patch-cc b/x11/kdelibs3/patches/patch-cc new file mode 100644 index 00000000000..e6c95297616 --- /dev/null +++ b/x11/kdelibs3/patches/patch-cc @@ -0,0 +1,22 @@ +$NetBSD: patch-cc,v 1.3 2003/01/20 10:04:26 skrll Exp $ + +--- kspell/ksconfig.cpp.orig Wed Jan 15 12:18:30 2003 ++++ kspell/ksconfig.cpp +@@ -360,6 +360,8 @@ void KSpellConfig::getAvailDictsIspell ( + // dictionary path + QFileInfo dir ("/usr/lib/ispell"); + if (!dir.exists() || !dir.isDir()) ++ dir.setFile ("@LOCALBASE@/lib"); ++ if (!dir.exists() || !dir.isDir()) + dir.setFile ("/usr/local/lib/ispell"); + if (!dir.exists() || !dir.isDir()) + dir.setFile ("/usr/local/share/ispell"); +@@ -422,6 +424,8 @@ void KSpellConfig::getAvailDictsAspell ( + // dictionary path + // FIXME: use "aspell dump config" to find out the dict-dir + QFileInfo dir ("/usr/lib/aspell"); ++ if (!dir.exists() || !dir.isDir()) ++ dir.setFile ("@LOCALBASE@/lib"); + if (!dir.exists() || !dir.isDir()) + dir.setFile ("/usr/local/lib/aspell"); + if (!dir.exists() || !dir.isDir()) |