diff options
Diffstat (limited to 'x11/kdebase2')
141 files changed, 0 insertions, 10404 deletions
diff --git a/x11/kdebase2/DESCR b/x11/kdebase2/DESCR deleted file mode 100644 index 90ae45773be..00000000000 --- a/x11/kdebase2/DESCR +++ /dev/null @@ -1 +0,0 @@ -KDE provides an integrated X11 based environment, much like CDE. diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile deleted file mode 100644 index cc699a77f5d..00000000000 --- a/x11/kdebase2/Makefile +++ /dev/null @@ -1,127 +0,0 @@ -# $NetBSD: Makefile,v 1.49 2004/10/03 00:18:36 tv Exp $ - -DISTNAME= kdebase-2.2.2 -PKGREVISION= 7 -CATEGORIES= x11 -COMMENT= Base modules for the KDE 2 integrated X11 desktop - -.include "../../x11/kde2/Makefile.kde2" - -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Daemon.png Daemon.README - -BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde - -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - -USE_BUILDLINK3= YES - -CONFIGURE_ARGS+= --with-ssl-dir="${SSLBASE}" \ - --with-ldap=${BUILDLINK_PREFIX.openldap} \ - --disable-greet-lib \ - --without-pam --without-cdparanoia \ - --without-lame --without-vorbis - -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" -LIBS+= -Wl,--export-dynamic -.endif - -PLIST_SRC= ${WRKDIR}/PLIST.Xdpms -UNLIMIT_RESOURCES= datasize - -.if ${OPSYS} == "Linux" -KDE2_NSPLUGINS?= YES -.else -KDE2_NSPLUGINS?= NO -.endif -BUILD_DEFS+= KDE2_NSPLUGINS - -.if ${KDE2_NSPLUGINS} == "YES" -PLIST_SRC+= ${PKGDIR}/PLIST.nsplugins -CONFIGURE_ARGS+= --with-motif-includes="${MOTIFBASE}/include" \ - --with-motif-libraries="${MOTIFBASE}/lib" -.include "../../mk/motif.buildlink3.mk" -.else -CONFIGURE_ARGS+= --without-motif -.endif - -# Don't execute kappfinder_install at install-time. This causes random -# applications to be found which causes random .desktop files to be created -# in the applnk directory. -# -CONFIGURE_ENV+= RUN_KAPPFINDER=no - -PLIST_SRC+= ${PKGDIR}/PLIST - -ICONDIR= share/kde/icons - -post-configure: - ln -s ../Linux/conf.c ${WRKSRC}/ksysguard/ksysguardd/FreeBSD/conf.c - ln -s ../Linux/conf.h ${WRKSRC}/ksysguard/ksysguardd/FreeBSD/conf.h - ln -s ../Linux/ksysguardd.h ${WRKSRC}/ksysguard/ksysguardd/FreeBSD/ksysguardd.h - ln -s ../Linux/conf.c ${WRKSRC}/ksysguard/ksysguardd/Solaris/conf.c - ln -s ../Linux/conf.h ${WRKSRC}/ksysguard/ksysguardd/Solaris/conf.h - ln -s ../Linux/ksysguardd.h ${WRKSRC}/ksysguard/ksysguardd/Solaris/ksysguardd.h - -post-build: - cd ${WRKSRC}; \ - files="kioslave/info/kde-info2html.conf"; \ - for file in $${files}; do \ - ${SED} -e "s|@LOCALBASE@|${LOCALBASE}|" \ - $${file} > $${file}.new; \ - ${MV} -f $${file}.new $${file}; \ - done - -post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/kde/templates/.source/emptydir - ${INSTALL_DATA} ${DISTDIR}/Daemon.png ${PREFIX}/${ICONDIR} - ${INSTALL_DATA} ${DISTDIR}/Daemon.README \ - ${PREFIX}/share/doc/kde/HTML/en/kdm - - @# Several programs need to be setuid-root, but due to the way that - @# KDE2 finds executables, the files must have their read bit set - @# so that KStandardDir::findResource() will find them - @# - suid_progs=" \ - bin/konsole_grantpty \ - bin/kcheckpass \ - bin/ksysguardd \ - "; \ - for prog in $${suid_progs}; do \ - ${CHMOD} 4755 ${PREFIX}/$${prog}; \ - done - - @# The global desktop template files need to be user-writeable, or - @# else users won't be able to alter them after copying them to - @# their local directories. - @# - ${CHMOD} u+w ${PREFIX}/share/kde/templates/.source/* - - @# On some systems, the Xdpms routines aren't available in a shared - @# library, and some libraries aren't created as a result. - @# - ( files=" \ - lib/kde2/libkcm_energy.so \ - lib/kde2/libkcm_screensaver.so \ - "; \ - for file in $${files}; do \ - if [ -f ${PREFIX}/$${file} ]; then \ - ${ECHO} "$${file}"; \ - fi; \ - done; \ - ) > ${WRKDIR}/PLIST.Xdpms - -.if ${OPSYS} == "NetBSD" - @# NetBSD Advertisement O:-) - cd ${PREFIX}/share/kde/config/kdm; \ - ${SED} -e 's|^#\(LogoPixmap\)=.*|\1=${PREFIX}/${ICONDIR}/Daemon.png|' \ - kdmrc > ${WRKDIR}/kdmrc.ad; \ - ${CP} -f ${WRKDIR}/kdmrc.ad kdmrc -.endif - -.include "../../databases/openldap/buildlink3.mk" -.include "../../x11/kde2/kde2.mk" -.include "../../x11/kdelibs2/buildlink3.mk" - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/kdebase2/PLIST b/x11/kdebase2/PLIST deleted file mode 100644 index 87800561d26..00000000000 --- a/x11/kdebase2/PLIST +++ /dev/null @@ -1,2599 +0,0 @@ -@comment $NetBSD: PLIST,v 1.8 2004/09/22 08:09:59 jlam Exp $ -bin/appletproxy -bin/chooser -bin/conttest -bin/drkonqi -bin/extensionproxy -bin/kaccess -bin/kaddressbook -bin/kappfinder -bin/kate -bin/kbanner.kss -bin/kblankscrn.kss -bin/kblob.kss -bin/kbouboule.kss -bin/kcheckpass -bin/kcminit -bin/kcmshell -bin/kcontrol -bin/kdcop -bin/kdebugdialog -bin/kdeeject -bin/kdeprintfax -bin/kdesktop -bin/kdesu -bin/kdesud -bin/kdm -bin/kdm_config -bin/kdm_greet -bin/kdmdesktop -bin/keditbookmarks -bin/keditfiletype -bin/kfmclient -bin/kfmexec -bin/khelpcenter -bin/khotkeys -bin/kicker -bin/kjobviewer -bin/klegacyimport -bin/klines.kss -bin/klipper -bin/klorenz.kss -bin/kmatrix.kss -bin/kmenuedit -bin/kmorph3d.kss -bin/konqueror -bin/konsole -bin/konsole_grantpty -bin/kpager -bin/kpartsaver.kss -bin/kpersonalizer -bin/kpipes.kss -bin/kpolygon.kss -bin/kprinter -bin/kpyro.kss -bin/krandom.kss -bin/krdb -bin/kreadconfig -bin/krock.kss -bin/kscience.kss -bin/kslidescreen.kss -bin/kslideshow.kss -bin/ksmserver -bin/kspace.kss -bin/ksplash -bin/kstart -bin/kswarm.kss -bin/ksysguard -bin/ksysguardd -bin/ktip -bin/kvm.kss -bin/kwebdesktop -bin/kwin -bin/kwmtheme -bin/kwrite -bin/kwrited -bin/kxkb -bin/kxmlrpcd -bin/kxsconfig -bin/kxsrun -bin/startkde -etc/ksysguarddrc -include/KBackgroundIface.h -include/KDesktopIface.h -include/KScreensaverIface.h -include/KWinInterface.h -include/KonquerorIface.h -include/ccont.h -include/kate/application.h -include/kate/docmanager.h -include/kate/document.h -include/kate/mainwindow.h -include/kate/plugin.h -include/kate/view.h -include/kate/viewmanager.h -include/kbookmark.h -include/kbookmarkbar.h -include/kbookmarkdrag.h -include/kbookmarkexporter.h -include/kbookmarkimporter.h -include/kbookmarkmanager.h -include/kbookmarkmenu.h -include/kfileivi.h -include/knewmenu.h -include/konq_bgnddlg.h -include/konq_defaults.h -include/konq_dirlister.h -include/konq_dirpart.h -include/konq_drag.h -include/konq_events.h -include/konq_faviconmgr.h -include/konq_fileitem.h -include/konq_historycomm.h -include/konq_historymgr.h -include/konq_iconviewwidget.h -include/konq_imagepreviewjob.h -include/konq_mimetyperesolver.h -include/konq_operations.h -include/konq_pixmapprovider.h -include/konq_popupmenu.h -include/konq_propsview.h -include/konq_settings.h -include/konq_undo.h -include/kwin/client.h -include/kwin/kwinbutton.h -include/kwin/options.h -include/kwin/workspace.h -include/thumbcreator.h -lib/appletproxy.la -lib/extensionproxy.la -lib/kate.la -lib/kde2/gsthumbnail.la -lib/kde2/htmlthumbnail.la -lib/kde2/imagethumbnail.la -lib/kde2/kaccess.la -lib/kde2/kcminit.la -lib/kde2/kcmshell.la -lib/kde2/kcontrol.la -lib/kde2/khelpcenter.la -lib/kde2/kio_filter.la -lib/kde2/kio_finger.la -lib/kde2/kio_floppy.la -lib/kde2/kio_gopher.la -lib/kde2/kio_imap4.la -lib/kde2/kio_info.la -lib/kde2/kio_ldap.la -lib/kde2/kio_man.la -lib/kde2/kio_nfs.la -lib/kde2/kio_nntp.la -lib/kde2/kio_pop3.la -lib/kde2/kio_smb.la -lib/kde2/kio_tar.la -lib/kde2/kio_thumbnail.la -lib/kde2/libkaccess_sl.la -lib/kde2/libkcm_access.la -lib/kde2/libkcm_arts.la -lib/kde2/libkcm_background.la -lib/kde2/libkcm_bell.la -lib/kde2/libkcm_clock.la -lib/kde2/libkcm_colors.la -lib/kde2/libkcm_crypto.la -lib/kde2/libkcm_css.la -lib/kde2/libkcm_email.la -lib/kde2/libkcm_energy.la -lib/kde2/libkcm_filetypes.la -lib/kde2/libkcm_fonts.la -lib/kde2/libkcm_icons.la -lib/kde2/libkcm_info.la -lib/kde2/libkcm_input.la -lib/kde2/libkcm_ioslaveinfo.la -lib/kde2/libkcm_kdm.la -lib/kde2/libkcm_keys.la -lib/kde2/libkcm_khotkeys.la -lib/kde2/libkcm_kicker.la -lib/kde2/libkcm_kio.la -lib/kde2/libkcm_knotify.la -lib/kde2/libkcm_konq.la -lib/kde2/libkcm_konqhtml.la -lib/kde2/libkcm_konsole.la -lib/kde2/libkcm_kurifilt.la -lib/kde2/libkcm_kwindecoration.la -lib/kde2/libkcm_kwinoptions.la -lib/kde2/libkcm_launch.la -lib/kde2/libkcm_locale.la -lib/kde2/libkcm_midi.la -lib/kde2/libkcm_passwords.la -lib/kde2/libkcm_printmgr.la -lib/kde2/libkcm_samba.la -lib/kde2/libkcm_screensaver.la -lib/kde2/libkcm_smserver.la -lib/kde2/libkcm_socks.la -lib/kde2/libkcm_spellchecking.la -lib/kde2/libkcm_style.la -lib/kde2/libkcm_taskbar.la -lib/kde2/libkcm_themes.la -lib/kde2/libkcm_usb.la -lib/kde2/libkcminit_main.la -lib/kde2/libkcmshell_main.la -lib/kde2/libkcontrol_main.la -lib/kde2/libkded_favicons.la -lib/kde2/libkfindpart.la -lib/kde2/libkhelpcenterpart.la -lib/kde2/libkonqiconview.la -lib/kde2/libkonqlistview.la -lib/kde2/libkonqsidebar_classic_wrap.la -lib/kde2/libkonqsidebar_tree.la -lib/kde2/libkonqsidebartree_bookmarks.la -lib/kde2/libkonqsidebartree_dirtree.la -lib/kde2/libkonqsidebartree_history.la -lib/kde2/libkonqsound.la -lib/kde2/libkonqtree.la -lib/kde2/libkshellcmdplugin.la -lib/kde2/libkshorturifilter.la -lib/kde2/libkuriikwsfilter.la -lib/kde2/libkurisearchfilter.la -lib/kde2/libkwinb2.la -lib/kde2/libkwindefault.la -lib/kde2/libkwindefault_config.la -lib/kde2/libkwinicewm.la -lib/kde2/libkwinicewm_config.la -lib/kde2/libkwinkde1.la -lib/kde2/libkwinkstep.la -lib/kde2/libkwinkwmtheme.la -lib/kde2/libkwinlaptop.la -lib/kde2/libkwinmodernsys.la -lib/kde2/libkwinmodernsys_config.la -lib/kde2/libkwinmwm.la -lib/kde2/libkwinquartz.la -lib/kde2/libkwinquartz_config.la -lib/kde2/libkwinredmond.la -lib/kde2/libkwinriscos.la -lib/kde2/libkwinsystem.la -lib/kde2/libkwinweb.la -lib/kde2/textthumbnail.la -lib/kdesktop.la -lib/keditbookmarks.la -lib/kfmclient.la -lib/khotkeys.la -lib/kicker.la -lib/kjobviewer.la -lib/klegacyimport.la -lib/klipper.la -lib/kmenuedit.la -lib/konqueror.la -lib/konsole.la -lib/kwrite.la -lib/kwrited.la -lib/kxkb.la -lib/kxmlrpcd.la -lib/libappletproxy_sl.la -lib/libchildpanelextension.la -lib/libclockapplet.la -lib/libdockbarextension.la -lib/libextensionproxy_sl.la -lib/libkasbarextension.la -lib/libkate_main.la -lib/libkatecore.la -lib/libkateinterfaces.la -lib/libkcm_keyboard.la -lib/libkcm_xmlrpcd.la -lib/libkdesktop_main.la -lib/libkeditbookmarks_main.la -lib/libkfmclient_main.la -lib/libkhotkeys_main.la -lib/libkicker.la -lib/libkjobviewer_main.la -lib/libklegacyimport_main.la -lib/libklipper_main.la -lib/libkmenuedit_main.la -lib/libkminipagerapplet.la -lib/libkonq.la -lib/libkonqaboutpage.la -lib/libkonqsidebar.la -lib/libkonqsidebarplugin.la -lib/libkonqueror_main.la -lib/libkonsole_main.la -lib/libkonsolepart.la -lib/libkrunapplet.la -lib/libksysguardapplet.la -lib/libksystemtrayapplet.la -lib/libkwin.la -lib/libkwrite_main.la -lib/libkwrited_main.la -lib/libkxkb_main.la -lib/libkxmlrpcd_main.la -lib/libnaughtyapplet.la -lib/libquicklauncher.la -lib/libtaskbar.la -lib/libtaskbarapplet.la -lib/libtaskbarextension.la -lib/libtaskmanager.la -share/autostart/khotkeys.desktop -share/autostart/klipper.desktop -share/autostart/kpersonalizer.desktop -share/autostart/ktip.desktop -share/autostart/kwrited.desktop -share/autostart/panel.desktop -share/doc/kde/HTML/en/kaddressbook/common -share/doc/kde/HTML/en/kaddressbook/index.cache.bz2 -share/doc/kde/HTML/en/kaddressbook/index.docbook -share/doc/kde/HTML/en/kate/common -share/doc/kde/HTML/en/kate/index.cache.bz2 -share/doc/kde/HTML/en/kate/index.docbook -share/doc/kde/HTML/en/kcontrol/common -share/doc/kde/HTML/en/kcontrol/index.cache.bz2 -share/doc/kde/HTML/en/kcontrol/index.docbook -share/doc/kde/HTML/en/kcontrol/kcmaccess.docbook -share/doc/kde/HTML/en/kcontrol/kcmaction.docbook -share/doc/kde/HTML/en/kcontrol/kcmbackgnd.docbook -share/doc/kde/HTML/en/kcontrol/kcmbatmon.docbook -share/doc/kde/HTML/en/kcontrol/kcmbell.docbook -share/doc/kde/HTML/en/kcontrol/kcmblockdev.docbook -share/doc/kde/HTML/en/kcontrol/kcmcolor.docbook -share/doc/kde/HTML/en/kcontrol/kcmcookie.docbook -share/doc/kde/HTML/en/kcontrol/kcmcrypto.docbook -share/doc/kde/HTML/en/kcontrol/kcmcss.docbook -share/doc/kde/HTML/en/kcontrol/kcmdatetime.docbook -share/doc/kde/HTML/en/kcontrol/kcmdesktop.docbook -share/doc/kde/HTML/en/kcontrol/kcmdeviceinfo.docbook -share/doc/kde/HTML/en/kcontrol/kcmdmainfo.docbook -share/doc/kde/HTML/en/kcontrol/kcmebrowse.docbook -share/doc/kde/HTML/en/kcontrol/kcmemail.docbook -share/doc/kde/HTML/en/kcontrol/kcmenergy.docbook -share/doc/kde/HTML/en/kcontrol/kcmfile.docbook -share/doc/kde/HTML/en/kcontrol/kcmfileman.docbook -share/doc/kde/HTML/en/kcontrol/kcmfonts.docbook -share/doc/kde/HTML/en/kcontrol/kcmhelpindex.docbook -share/doc/kde/HTML/en/kcontrol/kcmicon.docbook -share/doc/kde/HTML/en/kcontrol/kcmintinfo.docbook -share/doc/kde/HTML/en/kcontrol/kcmioportinfo.docbook -share/doc/kde/HTML/en/kcontrol/kcmkbd.docbook -share/doc/kde/HTML/en/kcontrol/kcmkbrowse.docbook -share/doc/kde/HTML/en/kcontrol/kcmkeybind.docbook -share/doc/kde/HTML/en/kcontrol/kcmkonsole.docbook -share/doc/kde/HTML/en/kcontrol/kcmkwintheme.docbook -share/doc/kde/HTML/en/kcontrol/kcmlaunch.docbook -share/doc/kde/HTML/en/kcontrol/kcmlisa.docbook -share/doc/kde/HTML/en/kcontrol/kcmlocate.docbook -share/doc/kde/HTML/en/kcontrol/kcmloginmanage.docbook -share/doc/kde/HTML/en/kcontrol/kcmlowbatcrit.docbook -share/doc/kde/HTML/en/kcontrol/kcmlowbatwarn.docbook -share/doc/kde/HTML/en/kcontrol/kcmmemoryinfo.docbook -share/doc/kde/HTML/en/kcontrol/kcmmidi.docbook -share/doc/kde/HTML/en/kcontrol/kcmmixer.docbook -share/doc/kde/HTML/en/kcontrol/kcmmouse.docbook -share/doc/kde/HTML/en/kcontrol/kcmnetscapeplugins.docbook -share/doc/kde/HTML/en/kcontrol/kcmpanel.docbook -share/doc/kde/HTML/en/kcontrol/kcmpartitioninfo.docbook -share/doc/kde/HTML/en/kcontrol/kcmpasswd.docbook -share/doc/kde/HTML/en/kcontrol/kcmpciinfo.docbook -share/doc/kde/HTML/en/kcontrol/kcmpcmcia.docbook -share/doc/kde/HTML/en/kcontrol/kcmpowerctrl.docbook -share/doc/kde/HTML/en/kcontrol/kcmprocinfo.docbook -share/doc/kde/HTML/en/kcontrol/kcmproxie.docbook -share/doc/kde/HTML/en/kcontrol/kcmscnsave.docbook -share/doc/kde/HTML/en/kcontrol/kcmscsiinfo.docbook -share/doc/kde/HTML/en/kcontrol/kcmsessionman.docbook -share/doc/kde/HTML/en/kcontrol/kcmsmbstat.docbook -share/doc/kde/HTML/en/kcontrol/kcmsndinfo.docbook -share/doc/kde/HTML/en/kcontrol/kcmsndsrv.docbook -share/doc/kde/HTML/en/kcontrol/kcmsocks.docbook -share/doc/kde/HTML/en/kcontrol/kcmspellchecking.docbook -share/doc/kde/HTML/en/kcontrol/kcmstyle.docbook -share/doc/kde/HTML/en/kcontrol/kcmsysnotify.docbook -share/doc/kde/HTML/en/kcontrol/kcmtalk.docbook -share/doc/kde/HTML/en/kcontrol/kcmtaskbar.docbook -share/doc/kde/HTML/en/kcontrol/kcmusb.docbook -share/doc/kde/HTML/en/kcontrol/kcmuseragent.docbook -share/doc/kde/HTML/en/kcontrol/kcmwinshare.docbook -share/doc/kde/HTML/en/kcontrol/kcmxservinfo.docbook -share/doc/kde/HTML/en/kcontrol/kfileman1.png -share/doc/kde/HTML/en/kcontrol/kfileman2.png -share/doc/kde/HTML/en/kcontrol/nettimeouts.docbook -share/doc/kde/HTML/en/kcontrol/printmanager.docbook -share/doc/kde/HTML/en/kcontrol/printsystem.docbook -share/doc/kde/HTML/en/kcontrol/protocols.docbook -share/doc/kde/HTML/en/kcontrol/screenshot.png -share/doc/kde/HTML/en/kcontrol/systemcontrol.docbook -share/doc/kde/HTML/en/kcontrol/thememgr.docbook -share/doc/kde/HTML/en/kdebugdialog/common -share/doc/kde/HTML/en/kdebugdialog/index.cache.bz2 -share/doc/kde/HTML/en/kdebugdialog/index.docbook -share/doc/kde/HTML/en/kdeprint/KDE-printingmanager-im-controlcenter-2.png -share/doc/kde/HTML/en/kdeprint/KDE-printingmanager-im-controlcenter.png -share/doc/kde/HTML/en/kdeprint/PPD-options-for-HP8100mopier.png -share/doc/kde/HTML/en/kdeprint/PPD-options-for-infotecP450.png -share/doc/kde/HTML/en/kdeprint/PrintQueue-KJobViewer.png -share/doc/kde/HTML/en/kdeprint/add-printer-wizard-confirmation-1.png -share/doc/kde/HTML/en/kdeprint/big-ppd-esppp-gui.png -share/doc/kde/HTML/en/kdeprint/common -share/doc/kde/HTML/en/kdeprint/cups-filterarchitecture-kivio-50Percent-scaled.png -share/doc/kde/HTML/en/kdeprint/cups-filterarchitecture-kivio-70Percent-scaled.png -share/doc/kde/HTML/en/kdeprint/cups-filterarchitecture-kivio.png -share/doc/kde/HTML/en/kdeprint/cups-server-configuration-2.png -share/doc/kde/HTML/en/kdeprint/cups-server-configuration-3.png -share/doc/kde/HTML/en/kdeprint/cups-server-configuration-4.png -share/doc/kde/HTML/en/kdeprint/cups-server-configuration.png -share/doc/kde/HTML/en/kdeprint/cupsaddpostscriptprinter_fromcommandline.png -share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard1.png -share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard2_backendselection.png -share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan.png -share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan_results.png -share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard4_networkscan_config.png -share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard5_networkscan_SMBresults.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_broadcastaddress_add_button.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browse_relay_add_button.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browserelay_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browsetimeouts_browseinterval_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browsetimeouts_browsetimeout_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browseaddress_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browsepoll_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browseport_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_browseshortnames_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_browsingonoff_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_implicitclasses_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browsingmasks_add_button.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browsingmasks_browseallowdeny_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browsingmasks_browseorder_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_networkclients_keepalive_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_networkclients_keepalivetimeout_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_networkclients_maxclients_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_networkgeneral_hostnamelookups_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_networkgeneral_maxrequestsize_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_networkgeneral_portsaddresses_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_networkgeneral_timeout_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_securityconfig_accesspermissions_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_securityconfig_allowfrom_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_securityconfig_authclass_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_securityconfig_authgroupname_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_securityconfig_authtype_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_securityconfig_denyfrom_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_securityconfig_encryption_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_securityconfig_order_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_securityconfig_systemgroup_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverdirectories_data_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverdirectories_defaultcharset_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverdirectories_defaultlanguage.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverdirectories_documenttroot_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverdirectories_executables_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverdirectories_fontpath_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverdirectories_requestroot_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverdirectories_serverroot_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverdirectories_temdir_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverdirectories_tempdir_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverencryptionconfig_servercertificate_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverencryptionconfig_serverkey_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_servergeneral_group_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_servergeneral_remoteroot_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_servergeneral_serveradmin_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_servergeneral_servername_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_servergeneral_user_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_defaultcharset_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_defaultlanguage.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_documenttroot_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverlogging_accesslog_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverlogging_errorlog_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverlogging_loglevel_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverlogging_maxlogsize_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverlogging_pagelog_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_filterlimit_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_preservehistory_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_preservejobfiles_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_printcap_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_ripcache_blurb.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration10_browsinggeneral.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration11_browsingconnections.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration11_browsingmasks.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration12_browsingtimeouts.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration14_browsingrelay.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration15a_resourceallprinters_defineaccess.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration15b_resourceallprinters_defineaccess.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration15c_resourceallprinters_defineaccess.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration1_welcome.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration2_general.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration3_logging.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration4_directories.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration5_HTTP.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration6_encryption.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration7_miscellanious.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration8_networkgeneral.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration9_networkclients.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaccessmasks.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters_defineaccess.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_resourceadminauthorization.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_securityoverview.png -share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_securityoverview1.png -share/doc/kde/HTML/en/kdeprint/hi32-action-wizard.png -share/doc/kde/HTML/en/kdeprint/iconview-printerwindow.png -share/doc/kde/HTML/en/kdeprint/index.cache.bz2 -share/doc/kde/HTML/en/kdeprint/index.docbook -share/doc/kde/HTML/en/kdeprint/info-tab.png -share/doc/kde/HTML/en/kdeprint/ipp-scan-result-1.png -share/doc/kde/HTML/en/kdeprint/kcontrol-icon.png -share/doc/kde/HTML/en/kdeprint/kcontrolcenter-printmanager-jobcontrol-2.png -share/doc/kde/HTML/en/kdeprint/kcontrolcenter-printmanager-jobcontrol.png -share/doc/kde/HTML/en/kdeprint/kcontrolcenter-printmanager-spartanicview.png -share/doc/kde/HTML/en/kdeprint/kcontrolcenter-printmanager-toolbarplusinfoview.png -share/doc/kde/HTML/en/kdeprint/kcontrolcenter-printsystem.png -share/doc/kde/HTML/en/kdeprint/kcron_to_be_printed.png -share/doc/kde/HTML/en/kdeprint/kdeprint-jobviewer.png -share/doc/kde/HTML/en/kdeprint/kdeprint_printer.png -share/doc/kde/HTML/en/kdeprint/kdeprint_printer_class.png -share/doc/kde/HTML/en/kdeprint/kdeprint_printer_class_stopped.png -share/doc/kde/HTML/en/kdeprint/kdeprint_printer_remote.png -share/doc/kde/HTML/en/kdeprint/kdeprint_printer_stopped.png -share/doc/kde/HTML/en/kdeprint/kprinter-as-netscape-printcommand.png -share/doc/kde/HTML/en/kdeprint/kprinter-dialog.png -share/doc/kde/HTML/en/kdeprint/kprinter-fonts.png -share/doc/kde/HTML/en/kdeprint/kprinter-kivio.png -share/doc/kde/HTML/en/kdeprint/kprinter.png -share/doc/kde/HTML/en/kdeprint/kprinter_called_from_run_command.png -share/doc/kde/HTML/en/kdeprint/kprinter_with_kcron_developer_special.png -share/doc/kde/HTML/en/kdeprint/kprinter_with_kcron_developer_special_nodeco.png -share/doc/kde/HTML/en/kdeprint/printericons-meanings.png -share/doc/kde/HTML/en/kdeprint/ps-boxes.png -share/doc/kde/HTML/en/kdeprint/selecting-printingsystem.png -share/doc/kde/HTML/en/kdeprint/smb-scan-result-2.png -share/doc/kde/HTML/en/kdeprint/smb-scan-result-3.png -share/doc/kde/HTML/en/kdeprint/steinbruch.png -share/doc/kde/HTML/en/kdeprint/steinbruch_scaled.png -share/doc/kde/HTML/en/kdeprint/taskbar-icons.png -share/doc/kde/HTML/en/kdeprint/test_size_withdecoration.png -share/doc/kde/HTML/en/kdeprint/test_size_without_decoration.png -share/doc/kde/HTML/en/kdeprint/xpp-fonts.png -share/doc/kde/HTML/en/kdesu/common -share/doc/kde/HTML/en/kdesu/index.cache.bz2 -share/doc/kde/HTML/en/kdesu/index.docbook -share/doc/kde/HTML/en/kdm/Daemon.README -share/doc/kde/HTML/en/kdm/common -share/doc/kde/HTML/en/kdm/index.cache.bz2 -share/doc/kde/HTML/en/kdm/index.docbook -share/doc/kde/HTML/en/khelpcenter/background.png -share/doc/kde/HTML/en/khelpcenter/bgtable.png -share/doc/kde/HTML/en/khelpcenter/common -share/doc/kde/HTML/en/khelpcenter/contact.docbook -share/doc/kde/HTML/en/khelpcenter/faq/TODO -share/doc/kde/HTML/en/khelpcenter/faq/about.docbook -share/doc/kde/HTML/en/khelpcenter/faq/common -share/doc/kde/HTML/en/khelpcenter/faq/configkde.docbook -share/doc/kde/HTML/en/khelpcenter/faq/contrib.docbook -share/doc/kde/HTML/en/khelpcenter/faq/desktop.docbook -share/doc/kde/HTML/en/khelpcenter/faq/filemng.docbook -share/doc/kde/HTML/en/khelpcenter/faq/getkde.docbook -share/doc/kde/HTML/en/khelpcenter/faq/index.cache.bz2 -share/doc/kde/HTML/en/khelpcenter/faq/index.docbook -share/doc/kde/HTML/en/khelpcenter/faq/index.docbook.old -share/doc/kde/HTML/en/khelpcenter/faq/install.docbook -share/doc/kde/HTML/en/khelpcenter/faq/intro.docbook -share/doc/kde/HTML/en/khelpcenter/faq/kdeapps.docbook -share/doc/kde/HTML/en/khelpcenter/faq/misc.docbook -share/doc/kde/HTML/en/khelpcenter/faq/moreinfo.docbook -share/doc/kde/HTML/en/khelpcenter/faq/nonkdeapps.docbook -share/doc/kde/HTML/en/khelpcenter/faq/notrelated.docbook -share/doc/kde/HTML/en/khelpcenter/faq/panel.docbook -share/doc/kde/HTML/en/khelpcenter/faq/tips.docbook -share/doc/kde/HTML/en/khelpcenter/faq/winmng.docbook -share/doc/kde/HTML/en/khelpcenter/glossary/common -share/doc/kde/HTML/en/khelpcenter/glossary/index.cache.bz2 -share/doc/kde/HTML/en/khelpcenter/glossary/index.docbook -share/doc/kde/HTML/en/khelpcenter/help.docbook -share/doc/kde/HTML/en/khelpcenter/index.cache.bz2 -share/doc/kde/HTML/en/khelpcenter/index.docbook -share/doc/kde/HTML/en/khelpcenter/kdelogo2.png -share/doc/kde/HTML/en/khelpcenter/khelpcenter.png -share/doc/kde/HTML/en/khelpcenter/konq.css -share/doc/kde/HTML/en/khelpcenter/lines.png -share/doc/kde/HTML/en/khelpcenter/lines2.png -share/doc/kde/HTML/en/khelpcenter/links.docbook -share/doc/kde/HTML/en/khelpcenter/pointers.png -share/doc/kde/HTML/en/khelpcenter/quickstart/common -share/doc/kde/HTML/en/khelpcenter/quickstart/index.cache.bz2 -share/doc/kde/HTML/en/khelpcenter/quickstart/index.docbook -share/doc/kde/HTML/en/khelpcenter/shadow1.png -share/doc/kde/HTML/en/khelpcenter/support.docbook -share/doc/kde/HTML/en/khelpcenter/userguide/common -share/doc/kde/HTML/en/khelpcenter/userguide/index.cache.bz2 -share/doc/kde/HTML/en/khelpcenter/userguide/index.docbook -share/doc/kde/HTML/en/khelpcenter/visualdict/common -share/doc/kde/HTML/en/khelpcenter/visualdict/index.cache.bz2 -share/doc/kde/HTML/en/khelpcenter/visualdict/index.docbook -share/doc/kde/HTML/en/khelpcenter/visualdict/pict1.png -share/doc/kde/HTML/en/khelpcenter/visualdict/pict10.png -share/doc/kde/HTML/en/khelpcenter/visualdict/pict11.png -share/doc/kde/HTML/en/khelpcenter/visualdict/pict12.png -share/doc/kde/HTML/en/khelpcenter/visualdict/pict13.png -share/doc/kde/HTML/en/khelpcenter/visualdict/pict14.png -share/doc/kde/HTML/en/khelpcenter/visualdict/pict15.png -share/doc/kde/HTML/en/khelpcenter/visualdict/pict16.png -share/doc/kde/HTML/en/khelpcenter/visualdict/pict17.png -share/doc/kde/HTML/en/khelpcenter/visualdict/pict18.png -share/doc/kde/HTML/en/khelpcenter/visualdict/pict19.png -share/doc/kde/HTML/en/khelpcenter/visualdict/pict2.png -share/doc/kde/HTML/en/khelpcenter/visualdict/pict20.png -share/doc/kde/HTML/en/khelpcenter/visualdict/pict3.png -share/doc/kde/HTML/en/khelpcenter/visualdict/pict4.png -share/doc/kde/HTML/en/khelpcenter/visualdict/pict5.png -share/doc/kde/HTML/en/khelpcenter/visualdict/pict6.png -share/doc/kde/HTML/en/khelpcenter/visualdict/pict7.png -share/doc/kde/HTML/en/khelpcenter/visualdict/pict8.png -share/doc/kde/HTML/en/khelpcenter/visualdict/pict9.png -share/doc/kde/HTML/en/khelpcenter/welcome.docbook -share/doc/kde/HTML/en/khelpcenter/whatiskde.docbook -share/doc/kde/HTML/en/kicker/bookmarks_icon.png -share/doc/kde/HTML/en/kicker/common -share/doc/kde/HTML/en/kicker/desktop_icon.png -share/doc/kde/HTML/en/kicker/index.cache.bz2 -share/doc/kde/HTML/en/kicker/index.docbook -share/doc/kde/HTML/en/kicker/k_menu_icon.png -share/doc/kde/HTML/en/kicker/recent_docs_icon.png -share/doc/kde/HTML/en/kicker/screenshot_left.png -share/doc/kde/HTML/en/kicker/screenshot_right.png -share/doc/kde/HTML/en/kicker/taskbar_group.png -share/doc/kde/HTML/en/kicker/terminals_icon.png -share/doc/kde/HTML/en/kicker/windowlist_icon.png -share/doc/kde/HTML/en/kioslave/audiocd.docbook -share/doc/kde/HTML/en/kioslave/bzip.docbook -share/doc/kde/HTML/en/kioslave/bzip2.docbook -share/doc/kde/HTML/en/kioslave/common -share/doc/kde/HTML/en/kioslave/file.docbook -share/doc/kde/HTML/en/kioslave/finger.docbook -share/doc/kde/HTML/en/kioslave/floppy.docbook -share/doc/kde/HTML/en/kioslave/ftp.docbook -share/doc/kde/HTML/en/kioslave/gopher.docbook -share/doc/kde/HTML/en/kioslave/gzip.docbook -share/doc/kde/HTML/en/kioslave/help.docbook -share/doc/kde/HTML/en/kioslave/http.docbook -share/doc/kde/HTML/en/kioslave/https.docbook -share/doc/kde/HTML/en/kioslave/imap.docbook -share/doc/kde/HTML/en/kioslave/imaps.docbook -share/doc/kde/HTML/en/kioslave/index.cache.bz2 -share/doc/kde/HTML/en/kioslave/index.docbook -share/doc/kde/HTML/en/kioslave/info.docbook -share/doc/kde/HTML/en/kioslave/lan.docbook -share/doc/kde/HTML/en/kioslave/ldap.docbook -share/doc/kde/HTML/en/kioslave/mailto.docbook -share/doc/kde/HTML/en/kioslave/man.docbook -share/doc/kde/HTML/en/kioslave/news.docbook -share/doc/kde/HTML/en/kioslave/nfs.docbook -share/doc/kde/HTML/en/kioslave/nntp.docbook -share/doc/kde/HTML/en/kioslave/pop3.docbook -share/doc/kde/HTML/en/kioslave/pop3s.docbook -share/doc/kde/HTML/en/kioslave/rlan.docbook -share/doc/kde/HTML/en/kioslave/rlogin.docbook -share/doc/kde/HTML/en/kioslave/smb.docbook -share/doc/kde/HTML/en/kioslave/tar.docbook -share/doc/kde/HTML/en/kioslave/telnet.docbook -share/doc/kde/HTML/en/kioslave/thumbnail.docbook -share/doc/kde/HTML/en/klipper/common -share/doc/kde/HTML/en/klipper/index.cache.bz2 -share/doc/kde/HTML/en/klipper/index.docbook -share/doc/kde/HTML/en/klipper/screenshot.png -share/doc/kde/HTML/en/kmenuedit/common -share/doc/kde/HTML/en/kmenuedit/i_copy.png -share/doc/kde/HTML/en/kmenuedit/i_cut.png -share/doc/kde/HTML/en/kmenuedit/i_delete.png -share/doc/kde/HTML/en/kmenuedit/i_k_button.png -share/doc/kde/HTML/en/kmenuedit/i_new_item.png -share/doc/kde/HTML/en/kmenuedit/i_new_submenu.png -share/doc/kde/HTML/en/kmenuedit/i_paste.png -share/doc/kde/HTML/en/kmenuedit/icon_sets.png -share/doc/kde/HTML/en/kmenuedit/icons.png -share/doc/kde/HTML/en/kmenuedit/index.cache.bz2 -share/doc/kde/HTML/en/kmenuedit/index.docbook -share/doc/kde/HTML/en/konqueror/cmndline.png -share/doc/kde/HTML/en/konqueror/common -share/doc/kde/HTML/en/konqueror/dirtree.png -share/doc/kde/HTML/en/konqueror/dragdrop.png -share/doc/kde/HTML/en/konqueror/filetype1.png -share/doc/kde/HTML/en/konqueror/filetype3.png -share/doc/kde/HTML/en/konqueror/filetype4.png -share/doc/kde/HTML/en/konqueror/index.cache.bz2 -share/doc/kde/HTML/en/konqueror/index.docbook -share/doc/kde/HTML/en/konqueror/konqorg.png -share/doc/kde/HTML/en/konqueror/parts.png -share/doc/kde/HTML/en/konqueror/samba.png -share/doc/kde/HTML/en/konsole/common -share/doc/kde/HTML/en/konsole/index.cache.bz2 -share/doc/kde/HTML/en/konsole/index.docbook -share/doc/kde/HTML/en/konsole/konsole.png -share/doc/kde/HTML/en/konsole/konsole1.gif -share/doc/kde/HTML/en/konsole/konsole2.gif -share/doc/kde/HTML/en/konsole/techref.html -share/doc/kde/HTML/en/konsole/vt100.gif -share/doc/kde/HTML/en/kpager/common -share/doc/kde/HTML/en/kpager/index.cache.bz2 -share/doc/kde/HTML/en/kpager/index.docbook -share/doc/kde/HTML/en/kpager/screenshot.png -share/doc/kde/HTML/en/kpager/settings.png -share/doc/kde/HTML/en/ksysguard/common -share/doc/kde/HTML/en/ksysguard/index.cache.bz2 -share/doc/kde/HTML/en/ksysguard/index.docbook -share/doc/kde/HTML/en/kwrite/common -share/doc/kde/HTML/en/kwrite/index.cache.bz2 -share/doc/kde/HTML/en/kwrite/index.docbook -share/fonts/9x15.pcf.gz -share/fonts/console8x16.pcf.gz -share/fonts/console8x8.pcf.gz -share/fonts/fonts.dir -share/fonts/override/fonts.dir -share/kde/applnk/.directory -share/kde/applnk/.hidden/konqfilemgr.desktop -share/kde/applnk/Applications/.directory -share/kde/applnk/Development/.directory -share/kde/applnk/Editors/.directory -share/kde/applnk/Editors/kate.desktop -share/kde/applnk/Editors/kwrite.desktop -share/kde/applnk/Games/.directory -share/kde/applnk/Games/Arcade/.directory -share/kde/applnk/Games/Board/.directory -share/kde/applnk/Games/Card/.directory -share/kde/applnk/Games/TacticStrategy/.directory -share/kde/applnk/Graphics/.directory -share/kde/applnk/Help.desktop -share/kde/applnk/Home.desktop -share/kde/applnk/Internet/.directory -share/kde/applnk/Internet/Terminal/.directory -share/kde/applnk/Internet/keditbookmarks.desktop -share/kde/applnk/Internet/konqbrowser.desktop -share/kde/applnk/KControl.desktop -share/kde/applnk/Multimedia/.directory -share/kde/applnk/Office/.directory -share/kde/applnk/Settings/.directory -share/kde/applnk/Settings/Databases/.directory -share/kde/applnk/Settings/FileBrowsing/.directory -share/kde/applnk/Settings/FileBrowsing/filetypes.desktop -share/kde/applnk/Settings/FileBrowsing/kcmkonq.desktop -share/kde/applnk/Settings/Help/.directory -share/kde/applnk/Settings/Information/.directory -share/kde/applnk/Settings/Information/devices.desktop -share/kde/applnk/Settings/Information/dma.desktop -share/kde/applnk/Settings/Information/interrupts.desktop -share/kde/applnk/Settings/Information/ioports.desktop -share/kde/applnk/Settings/Information/ioslaveinfo.desktop -share/kde/applnk/Settings/Information/kcmusb.desktop -share/kde/applnk/Settings/Information/memory.desktop -share/kde/applnk/Settings/Information/partitions.desktop -share/kde/applnk/Settings/Information/pci.desktop -share/kde/applnk/Settings/Information/processor.desktop -share/kde/applnk/Settings/Information/scsi.desktop -share/kde/applnk/Settings/Information/smbstatus.desktop -share/kde/applnk/Settings/Information/sound.desktop -share/kde/applnk/Settings/Information/xserver.desktop -share/kde/applnk/Settings/LookNFeel/.directory -share/kde/applnk/Settings/LookNFeel/Desktop/background.desktop -share/kde/applnk/Settings/LookNFeel/Desktop/borders.desktop -share/kde/applnk/Settings/LookNFeel/Desktop/desktop.desktop -share/kde/applnk/Settings/LookNFeel/Desktop/virtualdesktops.desktop -share/kde/applnk/Settings/LookNFeel/Themes/iconthemes.desktop -share/kde/applnk/Settings/LookNFeel/Themes/style.desktop -share/kde/applnk/Settings/LookNFeel/Windows/actions.desktop -share/kde/applnk/Settings/LookNFeel/Windows/kwinmouse.desktop -share/kde/applnk/Settings/LookNFeel/Windows/mouse.desktop -share/kde/applnk/Settings/LookNFeel/background.desktop -share/kde/applnk/Settings/LookNFeel/colors.desktop -share/kde/applnk/Settings/LookNFeel/desktop.desktop -share/kde/applnk/Settings/LookNFeel/fonts.desktop -share/kde/applnk/Settings/LookNFeel/icons.desktop -share/kde/applnk/Settings/LookNFeel/kcmlaunch.desktop -share/kde/applnk/Settings/LookNFeel/kcmtaskbar.desktop -share/kde/applnk/Settings/LookNFeel/keys.desktop -share/kde/applnk/Settings/LookNFeel/kthememgr.desktop -share/kde/applnk/Settings/LookNFeel/kwindecoration.desktop -share/kde/applnk/Settings/LookNFeel/kwinoptions.desktop -share/kde/applnk/Settings/LookNFeel/panel.desktop -share/kde/applnk/Settings/LookNFeel/screensaver.desktop -share/kde/applnk/Settings/LookNFeel/style.desktop -share/kde/applnk/Settings/LookNFeel/virtualdesktops.desktop -share/kde/applnk/Settings/Network/.directory -share/kde/applnk/Settings/Network/email.desktop -share/kde/applnk/Settings/Network/ioslaveinfo.desktop -share/kde/applnk/Settings/Network/netpref.desktop -share/kde/applnk/Settings/Network/smb.desktop -share/kde/applnk/Settings/Network/socks.desktop -share/kde/applnk/Settings/Peripherals/.directory -share/kde/applnk/Settings/Peripherals/keyboard.desktop -share/kde/applnk/Settings/Peripherals/mouse.desktop -share/kde/applnk/Settings/Personalization/.directory -share/kde/applnk/Settings/Personalization/crypto.desktop -share/kde/applnk/Settings/Personalization/kcmaccess.desktop -share/kde/applnk/Settings/Personalization/kcmlayout.desktop -share/kde/applnk/Settings/Personalization/language.desktop -share/kde/applnk/Settings/Personalization/passwords.desktop -share/kde/applnk/Settings/Personalization/spellchecking.desktop -share/kde/applnk/Settings/PowerControl/.directory -share/kde/applnk/Settings/PowerControl/energy.desktop -share/kde/applnk/Settings/Sound/.directory -share/kde/applnk/Settings/Sound/arts.desktop -share/kde/applnk/Settings/Sound/bell.desktop -share/kde/applnk/Settings/Sound/kcmnotify.desktop -share/kde/applnk/Settings/Sound/midi.desktop -share/kde/applnk/Settings/System/.directory -share/kde/applnk/Settings/System/clock.desktop -share/kde/applnk/Settings/System/kcmkonsole.desktop -share/kde/applnk/Settings/System/kcmsmserver.desktop -share/kde/applnk/Settings/System/kdm.desktop -share/kde/applnk/Settings/System/printmgr.desktop -share/kde/applnk/Settings/WebBrowsing/.directory -share/kde/applnk/Settings/WebBrowsing/cookies.desktop -share/kde/applnk/Settings/WebBrowsing/ebrowsing.desktop -share/kde/applnk/Settings/WebBrowsing/kcmcss.desktop -share/kde/applnk/Settings/WebBrowsing/konqhtml.desktop -share/kde/applnk/Settings/WebBrowsing/proxy.desktop -share/kde/applnk/Settings/WebBrowsing/smb.desktop -share/kde/applnk/Settings/WebBrowsing/useragent.desktop -share/kde/applnk/System/.directory -share/kde/applnk/System/ScreenSavers/.directory -share/kde/applnk/System/ScreenSavers/KBanner.desktop -share/kde/applnk/System/ScreenSavers/KBlankscreen.desktop -share/kde/applnk/System/ScreenSavers/KBlob.desktop -share/kde/applnk/System/ScreenSavers/KBouboule.desktop -share/kde/applnk/System/ScreenSavers/KLines.desktop -share/kde/applnk/System/ScreenSavers/KLorenz.desktop -share/kde/applnk/System/ScreenSavers/KMatrix.desktop -share/kde/applnk/System/ScreenSavers/KMorph3D.desktop -share/kde/applnk/System/ScreenSavers/KPipes.desktop -share/kde/applnk/System/ScreenSavers/KPolygon.desktop -share/kde/applnk/System/ScreenSavers/KPyro.desktop -share/kde/applnk/System/ScreenSavers/KRandom.desktop -share/kde/applnk/System/ScreenSavers/KRock.desktop -share/kde/applnk/System/ScreenSavers/KScience.desktop -share/kde/applnk/System/ScreenSavers/KSlidescreen.desktop -share/kde/applnk/System/ScreenSavers/KSlideshow.desktop -share/kde/applnk/System/ScreenSavers/KSpace.desktop -share/kde/applnk/System/ScreenSavers/KSwarm.desktop -share/kde/applnk/System/ScreenSavers/KVm.desktop -share/kde/applnk/System/ScreenSavers/kpartsaver.desktop -share/kde/applnk/System/Terminal/.directory -share/kde/applnk/System/kappfinder.desktop -share/kde/applnk/System/kfmclient.desktop -share/kde/applnk/System/kfmclient_dir.desktop -share/kde/applnk/System/kfmclient_html.desktop -share/kde/applnk/System/klegacyimport.desktop -share/kde/applnk/System/kmenuedit.desktop -share/kde/applnk/System/konquerorsu.desktop -share/kde/applnk/System/konsole.desktop -share/kde/applnk/System/konsolesu.desktop -share/kde/applnk/System/kpersonalizer.desktop -share/kde/applnk/System/ksysguard.desktop -share/kde/applnk/Toys/.directory -share/kde/applnk/Toys/ktip.desktop -share/kde/applnk/Utilities/.directory -share/kde/applnk/Utilities/kaddressbook.desktop -share/kde/applnk/Utilities/kdeprintfax.desktop -share/kde/applnk/Utilities/kjobviewer.desktop -share/kde/applnk/Utilities/klipper.desktop -share/kde/applnk/Utilities/kpager.desktop -share/kde/applnk/WordProcessing/.directory -share/kde/applnk/ksysguard/eventsrc -share/kde/apps/clockapplet/pics/lcd.png -share/kde/apps/drkonqi/debuggers/gdbrc -share/kde/apps/drkonqi/pics/konqi.png -share/kde/apps/drkonqi/presets/developerrc -share/kde/apps/drkonqi/presets/enduserrc -share/kde/apps/kaddressbook/kaddressbookui.rc -share/kde/apps/kaddressbook/pics/abentry.xpm -share/kde/apps/kaddressbook/pics/delete.xpm -share/kde/apps/kaddressbook/pics/down.xpm -share/kde/apps/kaddressbook/pics/filemail.xpm -share/kde/apps/kaddressbook/pics/find.xpm -share/kde/apps/kaddressbook/pics/group.xpm -share/kde/apps/kaddressbook/pics/page.xpm -share/kde/apps/kaddressbook/pics/up.xpm -share/kde/apps/kappfinder/apps/Development/ddd.desktop -share/kde/apps/kappfinder/apps/Development/designer.desktop -share/kde/apps/kappfinder/apps/Development/dlgedit.desktop -share/kde/apps/kappfinder/apps/Development/linguist.desktop -share/kde/apps/kappfinder/apps/Editors/emacs.desktop -share/kde/apps/kappfinder/apps/Editors/gvim.desktop -share/kde/apps/kappfinder/apps/Editors/lemacs.desktop -share/kde/apps/kappfinder/apps/Editors/nedit.desktop -share/kde/apps/kappfinder/apps/Editors/xedit.desktop -share/kde/apps/kappfinder/apps/Editors/xemacs.desktop -@exec ${MKDIR} %D/share/kde/apps/kappfinder/apps/Games/Arcade -share/kde/apps/kappfinder/apps/Games/Board/xboard.desktop -share/kde/apps/kappfinder/apps/Games/Card/PySol.desktop -share/kde/apps/kappfinder/apps/Games/Clanbomber.desktop -share/kde/apps/kappfinder/apps/Games/Emulators/qmamecat.desktop -share/kde/apps/kappfinder/apps/Games/TacticStrategy/freeciv.desktop -share/kde/apps/kappfinder/apps/Games/defendguin.desktop -share/kde/apps/kappfinder/apps/Games/penguin-command.desktop -share/kde/apps/kappfinder/apps/Games/xshipwars.desktop -share/kde/apps/kappfinder/apps/Graphics/gimp.desktop -share/kde/apps/kappfinder/apps/Graphics/xfig.desktop -share/kde/apps/kappfinder/apps/Graphics/xpaint.desktop -share/kde/apps/kappfinder/apps/Graphics/xv.desktop -share/kde/apps/kappfinder/apps/Internet/Terminal/lftp.desktop -share/kde/apps/kappfinder/apps/Internet/Terminal/mutt.desktop -share/kde/apps/kappfinder/apps/Internet/Terminal/ncftp.desktop -share/kde/apps/kappfinder/apps/Internet/Terminal/pine.desktop -share/kde/apps/kappfinder/apps/Internet/arena.desktop -share/kde/apps/kappfinder/apps/Internet/coolmail.desktop -share/kde/apps/kappfinder/apps/Internet/ethereal.desktop -share/kde/apps/kappfinder/apps/Internet/licq.desktop -share/kde/apps/kappfinder/apps/Internet/mozilla.desktop -share/kde/apps/kappfinder/apps/Internet/netscape.desktop -share/kde/apps/kappfinder/apps/Internet/xbiff.desktop -share/kde/apps/kappfinder/apps/Internet/xchat.desktop -share/kde/apps/kappfinder/apps/Internet/xfmail.desktop -share/kde/apps/kappfinder/apps/Internet/xftp.desktop -share/kde/apps/kappfinder/apps/Multimedia/alevt.desktop -share/kde/apps/kappfinder/apps/Multimedia/aviplay.desktop -share/kde/apps/kappfinder/apps/Multimedia/gtv.desktop -share/kde/apps/kappfinder/apps/Multimedia/mtv.desktop -share/kde/apps/kappfinder/apps/Multimedia/realplayer.desktop -share/kde/apps/kappfinder/apps/Multimedia/xawtv.desktop -share/kde/apps/kappfinder/apps/Multimedia/xmms-enqueue.desktop -share/kde/apps/kappfinder/apps/Multimedia/xmms.desktop -share/kde/apps/kappfinder/apps/Office/Applix.desktop -share/kde/apps/kappfinder/apps/Office/XAcc.desktop -share/kde/apps/kappfinder/apps/Office/XsLite.desktop -share/kde/apps/kappfinder/apps/Office/plan.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Ant.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Atlantis.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Attraction.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Bouboule.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Braid.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Bubble3d.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Bubbles.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Cage.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Compass.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Coral.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Crystal.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Cynosure.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Demon.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Drift.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Fadeplot.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Flag.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Flame.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Flow.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Forest.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/GLPlanet.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Galaxy.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Gears.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Goop.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Grav.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Hopalong.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Hypercube.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Ifs.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Imsmap.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Interference.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Julia.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Kaleidescope.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Kumppa.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/LMorph.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Lament.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Laser.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Lightning.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Lissie.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Moenius.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Penrose.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Phosphor.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Pulsar.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Rubik.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Slip.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Sonar.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Sproingies.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Stairs.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Starfish.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Strange.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Superquadrics.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Swirl.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/T3d.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Triangle.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Vines.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Worm.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/XFlame.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/XJack.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/XMatrix.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/XPipes.desktop -share/kde/apps/kappfinder/apps/System/Terminal/procinfo.desktop -share/kde/apps/kappfinder/apps/System/Terminal/vmstat.desktop -share/kde/apps/kappfinder/apps/System/sam.desktop -share/kde/apps/kappfinder/apps/System/xosview.desktop -share/kde/apps/kappfinder/apps/Toys/xeyes.desktop -share/kde/apps/kappfinder/apps/Toys/xpinguin.desktop -share/kde/apps/kappfinder/apps/Utilities/XUtilities/xcalc.desktop -share/kde/apps/kappfinder/apps/Utilities/XUtilities/xclipboard.desktop -share/kde/apps/kappfinder/apps/Utilities/XUtilities/xclock.desktop -share/kde/apps/kappfinder/apps/Utilities/XUtilities/xconsole.desktop -share/kde/apps/kappfinder/apps/Utilities/XUtilities/xload.desktop -share/kde/apps/kappfinder/apps/Utilities/XUtilities/xmag.desktop -share/kde/apps/kappfinder/apps/Utilities/XUtilities/xterm.desktop -share/kde/apps/kappfinder/apps/WordProcessing/WordPerfect.desktop -share/kde/apps/kappfinder/apps/WordProcessing/WordPerfect2000.desktop -share/kde/apps/kappfinder/apps/WordProcessing/acroread.desktop -share/kde/apps/kappfinder/apps/WordProcessing/ghostview.desktop -share/kde/apps/kappfinder/apps/WordProcessing/gv.desktop -share/kde/apps/kappfinder/apps/WordProcessing/lyx.desktop -share/kde/apps/kappfinder/apps/WordProcessing/pybliographic.desktop -share/kde/apps/kappfinder/apps/WordProcessing/xdvi.desktop -share/kde/apps/kappfinder/apps/WordProcessing/xpdf.desktop -share/kde/apps/kate/icons/hicolor/16x16/actions/curfiledir.png -share/kde/apps/kate/icons/hicolor/16x16/actions/highlighting.png -share/kde/apps/kate/icons/hicolor/16x16/actions/modified.png -share/kde/apps/kate/icons/hicolor/16x16/actions/null.png -share/kde/apps/kate/icons/hicolor/16x16/actions/save_all.png -share/kde/apps/kate/icons/hicolor/22x22/actions/save_all.png -share/kde/apps/kate/icons/hicolor/32x32/actions/highlighting.png -share/kde/apps/kate/icons/hicolor/32x32/actions/indent.png -share/kde/apps/kate/icons/hicolor/32x32/actions/unindent.png -share/kde/apps/kate/icons/hicolor/48x48/actions/indent.png -share/kde/apps/kate/icons/hicolor/48x48/actions/unindent.png -share/kde/apps/kate/icons/locolor/16x16/actions/curfiledir.png -share/kde/apps/kate/icons/locolor/16x16/actions/indent.png -share/kde/apps/kate/icons/locolor/16x16/actions/modified.png -share/kde/apps/kate/icons/locolor/16x16/actions/null.png -share/kde/apps/kate/icons/locolor/16x16/actions/save_all.png -share/kde/apps/kate/icons/locolor/16x16/actions/unindent.png -share/kde/apps/kate/icons/locolor/22x22/actions/indent.png -share/kde/apps/kate/icons/locolor/22x22/actions/save_all.png -share/kde/apps/kate/icons/locolor/22x22/actions/unindent.png -share/kde/apps/kate/katepartbrowserui.rc -share/kde/apps/kate/katepartui.rc -share/kde/apps/kate/kateui.rc -share/kde/apps/kate/pics/fileselector.png -share/kde/apps/kate/pics/indicator_empty.png -share/kde/apps/kate/pics/indicator_viewactive.png -share/kde/apps/kate/pics/openfiles.png -share/kde/apps/kate/syntax/ada.xml -share/kde/apps/kate/syntax/bash.xml -share/kde/apps/kate/syntax/c.xml -share/kde/apps/kate/syntax/changelog.xml -share/kde/apps/kate/syntax/cpp.xml -share/kde/apps/kate/syntax/css.xml -share/kde/apps/kate/syntax/desktop.xml -share/kde/apps/kate/syntax/diff.xml -share/kde/apps/kate/syntax/html.xml -share/kde/apps/kate/syntax/java.xml -share/kde/apps/kate/syntax/kbasic.xml -share/kde/apps/kate/syntax/language.dtd -share/kde/apps/kate/syntax/latex.xml -share/kde/apps/kate/syntax/objectivec.xml -share/kde/apps/kate/syntax/perl.xml -share/kde/apps/kate/syntax/php.xml -share/kde/apps/kate/syntax/postscript.xml -share/kde/apps/kate/syntax/rpmspec.xml -share/kde/apps/kate/syntax/ruby.xml -share/kde/apps/kate/syntax/sql.xml -share/kde/apps/kate/syntax/syntax.template -share/kde/apps/kate/syntax/vhdl.xml -share/kde/apps/kate/syntax/xml.xml -share/kde/apps/kbookmark/directory_bookmarkbar.desktop -share/kde/apps/kcmcss/template.css -share/kde/apps/kcminput/cursor_large.pcf.gz -share/kde/apps/kcminput/pics/mouse_lh.png -share/kde/apps/kcminput/pics/mouse_rh.png -share/kde/apps/kcmkeys/global/global-kde3.kksrc -share/kde/apps/kcmkeys/global/global-kde4.kksrc -share/kde/apps/kcmkeys/global/global-mac3.kksrc -share/kde/apps/kcmkeys/global/global-unix3.kksrc -share/kde/apps/kcmkeys/global/global-win3.kksrc -share/kde/apps/kcmkeys/global/global-win4.kksrc -share/kde/apps/kcmkeys/standard/app-kde3.kksrc -share/kde/apps/kcmkeys/standard/app-kde4.kksrc -share/kde/apps/kcmkeys/standard/app-mac3.kksrc -share/kde/apps/kcmkeys/standard/app-unix3.kksrc -share/kde/apps/kcmkeys/standard/app-win3.kksrc -share/kde/apps/kcmlocale/pics/background.png -share/kde/apps/kcmusb/usb.ids -share/kde/apps/kconf_update/klipper-1-2.pl -share/kde/apps/kconf_update/klipperrc.upd -share/kde/apps/kconf_update/konsole.upd -share/kde/apps/kcontrol/kcontrolui.rc -share/kde/apps/kcontrol/pics/energybig.png -share/kde/apps/kcontrol/pics/lo-energy.png -share/kde/apps/kcontrol/pics/logo.png -share/kde/apps/kcontrol/pics/mini-world.png -share/kde/apps/kcontrol/pics/monitor.png -share/kde/apps/kcontrol/pics/onlyone.png -share/kde/apps/kcontrol/pics/overlapping.png -share/kde/apps/kcontrol/pics/part1.png -share/kde/apps/kcontrol/pics/part2.png -share/kde/apps/kcontrol/pics/part3.png -share/kde/apps/kcontrol/pics/play.png -share/kde/apps/kdcop/kdcopui.rc -share/kde/apps/kdeprintfax/anytops -share/kde/apps/kdeprintfax/faxfilters -share/kde/apps/kdeprintfax/icons/hicolor/16x16/actions/abentry.png -share/kde/apps/kdeprintfax/kdeprintfaxui.rc -share/kde/apps/kdesktop/DesktopLinks/Home.desktop -share/kde/apps/kdesktop/directory.autostart -share/kde/apps/kdesktop/directory.desktop -share/kde/apps/kdesktop/directory.templates -share/kde/apps/kdesktop/directory.trash -share/kde/apps/kdesktop/patterns/fish.desktop -share/kde/apps/kdesktop/patterns/fish.png -share/kde/apps/kdesktop/patterns/flowers.desktop -share/kde/apps/kdesktop/patterns/flowers.png -share/kde/apps/kdesktop/patterns/night-rock.desktop -share/kde/apps/kdesktop/patterns/night-rock.jpg -share/kde/apps/kdesktop/patterns/pavement.desktop -share/kde/apps/kdesktop/patterns/pavement.png -share/kde/apps/kdesktop/patterns/rattan.desktop -share/kde/apps/kdesktop/patterns/rattan.png -share/kde/apps/kdesktop/patterns/stonewall2.desktop -share/kde/apps/kdesktop/patterns/stonewall2.png -share/kde/apps/kdesktop/patterns/triangles.desktop -share/kde/apps/kdesktop/patterns/triangles.png -share/kde/apps/kdesktop/pics/kde2.xbm -share/kde/apps/kdesktop/pics/ksslogo.png -share/kde/apps/kdesktop/pics/splash.png -share/kde/apps/kdesktop/pics/splash2.png -share/kde/apps/kdesktop/programs/kwebdesktop.desktop -share/kde/apps/kdesktop/programs/xearth.desktop -share/kde/apps/kdesktop/programs/xglobe.desktop -share/kde/apps/kdesktop/programs/xplanet.desktop -share/kde/apps/kdewizard/pics/wizard_small.png -share/kde/apps/kdewizard/tips -share/kde/apps/kdisplay/app-defaults/AAAAAAGeneral.ad -share/kde/apps/kdisplay/app-defaults/AAAMotif.ad -share/kde/apps/kdisplay/app-defaults/AAATk.ad -share/kde/apps/kdisplay/app-defaults/AAAXaw.ad -share/kde/apps/kdisplay/app-defaults/AcroRead.ad -share/kde/apps/kdisplay/app-defaults/Editres.ad -share/kde/apps/kdisplay/app-defaults/Emacs.ad -share/kde/apps/kdisplay/app-defaults/GV.ad -share/kde/apps/kdisplay/app-defaults/ML.ad -share/kde/apps/kdisplay/app-defaults/Nedit.ad -share/kde/apps/kdisplay/app-defaults/Netscape.ad -share/kde/apps/kdisplay/app-defaults/RVPlayer.ad -share/kde/apps/kdisplay/app-defaults/WPerfect.ad -share/kde/apps/kdisplay/app-defaults/XCalc.ad -share/kde/apps/kdisplay/app-defaults/XOsview.ad -share/kde/apps/kdisplay/app-defaults/XTerm.ad -share/kde/apps/kdisplay/app-defaults/XV.ad -share/kde/apps/kdisplay/app-defaults/Xawtv.ad -share/kde/apps/kdisplay/app-defaults/Xdvi.ad -share/kde/apps/kdisplay/app-defaults/Xpdf.ad -share/kde/apps/kdisplay/color-schemes/AtlasGreen.kcsrc -share/kde/apps/kdisplay/color-schemes/BeOS.kcsrc -share/kde/apps/kdisplay/color-schemes/BlueSlate.kcsrc -share/kde/apps/kdisplay/color-schemes/CDE.kcsrc -share/kde/apps/kdisplay/color-schemes/DarkBlue.kcsrc -share/kde/apps/kdisplay/color-schemes/DesertRed.kcsrc -share/kde/apps/kdisplay/color-schemes/DigitalCDE.kcsrc -share/kde/apps/kdisplay/color-schemes/EveX.kcsrc -share/kde/apps/kdisplay/color-schemes/KDEOne.kcsrc -share/kde/apps/kdisplay/color-schemes/MediaPeach.kcsrc -share/kde/apps/kdisplay/color-schemes/Next.kcsrc -share/kde/apps/kdisplay/color-schemes/PaleGray.kcsrc -share/kde/apps/kdisplay/color-schemes/PointReyesGreen.kcsrc -share/kde/apps/kdisplay/color-schemes/Pumpkin.kcsrc -share/kde/apps/kdisplay/color-schemes/SolarisCDE.kcsrc -share/kde/apps/kdisplay/color-schemes/Storm.kcsrc -share/kde/apps/kdisplay/color-schemes/System.kcsrc -share/kde/apps/kdisplay/color-schemes/Windows2000.kcsrc -share/kde/apps/kdisplay/color-schemes/Windows95.kcsrc -share/kde/apps/kdm/pics/kdeflower.png -share/kde/apps/kdm/pics/kdelogo.png -share/kde/apps/kdm/pics/users/default.png -share/kde/apps/kdm/pics/users/default2.png -share/kde/apps/kdm/pics/users/root.png -share/kde/apps/kdm/pics/users/root2.png -share/kde/apps/keditbookmarks/keditbookmarksui.rc -share/kde/apps/kfind/icons/locolor/22x22/actions/archive.png -share/kde/apps/kfind/icons/locolor/22x22/actions/delete.png -share/kde/apps/kfind/icons/locolor/22x22/actions/idea.png -share/kde/apps/kfind/icons/locolor/22x22/actions/info.png -share/kde/apps/kfind/icons/locolor/22x22/actions/openfile.png -share/kde/apps/kfind/icons/locolor/22x22/actions/save.png -share/kde/apps/kfind/icons/locolor/22x22/actions/search.png -share/kde/apps/khelpcenter/glossary.html.in -share/kde/apps/khelpcenter/intro.html.in -share/kde/apps/khelpcenter/khelpcenterui.rc -share/kde/apps/khelpcenter/plugins/Tutorials/.directory -share/kde/apps/khelpcenter/plugins/Tutorials/quickstart.desktop -share/kde/apps/khelpcenter/plugins/Tutorials/visualdict.desktop -share/kde/apps/kicker/applets/clockapplet.desktop -share/kde/apps/kicker/applets/kminipagerapplet.desktop -share/kde/apps/kicker/applets/krunapplet.desktop -share/kde/apps/kicker/applets/ksysguardapplet.desktop -share/kde/apps/kicker/applets/ksystemtrayapplet.desktop -share/kde/apps/kicker/applets/ktaskbarapplet.desktop -share/kde/apps/kicker/applets/naughtyapplet.desktop -share/kde/apps/kicker/applets/quicklauncher.desktop -share/kde/apps/kicker/default-apps -share/kde/apps/kicker/extensions/childpanelextension.desktop -share/kde/apps/kicker/extensions/dockbarextension.desktop -share/kde/apps/kicker/extensions/kasbarextension.desktop -share/kde/apps/kicker/extensions/taskbarextension.desktop -share/kde/apps/kicker/icons/hicolor/16x16/actions/modified.png -share/kde/apps/kicker/icons/locolor/16x16/actions/modified.png -share/kde/apps/kicker/pics/disk1.png -share/kde/apps/kicker/pics/disk2.png -share/kde/apps/kicker/pics/disk3.png -share/kde/apps/kicker/pics/disk4.png -share/kde/apps/kicker/pics/disk5.png -share/kde/apps/kicker/pics/disk6.png -share/kde/apps/kicker/pics/disk7.png -share/kde/apps/kicker/pics/disk8.png -share/kde/apps/kicker/tiles/blue_wood_large_down.png -share/kde/apps/kicker/tiles/blue_wood_large_up.png -share/kde/apps/kicker/tiles/blue_wood_normal_down.png -share/kde/apps/kicker/tiles/blue_wood_normal_up.png -share/kde/apps/kicker/tiles/blue_wood_tiny_down.png -share/kde/apps/kicker/tiles/blue_wood_tiny_up.png -share/kde/apps/kicker/tiles/green_wood_large_down.png -share/kde/apps/kicker/tiles/green_wood_large_up.png -share/kde/apps/kicker/tiles/green_wood_normal_down.png -share/kde/apps/kicker/tiles/green_wood_normal_up.png -share/kde/apps/kicker/tiles/green_wood_tiny_down.png -share/kde/apps/kicker/tiles/green_wood_tiny_up.png -share/kde/apps/kicker/tiles/kde2_button_large_down.png -share/kde/apps/kicker/tiles/kde2_button_large_up.png -share/kde/apps/kicker/tiles/kde2_button_normal_down.png -share/kde/apps/kicker/tiles/kde2_button_normal_up.png -share/kde/apps/kicker/tiles/kde2_button_tiny_down.png -share/kde/apps/kicker/tiles/kde2_button_tiny_up.png -share/kde/apps/kicker/tiles/light_green_large_down.png -share/kde/apps/kicker/tiles/light_green_large_up.png -share/kde/apps/kicker/tiles/light_green_normal_down.png -share/kde/apps/kicker/tiles/light_green_normal_up.png -share/kde/apps/kicker/tiles/light_green_tiny_down.png -share/kde/apps/kicker/tiles/light_green_tiny_up.png -share/kde/apps/kicker/tiles/light_grey_large_down.png -share/kde/apps/kicker/tiles/light_grey_large_up.png -share/kde/apps/kicker/tiles/light_grey_normal_up.png -share/kde/apps/kicker/tiles/light_grey_tiny_down.png -share/kde/apps/kicker/tiles/light_grey_tiny_up.png -share/kde/apps/kicker/tiles/light_pastel_large_down.png -share/kde/apps/kicker/tiles/light_pastel_large_up.png -share/kde/apps/kicker/tiles/light_pastel_normal_up.png -share/kde/apps/kicker/tiles/light_pastel_tiny_down.png -share/kde/apps/kicker/tiles/light_pastel_tiny_up.png -share/kde/apps/kicker/tiles/light_purple_large_down.png -share/kde/apps/kicker/tiles/light_purple_large_up.png -share/kde/apps/kicker/tiles/light_purple_normal_down.png -share/kde/apps/kicker/tiles/light_purple_normal_up.png -share/kde/apps/kicker/tiles/light_purple_tiny_down.png -share/kde/apps/kicker/tiles/light_purple_tiny_up.png -share/kde/apps/kicker/tiles/nuts_andBolts_large_down.png -share/kde/apps/kicker/tiles/nuts_andBolts_large_up.png -share/kde/apps/kicker/tiles/nuts_andBolts_normal_down.png -share/kde/apps/kicker/tiles/nuts_andBolts_normal_up.png -share/kde/apps/kicker/tiles/nuts_andBolts_tiny_down.png -share/kde/apps/kicker/tiles/nuts_andBolts_tiny_up.png -share/kde/apps/kicker/tiles/red_wood_large_down.png -share/kde/apps/kicker/tiles/red_wood_large_up.png -share/kde/apps/kicker/tiles/red_wood_normal_down.png -share/kde/apps/kicker/tiles/red_wood_normal_up.png -share/kde/apps/kicker/tiles/red_wood_tiny_down.png -share/kde/apps/kicker/tiles/red_wood_tiny_up.png -share/kde/apps/kicker/tiles/solid_blue_large_down.png -share/kde/apps/kicker/tiles/solid_blue_large_up.png -share/kde/apps/kicker/tiles/solid_blue_normal_down.png -share/kde/apps/kicker/tiles/solid_blue_normal_up.png -share/kde/apps/kicker/tiles/solid_blue_tiny_down.png -share/kde/apps/kicker/tiles/solid_blue_tiny_up.png -share/kde/apps/kicker/tiles/solid_gray_large_down.png -share/kde/apps/kicker/tiles/solid_gray_large_up.png -share/kde/apps/kicker/tiles/solid_gray_normal_down.png -share/kde/apps/kicker/tiles/solid_gray_normal_up.png -share/kde/apps/kicker/tiles/solid_gray_tiny_down.png -share/kde/apps/kicker/tiles/solid_gray_tiny_up.png -share/kde/apps/kicker/tiles/solid_green_large_down.png -share/kde/apps/kicker/tiles/solid_green_large_up.png -share/kde/apps/kicker/tiles/solid_green_normal_down.png -share/kde/apps/kicker/tiles/solid_green_normal_up.png -share/kde/apps/kicker/tiles/solid_green_tiny_down.png -share/kde/apps/kicker/tiles/solid_green_tiny_up.png -share/kde/apps/kicker/tiles/solid_orange_large_down.png -share/kde/apps/kicker/tiles/solid_orange_large_up.png -share/kde/apps/kicker/tiles/solid_orange_normal_down.png -share/kde/apps/kicker/tiles/solid_orange_normal_up.png -share/kde/apps/kicker/tiles/solid_orange_tiny_down.png -share/kde/apps/kicker/tiles/solid_orange_tiny_up.png -share/kde/apps/kicker/tiles/solid_pastel_large_down.png -share/kde/apps/kicker/tiles/solid_pastel_large_up.png -share/kde/apps/kicker/tiles/solid_pastel_normal_down.png -share/kde/apps/kicker/tiles/solid_pastel_normal_up.png -share/kde/apps/kicker/tiles/solid_pastel_tiny_down.png -share/kde/apps/kicker/tiles/solid_pastel_tiny_up.png -share/kde/apps/kicker/tiles/solid_purple_large_down.png -share/kde/apps/kicker/tiles/solid_purple_large_up.png -share/kde/apps/kicker/tiles/solid_purple_normal_down.png -share/kde/apps/kicker/tiles/solid_purple_normal_up.png -share/kde/apps/kicker/tiles/solid_purple_tiny_down.png -share/kde/apps/kicker/tiles/solid_purple_tiny_up.png -share/kde/apps/kicker/tiles/solid_red_large_down.png -share/kde/apps/kicker/tiles/solid_red_large_up.png -share/kde/apps/kicker/tiles/solid_red_normal_down.png -share/kde/apps/kicker/tiles/solid_red_normal_up.png -share/kde/apps/kicker/tiles/solid_red_tiny_down.png -share/kde/apps/kicker/tiles/solid_red_tiny_up.png -share/kde/apps/kicker/tiles/solid_tgri_large_down.png -share/kde/apps/kicker/tiles/solid_tgri_large_up.png -share/kde/apps/kicker/tiles/solid_tgri_normal_down.png -share/kde/apps/kicker/tiles/solid_tgri_normal_up.png -share/kde/apps/kicker/tiles/solid_tgri_tiny_down.png -share/kde/apps/kicker/tiles/solid_tgri_tiny_up.png -share/kde/apps/kicker/wallpapers/deck_plate.png -share/kde/apps/kicker/wallpapers/green_line.png -share/kde/apps/kicker/wallpapers/rail.png -share/kde/apps/kio_finger/kio_finger.css -share/kde/apps/kio_finger/kio_finger.pl -share/kde/apps/kio_info/kde-info2html -share/kde/apps/kio_info/kde-info2html.conf -share/kde/apps/kioslave/smb.html -share/kde/apps/kjobviewer/kjobviewerui.rc -share/kde/apps/kmenuedit/icons/hicolor/22x22/actions/menu_new.png -share/kde/apps/kmenuedit/icons/hicolor/32x32/actions/menu_new.png -share/kde/apps/kmenuedit/icons/locolor/16x16/actions/menu_new.png -share/kde/apps/kmenuedit/kmenueditui.rc -share/kde/apps/konqiconview/konq_iconview.rc -share/kde/apps/konqiconview/konq_multicolumnview.rc -share/kde/apps/konqiconview/kpartplugins/kshellcmdplugin.rc -share/kde/apps/konqlistview/konq_detailedlistview.rc -share/kde/apps/konqlistview/konq_textview.rc -share/kde/apps/konqlistview/konq_treeview.rc -share/kde/apps/konqlistview/kpartplugins/kshellcmdplugin.rc -share/kde/apps/konqsidebartng/add/sidebar_classic_add.desktop -share/kde/apps/konqsidebartng/add/virtualfolderadd.desktop -share/kde/apps/konqsidebartng/dirtree/bookmarks_module.desktop -share/kde/apps/konqsidebartng/dirtree/dirtree_module.desktop -share/kde/apps/konqsidebartng/dirtree/history_module.desktop -share/kde/apps/konqsidebartng/entries/.version -share/kde/apps/konqsidebartng/entries/bookmarks.desktop -share/kde/apps/konqsidebartng/entries/history.desktop -share/kde/apps/konqsidebartng/entries/home.desktop -share/kde/apps/konqsidebartng/entries/remote.desktop -share/kde/apps/konqsidebartng/entries/root.desktop -share/kde/apps/konqsidebartng/entries/services.desktop -share/kde/apps/konqsidebartng/entries/sidebar_classic.desktop -share/kde/apps/konqsidebartng/virtual_folders/remote/.directory -share/kde/apps/konqsidebartng/virtual_folders/remote/ftp/.directory -share/kde/apps/konqsidebartng/virtual_folders/remote/ftp/kde_ftp.desktop -share/kde/apps/konqsidebartng/virtual_folders/remote/web/.directory -share/kde/apps/konqsidebartng/virtual_folders/remote/web/apps_web.desktop -share/kde/apps/konqsidebartng/virtual_folders/remote/web/dot_web.desktop -share/kde/apps/konqsidebartng/virtual_folders/remote/web/kde_web.desktop -share/kde/apps/konqsidebartng/virtual_folders/services/.directory -share/kde/apps/konqsidebartng/virtual_folders/services/audiocd.desktop -share/kde/apps/konqueror/about/back.png -share/kde/apps/konqueror/about/background.png -share/kde/apps/konqueror/about/bgtable.png -share/kde/apps/konqueror/about/gohome.png -share/kde/apps/konqueror/about/history.png -share/kde/apps/konqueror/about/intro.html -share/kde/apps/konqueror/about/kdelogo2.png -share/kde/apps/konqueror/about/konq.css -share/kde/apps/konqueror/about/konqueror.png -share/kde/apps/konqueror/about/lightning.png -share/kde/apps/konqueror/about/lines.png -share/kde/apps/konqueror/about/lines2.png -share/kde/apps/konqueror/about/locationbar_erase.png -share/kde/apps/konqueror/about/more.png -share/kde/apps/konqueror/about/openterm.png -share/kde/apps/konqueror/about/pointers.gif -share/kde/apps/konqueror/about/shadow1.png -share/kde/apps/konqueror/about/specs.html -share/kde/apps/konqueror/about/tips.html -share/kde/apps/konqueror/about/view_left_right.png -share/kde/apps/konqueror/about/viewmag.png -share/kde/apps/konqueror/about/window_fullscreen.png -share/kde/apps/konqueror/dirtree/bookmarks.desktop -share/kde/apps/konqueror/dirtree/history.desktop -share/kde/apps/konqueror/dirtree/home.desktop -share/kde/apps/konqueror/dirtree/remote/.directory -share/kde/apps/konqueror/dirtree/remote/ftp/.directory -share/kde/apps/konqueror/dirtree/remote/ftp/kde_ftp.desktop -share/kde/apps/konqueror/dirtree/remote/web/.directory -share/kde/apps/konqueror/dirtree/remote/web/apps_web.desktop -share/kde/apps/konqueror/dirtree/remote/web/dot_web.desktop -share/kde/apps/konqueror/dirtree/remote/web/kde_web.desktop -share/kde/apps/konqueror/dirtree/root.desktop -share/kde/apps/konqueror/dirtree/services/.directory -share/kde/apps/konqueror/dirtree/services/audiocd.desktop -share/kde/apps/konqueror/icons/hicolor/16x16/actions/history_clear.png -share/kde/apps/konqueror/icons/hicolor/16x16/actions/kde1.png -share/kde/apps/konqueror/icons/hicolor/16x16/actions/kde2.png -share/kde/apps/konqueror/icons/hicolor/16x16/actions/kde3.png -share/kde/apps/konqueror/icons/hicolor/16x16/actions/kde4.png -share/kde/apps/konqueror/icons/hicolor/16x16/actions/kde5.png -share/kde/apps/konqueror/icons/hicolor/16x16/actions/kde6.png -share/kde/apps/konqueror/konqueror.rc -share/kde/apps/konqueror/pics/indicator_anchor.png -share/kde/apps/konqueror/pics/indicator_connect.png -share/kde/apps/konqueror/pics/indicator_empty.png -share/kde/apps/konqueror/pics/indicator_noconnect.png -share/kde/apps/konqueror/pics/indicator_viewactive.png -share/kde/apps/konqueror/pics/thumbnailfont_7x4.png -share/kde/apps/konqueror/profiles/filemanagement -share/kde/apps/konqueror/profiles/filepreview -share/kde/apps/konqueror/profiles/midnightcommander -share/kde/apps/konqueror/profiles/webbrowsing -share/kde/apps/konqueror/tiles/bluemorning.png -share/kde/apps/konqueror/tiles/canvas.png -share/kde/apps/konqueror/tiles/checker.png -share/kde/apps/konqueror/tiles/cubic.png -share/kde/apps/konqueror/tiles/kde4ever.png -share/kde/apps/konqueror/tiles/kenwimer.png -share/kde/apps/konqueror/tiles/noise.png -share/kde/apps/konqueror/tiles/paper_flieder.png -share/kde/apps/konqueror/tiles/punika_attack.png -share/kde/apps/konqueror/tiles/redfiber.png -share/kde/apps/konsole/BlackOnLightYellow.schema -share/kde/apps/konsole/BlackOnWhite.schema -share/kde/apps/konsole/DarkPicture.schema -share/kde/apps/konsole/Example.Schema -share/kde/apps/konsole/GreenOnBlack.schema -share/kde/apps/konsole/GreenTint.schema -share/kde/apps/konsole/GreenTint_MC.schema -share/kde/apps/konsole/LightPicture.schema -share/kde/apps/konsole/Linux.schema -share/kde/apps/konsole/README.KeyTab -share/kde/apps/konsole/README.Schema -share/kde/apps/konsole/Transparent.schema -share/kde/apps/konsole/Transparent_MC.schema -share/kde/apps/konsole/Transparent_darkbg.schema -share/kde/apps/konsole/Transparent_lightbg.schema -share/kde/apps/konsole/WhiteOnBlack.schema -share/kde/apps/konsole/XTerm.schema -share/kde/apps/konsole/default.Keytab -share/kde/apps/konsole/default.Schema -share/kde/apps/konsole/konsole_part.rc -share/kde/apps/konsole/linux.desktop -share/kde/apps/konsole/linux.keytab -share/kde/apps/konsole/mc.desktop -share/kde/apps/konsole/shell.desktop -share/kde/apps/konsole/su.desktop -share/kde/apps/konsole/sumc.desktop -share/kde/apps/konsole/syscolor.schema -share/kde/apps/konsole/vim.schema -share/kde/apps/konsole/vt100.keytab -share/kde/apps/konsole/vt420pc.keytab -share/kde/apps/konsole/x11r5.keytab -share/kde/apps/kpersonalizer/pics/step1.png -share/kde/apps/kpersonalizer/pics/step2.png -share/kde/apps/kpersonalizer/pics/step3.png -share/kde/apps/kpersonalizer/pics/step4.png -share/kde/apps/kpersonalizer/pics/step5.png -share/kde/apps/kscreensaver/kscience.png -share/kde/apps/ksplash/pics/locolor/splash_active_bar.png -share/kde/apps/ksplash/pics/locolor/splash_bottom.png -share/kde/apps/ksplash/pics/locolor/splash_inactive_bar.png -share/kde/apps/ksplash/pics/locolor/splash_top.png -share/kde/apps/ksplash/pics/splash_active_bar.png -share/kde/apps/ksplash/pics/splash_bottom.png -share/kde/apps/ksplash/pics/splash_inactive_bar.png -share/kde/apps/ksplash/pics/splash_top.png -share/kde/apps/ksysguard/KSysGuardApplet.xml -share/kde/apps/ksysguard/ProcessTable.sgrd -share/kde/apps/ksysguard/SystemLoad.sgrd -share/kde/apps/ksysguard/ksysguardui.rc -share/kde/apps/ksysguard/pics/X.png -share/kde/apps/ksysguard/pics/computer.png -share/kde/apps/ksysguard/pics/daemon.png -share/kde/apps/ksysguard/pics/kdeapp.png -share/kde/apps/ksysguard/pics/kernel.png -share/kde/apps/ksysguard/pics/ksysguardd.png -share/kde/apps/ksysguard/pics/running.png -share/kde/apps/ksysguard/pics/shell.png -share/kde/apps/ksysguard/pics/tools.png -share/kde/apps/ksysguard/pics/unknownapp.png -share/kde/apps/ksysguard/pics/waiting.png -share/kde/apps/kthememgr/Themes/Default.ktheme -share/kde/apps/kthememgr/Themes/MGBreizh.ktheme -share/kde/apps/kthememgr/Themes/Nostalgy.ktheme -share/kde/apps/kthememgr/Themes/Template.themerc -share/kde/apps/kthememgr/Themes/Wood.ktheme -share/kde/apps/kthememgr/theme.mappings -share/kde/apps/kwin/b2.desktop -share/kde/apps/kwin/eventsrc -share/kde/apps/kwin/icewm-themes/closeA.xpm -share/kde/apps/kwin/icewm-themes/closeI.xpm -share/kde/apps/kwin/icewm-themes/default.theme -share/kde/apps/kwin/icewm-themes/depthA.xpm -share/kde/apps/kwin/icewm-themes/depthI.xpm -share/kde/apps/kwin/icewm-themes/maximizeA.xpm -share/kde/apps/kwin/icewm-themes/maximizeI.xpm -share/kde/apps/kwin/icewm-themes/menuButtonA.xpm -share/kde/apps/kwin/icewm-themes/menuButtonI.xpm -share/kde/apps/kwin/icewm-themes/minimizeA.xpm -share/kde/apps/kwin/icewm-themes/minimizeI.xpm -share/kde/apps/kwin/icewm-themes/restoreA.xpm -share/kde/apps/kwin/icewm-themes/restoreI.xpm -share/kde/apps/kwin/icewm-themes/rolldownA.xpm -share/kde/apps/kwin/icewm-themes/rolldownI.xpm -share/kde/apps/kwin/icewm-themes/rollupA.xpm -share/kde/apps/kwin/icewm-themes/rollupI.xpm -share/kde/apps/kwin/icewm-themes/titleAB.xpm -share/kde/apps/kwin/icewm-themes/titleAJ.xpm -share/kde/apps/kwin/icewm-themes/titleAM.xpm -share/kde/apps/kwin/icewm-themes/titleAP.xpm -share/kde/apps/kwin/icewm-themes/titleAQ.xpm -share/kde/apps/kwin/icewm-themes/titleAR.xpm -share/kde/apps/kwin/icewm-themes/titleAS.xpm -share/kde/apps/kwin/icewm-themes/titleAT.xpm -share/kde/apps/kwin/icewm-themes/titleIB.xpm -share/kde/apps/kwin/icewm-themes/titleIJ.xpm -share/kde/apps/kwin/icewm-themes/titleIM.xpm -share/kde/apps/kwin/icewm-themes/titleIP.xpm -share/kde/apps/kwin/icewm-themes/titleIQ.xpm -share/kde/apps/kwin/icewm-themes/titleIR.xpm -share/kde/apps/kwin/icewm-themes/titleIS.xpm -share/kde/apps/kwin/icewm-themes/titleIT.xpm -share/kde/apps/kwin/icewm.desktop -share/kde/apps/kwin/kde1.desktop -share/kde/apps/kwin/kstep.desktop -share/kde/apps/kwin/laptop.desktop -share/kde/apps/kwin/modernsystem.desktop -share/kde/apps/kwin/mwm.desktop -share/kde/apps/kwin/pics/bluesun.png -share/kde/apps/kwin/pics/close.png -share/kde/apps/kwin/pics/fog-grey.png -share/kde/apps/kwin/pics/fog.png -share/kde/apps/kwin/pics/greenie.dim.png -share/kde/apps/kwin/pics/greenie.light.png -share/kde/apps/kwin/pics/iconify.png -share/kde/apps/kwin/pics/maximize.png -share/kde/apps/kwin/pics/maximizedown.png -share/kde/apps/kwin/pics/menu.png -share/kde/apps/kwin/pics/pindown.png -share/kde/apps/kwin/pics/pinup.png -share/kde/apps/kwin/pics/unknown.png -share/kde/apps/kwin/quartz.desktop -share/kde/apps/kwin/redmond.desktop -share/kde/apps/kwin/riscos.desktop -share/kde/apps/kwin/system.desktop -share/kde/apps/kwin/web.desktop -share/kde/apps/kwrite/kwriteui.rc -share/kde/apps/naughtyapplet/pics/naughty-happy.png -share/kde/apps/naughtyapplet/pics/naughty-sad.png -share/kde/config/antrc -share/kde/config/attractionrc -share/kde/config/bouboulerc -share/kde/config/bubblesrc -share/kde/config/coralrc -share/kde/config/crystalrc -share/kde/config/decayscreenrc -share/kde/config/deluxerc -share/kde/config/demonrc -share/kde/config/driftrc -share/kde/config/epicyclerc -share/kde/config/fadeplotrc -share/kde/config/flamerc -share/kde/config/flowrc -share/kde/config/forestrc -share/kde/config/gearsrc -share/kde/config/gooprc -share/kde/config/gravrc -share/kde/config/halorc -share/kde/config/imsmaprc -share/kde/config/interferencerc -share/kde/config/kdesktop_custom_menu1 -share/kde/config/kdesktop_custom_menu2 -share/kde/config/kdm/README -share/kde/config/kdm/kdmrc -share/kde/config/klipperrc -share/kde/config/konqsidebartng.rc -share/kde/config/konsolerc -share/kde/config/kshorturifilterrc -share/kde/config/kumpparc -share/kde/config/kuriikwsfilterrc -share/kde/config/laserrc -share/kde/config/lissierc -share/kde/config/penroserc -share/kde/config/rocksrc -share/kde/config/sliprc -share/kde/icons/Daemon.png -share/kde/icons/hicolor/16x16/actions/view_choose.png -share/kde/icons/hicolor/16x16/actions/view_detailed.png -share/kde/icons/hicolor/16x16/actions/view_icon.png -share/kde/icons/hicolor/16x16/actions/view_multicolumn.png -share/kde/icons/hicolor/16x16/actions/view_text.png -share/kde/icons/hicolor/16x16/actions/view_tree.png -share/kde/icons/hicolor/16x16/apps/access.png -share/kde/icons/hicolor/16x16/apps/acroread.png -share/kde/icons/hicolor/16x16/apps/agent.png -share/kde/icons/hicolor/16x16/apps/alevt.png -share/kde/icons/hicolor/16x16/apps/applixware.png -share/kde/icons/hicolor/16x16/apps/arts.png -share/kde/icons/hicolor/16x16/apps/background.png -share/kde/icons/hicolor/16x16/apps/bell.png -share/kde/icons/hicolor/16x16/apps/blender.png -share/kde/icons/hicolor/16x16/apps/clock.png -share/kde/icons/hicolor/16x16/apps/colors.png -share/kde/icons/hicolor/16x16/apps/cookie.png -share/kde/icons/hicolor/16x16/apps/date.png -share/kde/icons/hicolor/16x16/apps/designer.png -share/kde/icons/hicolor/16x16/apps/dlgedit.png -share/kde/icons/hicolor/16x16/apps/emacs.png -share/kde/icons/hicolor/16x16/apps/email.png -share/kde/icons/hicolor/16x16/apps/energy.png -share/kde/icons/hicolor/16x16/apps/energy_star.png -share/kde/icons/hicolor/16x16/apps/enhanced_browsing.png -share/kde/icons/hicolor/16x16/apps/filetypes.png -share/kde/icons/hicolor/16x16/apps/fonts.png -share/kde/icons/hicolor/16x16/apps/gimp.png -share/kde/icons/hicolor/16x16/apps/go.png -share/kde/icons/hicolor/16x16/apps/gv.png -share/kde/icons/hicolor/16x16/apps/gvim.png -share/kde/icons/hicolor/16x16/apps/help_index.png -share/kde/icons/hicolor/16x16/apps/hwinfo.png -share/kde/icons/hicolor/16x16/apps/icons.png -share/kde/icons/hicolor/16x16/apps/iconthemes.png -share/kde/icons/hicolor/16x16/apps/input_devices_settings.png -share/kde/icons/hicolor/16x16/apps/kaddressbook.png -share/kde/icons/hicolor/16x16/apps/kappfinder.png -share/kde/icons/hicolor/16x16/apps/kate.png -share/kde/icons/hicolor/16x16/apps/kcmdevices.png -share/kde/icons/hicolor/16x16/apps/kcmkicker.png -share/kde/icons/hicolor/16x16/apps/kcmkwm.png -share/kde/icons/hicolor/16x16/apps/kcmmemory.png -share/kde/icons/hicolor/16x16/apps/kcmmidi.png -share/kde/icons/hicolor/16x16/apps/kcmpartitions.png -share/kde/icons/hicolor/16x16/apps/kcmpci.png -share/kde/icons/hicolor/16x16/apps/kcmprocessor.png -share/kde/icons/hicolor/16x16/apps/kcmscsi.png -share/kde/icons/hicolor/16x16/apps/kcmsound.png -share/kde/icons/hicolor/16x16/apps/kcmsystem.png -share/kde/icons/hicolor/16x16/apps/kcmx.png -share/kde/icons/hicolor/16x16/apps/kcontrol.png -share/kde/icons/hicolor/16x16/apps/kdeprintfax.png -share/kde/icons/hicolor/16x16/apps/kdisknav.png -share/kde/icons/hicolor/16x16/apps/kdmconfig.png -share/kde/icons/hicolor/16x16/apps/keditbookmarks.png -share/kde/icons/hicolor/16x16/apps/key_bindings.png -share/kde/icons/hicolor/16x16/apps/keyboard.png -share/kde/icons/hicolor/16x16/apps/keyboard_layout.png -share/kde/icons/hicolor/16x16/apps/kfm.png -share/kde/icons/hicolor/16x16/apps/kfm_home.png -share/kde/icons/hicolor/16x16/apps/khelpcenter.png -share/kde/icons/hicolor/16x16/apps/kicker.png -share/kde/icons/hicolor/16x16/apps/kjobviewer.png -share/kde/icons/hicolor/16x16/apps/klipper.png -share/kde/icons/hicolor/16x16/apps/kmenuedit.png -share/kde/icons/hicolor/16x16/apps/knotify.png -share/kde/icons/hicolor/16x16/apps/konqueror.png -share/kde/icons/hicolor/16x16/apps/konsole.png -share/kde/icons/hicolor/16x16/apps/kpager.png -share/kde/icons/hicolor/16x16/apps/kpersonalizer.png -share/kde/icons/hicolor/16x16/apps/kscreensaver.png -share/kde/icons/hicolor/16x16/apps/ksysguard.png -share/kde/icons/hicolor/16x16/apps/kthememgr.png -share/kde/icons/hicolor/16x16/apps/ktip.png -share/kde/icons/hicolor/16x16/apps/kwin.png -share/kde/icons/hicolor/16x16/apps/kwrite.png -share/kde/icons/hicolor/16x16/apps/licq.png -share/kde/icons/hicolor/16x16/apps/locale.png -share/kde/icons/hicolor/16x16/apps/looknfeel.png -share/kde/icons/hicolor/16x16/apps/lyx.png -share/kde/icons/hicolor/16x16/apps/mathematica.png -share/kde/icons/hicolor/16x16/apps/mouse.png -share/kde/icons/hicolor/16x16/apps/mozilla.png -share/kde/icons/hicolor/16x16/apps/multimedia.png -share/kde/icons/hicolor/16x16/apps/nedit.png -share/kde/icons/hicolor/16x16/apps/netscape.png -share/kde/icons/hicolor/16x16/apps/package_applications.png -share/kde/icons/hicolor/16x16/apps/package_development.png -share/kde/icons/hicolor/16x16/apps/package_editors.png -share/kde/icons/hicolor/16x16/apps/package_favourite.png -share/kde/icons/hicolor/16x16/apps/package_games.png -share/kde/icons/hicolor/16x16/apps/package_games_arcade.png -share/kde/icons/hicolor/16x16/apps/package_games_board.png -share/kde/icons/hicolor/16x16/apps/package_games_card.png -share/kde/icons/hicolor/16x16/apps/package_games_strategy.png -share/kde/icons/hicolor/16x16/apps/package_graphics.png -share/kde/icons/hicolor/16x16/apps/package_multimedia.png -share/kde/icons/hicolor/16x16/apps/package_network.png -share/kde/icons/hicolor/16x16/apps/package_settings.png -share/kde/icons/hicolor/16x16/apps/package_system.png -share/kde/icons/hicolor/16x16/apps/package_toys.png -share/kde/icons/hicolor/16x16/apps/package_utilities.png -share/kde/icons/hicolor/16x16/apps/package_wordprocessing.png -share/kde/icons/hicolor/16x16/apps/panel.png -share/kde/icons/hicolor/16x16/apps/panel_settings.png -share/kde/icons/hicolor/16x16/apps/password.png -share/kde/icons/hicolor/16x16/apps/penguin.png -share/kde/icons/hicolor/16x16/apps/personal.png -share/kde/icons/hicolor/16x16/apps/plan.png -share/kde/icons/hicolor/16x16/apps/printmgr.png -share/kde/icons/hicolor/16x16/apps/proxy.png -share/kde/icons/hicolor/16x16/apps/pybliographic.png -share/kde/icons/hicolor/16x16/apps/realplayer.png -share/kde/icons/hicolor/16x16/apps/remote.png -share/kde/icons/hicolor/16x16/apps/samba.png -share/kde/icons/hicolor/16x16/apps/style.png -share/kde/icons/hicolor/16x16/apps/stylesheet.png -share/kde/icons/hicolor/16x16/apps/terminal.png -share/kde/icons/hicolor/16x16/apps/usb.png -share/kde/icons/hicolor/16x16/apps/wabi.png -share/kde/icons/hicolor/16x16/apps/window_list.png -share/kde/icons/hicolor/16x16/apps/winprops.png -share/kde/icons/hicolor/16x16/apps/wp.png -share/kde/icons/hicolor/16x16/apps/xcalc.png -share/kde/icons/hicolor/16x16/apps/xclipboard.png -share/kde/icons/hicolor/16x16/apps/xclock.png -share/kde/icons/hicolor/16x16/apps/xconsole.png -share/kde/icons/hicolor/16x16/apps/xedit.png -share/kde/icons/hicolor/16x16/apps/xemacs.png -share/kde/icons/hicolor/16x16/apps/xeyes.png -share/kde/icons/hicolor/16x16/apps/xfig.png -share/kde/icons/hicolor/16x16/apps/xfmail.png -share/kde/icons/hicolor/16x16/apps/xload.png -share/kde/icons/hicolor/16x16/apps/xmag.png -share/kde/icons/hicolor/16x16/apps/xmms.png -share/kde/icons/hicolor/16x16/apps/xosview.png -share/kde/icons/hicolor/16x16/apps/xpaint.png -share/kde/icons/hicolor/16x16/apps/xv.png -share/kde/icons/hicolor/16x16/filesystems/file_important.png -share/kde/icons/hicolor/16x16/filesystems/folder_important.png -share/kde/icons/hicolor/22x22/actions/view_choose.png -share/kde/icons/hicolor/22x22/actions/view_detailed.png -share/kde/icons/hicolor/22x22/actions/view_icon.png -share/kde/icons/hicolor/22x22/actions/view_multicolumn.png -share/kde/icons/hicolor/22x22/actions/view_text.png -share/kde/icons/hicolor/22x22/actions/view_tree.png -share/kde/icons/hicolor/32x32/actions/view_choose.png -share/kde/icons/hicolor/32x32/actions/view_detailed.png -share/kde/icons/hicolor/32x32/actions/view_icon.png -share/kde/icons/hicolor/32x32/actions/view_multicolumn.png -share/kde/icons/hicolor/32x32/actions/view_text.png -share/kde/icons/hicolor/32x32/actions/view_tree.png -share/kde/icons/hicolor/32x32/apps/access.png -share/kde/icons/hicolor/32x32/apps/acroread.png -share/kde/icons/hicolor/32x32/apps/agent.png -share/kde/icons/hicolor/32x32/apps/alevt.png -share/kde/icons/hicolor/32x32/apps/applixware.png -share/kde/icons/hicolor/32x32/apps/background.png -share/kde/icons/hicolor/32x32/apps/bell.png -share/kde/icons/hicolor/32x32/apps/blender.png -share/kde/icons/hicolor/32x32/apps/clanbomber.png -share/kde/icons/hicolor/32x32/apps/clock.png -share/kde/icons/hicolor/32x32/apps/colors.png -share/kde/icons/hicolor/32x32/apps/cookie.png -share/kde/icons/hicolor/32x32/apps/date.png -share/kde/icons/hicolor/32x32/apps/designer.png -share/kde/icons/hicolor/32x32/apps/dlgedit.png -share/kde/icons/hicolor/32x32/apps/emacs.png -share/kde/icons/hicolor/32x32/apps/email.png -share/kde/icons/hicolor/32x32/apps/energy.png -share/kde/icons/hicolor/32x32/apps/energy_star.png -share/kde/icons/hicolor/32x32/apps/enhanced_browsing.png -share/kde/icons/hicolor/32x32/apps/error.png -share/kde/icons/hicolor/32x32/apps/filetypes.png -share/kde/icons/hicolor/32x32/apps/fonts.png -share/kde/icons/hicolor/32x32/apps/gimp.png -share/kde/icons/hicolor/32x32/apps/go.png -share/kde/icons/hicolor/32x32/apps/gv.png -share/kde/icons/hicolor/32x32/apps/gvim.png -share/kde/icons/hicolor/32x32/apps/help_index.png -share/kde/icons/hicolor/32x32/apps/hwinfo.png -share/kde/icons/hicolor/32x32/apps/icons.png -share/kde/icons/hicolor/32x32/apps/iconthemes.png -share/kde/icons/hicolor/32x32/apps/input_devices_settings.png -share/kde/icons/hicolor/32x32/apps/kaddressbook.png -share/kde/icons/hicolor/32x32/apps/kappfinder.png -share/kde/icons/hicolor/32x32/apps/kate.png -share/kde/icons/hicolor/32x32/apps/kcmdevices.png -share/kde/icons/hicolor/32x32/apps/kcmdrkonqi.png -share/kde/icons/hicolor/32x32/apps/kcmkicker.png -share/kde/icons/hicolor/32x32/apps/kcmkwm.png -share/kde/icons/hicolor/32x32/apps/kcmmemory.png -share/kde/icons/hicolor/32x32/apps/kcmmidi.png -share/kde/icons/hicolor/32x32/apps/kcmpartitions.png -share/kde/icons/hicolor/32x32/apps/kcmpci.png -share/kde/icons/hicolor/32x32/apps/kcmprocessor.png -share/kde/icons/hicolor/32x32/apps/kcmscsi.png -share/kde/icons/hicolor/32x32/apps/kcmsound.png -share/kde/icons/hicolor/32x32/apps/kcmsystem.png -share/kde/icons/hicolor/32x32/apps/kcmx.png -share/kde/icons/hicolor/32x32/apps/kcontrol.png -share/kde/icons/hicolor/32x32/apps/kdeprintfax.png -share/kde/icons/hicolor/32x32/apps/kdisknav.png -share/kde/icons/hicolor/32x32/apps/kdmconfig.png -share/kde/icons/hicolor/32x32/apps/keditbookmarks.png -share/kde/icons/hicolor/32x32/apps/key_bindings.png -share/kde/icons/hicolor/32x32/apps/keyboard.png -share/kde/icons/hicolor/32x32/apps/keyboard_layout.png -share/kde/icons/hicolor/32x32/apps/kfm.png -share/kde/icons/hicolor/32x32/apps/kfm_home.png -share/kde/icons/hicolor/32x32/apps/khelpcenter.png -share/kde/icons/hicolor/32x32/apps/kjobviewer.png -share/kde/icons/hicolor/32x32/apps/klipper.png -share/kde/icons/hicolor/32x32/apps/kmenuedit.png -share/kde/icons/hicolor/32x32/apps/knotify.png -share/kde/icons/hicolor/32x32/apps/konqueror.png -share/kde/icons/hicolor/32x32/apps/konsole.png -share/kde/icons/hicolor/32x32/apps/kpager.png -share/kde/icons/hicolor/32x32/apps/kpersonalizer.png -share/kde/icons/hicolor/32x32/apps/kscreensaver.png -share/kde/icons/hicolor/32x32/apps/ksysguard.png -share/kde/icons/hicolor/32x32/apps/kthememgr.png -share/kde/icons/hicolor/32x32/apps/ktip.png -share/kde/icons/hicolor/32x32/apps/kwin.png -share/kde/icons/hicolor/32x32/apps/kwrite.png -share/kde/icons/hicolor/32x32/apps/licq.png -share/kde/icons/hicolor/32x32/apps/locale.png -share/kde/icons/hicolor/32x32/apps/looknfeel.png -share/kde/icons/hicolor/32x32/apps/lyx.png -share/kde/icons/hicolor/32x32/apps/mathematica.png -share/kde/icons/hicolor/32x32/apps/mouse.png -share/kde/icons/hicolor/32x32/apps/multimedia.png -share/kde/icons/hicolor/32x32/apps/nedit.png -share/kde/icons/hicolor/32x32/apps/netscape.png -share/kde/icons/hicolor/32x32/apps/package.png -share/kde/icons/hicolor/32x32/apps/package_applications.png -share/kde/icons/hicolor/32x32/apps/package_editors.png -share/kde/icons/hicolor/32x32/apps/package_favourite.png -share/kde/icons/hicolor/32x32/apps/package_games.png -share/kde/icons/hicolor/32x32/apps/package_games_arcade.png -share/kde/icons/hicolor/32x32/apps/package_games_board.png -share/kde/icons/hicolor/32x32/apps/package_games_card.png -share/kde/icons/hicolor/32x32/apps/package_games_strategy.png -share/kde/icons/hicolor/32x32/apps/package_graphics.png -share/kde/icons/hicolor/32x32/apps/package_multimedia.png -share/kde/icons/hicolor/32x32/apps/package_network.png -share/kde/icons/hicolor/32x32/apps/package_settings.png -share/kde/icons/hicolor/32x32/apps/package_system.png -share/kde/icons/hicolor/32x32/apps/package_toys.png -share/kde/icons/hicolor/32x32/apps/package_utilities.png -share/kde/icons/hicolor/32x32/apps/package_wordprocessing.png -share/kde/icons/hicolor/32x32/apps/password.png -share/kde/icons/hicolor/32x32/apps/penguin.png -share/kde/icons/hicolor/32x32/apps/personal.png -share/kde/icons/hicolor/32x32/apps/plan.png -share/kde/icons/hicolor/32x32/apps/printmgr.png -share/kde/icons/hicolor/32x32/apps/proxy.png -share/kde/icons/hicolor/32x32/apps/pybliographic.png -share/kde/icons/hicolor/32x32/apps/pysol.png -share/kde/icons/hicolor/32x32/apps/realplayer.png -share/kde/icons/hicolor/32x32/apps/samba.png -share/kde/icons/hicolor/32x32/apps/style.png -share/kde/icons/hicolor/32x32/apps/stylesheet.png -share/kde/icons/hicolor/32x32/apps/terminal.png -share/kde/icons/hicolor/32x32/apps/usb.png -share/kde/icons/hicolor/32x32/apps/wabi.png -share/kde/icons/hicolor/32x32/apps/window_list.png -share/kde/icons/hicolor/32x32/apps/winprops.png -share/kde/icons/hicolor/32x32/apps/wp.png -share/kde/icons/hicolor/32x32/apps/x.png -share/kde/icons/hicolor/32x32/apps/xapp.png -share/kde/icons/hicolor/32x32/apps/xawtv.png -share/kde/icons/hicolor/32x32/apps/xcalc.png -share/kde/icons/hicolor/32x32/apps/xclipboard.png -share/kde/icons/hicolor/32x32/apps/xclock.png -share/kde/icons/hicolor/32x32/apps/xconsole.png -share/kde/icons/hicolor/32x32/apps/xedit.png -share/kde/icons/hicolor/32x32/apps/xemacs.png -share/kde/icons/hicolor/32x32/apps/xeyes.png -share/kde/icons/hicolor/32x32/apps/xfig.png -share/kde/icons/hicolor/32x32/apps/xfmail.png -share/kde/icons/hicolor/32x32/apps/xload.png -share/kde/icons/hicolor/32x32/apps/xmag.png -share/kde/icons/hicolor/32x32/apps/xmms.png -share/kde/icons/hicolor/32x32/apps/xosview.png -share/kde/icons/hicolor/32x32/apps/xpaint.png -share/kde/icons/hicolor/32x32/apps/xv.png -share/kde/icons/hicolor/32x32/filesystems/file_important.png -share/kde/icons/hicolor/32x32/filesystems/folder_important.png -share/kde/icons/hicolor/48x48/apps/access.png -share/kde/icons/hicolor/48x48/apps/agent.png -share/kde/icons/hicolor/48x48/apps/bell.png -share/kde/icons/hicolor/48x48/apps/blender.png -share/kde/icons/hicolor/48x48/apps/clock.png -share/kde/icons/hicolor/48x48/apps/colors.png -share/kde/icons/hicolor/48x48/apps/cookie.png -share/kde/icons/hicolor/48x48/apps/date.png -share/kde/icons/hicolor/48x48/apps/designer.png -share/kde/icons/hicolor/48x48/apps/emacs.png -share/kde/icons/hicolor/48x48/apps/email.png -share/kde/icons/hicolor/48x48/apps/energy.png -share/kde/icons/hicolor/48x48/apps/energy_star.png -share/kde/icons/hicolor/48x48/apps/enhanced_browsing.png -share/kde/icons/hicolor/48x48/apps/filetypes.png -share/kde/icons/hicolor/48x48/apps/fonts.png -share/kde/icons/hicolor/48x48/apps/gimp.png -share/kde/icons/hicolor/48x48/apps/go.png -share/kde/icons/hicolor/48x48/apps/gvim.png -share/kde/icons/hicolor/48x48/apps/help_index.png -share/kde/icons/hicolor/48x48/apps/hwinfo.png -share/kde/icons/hicolor/48x48/apps/icons.png -share/kde/icons/hicolor/48x48/apps/iconthemes.png -share/kde/icons/hicolor/48x48/apps/input_devices_settings.png -share/kde/icons/hicolor/48x48/apps/kappfinder.png -share/kde/icons/hicolor/48x48/apps/kate.png -share/kde/icons/hicolor/48x48/apps/kcmdevices.png -share/kde/icons/hicolor/48x48/apps/kcmdrkonqi.png -share/kde/icons/hicolor/48x48/apps/kcmkwm.png -share/kde/icons/hicolor/48x48/apps/kcmmemory.png -share/kde/icons/hicolor/48x48/apps/kcmmidi.png -share/kde/icons/hicolor/48x48/apps/kcmpartitions.png -share/kde/icons/hicolor/48x48/apps/kcmpci.png -share/kde/icons/hicolor/48x48/apps/kcmprocessor.png -share/kde/icons/hicolor/48x48/apps/kcmscsi.png -share/kde/icons/hicolor/48x48/apps/kcmsystem.png -share/kde/icons/hicolor/48x48/apps/kcontrol.png -share/kde/icons/hicolor/48x48/apps/kdisknav.png -share/kde/icons/hicolor/48x48/apps/kdmconfig.png -share/kde/icons/hicolor/48x48/apps/key_bindings.png -share/kde/icons/hicolor/48x48/apps/keyboard.png -share/kde/icons/hicolor/48x48/apps/keyboard_layout.png -share/kde/icons/hicolor/48x48/apps/kfm.png -share/kde/icons/hicolor/48x48/apps/kfm_home.png -share/kde/icons/hicolor/48x48/apps/khelpcenter.png -share/kde/icons/hicolor/48x48/apps/klipper.png -share/kde/icons/hicolor/48x48/apps/kmenuedit.png -share/kde/icons/hicolor/48x48/apps/knotify.png -share/kde/icons/hicolor/48x48/apps/konqueror.png -share/kde/icons/hicolor/48x48/apps/konsole.png -share/kde/icons/hicolor/48x48/apps/kpager.png -share/kde/icons/hicolor/48x48/apps/kscreensaver.png -share/kde/icons/hicolor/48x48/apps/ksysguard.png -share/kde/icons/hicolor/48x48/apps/kthememgr.png -share/kde/icons/hicolor/48x48/apps/ktip.png -share/kde/icons/hicolor/48x48/apps/kwin.png -share/kde/icons/hicolor/48x48/apps/kwrite.png -share/kde/icons/hicolor/48x48/apps/licq.png -share/kde/icons/hicolor/48x48/apps/locale.png -share/kde/icons/hicolor/48x48/apps/looknfeel.png -share/kde/icons/hicolor/48x48/apps/mouse.png -share/kde/icons/hicolor/48x48/apps/multimedia.png -share/kde/icons/hicolor/48x48/apps/netscape.png -share/kde/icons/hicolor/48x48/apps/package.png -share/kde/icons/hicolor/48x48/apps/package_applications.png -share/kde/icons/hicolor/48x48/apps/package_editors.png -share/kde/icons/hicolor/48x48/apps/package_favourite.png -share/kde/icons/hicolor/48x48/apps/package_games.png -share/kde/icons/hicolor/48x48/apps/package_games_arcade.png -share/kde/icons/hicolor/48x48/apps/package_games_board.png -share/kde/icons/hicolor/48x48/apps/package_games_card.png -share/kde/icons/hicolor/48x48/apps/package_games_strategy.png -share/kde/icons/hicolor/48x48/apps/package_graphics.png -share/kde/icons/hicolor/48x48/apps/package_multimedia.png -share/kde/icons/hicolor/48x48/apps/package_network.png -share/kde/icons/hicolor/48x48/apps/package_settings.png -share/kde/icons/hicolor/48x48/apps/package_system.png -share/kde/icons/hicolor/48x48/apps/package_toys.png -share/kde/icons/hicolor/48x48/apps/package_utilities.png -share/kde/icons/hicolor/48x48/apps/package_wordprocessing.png -share/kde/icons/hicolor/48x48/apps/password.png -share/kde/icons/hicolor/48x48/apps/personal.png -share/kde/icons/hicolor/48x48/apps/proxy.png -share/kde/icons/hicolor/48x48/apps/remote.png -share/kde/icons/hicolor/48x48/apps/samba.png -share/kde/icons/hicolor/48x48/apps/style.png -share/kde/icons/hicolor/48x48/apps/stylesheet.png -share/kde/icons/hicolor/48x48/apps/terminal.png -share/kde/icons/hicolor/48x48/apps/usb.png -share/kde/icons/hicolor/48x48/apps/window_list.png -share/kde/icons/hicolor/48x48/apps/winprops.png -share/kde/icons/hicolor/48x48/apps/xedit.png -share/kde/icons/hicolor/48x48/apps/xemacs.png -share/kde/icons/hicolor/48x48/apps/xmag.png -share/kde/icons/hicolor/48x48/apps/xv.png -share/kde/icons/hicolor/48x48/filesystems/file_important.png -share/kde/icons/hicolor/48x48/filesystems/folder_important.png -share/kde/icons/locolor/16x16/apps/bell.png -share/kde/icons/locolor/32x32/apps/bell.png -share/kde/locale/C/entry.desktop -share/kde/locale/C/flag.png -share/kde/locale/l10n/C/entry.desktop -share/kde/locale/l10n/C/flag.png -share/kde/locale/l10n/africa.desktop -share/kde/locale/l10n/ag/entry.desktop -share/kde/locale/l10n/ag/flag.png -share/kde/locale/l10n/ar/entry.desktop -share/kde/locale/l10n/ar/flag.png -share/kde/locale/l10n/asia.desktop -share/kde/locale/l10n/at/entry.desktop -share/kde/locale/l10n/at/flag.png -share/kde/locale/l10n/au/entry.desktop -share/kde/locale/l10n/au/flag.png -share/kde/locale/l10n/az/entry.desktop -share/kde/locale/l10n/az/flag.png -share/kde/locale/l10n/bb/entry.desktop -share/kde/locale/l10n/bb/flag.png -share/kde/locale/l10n/be/entry.desktop -share/kde/locale/l10n/be/flag.png -share/kde/locale/l10n/bg/entry.desktop -share/kde/locale/l10n/bg/flag.png -share/kde/locale/l10n/bo/entry.desktop -share/kde/locale/l10n/bo/flag.png -share/kde/locale/l10n/br/entry.desktop -share/kde/locale/l10n/br/flag.png -share/kde/locale/l10n/ca/entry.desktop -share/kde/locale/l10n/ca/flag.png -share/kde/locale/l10n/caribbean.desktop -share/kde/locale/l10n/centraleurope.desktop -share/kde/locale/l10n/ch/entry.desktop -share/kde/locale/l10n/ch/flag.png -share/kde/locale/l10n/cl/entry.desktop -share/kde/locale/l10n/cl/flag.png -share/kde/locale/l10n/cn/entry.desktop -share/kde/locale/l10n/cn/flag.png -share/kde/locale/l10n/co/entry.desktop -share/kde/locale/l10n/co/flag.png -share/kde/locale/l10n/cz/entry.desktop -share/kde/locale/l10n/cz/flag.png -share/kde/locale/l10n/de/entry.desktop -share/kde/locale/l10n/de/flag.png -share/kde/locale/l10n/dk/entry.desktop -share/kde/locale/l10n/dk/flag.png -share/kde/locale/l10n/do/entry.desktop -share/kde/locale/l10n/do/flag.png -share/kde/locale/l10n/easteurope.desktop -share/kde/locale/l10n/ec/entry.desktop -share/kde/locale/l10n/ec/flag.png -share/kde/locale/l10n/ee/entry.desktop -share/kde/locale/l10n/ee/flag.png -share/kde/locale/l10n/es/entry.desktop -share/kde/locale/l10n/es/flag.png -share/kde/locale/l10n/fi/entry.desktop -share/kde/locale/l10n/fi/flag.png -share/kde/locale/l10n/fr/entry.desktop -share/kde/locale/l10n/fr/flag.png -share/kde/locale/l10n/gb/entry.desktop -share/kde/locale/l10n/gb/flag.png -share/kde/locale/l10n/gd/entry.desktop -share/kde/locale/l10n/gd/flag.png -share/kde/locale/l10n/gr/entry.desktop -share/kde/locale/l10n/gr/flag.png -share/kde/locale/l10n/gt/entry.desktop -share/kde/locale/l10n/gt/flag.png -share/kde/locale/l10n/hn/entry.desktop -share/kde/locale/l10n/hn/flag.png -share/kde/locale/l10n/hr/entry.desktop -share/kde/locale/l10n/hr/flag.png -share/kde/locale/l10n/hu/entry.desktop -share/kde/locale/l10n/hu/flag.png -share/kde/locale/l10n/id/entry.desktop -share/kde/locale/l10n/id/flag.png -share/kde/locale/l10n/ie/entry.desktop -share/kde/locale/l10n/ie/flag.png -share/kde/locale/l10n/il/entry.desktop -share/kde/locale/l10n/il/flag.png -share/kde/locale/l10n/is/entry.desktop -share/kde/locale/l10n/is/flag.png -share/kde/locale/l10n/it/entry.desktop -share/kde/locale/l10n/it/flag.png -share/kde/locale/l10n/jm/entry.desktop -share/kde/locale/l10n/jm/flag.png -share/kde/locale/l10n/jp/entry.desktop -share/kde/locale/l10n/jp/flag.png -share/kde/locale/l10n/kn/entry.desktop -share/kde/locale/l10n/kn/flag.png -share/kde/locale/l10n/kp/entry.desktop -share/kde/locale/l10n/kp/flag.png -share/kde/locale/l10n/kr/entry.desktop -share/kde/locale/l10n/kr/flag.png -share/kde/locale/l10n/lc/entry.desktop -share/kde/locale/l10n/lc/flag.png -share/kde/locale/l10n/lt/entry.desktop -share/kde/locale/l10n/lt/flag.png -share/kde/locale/l10n/lu/entry.desktop -share/kde/locale/l10n/lu/flag.png -share/kde/locale/l10n/lv/entry.desktop -share/kde/locale/l10n/lv/flag.png -share/kde/locale/l10n/mk/entry.desktop -share/kde/locale/l10n/mk/flag.png -share/kde/locale/l10n/mt/entry.desktop -share/kde/locale/l10n/mt/flag.png -share/kde/locale/l10n/mx/entry.desktop -share/kde/locale/l10n/mx/flag.png -share/kde/locale/l10n/nl/entry.desktop -share/kde/locale/l10n/nl/flag.png -share/kde/locale/l10n/no/entry.desktop -share/kde/locale/l10n/no/flag.png -share/kde/locale/l10n/northamerica.desktop -share/kde/locale/l10n/northeurope.desktop -share/kde/locale/l10n/nz/entry.desktop -share/kde/locale/l10n/nz/flag.png -share/kde/locale/l10n/pa/entry.desktop -share/kde/locale/l10n/pa/flag.png -share/kde/locale/l10n/pe/entry.desktop -share/kde/locale/l10n/pe/flag.png -share/kde/locale/l10n/pl/entry.desktop -share/kde/locale/l10n/pl/flag.png -share/kde/locale/l10n/pt/entry.desktop -share/kde/locale/l10n/pt/flag.png -share/kde/locale/l10n/py/entry.desktop -share/kde/locale/l10n/py/flag.png -share/kde/locale/l10n/ro/entry.desktop -share/kde/locale/l10n/ro/flag.png -share/kde/locale/l10n/ru/entry.desktop -share/kde/locale/l10n/ru/flag.png -share/kde/locale/l10n/se/entry.desktop -share/kde/locale/l10n/se/flag.png -share/kde/locale/l10n/si/entry.desktop -share/kde/locale/l10n/si/flag.png -share/kde/locale/l10n/sk/entry.desktop -share/kde/locale/l10n/sk/flag.png -share/kde/locale/l10n/southamerica.desktop -share/kde/locale/l10n/southeurope.desktop -share/kde/locale/l10n/sr/entry.desktop -share/kde/locale/l10n/sr/flag.png -share/kde/locale/l10n/sv/entry.desktop -share/kde/locale/l10n/sv/flag.png -share/kde/locale/l10n/th/entry.desktop -share/kde/locale/l10n/th/flag.png -share/kde/locale/l10n/tr/entry.desktop -share/kde/locale/l10n/tr/flag.png -share/kde/locale/l10n/tt/entry.desktop -share/kde/locale/l10n/tt/flag.png -share/kde/locale/l10n/tw/entry.desktop -share/kde/locale/l10n/tw/flag.png -share/kde/locale/l10n/ua/entry.desktop -share/kde/locale/l10n/ua/flag.png -share/kde/locale/l10n/us/entry.desktop -share/kde/locale/l10n/us/flag.png -share/kde/locale/l10n/uy/entry.desktop -share/kde/locale/l10n/uy/flag.png -share/kde/locale/l10n/vc/entry.desktop -share/kde/locale/l10n/vc/flag.png -share/kde/locale/l10n/ve/entry.desktop -share/kde/locale/l10n/ve/flag.png -share/kde/locale/l10n/westeurope.desktop -share/kde/locale/l10n/za/entry.desktop -share/kde/locale/l10n/za/flag.png -share/kde/mimelnk/application/x-konsole.desktop -share/kde/mimelnk/application/x-ksysguard.desktop -share/kde/mimelnk/application/x-ktheme.desktop -share/kde/services/bzip.protocol -share/kde/services/bzip2.protocol -share/kde/services/finger.protocol -share/kde/services/floppy.protocol -share/kde/services/gopher.protocol -share/kde/services/gsthumbnail.desktop -share/kde/services/gzip.protocol -share/kde/services/htmlthumbnail.desktop -share/kde/services/imagethumbnail.desktop -share/kde/services/imap4.protocol -share/kde/services/imaps.protocol -share/kde/services/info.protocol -share/kde/services/kaccess.desktop -share/kde/services/kate_component.desktop -share/kde/services/kded/favicons.desktop -share/kde/services/kfindpart.desktop -share/kde/services/khelpcenter.desktop -share/kde/services/konq_aboutpage.desktop -share/kde/services/konq_detailedlistview.desktop -share/kde/services/konq_dirtree.desktop -share/kde/services/konq_iconview.desktop -share/kde/services/konq_multicolumnview.desktop -share/kde/services/konq_sidebartng.desktop -share/kde/services/konq_textview.desktop -share/kde/services/konq_treeview.desktop -share/kde/services/konqueror.desktop -share/kde/services/konqueror_config.desktop -share/kde/services/konsolepart.desktop -share/kde/services/kshorturifilter.desktop -share/kde/services/kuriikwsfilter.desktop -share/kde/services/kurisearchfilter.desktop -share/kde/services/kwrite_component.desktop -share/kde/services/kxkb.desktop -share/kde/services/kxmlrpcd.desktop -share/kde/services/ldap.protocol -share/kde/services/man.protocol -share/kde/services/nfs.protocol -share/kde/services/nntp.protocol -share/kde/services/pop3.protocol -share/kde/services/pop3s.protocol -share/kde/services/searchproviders/acronym.desktop -share/kde/services/searchproviders/altavista.desktop -share/kde/services/searchproviders/austronaut.desktop -share/kde/services/searchproviders/bugft.desktop -share/kde/services/searchproviders/bugno.desktop -share/kde/services/searchproviders/deja.desktop -share/kde/services/searchproviders/dmoz.desktop -share/kde/services/searchproviders/excite.desktop -share/kde/services/searchproviders/foldoc.desktop -share/kde/services/searchproviders/freshmeat.desktop -share/kde/services/searchproviders/google.desktop -share/kde/services/searchproviders/hotbot.desktop -share/kde/services/searchproviders/jeeves.desktop -share/kde/services/searchproviders/leo.desktop -share/kde/services/searchproviders/lycos.desktop -share/kde/services/searchproviders/mamma.desktop -share/kde/services/searchproviders/metacrawler.desktop -share/kde/services/searchproviders/realnames.desktop -share/kde/services/searchproviders/rpmfind.desktop -share/kde/services/searchproviders/seek.desktop -share/kde/services/searchproviders/thesaurus.desktop -share/kde/services/searchproviders/vivisimo.desktop -share/kde/services/searchproviders/voila.desktop -share/kde/services/searchproviders/webster.desktop -share/kde/services/searchproviders/whatis.desktop -share/kde/services/smb.protocol -share/kde/services/tar.protocol -share/kde/services/textthumbnail.desktop -share/kde/services/thumbnail.protocol -share/kde/services/useragentstrings/ie401onwinnt4.desktop -share/kde/services/useragentstrings/ie45onwinnt5.desktop -share/kde/services/useragentstrings/ie501onwinnt5.desktop -share/kde/services/useragentstrings/ie50onppc.desktop -share/kde/services/useragentstrings/ie50onwin95.desktop -share/kde/services/useragentstrings/ie55onwin98.desktop -share/kde/services/useragentstrings/ie55onwinnt5.desktop -share/kde/services/useragentstrings/lynxoncurrent.desktop -share/kde/services/useragentstrings/mozm18oncurrent.desktop -share/kde/services/useragentstrings/mozm18onwinnt4.desktop -share/kde/services/useragentstrings/nn301oncurrent.desktop -share/kde/services/useragentstrings/nn475oncurrent.desktop -share/kde/services/useragentstrings/nn475onwin95.desktop -share/kde/services/useragentstrings/nn476onppc.desktop -share/kde/services/useragentstrings/op403onwinnt4.desktop -share/kde/services/useragentstrings/w3moncurrent.desktop -share/kde/services/useragentstrings/wgetoncurrent.desktop -share/kde/servicetypes/findpart.desktop -share/kde/servicetypes/kate_servicetype.desktop -share/kde/servicetypes/konqaboutpage.desktop -share/kde/servicetypes/searchprovider.desktop -share/kde/servicetypes/thumbcreator.desktop -share/kde/servicetypes/uasprovider.desktop -share/kde/sounds/KDE_Beep_Ahem.wav -share/kde/sounds/KDE_Beep_Beep.wav -share/kde/sounds/KDE_Beep_Bottles.wav -share/kde/sounds/KDE_Beep_ClassicBeep.wav -share/kde/sounds/KDE_Beep_ClockChime.wav -share/kde/sounds/KDE_Beep_Connect.wav -share/kde/sounds/KDE_Beep_Door.wav -share/kde/sounds/KDE_Beep_Honk.wav -share/kde/sounds/KDE_Beep_Lightning.wav -share/kde/sounds/KDE_Beep_Pop.wav -share/kde/sounds/KDE_Beep_RimShot.wav -share/kde/sounds/KDE_Beep_RingRing.wav -share/kde/sounds/KDE_Beep_ShortBeep.wav -share/kde/sounds/KDE_Beep_Yo.wav -share/kde/sounds/KDE_Click.wav -share/kde/sounds/KDE_Close_Window.wav -share/kde/sounds/KDE_Critical_Error.wav -share/kde/sounds/KDE_Desktop1.wav -share/kde/sounds/KDE_Desktop2.wav -share/kde/sounds/KDE_Desktop3.wav -share/kde/sounds/KDE_Desktop4.wav -share/kde/sounds/KDE_Desktop5.wav -share/kde/sounds/KDE_Desktop6.wav -share/kde/sounds/KDE_Desktop7.wav -share/kde/sounds/KDE_Desktop8.wav -share/kde/sounds/KDE_Dialog_Appear.wav -share/kde/sounds/KDE_Dialog_Disappear.wav -share/kde/sounds/KDE_Error.wav -share/kde/sounds/KDE_Logout.wav -share/kde/sounds/KDE_Notify.wav -share/kde/sounds/KDE_Startup.wav -share/kde/sounds/KDE_Window_Close.wav -share/kde/sounds/KDE_Window_DeIconify.wav -share/kde/sounds/KDE_Window_Iconify.wav -share/kde/sounds/KDE_Window_Maximize.wav -share/kde/sounds/KDE_Window_Open.wav -share/kde/sounds/KDE_Window_Shade_Down.wav -share/kde/sounds/KDE_Window_Shade_Up.wav -share/kde/sounds/KDE_Window_Sticky.wav -share/kde/sounds/KDE_Window_UnMaximize.wav -share/kde/sounds/KDE_Window_UnSticky.wav -share/kde/sounds/pop.wav -share/kde/templates/.source/CDROM-Device.desktop -share/kde/templates/.source/Floppy.desktop -share/kde/templates/.source/HD.desktop -share/kde/templates/.source/HTMLFile.html -share/kde/templates/.source/Program.desktop -share/kde/templates/.source/TextFile.txt -share/kde/templates/.source/URL.desktop -share/kde/templates/Directory.desktop -share/kde/templates/HTMLFile.desktop -share/kde/templates/TextFile.desktop -share/kde/templates/linkCDROM.desktop -share/kde/templates/linkFloppy.desktop -share/kde/templates/linkHD.desktop -share/kde/templates/linkProgram.desktop -share/kde/templates/linkURL.desktop -@exec ${MKDIR} %D/share/kde/templates/.source/emptydir -@exec ${CHMOD} 755 %D/share/kde/templates/.source/emptydir -share/kde/wallpapers/All-Good-People-1.jpg -share/kde/wallpapers/Ancient_Glyphs.jpg -share/kde/wallpapers/Appropriately-Left-Handed-2.jpg -share/kde/wallpapers/Blkmarble.jpg -share/kde/wallpapers/Chicken-Songs-2.jpg -share/kde/wallpapers/Circuit.jpg -share/kde/wallpapers/Dasding.jpg -share/kde/wallpapers/Foggy1.jpg -share/kde/wallpapers/Marble01.jpg -share/kde/wallpapers/No-Ones-Laughing-3.jpg -share/kde/wallpapers/Paper01.jpg -share/kde/wallpapers/Planning-And-Probing-1.jpg -share/kde/wallpapers/Prpbumps.jpg -share/kde/wallpapers/Superfluous-Organ-1.jpg -share/kde/wallpapers/The-Good-Times-1.jpg -share/kde/wallpapers/Time-For-Lunch-2.jpg -share/kde/wallpapers/Totally-New-Product-1.jpg -share/kde/wallpapers/Water01.jpg -share/kde/wallpapers/Whirling_Spirit.jpg -share/kde/wallpapers/Won-Ton-Soup-3.jpg -share/kde/wallpapers/blue_angle_swirl.jpg -share/kde/wallpapers/bluegreencrisscross.jpg -share/kde/wallpapers/default_blue.jpg -share/kde/wallpapers/gold_crinkle.jpg -share/kde/wallpapers/kdm_bg.jpg -share/kde/wallpapers/northbeach.jpg -share/kde/wallpapers/simple_wallpaper.jpg -share/kde/wallpapers/sunday_brunch.jpg -share/kde/wallpapers/vegetative_fog.jpg -@dirrm share/kde/wallpapers -@dirrm share/kde/templates/.source/emptydir -@dirrm share/kde/templates/.source -@dirrm share/kde/templates -@dirrm share/kde/sounds -@dirrm share/kde/services/useragentstrings -@dirrm share/kde/services/searchproviders -@dirrm share/kde/locale/l10n/za -@dirrm share/kde/locale/l10n/ve -@dirrm share/kde/locale/l10n/vc -@dirrm share/kde/locale/l10n/uy -@dirrm share/kde/locale/l10n/us -@dirrm share/kde/locale/l10n/ua -@dirrm share/kde/locale/l10n/tw -@dirrm share/kde/locale/l10n/tt -@dirrm share/kde/locale/l10n/tr -@dirrm share/kde/locale/l10n/th -@dirrm share/kde/locale/l10n/sv -@dirrm share/kde/locale/l10n/sr -@dirrm share/kde/locale/l10n/sk -@dirrm share/kde/locale/l10n/si -@dirrm share/kde/locale/l10n/se -@dirrm share/kde/locale/l10n/ru -@dirrm share/kde/locale/l10n/ro -@dirrm share/kde/locale/l10n/py -@dirrm share/kde/locale/l10n/pt -@dirrm share/kde/locale/l10n/pl -@dirrm share/kde/locale/l10n/pe -@dirrm share/kde/locale/l10n/pa -@dirrm share/kde/locale/l10n/nz -@dirrm share/kde/locale/l10n/no -@dirrm share/kde/locale/l10n/nl -@dirrm share/kde/locale/l10n/mx -@dirrm share/kde/locale/l10n/mt -@dirrm share/kde/locale/l10n/mk -@dirrm share/kde/locale/l10n/lv -@dirrm share/kde/locale/l10n/lu -@dirrm share/kde/locale/l10n/lt -@dirrm share/kde/locale/l10n/lc -@dirrm share/kde/locale/l10n/kr -@dirrm share/kde/locale/l10n/kp -@dirrm share/kde/locale/l10n/kn -@dirrm share/kde/locale/l10n/jp -@dirrm share/kde/locale/l10n/jm -@dirrm share/kde/locale/l10n/it -@dirrm share/kde/locale/l10n/is -@dirrm share/kde/locale/l10n/il -@dirrm share/kde/locale/l10n/ie -@dirrm share/kde/locale/l10n/id -@dirrm share/kde/locale/l10n/hu -@dirrm share/kde/locale/l10n/hr -@dirrm share/kde/locale/l10n/hn -@dirrm share/kde/locale/l10n/gt -@dirrm share/kde/locale/l10n/gr -@dirrm share/kde/locale/l10n/gd -@dirrm share/kde/locale/l10n/gb -@dirrm share/kde/locale/l10n/fr -@dirrm share/kde/locale/l10n/fi -@dirrm share/kde/locale/l10n/es -@dirrm share/kde/locale/l10n/ee -@dirrm share/kde/locale/l10n/ec -@dirrm share/kde/locale/l10n/do -@dirrm share/kde/locale/l10n/dk -@dirrm share/kde/locale/l10n/de -@dirrm share/kde/locale/l10n/cz -@dirrm share/kde/locale/l10n/co -@dirrm share/kde/locale/l10n/cn -@dirrm share/kde/locale/l10n/cl -@dirrm share/kde/locale/l10n/ch -@dirrm share/kde/locale/l10n/ca -@dirrm share/kde/locale/l10n/br -@dirrm share/kde/locale/l10n/bo -@dirrm share/kde/locale/l10n/bg -@dirrm share/kde/locale/l10n/be -@dirrm share/kde/locale/l10n/bb -@dirrm share/kde/locale/l10n/az -@dirrm share/kde/locale/l10n/au -@dirrm share/kde/locale/l10n/at -@dirrm share/kde/locale/l10n/ar -@dirrm share/kde/locale/l10n/ag -@dirrm share/kde/locale/l10n/C -@dirrm share/kde/locale/l10n -@dirrm share/kde/locale/C -@dirrm share/kde/config/kdm -@dirrm share/kde/apps/naughtyapplet/pics -@dirrm share/kde/apps/naughtyapplet -@dirrm share/kde/apps/kwrite -@dirrm share/kde/apps/kwin/pics -@dirrm share/kde/apps/kwin/icewm-themes -@dirrm share/kde/apps/kwin -@dirrm share/kde/apps/kthememgr/Themes -@dirrm share/kde/apps/kthememgr -@dirrm share/kde/apps/ksysguard/pics -@dirrm share/kde/apps/ksysguard -@dirrm share/kde/apps/ksplash/pics/locolor -@dirrm share/kde/apps/ksplash/pics -@dirrm share/kde/apps/ksplash -@dirrm share/kde/apps/kscreensaver -@dirrm share/kde/apps/kpersonalizer/pics -@dirrm share/kde/apps/kpersonalizer -@dirrm share/kde/apps/konsole -@dirrm share/kde/apps/konqueror/tiles -@dirrm share/kde/apps/konqueror/profiles -@dirrm share/kde/apps/konqueror/pics -@dirrm share/kde/apps/konqueror/icons/hicolor/16x16/actions -@dirrm share/kde/apps/konqueror/icons/hicolor/16x16 -@dirrm share/kde/apps/konqueror/icons/hicolor -@dirrm share/kde/apps/konqueror/icons -@dirrm share/kde/apps/konqueror/dirtree/services -@dirrm share/kde/apps/konqueror/dirtree/remote/web -@dirrm share/kde/apps/konqueror/dirtree/remote/ftp -@dirrm share/kde/apps/konqueror/dirtree/remote -@dirrm share/kde/apps/konqueror/dirtree -@dirrm share/kde/apps/konqueror/about -@dirrm share/kde/apps/konqueror -@dirrm share/kde/apps/konqsidebartng/virtual_folders/services -@dirrm share/kde/apps/konqsidebartng/virtual_folders/remote/web -@dirrm share/kde/apps/konqsidebartng/virtual_folders/remote/ftp -@dirrm share/kde/apps/konqsidebartng/virtual_folders/remote -@dirrm share/kde/apps/konqsidebartng/virtual_folders -@dirrm share/kde/apps/konqsidebartng/entries -@dirrm share/kde/apps/konqsidebartng/dirtree -@dirrm share/kde/apps/konqsidebartng/add -@dirrm share/kde/apps/konqsidebartng -@dirrm share/kde/apps/konqlistview/kpartplugins -@dirrm share/kde/apps/konqlistview -@dirrm share/kde/apps/konqiconview/kpartplugins -@dirrm share/kde/apps/konqiconview -@dirrm share/kde/apps/kmenuedit/icons/locolor/16x16/actions -@dirrm share/kde/apps/kmenuedit/icons/locolor/16x16 -@dirrm share/kde/apps/kmenuedit/icons/locolor -@dirrm share/kde/apps/kmenuedit/icons/hicolor/32x32/actions -@dirrm share/kde/apps/kmenuedit/icons/hicolor/32x32 -@dirrm share/kde/apps/kmenuedit/icons/hicolor/22x22/actions -@dirrm share/kde/apps/kmenuedit/icons/hicolor/22x22 -@dirrm share/kde/apps/kmenuedit/icons/hicolor -@dirrm share/kde/apps/kmenuedit/icons -@dirrm share/kde/apps/kmenuedit -@dirrm share/kde/apps/kjobviewer -@dirrm share/kde/apps/kioslave -@dirrm share/kde/apps/kio_info -@dirrm share/kde/apps/kio_finger -@dirrm share/kde/apps/kicker/wallpapers -@dirrm share/kde/apps/kicker/tiles -@dirrm share/kde/apps/kicker/pics -@dirrm share/kde/apps/kicker/icons/locolor/16x16/actions -@dirrm share/kde/apps/kicker/icons/locolor/16x16 -@dirrm share/kde/apps/kicker/icons/locolor -@dirrm share/kde/apps/kicker/icons/hicolor/16x16/actions -@dirrm share/kde/apps/kicker/icons/hicolor/16x16 -@dirrm share/kde/apps/kicker/icons/hicolor -@dirrm share/kde/apps/kicker/icons -@dirrm share/kde/apps/kicker/extensions -@dirrm share/kde/apps/kicker/applets -@dirrm share/kde/apps/kicker -@dirrm share/kde/apps/khelpcenter/plugins/Tutorials -@dirrm share/kde/apps/khelpcenter/plugins -@dirrm share/kde/apps/khelpcenter -@dirrm share/kde/apps/kfind/icons/locolor/22x22/actions -@dirrm share/kde/apps/kfind/icons/locolor/22x22 -@dirrm share/kde/apps/kfind/icons/locolor -@dirrm share/kde/apps/kfind/icons -@dirrm share/kde/apps/kfind -@dirrm share/kde/apps/keditbookmarks -@dirrm share/kde/apps/kdm/pics/users -@dirrm share/kde/apps/kdm/pics -@dirrm share/kde/apps/kdm -@dirrm share/kde/apps/kdisplay/color-schemes -@dirrm share/kde/apps/kdisplay/app-defaults -@dirrm share/kde/apps/kdisplay -@dirrm share/kde/apps/kdewizard/pics -@dirrm share/kde/apps/kdewizard -@dirrm share/kde/apps/kdesktop/programs -@dirrm share/kde/apps/kdesktop/pics -@dirrm share/kde/apps/kdesktop/patterns -@dirrm share/kde/apps/kdesktop/DesktopLinks -@dirrm share/kde/apps/kdesktop -@dirrm share/kde/apps/kdeprintfax/icons/hicolor/16x16/actions -@dirrm share/kde/apps/kdeprintfax/icons/hicolor/16x16 -@dirrm share/kde/apps/kdeprintfax/icons/hicolor -@dirrm share/kde/apps/kdeprintfax/icons -@dirrm share/kde/apps/kdeprintfax -@dirrm share/kde/apps/kdcop -@dirrm share/kde/apps/kcontrol/pics -@dirrm share/kde/apps/kcontrol -@dirrm share/kde/apps/kcmusb -@dirrm share/kde/apps/kcmlocale/pics -@dirrm share/kde/apps/kcmlocale -@dirrm share/kde/apps/kcmkeys/standard -@dirrm share/kde/apps/kcmkeys/global -@dirrm share/kde/apps/kcmkeys -@dirrm share/kde/apps/kcminput/pics -@dirrm share/kde/apps/kcminput -@dirrm share/kde/apps/kcmcss -@dirrm share/kde/apps/kbookmark -@dirrm share/kde/apps/kate/syntax -@dirrm share/kde/apps/kate/pics -@dirrm share/kde/apps/kate/icons/locolor/22x22/actions -@dirrm share/kde/apps/kate/icons/locolor/22x22 -@dirrm share/kde/apps/kate/icons/locolor/16x16/actions -@dirrm share/kde/apps/kate/icons/locolor/16x16 -@dirrm share/kde/apps/kate/icons/locolor -@dirrm share/kde/apps/kate/icons/hicolor/48x48/actions -@dirrm share/kde/apps/kate/icons/hicolor/48x48 -@dirrm share/kde/apps/kate/icons/hicolor/32x32/actions -@dirrm share/kde/apps/kate/icons/hicolor/32x32 -@dirrm share/kde/apps/kate/icons/hicolor/22x22/actions -@dirrm share/kde/apps/kate/icons/hicolor/22x22 -@dirrm share/kde/apps/kate/icons/hicolor/16x16/actions -@dirrm share/kde/apps/kate/icons/hicolor/16x16 -@dirrm share/kde/apps/kate/icons/hicolor -@dirrm share/kde/apps/kate/icons -@dirrm share/kde/apps/kate -@dirrm share/kde/apps/kappfinder/apps/WordProcessing -@dirrm share/kde/apps/kappfinder/apps/Utilities/XUtilities -@dirrm share/kde/apps/kappfinder/apps/Utilities -@dirrm share/kde/apps/kappfinder/apps/Toys -@dirrm share/kde/apps/kappfinder/apps/System/Terminal -@dirrm share/kde/apps/kappfinder/apps/System/ScreenSavers -@dirrm share/kde/apps/kappfinder/apps/System -@dirrm share/kde/apps/kappfinder/apps/Office -@dirrm share/kde/apps/kappfinder/apps/Multimedia -@dirrm share/kde/apps/kappfinder/apps/Internet/Terminal -@dirrm share/kde/apps/kappfinder/apps/Internet -@dirrm share/kde/apps/kappfinder/apps/Graphics -@dirrm share/kde/apps/kappfinder/apps/Games/TacticStrategy -@dirrm share/kde/apps/kappfinder/apps/Games/Emulators -@dirrm share/kde/apps/kappfinder/apps/Games/Card -@dirrm share/kde/apps/kappfinder/apps/Games/Board -@dirrm share/kde/apps/kappfinder/apps/Games/Arcade -@dirrm share/kde/apps/kappfinder/apps/Games -@dirrm share/kde/apps/kappfinder/apps/Editors -@dirrm share/kde/apps/kappfinder/apps/Development -@dirrm share/kde/apps/kappfinder/apps -@dirrm share/kde/apps/kappfinder -@dirrm share/kde/apps/kaddressbook/pics -@dirrm share/kde/apps/kaddressbook -@dirrm share/kde/apps/drkonqi/presets -@dirrm share/kde/apps/drkonqi/pics -@dirrm share/kde/apps/drkonqi/debuggers -@dirrm share/kde/apps/drkonqi -@dirrm share/kde/apps/clockapplet/pics -@dirrm share/kde/apps/clockapplet -@unexec ${RMDIR} %D/share/kde/applnk/ksysguard 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/WordProcessing 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/Utilities 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/Toys 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/System/Terminal 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/System/ScreenSavers 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/System 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/Settings/WebBrowsing 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/Settings/System 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/Settings/Sound 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/Settings/PowerControl 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/Settings/Personalization 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/Settings/Peripherals 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/Settings/Network 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/Settings/LookNFeel/Windows 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/Settings/LookNFeel/Themes 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/Settings/LookNFeel/Desktop 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/Settings/LookNFeel 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/Settings/Information 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/Settings/Help 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/Settings/FileBrowsing 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/Settings/Databases 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/Settings 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/Office 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/Multimedia 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/Internet/Terminal 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/Internet 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/Graphics 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/Games/TacticStrategy 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/Games/Card 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/Games/Board 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/Games/Arcade 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/Games 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/Editors 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/Development 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/Applications 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk/.hidden 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/kde/applnk 2>/dev/null || ${TRUE} -@dirrm share/doc/kde/HTML/en/kwrite -@dirrm share/doc/kde/HTML/en/ksysguard -@dirrm share/doc/kde/HTML/en/kpager -@dirrm share/doc/kde/HTML/en/konsole -@dirrm share/doc/kde/HTML/en/konqueror -@dirrm share/doc/kde/HTML/en/kmenuedit -@dirrm share/doc/kde/HTML/en/klipper -@dirrm share/doc/kde/HTML/en/kioslave -@dirrm share/doc/kde/HTML/en/kicker -@dirrm share/doc/kde/HTML/en/khelpcenter/visualdict -@dirrm share/doc/kde/HTML/en/khelpcenter/userguide -@dirrm share/doc/kde/HTML/en/khelpcenter/quickstart -@dirrm share/doc/kde/HTML/en/khelpcenter/glossary -@dirrm share/doc/kde/HTML/en/khelpcenter/faq -@dirrm share/doc/kde/HTML/en/khelpcenter -@dirrm share/doc/kde/HTML/en/kdm -@dirrm share/doc/kde/HTML/en/kdesu -@dirrm share/doc/kde/HTML/en/kdeprint -@dirrm share/doc/kde/HTML/en/kdebugdialog -@dirrm share/doc/kde/HTML/en/kcontrol -@dirrm share/doc/kde/HTML/en/kate -@dirrm share/doc/kde/HTML/en/kaddressbook -@dirrm share/autostart -@dirrm include/kwin -@dirrm include/kate diff --git a/x11/kdebase2/PLIST.nsplugins b/x11/kdebase2/PLIST.nsplugins deleted file mode 100644 index 9601752d45c..00000000000 --- a/x11/kdebase2/PLIST.nsplugins +++ /dev/null @@ -1,5 +0,0 @@ -@comment $NetBSD: PLIST.nsplugins,v 1.2 2004/09/22 08:09:59 jlam Exp $ -bin/nspluginscan -bin/nspluginviewer -lib/libkcm_nsplugin.la -lib/libnsplugin.la diff --git a/x11/kdebase2/buildlink3.mk b/x11/kdebase2/buildlink3.mk deleted file mode 100644 index 9826afec5cb..00000000000 --- a/x11/kdebase2/buildlink3.mk +++ /dev/null @@ -1,22 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:18:36 tv Exp $ -# XXX BUILDLINK_DEPMETHOD.kdebase?= build - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -KDEBASE_BUILDLINK3_MK:= ${KDEBASE_BUILDLINK3_MK}+ - -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= kdebase -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkdebase} -BUILDLINK_PACKAGES+= kdebase - -.if !empty(KDEBASE_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.kdebase+= kdebase>=2.2.2nb4 -BUILDLINK_RECOMMENDED.kdebase2?=kdebase>=2.2.2nb7 -BUILDLINK_PKGSRCDIR.kdebase?= ../../x11/kdebase2 -.endif # KDEBASE_BUILDLINK3_MK - -.include "../../x11/kdelibs2/buildlink3.mk" - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/kdebase2/distinfo b/x11/kdebase2/distinfo deleted file mode 100644 index 4f6af095323..00000000000 --- a/x11/kdebase2/distinfo +++ /dev/null @@ -1,143 +0,0 @@ -$NetBSD: distinfo,v 1.17 2003/08/14 20:10:18 jmc Exp $ - -SHA1 (kdebase-2.2.2.tar.bz2) = dbbc8dec49b9bb15055ce43e1b4eafe6945463b0 -Size (kdebase-2.2.2.tar.bz2) = 12888455 bytes -SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d -Size (Daemon.png) = 15725 bytes -SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b -Size (Daemon.README) = 2191 bytes -SHA1 (patch-aa) = e630486f13824047326911aa046d9b08bbbdb6ff -SHA1 (patch-ab) = b20193817a7d4e10dc84890e024e48f63fdcf889 -SHA1 (patch-ac) = 9c2038386a23bc0d2fe8c3b3debf043319f6989e -SHA1 (patch-ad) = 972b0cace3baacc5d7ea031065a391b43dd377e5 -SHA1 (patch-ae) = 647a44a4f5db8c7ca44ca94e7f720eb18bd3285d -SHA1 (patch-af) = d60a3d8f5fcc6ed0ebf71ff9aa7dbfb25cbbb3f5 -SHA1 (patch-ag) = b5173768733b68e49028daa8c81b5c5cb9be70ff -SHA1 (patch-ah) = 538abd3555bf93e1a477e3e3753f141199a70ec3 -SHA1 (patch-ai) = 6e885ee27346be6739c1641856bf6ef7130ea9af -SHA1 (patch-aj) = 9b9c94d0b70c6eb1166144ef0da6fa51405fd698 -SHA1 (patch-ak) = b84ba03330ba49d8410237f3551a8331aa51c8e8 -SHA1 (patch-al) = 0540bc48551547b2d749c5a3abce3f0511c04522 -SHA1 (patch-am) = 0294870968b6c8ccc167ad84b9d6924e4de5d47f -SHA1 (patch-an) = 5a87690d7b2ed6aa12bb6f06b452c8edac62ff0c -SHA1 (patch-ao) = bfaa153d9e7429955def1b549647e5a56befb862 -SHA1 (patch-ap) = daef50b1acb53a63e747904e210a8f1f4d18143c -SHA1 (patch-aq) = 41bc29852561d5dbc2b5d874f63e0f14ecde9677 -SHA1 (patch-ar) = 65077f21078b47810238962fa97eae4278916f9d -SHA1 (patch-as) = 60919f97d69070ed4cf92b57d9ba3af98cac17a1 -SHA1 (patch-at) = a83ed07e5fb01ea1ac3b64f8550b84b1ceeb35dc -SHA1 (patch-au) = 5caac81b24a19c4c04817fdb7ddb6410f62d984f -SHA1 (patch-av) = c2e2777a0b9f25a3418e919121a8cb95c104425a -SHA1 (patch-aw) = d510d135a475c5f3367e218a7b35cf3f81a92a04 -SHA1 (patch-ax) = 67e65b516fec8d69fd24da2416c9392c5b8e0c19 -SHA1 (patch-ay) = 9bc38f27a3cbbf5749343bddf99914c954003e23 -SHA1 (patch-az) = c0d3bd7de39f25e5aeb6c6b8a2f53ed6a723a51e -SHA1 (patch-ba) = baf6d656d3c7bb9d89e222414b1e769470df75a3 -SHA1 (patch-bb) = 3fdad176411aa555a98278e0770479cc0aa188e1 -SHA1 (patch-bc) = 4c8ce299a99b7f61be62697669f2b215578abb49 -SHA1 (patch-bd) = 8e0436a500cc2b37098beac7413d8320310e8bb3 -SHA1 (patch-be) = 4dc45743c3fdb046ab5bf1357c608c23dbc2592f -SHA1 (patch-bf) = 2cace1983f5009e94e39eabbebfc261086ffe7bd -SHA1 (patch-bg) = 4e708f50e2f0cd2f222ac0cb7d155caa929da99a -SHA1 (patch-bh) = 0d0e023f793593653dc18d0391a6fcd336d75847 -SHA1 (patch-bi) = 16de13cef7655b3b0bd3d19c9dec935cfc4b6b81 -SHA1 (patch-bj) = 45e51ad6da60e2b38ccfecf61b75175b9e9858fb -SHA1 (patch-bk) = cdb0cc50e498c101e47b689a31078f7f942dcb9c -SHA1 (patch-bl) = dc3a589816c7c5681c09c9ef962178ff9e37409d -SHA1 (patch-bm) = f3391e9d958992cb8a2c7e6a562c2859b5661e65 -SHA1 (patch-bn) = 93c8f8a3bb6aaf1a5c852eac73441ea868aacf98 -SHA1 (patch-bo) = 3ed1b9b2bd2870c80aad7a0b39aee9ac3bdc9238 -SHA1 (patch-bp) = b3434d3bb0c9dd9574cefd33dab4223fc0781e18 -SHA1 (patch-bq) = 1aa1e975850333b25ca8e8e7ce04a5a0d4518874 -SHA1 (patch-br) = ccb960d5b9f43f70e17bde094ffa1b49f0d89d2b -SHA1 (patch-bs) = 95a0c171ae38c3d156d78105772265ecf1564f26 -SHA1 (patch-bt) = 19dad64a5f030d502116934618e62913318eb272 -SHA1 (patch-bu) = ef3fc303a8044c3d0bbfeee0ba4f2d2ec032c239 -SHA1 (patch-bv) = a38c2aae13e3f5fd1f8934624bf8619fa58c0583 -SHA1 (patch-bw) = 5d0bb3a631b84ab59c521175034ead0b440fb809 -SHA1 (patch-bx) = b17a1bf7eaf50274ae74c3b344b2e31a53d75472 -SHA1 (patch-by) = 2f1c28c09d8fd2f5c1776222d4f1365c1920f3b5 -SHA1 (patch-bz) = 9bbd80c748b2e2cd56c3c2c1cd336d712382c97a -SHA1 (patch-ca) = 737e6edbbf4e63d254227a3156b2fb944fa466fc -SHA1 (patch-cb) = b55ec33208f56ac784c5fce3b386f17f158f752c -SHA1 (patch-cc) = eca19e5c3f0efbcb919a5c2d570079ea17c1ea58 -SHA1 (patch-cd) = 0b0c2f7f9f5608500be781d5bd56a0b4a608e5a9 -SHA1 (patch-ce) = 59abadb4bcd1b194dfab07ebf667afb0b85bcfc8 -SHA1 (patch-cf) = f1cdafa3cc109ddeae15091493d179f19b6f1d38 -SHA1 (patch-cg) = 909c29002c494c2d04dbb01fa6ab8c981e7ea349 -SHA1 (patch-ch) = b8fb2688192c61778d79f8fbd1c4fb5fc3fe409d -SHA1 (patch-ci) = 12e515c4517a59c3c5f529162ea66c44cbcdd69c -SHA1 (patch-cj) = 2625ce2fb6de8fd7dd465cef97b4ff36537c9d68 -SHA1 (patch-ck) = 6af4e727203046c7fedda9a5870c37285849f85c -SHA1 (patch-cl) = c4b36e0d27a719d99e8e154691c52a111944ccd4 -SHA1 (patch-cm) = 1b6d0a49111a4e6dda4e262200c57e5a32e0ee4c -SHA1 (patch-cn) = a2c001d0fdcb0ddcda112319f2cd74494254c54c -SHA1 (patch-co) = 07f5c0bfae64c180ce954c5eb07a7e425d98a9b2 -SHA1 (patch-cp) = 6098f80a53bf90ad3ac868a2d97168c4904efc04 -SHA1 (patch-cq) = 6d8bd231a1d4cc7c1aaa679d55606d4920c01774 -SHA1 (patch-cr) = 6597394593adf2c192bb1efda1ce6d90518a1636 -SHA1 (patch-cs) = c111370c446497bd009950f42badfb2ac8ae6ba6 -SHA1 (patch-ct) = 65b1859c91d5f102ae2af2c4e3deb6d0681f09aa -SHA1 (patch-cu) = 905c9cdb6a257d56bbcc17d8db9abdcbf2cb13ee -SHA1 (patch-cv) = 300ad933f112da299ea019b18fecdd751c55c3f7 -SHA1 (patch-cw) = 4e153072d46391cfd8ec92aa680e15567a7cfd61 -SHA1 (patch-cx) = 99210d00107bf63f62928a614a60cb95c6d966ca -SHA1 (patch-cy) = 439a3d95a503b9821c3961e12e0d636cd27266ae -SHA1 (patch-cz) = 7ca3ed2680f8618ef5825b5f797789f7ad180bae -SHA1 (patch-da) = e95356642c3eb7f16fefb8ff9b0d12b81e6dca77 -SHA1 (patch-db) = 7f7b40b560a1e5d80df0c3365a4e21b5e09bab5a -SHA1 (patch-dc) = f96c5afb536e8458b9022aa289b19ffa7b7fc3cb -SHA1 (patch-dd) = 51790459743c70028e53b717422da8d88ca78f16 -SHA1 (patch-de) = ed75cc59870fdc3db56485b64297aa96a1179a35 -SHA1 (patch-df) = 4e9217d0b11d63b2a2e5631810b31177ef908b67 -SHA1 (patch-dg) = 4bd7d431a28a970355a6abe1b74bab9e13fcb0c5 -SHA1 (patch-dh) = ad92a9517752b85383ab0c885a53868c50895617 -SHA1 (patch-di) = 60f389ba30cb8dddbb7542eb52de672b47af66d5 -SHA1 (patch-dj) = 1c86ddba9a52ad50184edebda3f136cd7f51e47d -SHA1 (patch-dk) = faa2733e735965f3ba16d34c986dca973e429db6 -SHA1 (patch-dl) = 647cf0effe6c94a942741b0e61efcbacb71f0f6f -SHA1 (patch-dm) = 7a73526844a40e3ad99b35617a18a1c7e58ede00 -SHA1 (patch-dn) = 548ad36c01c1374d82eca2531add638dbee858fd -SHA1 (patch-do) = 837a1c746ce91c7840e1b05083b3ad62a03ce74b -SHA1 (patch-dp) = f93857e6410ec475281f2bd153430de911f051b6 -SHA1 (patch-dq) = 97192b14dcc33ad4aa4c8ffdbc4bf79e30c7ebcd -SHA1 (patch-dr) = 6f33a15c8cdc34fb1e67390e48c529ccef249171 -SHA1 (patch-ds) = ccb2b48a8dedf0a29b8ba05f81f4a07c589751a9 -SHA1 (patch-dt) = c05f146222ea7342241ca857e48eb310850c8047 -SHA1 (patch-du) = ea42d71cf5408ef9c60c1402d22329d1b6e4de77 -SHA1 (patch-dv) = 84abd1e2951346aeac06bc407057219920339768 -SHA1 (patch-dw) = 95167b1d8befcdf81c369dce8622d258c1c14abf -SHA1 (patch-dx) = 82a2b28db04ac66bf9348e5c83d48171e44938d7 -SHA1 (patch-dy) = 08a59976e69ca1357396cdef0091f902f601bc9d -SHA1 (patch-dz) = 680397ce7b0d3176876fb2cdec0680c22708c9f9 -SHA1 (patch-ea) = dd7cd27d59ae5613aa4e05bf2ac5da644721097d -SHA1 (patch-eb) = 8e1777dabe29400120ea27148e8d8b3e9c357a66 -SHA1 (patch-ec) = 8660a2e2267034ada37cb2462b447515744da859 -SHA1 (patch-ed) = 8ee44615ce8372a000d5550e764e980c925a5a0f -SHA1 (patch-ee) = 27eb064f024a275fb39ef29dde9e48be522a7cb6 -SHA1 (patch-ef) = 692eb8d20ce34c35e711eaa7366332ae3272305f -SHA1 (patch-eg) = e8f8208b62e76fd8e63e41f8f9bfef5277d2861a -SHA1 (patch-eh) = 642c18fdcbe215418597a5ab17ed148c112c0789 -SHA1 (patch-ei) = d435f063c2b8b2e68619472d85f1957775b3900e -SHA1 (patch-ej) = c6b8075e6da941a03032eb22c311867d0372a6d0 -SHA1 (patch-ek) = b29c40008c74e005911b3c8ede796ce6814c7e81 -SHA1 (patch-el) = 99f484d15555fdf38acf0d7c04bd55a0d0d2bff7 -SHA1 (patch-em) = 636dc26af3ca541dfecea60bcb8d4d5af7944f6d -SHA1 (patch-en) = e62d89268c19a0ad02f55b9543518b0fed0c8a5a -SHA1 (patch-eo) = 1ab86efd90dc176c9fe38964c9f2f232c8a7d9ef -SHA1 (patch-ep) = 57e1ed1d41871b626f7d7b906c552abb4dde8e9f -SHA1 (patch-eq) = 52e74649447f35114c0b92aebf23262ed67495b3 -SHA1 (patch-er) = df2f9a856bd75b7f3726b8d7457ab7123f91314b -SHA1 (patch-es) = fb6216bfd7304273378099566955e435f0937269 -SHA1 (patch-et) = 1a573a0f3043e803f7edb08492aa8d42f79ce5e5 -SHA1 (patch-eu) = d31dee4dbf809b237662eae8bdec019cc594dc73 -SHA1 (patch-ev) = 2e42263d67e5e44035bed13dc3e5245fc3a86709 -SHA1 (patch-ew) = 20da4927026655647414f5407edf83d8acf4e34b -SHA1 (patch-ex) = 96fac765f7678be3563245c3fa1a23ace5bce86b -SHA1 (patch-ey) = 2252a4ed9f9d15021e59b542568b0dc0f9c73e48 -SHA1 (patch-ez) = 8d3f98ab51075af154ef6db786cde704ddb8c556 -SHA1 (patch-fa) = bccd1a6d1939ef1c97c3c45ec9e3619b568eca09 -SHA1 (patch-fb) = 8f95df054822fd535c967ea770e6c65af6545b20 -SHA1 (patch-fc) = 5b3da5ab4370d01c1378a4e14467fd05e58932b7 -SHA1 (patch-fd) = 5f56f987336f37158e8be2e6d2e270c4e4282bc7 -SHA1 (patch-fe) = 0b6021621752304269ce042b16b80893840413ac diff --git a/x11/kdebase2/patches/patch-aa b/x11/kdebase2/patches/patch-aa deleted file mode 100644 index ce4cf56440f..00000000000 --- a/x11/kdebase2/patches/patch-aa +++ /dev/null @@ -1,70 +0,0 @@ -$NetBSD: patch-aa,v 1.8 2001/12/03 15:37:18 skrll Exp $ - ---- configure.orig Sat Nov 10 08:08:04 2001 -+++ configure -@@ -16640,7 +16640,7 @@ - - ac_save_ldflags="$LDFLAGS" - ac_save_cflags="$CFLAGS" -- LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries -lMesaGL -lMesaGLU -lX11 -lXext -lm $LIBSOCKET" -+ LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries -lGL -lGLU -lX11 -lXext -lm $LIBSOCKET" - CFLAGS="$CFLAGS $X_INCLUDES" - test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS" - cat >conftest.$ac_ext <<_ACEOF -@@ -16733,13 +16733,13 @@ - - if test "$GL_LDFLAGS" = ""; then - if test "$ac_cv_have_gl" = "mesa"; then -- GLLIB='-lMesaGL -lMesaGLU $(LIB_X11)' -+ GLLIB='-lGL -lGLU $(LIB_X11)' - else - GLLIB='-lGL -lGLU $(LIB_X11)' - fi - else - if test "$ac_cv_have_gl" = "mesa"; then -- GLLIB="$GL_LDFLAGS -lMesaGL -lMesaGLU "'$(LIB_X11)' -+ GLLIB="$GL_LDFLAGS -lGL -lGLU "'$(LIB_X11)' - else - GLLIB="$GL_LDFLAGS -lGL -lGLU "'$(LIB_X11)' - fi -@@ -16754,7 +16754,7 @@ - - GL_SAVERS="kmorph3d.kss kspace.kss kpipes.kss" - ac_save_CPPFLAGS="$CPPFLAGS" --CPPFLAGS="-I$GL_INCLUDE $CPPFLAGS $X_INCLUDES" -+CPPFLAGS="$GLINC $CPPFLAGS $X_INCLUDES" - - for ac_header in GL/xmesa.h GL/glut.h memory.h - do -@@ -16984,6 +16984,23 @@ - - ac_cv_have_dpms="-lXdpms" - -+ lib=Xdpms -+ shared_lib_found=no -+ for i in ${LDFLAGS}; do -+ case "$i" in -+ -L*) -+ dir=`echo $i | sed "s,^-L,,"` -+ if [ -e $dir/lib${lib}.so ] || -+ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then -+ shared_lib_found=yes -+ break; -+ fi -+ esac -+ done -+ if [ "$shared_lib_found" = "no" ]; then -+ eval "ac_cv_have_dpms=no" -+ fi -+ - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 -@@ -17108,6 +17125,7 @@ - case "$host" in - *-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;; - *-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;; -+ *-*-netbsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;; - *-*-solaris*) ksysguardd_compile=yes; UNAME='Solaris' ;; - *) ksysguard_compile=no; UNAME='' ;; - esac diff --git a/x11/kdebase2/patches/patch-ab b/x11/kdebase2/patches/patch-ab deleted file mode 100644 index a5772d4f529..00000000000 --- a/x11/kdebase2/patches/patch-ab +++ /dev/null @@ -1,47 +0,0 @@ -$NetBSD: patch-ab,v 1.4 2001/10/15 22:45:59 skrll Exp $ - ---- kate/main/Makefile.am.orig Thu May 31 16:51:43 2001 -+++ kate/main/Makefile.am -@@ -1,4 +1,4 @@ --lib_LTLIBRARIES = libkatecore.la kate.la kwrite.la -+lib_LTLIBRARIES = libkatecore.la libkate_main.la kate.la libkwrite_main.la kwrite.la - bin_PROGRAMS = kate kwrite - - libkatecore_la_SOURCES = dummy.cpp -@@ -10,20 +10,28 @@ - ../pluginmanager/libkatepluginmanager.la ../interfaces/libkateinterfaces.la -lktexteditor -lkspell -lkdeprint - libkatecore_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_PLUGIN) -module -avoid-version - --kate_la_SOURCES = katemain.cpp --kate_la_LIBADD = libkatecore.la -+libkate_main_la_SOURCES = katemain.cpp -+libkate_main_la_LIBADD = libkatecore.la -+libkate_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -+ -+kate_la_SOURCES = kate_main.cpp -+kate_la_LIBADD = libkate_main.la - kate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version - --kwrite_la_SOURCES = kwritemain.cpp --kwrite_la_LIBADD = libkatecore.la -+libkwrite_main_la_SOURCES = kwritemain.cpp -+libkwrite_main_la_LIBADD = libkatecore.la -+libkwrite_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -+ -+kwrite_la_SOURCES = kwrite_main.cpp -+kwrite_la_LIBADD = libkwrite_main.la - kwrite_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version - --kate_SOURCES = dummy.cpp --kate_LDADD = kate.la -+kate_SOURCES = kate_main.cpp -+kate_LDADD = libkate_main.la - kate_LDFLAGS = $(KDE_RPATH) $(all_libraries) - --kwrite_SOURCES = dummy.cpp --kwrite_LDADD = kwrite.la -+kwrite_SOURCES = kwrite_main.cpp -+kwrite_LDADD = libkwrite_main.la - kwrite_LDFLAGS = $(KDE_RPATH) $(all_libraries) - - dummy.cpp: diff --git a/x11/kdebase2/patches/patch-ac b/x11/kdebase2/patches/patch-ac deleted file mode 100644 index 42036e46772..00000000000 --- a/x11/kdebase2/patches/patch-ac +++ /dev/null @@ -1,269 +0,0 @@ -$NetBSD: patch-ac,v 1.6 2001/12/03 15:37:18 skrll Exp $ - ---- kate/main/Makefile.in.orig Sat Nov 10 07:58:16 2001 -+++ kate/main/Makefile.in -@@ -273,7 +273,7 @@ - x_includes = @x_includes@ - x_libraries = @x_libraries@ - --lib_LTLIBRARIES = libkatecore.la kate.la kwrite.la -+lib_LTLIBRARIES = libkatecore.la libkate_main.la kate.la libkwrite_main.la kwrite.la - bin_PROGRAMS = kate kwrite - - libkatecore_la_SOURCES = dummy.cpp -@@ -281,20 +281,28 @@ - - libkatecore_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_PLUGIN) -module -avoid-version - --kate_la_SOURCES = katemain.cpp --kate_la_LIBADD = libkatecore.la -+libkate_main_la_SOURCES = katemain.cpp -+libkate_main_la_LIBADD = libkatecore.la -+libkate_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -+ -+kate_la_SOURCES = kate_main.cpp -+kate_la_LIBADD = libkate_main.la - kate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version - --kwrite_la_SOURCES = kwritemain.cpp --kwrite_la_LIBADD = libkatecore.la -+libkwrite_main_la_SOURCES = kwritemain.cpp -+libkwrite_main_la_LIBADD = libkatecore.la -+libkwrite_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -+ -+kwrite_la_SOURCES = kwrite_main.cpp -+kwrite_la_LIBADD = libkwrite_main.la - kwrite_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version - --kate_SOURCES = dummy.cpp --kate_LDADD = kate.la -+kate_SOURCES = kate_main.cpp -+kate_LDADD = libkate_main.la - kate_LDFLAGS = $(KDE_RPATH) $(all_libraries) - --kwrite_SOURCES = dummy.cpp --kwrite_LDADD = kwrite.la -+kwrite_SOURCES = kwrite_main.cpp -+kwrite_LDADD = libkwrite_main.la - kwrite_LDFLAGS = $(KDE_RPATH) $(all_libraries) - - INCLUDES = $(all_includes) -@@ -322,29 +330,37 @@ - #>- libkatecore_la_OBJECTS = dummy.lo - #>+ 1 - libkatecore_la_OBJECTS = dummy.lo --kate_la_DEPENDENCIES = libkatecore.la --#>- kate_la_OBJECTS = katemain.lo -+libkate_main_la_DEPENDENCIES = libkatecore.la -+#>- libkate_main_la_OBJECTS = katemain.lo - #>+ 1 --kate_la_OBJECTS = katemain.lo --kwrite_la_DEPENDENCIES = libkatecore.la --#>- kwrite_la_OBJECTS = kwritemain.lo -+libkate_main_la_OBJECTS = katemain.lo -+kate_la_DEPENDENCIES = libkate_main.la -+#>- kate_la_OBJECTS = kate_main.lo -+#>+ 1 -+kate_la_OBJECTS = kate_main.lo -+libkwrite_main_la_DEPENDENCIES = libkatecore.la -+#>- libkwrite_main_la_OBJECTS = kwritemain.lo - #>+ 5 --kwrite_la_final_OBJECTS = kwrite_la.all_cpp.lo --kwrite_la_nofinal_OBJECTS = kwritemain.lo \ -- kwrite_la_meta_unload.lo --@KDE_USE_FINAL_FALSE@kwrite_la_OBJECTS = $(kwrite_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@kwrite_la_OBJECTS = $(kwrite_la_final_OBJECTS) -+libkwrite_main_la_final_OBJECTS = libkwrite_main_la.all_cpp.lo -+libkwrite_main_la_nofinal_OBJECTS = kwritemain.lo \ -+ libkwrite_main_la_meta_unload.lo -+@KDE_USE_FINAL_FALSE@libkwrite_main_la_OBJECTS = $(libkwrite_main_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libkwrite_main_la_OBJECTS = $(libkwrite_main_la_final_OBJECTS) -+kwrite_la_DEPENDENCIES = libkwrite_main.la -+#>- kwrite_la_OBJECTS = kwrite_main.lo -+#>+ 1 -+kwrite_la_OBJECTS = kwrite_main.lo - bin_PROGRAMS = kate$(EXEEXT) kwrite$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - --#>- kate_OBJECTS = dummy.$(OBJEXT) -+#>- kate_OBJECTS = kate_main.$(OBJEXT) - #>+ 1 --kate_OBJECTS = dummy.$(OBJEXT) --kate_DEPENDENCIES = kate.la --#>- kwrite_OBJECTS = dummy.$(OBJEXT) -+kate_OBJECTS = kate_main.$(OBJEXT) -+kate_DEPENDENCIES = libkate_main.la -+#>- kwrite_OBJECTS = kwrite_main.$(OBJEXT) - #>+ 1 --kwrite_OBJECTS = dummy.$(OBJEXT) --kwrite_DEPENDENCIES = kwrite.la -+kwrite_OBJECTS = kwrite_main.$(OBJEXT) -+kwrite_DEPENDENCIES = libkwrite_main.la - CXXFLAGS = @CXXFLAGS@ - #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 1 -@@ -368,8 +384,8 @@ - - TAR = tar - GZIP_ENV = --best --SOURCES = $(libkatecore_la_SOURCES) $(kate_la_SOURCES) $(kwrite_la_SOURCES) $(kate_SOURCES) $(kwrite_SOURCES) --OBJECTS = $(libkatecore_la_OBJECTS) $(kate_la_OBJECTS) $(kwrite_la_OBJECTS) $(kate_OBJECTS) $(kwrite_OBJECTS) -+SOURCES = $(libkatecore_la_SOURCES) $(libkate_main_la_SOURCES) $(kate_la_SOURCES) $(libkwrite_main_la_SOURCES) $(kwrite_la_SOURCES) $(kate_SOURCES) $(kwrite_SOURCES) -+OBJECTS = $(libkatecore_la_OBJECTS) $(libkate_main_la_OBJECTS) $(kate_la_OBJECTS) $(libkwrite_main_la_OBJECTS) $(kwrite_la_OBJECTS) $(kate_OBJECTS) $(kwrite_OBJECTS) - - #>- all: all-redirect - #>+ 1 -@@ -462,9 +478,15 @@ - @KDE_USE_CLOSURE_FALSE@libkatecore.la: $(libkatecore_la_OBJECTS) $(libkatecore_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(libkatecore_la_LDFLAGS) $(libkatecore_la_OBJECTS) $(libkatecore_la_LIBADD) $(LIBS) - -+libkate_main.la: $(libkate_main_la_OBJECTS) $(libkate_main_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(libdir) $(libkate_main_la_LDFLAGS) $(libkate_main_la_OBJECTS) $(libkate_main_la_LIBADD) $(LIBS) -+ - kate.la: $(kate_la_OBJECTS) $(kate_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(kate_la_LDFLAGS) $(kate_la_OBJECTS) $(kate_la_LIBADD) $(LIBS) - -+libkwrite_main.la: $(libkwrite_main_la_OBJECTS) $(libkwrite_main_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(libdir) $(libkwrite_main_la_LDFLAGS) $(libkwrite_main_la_OBJECTS) $(libkwrite_main_la_LIBADD) $(LIBS) -+ - kwrite.la: $(kwrite_la_OBJECTS) $(kwrite_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(kwrite_la_LDFLAGS) $(kwrite_la_OBJECTS) $(kwrite_la_LIBADD) $(LIBS) - -@@ -675,21 +697,21 @@ - - - #>+ 12 --kwrite_la_meta_unload.cpp: kwritemain.moc -- @echo 'creating kwrite_la_meta_unload.cpp' -- @-rm -f kwrite_la_meta_unload.cpp -+libkwrite_main_la_meta_unload.cpp: kwritemain.moc -+ @echo 'creating libkwrite_main_la_meta_unload.cpp' -+ @-rm -f libkwrite_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kwrite_la[] = {' > kwrite_la_meta_unload.cpp ;\ -- cat kwritemain.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kwrite_la_meta_unload.cpp ;\ -- echo '0};' >> kwrite_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kwrite_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kwrite_la)' >> kwrite_la_meta_unload.cpp ;\ -- else echo > kwrite_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkwrite_main_la[] = {' > libkwrite_main_la_meta_unload.cpp ;\ -+ cat kwritemain.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkwrite_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkwrite_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkwrite_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkwrite_main_la)' >> libkwrite_main_la_meta_unload.cpp ;\ -+ else echo > libkwrite_main_la_meta_unload.cpp; fi - - - #>+ 3 - clean-moc-classes: -- -rm -f kwrite_la_meta_unload.cpp -+ -rm -f libkwrite_main_la_meta_unload.cpp - - #>+ 11 - libkatecore_la.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp kwritemain.moc -@@ -704,11 +726,23 @@ - rm -f libkatecore_la.all_cpp.final libkatecore_la.all_cpp.files - - #>+ 11 --kate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/katemain.cpp -+libkate_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/katemain.cpp -+ @echo 'creating libkate_main_la.all_cpp.cpp ...'; \ -+ rm -f libkate_main_la.all_cpp.files libkate_main_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkate_main_la.all_cpp.final; \ -+ for file in katemain.cpp ; do \ -+ echo "#include \"$$file\"" >> libkate_main_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkate_main_la.all_cpp.final; \ -+ done; \ -+ cat libkate_main_la.all_cpp.final libkate_main_la.all_cpp.files > libkate_main_la.all_cpp.cpp; \ -+ rm -f libkate_main_la.all_cpp.final libkate_main_la.all_cpp.files -+ -+#>+ 11 -+kate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kate_main.cpp - @echo 'creating kate_la.all_cpp.cpp ...'; \ - rm -f kate_la.all_cpp.files kate_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kate_la.all_cpp.final; \ -- for file in katemain.cpp ; do \ -+ for file in kate_main.cpp ; do \ - echo "#include \"$$file\"" >> kate_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kate_la.all_cpp.final; \ - done; \ -@@ -716,11 +750,23 @@ - rm -f kate_la.all_cpp.final kate_la.all_cpp.files - - #>+ 11 --kwrite_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwritemain.cpp kwrite_la_meta_unload.cpp -+libkwrite_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwritemain.cpp libkwrite_main_la_meta_unload.cpp -+ @echo 'creating libkwrite_main_la.all_cpp.cpp ...'; \ -+ rm -f libkwrite_main_la.all_cpp.files libkwrite_main_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkwrite_main_la.all_cpp.final; \ -+ for file in kwritemain.cpp libkwrite_main_la_meta_unload.cpp ; do \ -+ echo "#include \"$$file\"" >> libkwrite_main_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkwrite_main_la.all_cpp.final; \ -+ done; \ -+ cat libkwrite_main_la.all_cpp.final libkwrite_main_la.all_cpp.files > libkwrite_main_la.all_cpp.cpp; \ -+ rm -f libkwrite_main_la.all_cpp.final libkwrite_main_la.all_cpp.files -+ -+#>+ 11 -+kwrite_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwrite_main.cpp - @echo 'creating kwrite_la.all_cpp.cpp ...'; \ - rm -f kwrite_la.all_cpp.files kwrite_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kwrite_la.all_cpp.final; \ -- for file in kwritemain.cpp kwrite_la_meta_unload.cpp ; do \ -+ for file in kwrite_main.cpp ; do \ - echo "#include \"$$file\"" >> kwrite_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrite_la.all_cpp.final; \ - done; \ -@@ -728,11 +774,11 @@ - rm -f kwrite_la.all_cpp.final kwrite_la.all_cpp.files - - #>+ 11 --kate.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+kate.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kate_main.cpp - @echo 'creating kate.all_cpp.cpp ...'; \ - rm -f kate.all_cpp.files kate.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kate.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kate_main.cpp ; do \ - echo "#include \"$$file\"" >> kate.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kate.all_cpp.final; \ - done; \ -@@ -740,11 +786,11 @@ - rm -f kate.all_cpp.final kate.all_cpp.files - - #>+ 11 --kwrite.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+kwrite.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwrite_main.cpp - @echo 'creating kwrite.all_cpp.cpp ...'; \ - rm -f kwrite.all_cpp.files kwrite.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kwrite.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kwrite_main.cpp ; do \ - echo "#include \"$$file\"" >> kwrite.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrite.all_cpp.final; \ - done; \ -@@ -753,20 +799,20 @@ - - #>+ 3 - clean-final: -- -rm -f libkatecore_la.all_cpp.cpp kate_la.all_cpp.cpp kwrite_la.all_cpp.cpp kate.all_cpp.cpp kwrite.all_cpp.cpp -+ -rm -f libkatecore_la.all_cpp.cpp libkate_main_la.all_cpp.cpp kate_la.all_cpp.cpp libkwrite_main_la.all_cpp.cpp kwrite_la.all_cpp.cpp kate.all_cpp.cpp kwrite.all_cpp.cpp - - #>+ 2 - final: -- $(MAKE) kwrite_la_OBJECTS="$(kwrite_la_final_OBJECTS)" all-am -+ $(MAKE) libkwrite_main_la_OBJECTS="$(libkwrite_main_la_final_OBJECTS)" all-am - #>+ 2 - final-install: -- $(MAKE) kwrite_la_OBJECTS="$(kwrite_la_final_OBJECTS)" install-am -+ $(MAKE) libkwrite_main_la_OBJECTS="$(libkwrite_main_la_final_OBJECTS)" install-am - #>+ 2 - no-final: -- $(MAKE) kwrite_la_OBJECTS="$(kwrite_la_nofinal_OBJECTS)" all-am -+ $(MAKE) libkwrite_main_la_OBJECTS="$(libkwrite_main_la_nofinal_OBJECTS)" all-am - #>+ 2 - no-final-install: -- $(MAKE) kwrite_la_OBJECTS="$(kwrite_la_nofinal_OBJECTS)" install-am -+ $(MAKE) libkwrite_main_la_OBJECTS="$(libkwrite_main_la_nofinal_OBJECTS)" install-am - #>+ 3 - cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase2/patches/patch-ad b/x11/kdebase2/patches/patch-ad deleted file mode 100644 index 669a3a5dea8..00000000000 --- a/x11/kdebase2/patches/patch-ad +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-ad,v 1.4 2001/10/15 22:46:00 skrll Exp $ - ---- kate/main/kate_main.cpp.orig Tue Oct 2 17:50:30 2001 -+++ kate/main/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 int kate_main(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kate_main(argc, argv); -+} diff --git a/x11/kdebase2/patches/patch-ae b/x11/kdebase2/patches/patch-ae deleted file mode 100644 index 359883008d4..00000000000 --- a/x11/kdebase2/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.4 2001/10/15 22:46:00 skrll Exp $ - ---- kate/main/katemain.cpp.orig Sun Jul 29 05:56:17 2001 -+++ kate/main/katemain.cpp -@@ -39,7 +39,7 @@ - { 0,0,0 } - }; - --int main( int argc, char **argv ) -+int kate_main( int argc, char **argv ) - { - KCmdLineArgs::init (argc, argv, KateFactory::aboutData()); - KCmdLineArgs::addCmdLineOptions (options); diff --git a/x11/kdebase2/patches/patch-af b/x11/kdebase2/patches/patch-af deleted file mode 100644 index 1afe34cae1e..00000000000 --- a/x11/kdebase2/patches/patch-af +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-af,v 1.2 2001/10/15 22:46:00 skrll Exp $ - ---- kate/main/kwrite_main.cpp.orig Tue Oct 2 17:50:30 2001 -+++ kate/main/kwrite_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 int kwrite_main(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kwrite_main(argc, argv); -+} diff --git a/x11/kdebase2/patches/patch-ag b/x11/kdebase2/patches/patch-ag deleted file mode 100644 index beb5d89fd2b..00000000000 --- a/x11/kdebase2/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.2 2001/10/15 22:46:00 skrll Exp $ - ---- kate/main/kwritemain.cpp.orig Sun Jul 29 05:56:17 2001 -+++ kate/main/kwritemain.cpp -@@ -468,7 +468,7 @@ - { 0, 0, 0} - }; - --int main(int argc, char **argv) -+int kwrite_main(int argc, char **argv) - { - KLocale::setMainCatalogue("kate"); //lukas: set this to have the kwritepart translated using kate message catalog - diff --git a/x11/kdebase2/patches/patch-ah b/x11/kdebase2/patches/patch-ah deleted file mode 100644 index 2fa8c570e16..00000000000 --- a/x11/kdebase2/patches/patch-ah +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-ah,v 1.2 2001/10/15 22:46:00 skrll Exp $ - ---- kcontrol/access/Makefile.am.orig Sat Dec 9 11:07:22 2000 -+++ kcontrol/access/Makefile.am -@@ -4,15 +4,19 @@ - - bin_PROGRAMS = kaccess - --kaccess_SOURCES = dummy.cpp -+kaccess_SOURCES = kaccess_main.cpp - kaccess_LDFLAGS = $(all_libraries) $(KDE_RPATH) --kaccess_LDADD = kaccess.la -+kaccess_LDADD = libkaccess_sl.la - --kde_module_LTLIBRARIES = libkcm_access.la kaccess.la -+kde_module_LTLIBRARIES = libkcm_access.la libkaccess_sl.la kaccess.la - --kaccess_la_SOURCES = kaccess.cpp main.cpp -+libkaccess_sl_la_SOURCES = kaccess.cpp main.cpp -+libkaccess_sl_la_LDFLAGS = $(all_libraries) -+libkaccess_sl_la_LIBADD = $(LIB_KDEUI) -+ -+kaccess_la_SOURCES = kaccess_main.cpp - kaccess_la_LDFLAGS = $(all_libraries) -module -avoid-version --kaccess_la_LIBADD = $(LIB_KDEUI) -+kaccess_la_LIBADD = libkaccess_sl.la $(LIB_KDEUI) - - libkcm_access_la_SOURCES = kcmaccess.cpp - libkcm_access_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -@@ -31,6 +35,3 @@ - messages: - $(XGETTEXT) $(kaccess_la_SOURCES) -o $(podir)/kaccess.pot - $(XGETTEXT) $(libkcm_access_la_SOURCES) -o $(podir)/kcmaccess.pot -- --dummy.cpp: -- echo > dummy.cpp diff --git a/x11/kdebase2/patches/patch-ai b/x11/kdebase2/patches/patch-ai deleted file mode 100644 index 8363828caa4..00000000000 --- a/x11/kdebase2/patches/patch-ai +++ /dev/null @@ -1,202 +0,0 @@ -$NetBSD: patch-ai,v 1.4 2001/12/03 15:37:19 skrll Exp $ - ---- kcontrol/access/Makefile.in.orig Sat Nov 10 07:58:17 2001 -+++ kcontrol/access/Makefile.in -@@ -277,15 +277,19 @@ - - bin_PROGRAMS = kaccess - --kaccess_SOURCES = dummy.cpp -+kaccess_SOURCES = kaccess_main.cpp - kaccess_LDFLAGS = $(all_libraries) $(KDE_RPATH) --kaccess_LDADD = kaccess.la -+kaccess_LDADD = libkaccess_sl.la - --kde_module_LTLIBRARIES = libkcm_access.la kaccess.la -+kde_module_LTLIBRARIES = libkcm_access.la libkaccess_sl.la kaccess.la - --kaccess_la_SOURCES = kaccess.cpp main.cpp -+libkaccess_sl_la_SOURCES = kaccess.cpp main.cpp -+libkaccess_sl_la_LDFLAGS = $(all_libraries) -+libkaccess_sl_la_LIBADD = $(LIB_KDEUI) -+ -+kaccess_la_SOURCES = kaccess_main.cpp - kaccess_la_LDFLAGS = $(all_libraries) -module -avoid-version --kaccess_la_LIBADD = $(LIB_KDEUI) -+kaccess_la_LIBADD = libkaccess_sl.la $(LIB_KDEUI) - - libkcm_access_la_SOURCES = kcmaccess.cpp - libkcm_access_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -@@ -318,21 +322,25 @@ - libkcm_access_la_meta_unload.lo - @KDE_USE_FINAL_FALSE@libkcm_access_la_OBJECTS = $(libkcm_access_la_nofinal_OBJECTS) - @KDE_USE_FINAL_TRUE@libkcm_access_la_OBJECTS = $(libkcm_access_la_final_OBJECTS) --kaccess_la_DEPENDENCIES = --#>- kaccess_la_OBJECTS = kaccess.lo main.lo -+libkaccess_sl_la_DEPENDENCIES = -+#>- libkaccess_sl_la_OBJECTS = kaccess.lo main.lo - #>+ 5 --kaccess_la_final_OBJECTS = kaccess_la.all_cpp.lo --kaccess_la_nofinal_OBJECTS = kaccess.lo main.lo \ -- kaccess_la_meta_unload.lo --@KDE_USE_FINAL_FALSE@kaccess_la_OBJECTS = $(kaccess_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@kaccess_la_OBJECTS = $(kaccess_la_final_OBJECTS) -+libkaccess_sl_la_final_OBJECTS = libkaccess_sl_la.all_cpp.lo -+libkaccess_sl_la_nofinal_OBJECTS = kaccess.lo main.lo \ -+ libkaccess_sl_la_meta_unload.lo -+@KDE_USE_FINAL_FALSE@libkaccess_sl_la_OBJECTS = $(libkaccess_sl_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libkaccess_sl_la_OBJECTS = $(libkaccess_sl_la_final_OBJECTS) -+kaccess_la_DEPENDENCIES = libkaccess_sl.la -+#>- kaccess_la_OBJECTS = kaccess_main.lo -+#>+ 1 -+kaccess_la_OBJECTS = kaccess_main.lo - bin_PROGRAMS = kaccess$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - --#>- kaccess_OBJECTS = dummy.$(OBJEXT) -+#>- kaccess_OBJECTS = kaccess_main.$(OBJEXT) - #>+ 1 --kaccess_OBJECTS = dummy.$(OBJEXT) --kaccess_DEPENDENCIES = kaccess.la -+kaccess_OBJECTS = kaccess_main.$(OBJEXT) -+kaccess_DEPENDENCIES = libkaccess_sl.la - CXXFLAGS = @CXXFLAGS@ - #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 1 -@@ -353,15 +361,15 @@ - - #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=kaccess.desktop configure.in.in kaccess.h kcmaccess.desktop -+KDE_DIST=configure.in.in kcmaccess.desktop kaccess.desktop kaccess.h - - DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - - - TAR = tar - GZIP_ENV = --best --SOURCES = $(libkcm_access_la_SOURCES) $(kaccess_la_SOURCES) $(kaccess_SOURCES) --OBJECTS = $(libkcm_access_la_OBJECTS) $(kaccess_la_OBJECTS) $(kaccess_OBJECTS) -+SOURCES = $(libkcm_access_la_SOURCES) $(libkaccess_sl_la_SOURCES) $(kaccess_la_SOURCES) $(kaccess_SOURCES) -+OBJECTS = $(libkcm_access_la_OBJECTS) $(libkaccess_sl_la_OBJECTS) $(kaccess_la_OBJECTS) $(kaccess_OBJECTS) - - #>- all: all-redirect - #>+ 1 -@@ -454,6 +462,9 @@ - @KDE_USE_CLOSURE_FALSE@libkcm_access.la: $(libkcm_access_la_OBJECTS) $(libkcm_access_la_DEPENDENCIES) - $(CXXLINK) -rpath $(kde_moduledir) $(libkcm_access_la_LDFLAGS) $(libkcm_access_la_OBJECTS) $(libkcm_access_la_LIBADD) $(LIBS) - -+libkaccess_sl.la: $(libkaccess_sl_la_OBJECTS) $(libkaccess_sl_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(kde_moduledir) $(libkaccess_sl_la_LDFLAGS) $(libkaccess_sl_la_OBJECTS) $(libkaccess_sl_la_LIBADD) $(LIBS) -+ - kaccess.la: $(kaccess_la_OBJECTS) $(kaccess_la_DEPENDENCIES) - $(CXXLINK) -rpath $(kde_moduledir) $(kaccess_la_LDFLAGS) $(kaccess_la_OBJECTS) $(kaccess_la_LIBADD) $(LIBS) - -@@ -676,9 +687,6 @@ - $(XGETTEXT) $(kaccess_la_SOURCES) -o $(podir)/kaccess.pot - $(XGETTEXT) $(libkcm_access_la_SOURCES) -o $(podir)/kcmaccess.pot - --dummy.cpp: -- echo > dummy.cpp -- - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: -@@ -731,21 +739,21 @@ - - - #>+ 12 --kaccess_la_meta_unload.cpp: kaccess.moc -- @echo 'creating kaccess_la_meta_unload.cpp' -- @-rm -f kaccess_la_meta_unload.cpp -+libkaccess_sl_la_meta_unload.cpp: kaccess.moc -+ @echo 'creating libkaccess_sl_la_meta_unload.cpp' -+ @-rm -f libkaccess_sl_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kaccess_la[] = {' > kaccess_la_meta_unload.cpp ;\ -- cat kaccess.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kaccess_la_meta_unload.cpp ;\ -- echo '0};' >> kaccess_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kaccess_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kaccess_la)' >> kaccess_la_meta_unload.cpp ;\ -- else echo > kaccess_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkaccess_sl_la[] = {' > libkaccess_sl_la_meta_unload.cpp ;\ -+ cat kaccess.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkaccess_sl_la_meta_unload.cpp ;\ -+ echo '0};' >> libkaccess_sl_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkaccess_sl_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkaccess_sl_la)' >> libkaccess_sl_la_meta_unload.cpp ;\ -+ else echo > libkaccess_sl_la_meta_unload.cpp; fi - - - #>+ 3 - clean-moc-classes: -- -rm -f libkcm_access_la_meta_unload.cpp kaccess_la_meta_unload.cpp -+ -rm -f libkcm_access_la_meta_unload.cpp libkaccess_sl_la_meta_unload.cpp - - #>+ 11 - libkcm_access_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmaccess.cpp libkcm_access_la_meta_unload.cpp kcmaccess.moc kaccess.moc -@@ -760,11 +768,23 @@ - rm -f libkcm_access_la.all_cpp.final libkcm_access_la.all_cpp.files - - #>+ 11 --kaccess_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaccess.cpp $(srcdir)/main.cpp kaccess_la_meta_unload.cpp -+libkaccess_sl_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaccess.cpp $(srcdir)/main.cpp libkaccess_sl_la_meta_unload.cpp -+ @echo 'creating libkaccess_sl_la.all_cpp.cpp ...'; \ -+ rm -f libkaccess_sl_la.all_cpp.files libkaccess_sl_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkaccess_sl_la.all_cpp.final; \ -+ for file in kaccess.cpp main.cpp libkaccess_sl_la_meta_unload.cpp ; do \ -+ echo "#include \"$$file\"" >> libkaccess_sl_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkaccess_sl_la.all_cpp.final; \ -+ done; \ -+ cat libkaccess_sl_la.all_cpp.final libkaccess_sl_la.all_cpp.files > libkaccess_sl_la.all_cpp.cpp; \ -+ rm -f libkaccess_sl_la.all_cpp.final libkaccess_sl_la.all_cpp.files -+ -+#>+ 11 -+kaccess_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaccess_main.cpp - @echo 'creating kaccess_la.all_cpp.cpp ...'; \ - rm -f kaccess_la.all_cpp.files kaccess_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kaccess_la.all_cpp.final; \ -- for file in kaccess.cpp main.cpp kaccess_la_meta_unload.cpp ; do \ -+ for file in kaccess_main.cpp ; do \ - echo "#include \"$$file\"" >> kaccess_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaccess_la.all_cpp.final; \ - done; \ -@@ -772,11 +792,11 @@ - rm -f kaccess_la.all_cpp.final kaccess_la.all_cpp.files - - #>+ 11 --kaccess.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+kaccess.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaccess_main.cpp - @echo 'creating kaccess.all_cpp.cpp ...'; \ - rm -f kaccess.all_cpp.files kaccess.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kaccess.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kaccess_main.cpp ; do \ - echo "#include \"$$file\"" >> kaccess.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaccess.all_cpp.final; \ - done; \ -@@ -785,20 +805,20 @@ - - #>+ 3 - clean-final: -- -rm -f libkcm_access_la.all_cpp.cpp kaccess_la.all_cpp.cpp kaccess.all_cpp.cpp -+ -rm -f libkcm_access_la.all_cpp.cpp libkaccess_sl_la.all_cpp.cpp kaccess_la.all_cpp.cpp kaccess.all_cpp.cpp - - #>+ 2 - final: -- $(MAKE) libkcm_access_la_OBJECTS="$(libkcm_access_la_final_OBJECTS)" kaccess_la_OBJECTS="$(kaccess_la_final_OBJECTS)" all-am -+ $(MAKE) libkcm_access_la_OBJECTS="$(libkcm_access_la_final_OBJECTS)" libkaccess_sl_la_OBJECTS="$(libkaccess_sl_la_final_OBJECTS)" all-am - #>+ 2 - final-install: -- $(MAKE) libkcm_access_la_OBJECTS="$(libkcm_access_la_final_OBJECTS)" kaccess_la_OBJECTS="$(kaccess_la_final_OBJECTS)" install-am -+ $(MAKE) libkcm_access_la_OBJECTS="$(libkcm_access_la_final_OBJECTS)" libkaccess_sl_la_OBJECTS="$(libkaccess_sl_la_final_OBJECTS)" install-am - #>+ 2 - no-final: -- $(MAKE) libkcm_access_la_OBJECTS="$(libkcm_access_la_nofinal_OBJECTS)" kaccess_la_OBJECTS="$(kaccess_la_nofinal_OBJECTS)" all-am -+ $(MAKE) libkcm_access_la_OBJECTS="$(libkcm_access_la_nofinal_OBJECTS)" libkaccess_sl_la_OBJECTS="$(libkaccess_sl_la_nofinal_OBJECTS)" all-am - #>+ 2 - no-final-install: -- $(MAKE) libkcm_access_la_OBJECTS="$(libkcm_access_la_nofinal_OBJECTS)" kaccess_la_OBJECTS="$(kaccess_la_nofinal_OBJECTS)" install-am -+ $(MAKE) libkcm_access_la_OBJECTS="$(libkcm_access_la_nofinal_OBJECTS)" libkaccess_sl_la_OBJECTS="$(libkaccess_sl_la_nofinal_OBJECTS)" install-am - #>+ 3 - cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase2/patches/patch-aj b/x11/kdebase2/patches/patch-aj deleted file mode 100644 index feefc341e92..00000000000 --- a/x11/kdebase2/patches/patch-aj +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-aj,v 1.2 2001/10/15 22:46:00 skrll Exp $ - ---- kcontrol/access/kaccess_main.cpp.orig Tue Oct 2 17:50:31 2001 -+++ 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 int kaccess_main(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kaccess_main(argc, argv); -+} diff --git a/x11/kdebase2/patches/patch-ak b/x11/kdebase2/patches/patch-ak deleted file mode 100644 index 1ad9618cc63..00000000000 --- a/x11/kdebase2/patches/patch-ak +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ak,v 1.2 2001/10/15 22:46:00 skrll Exp $ - ---- kcontrol/access/main.cpp.orig Mon Oct 30 01:36:22 2000 -+++ kcontrol/access/main.cpp -@@ -11,7 +11,7 @@ - "with disabilities."); - - --int main(int argc, char *argv[]) -+int kaccess_main(int argc, char *argv[]) - { - KAboutData about("kaccess", I18N_NOOP("KDE Accessibility Tool"), "0.1", - DESCRIPTION, KAboutData::License_QPL, diff --git a/x11/kdebase2/patches/patch-al b/x11/kdebase2/patches/patch-al deleted file mode 100644 index 28c2b72b84f..00000000000 --- a/x11/kdebase2/patches/patch-al +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-al,v 1.2 2001/10/15 22:46:00 skrll Exp $ - ---- kcontrol/ebrowsing/Makefile.am.orig Sat Dec 9 11:07:23 2000 -+++ kcontrol/ebrowsing/Makefile.am -@@ -10,7 +10,7 @@ - - libkcm_kurifilt_la_SOURCES = filteropts.cpp main.cpp - --libkcm_kurifilt_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -+libkcm_kurifilt_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined ${KDE_RPATH} - libkcm_kurifilt_la_LIBADD = $(LIB_KSYCOCA) - # Don't link this lib to the plugins. They are dlopened and linking to them - # results in crashes when closing kcmshell. diff --git a/x11/kdebase2/patches/patch-am b/x11/kdebase2/patches/patch-am deleted file mode 100644 index 51af1463ea1..00000000000 --- a/x11/kdebase2/patches/patch-am +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-am,v 1.3 2001/12/03 15:37:19 skrll Exp $ - ---- kcontrol/ebrowsing/Makefile.in.orig Sat Nov 10 07:58:18 2001 -+++ kcontrol/ebrowsing/Makefile.in -@@ -283,7 +283,7 @@ - - libkcm_kurifilt_la_SOURCES = filteropts.cpp main.cpp - --libkcm_kurifilt_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -+libkcm_kurifilt_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined ${KDE_RPATH} - libkcm_kurifilt_la_LIBADD = $(LIB_KSYCOCA) - - data_DATA = ebrowsing.desktop -@@ -325,7 +325,7 @@ - - #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=ebrowsing.desktop filteropts.h main.h -+KDE_DIST=main.h ebrowsing.desktop filteropts.h - - DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - diff --git a/x11/kdebase2/patches/patch-an b/x11/kdebase2/patches/patch-an deleted file mode 100644 index 5883122b802..00000000000 --- a/x11/kdebase2/patches/patch-an +++ /dev/null @@ -1,244 +0,0 @@ -$NetBSD: patch-an,v 1.3 2001/11/28 13:34:19 skrll Exp $ - ---- kcontrol/info/info_netbsd.cpp.orig Fri Sep 7 20:23:47 2001 -+++ kcontrol/info/info_netbsd.cpp -@@ -34,8 +34,10 @@ - #include <sys/types.h> - #include <sys/param.h> - #include <sys/sysctl.h> -+#include <sys/mount.h> - #include <stdio.h> /* for NULL */ - #include <stdlib.h> /* for malloc(3) */ -+#include <fstab.h> - - #include <qfile.h> - #include <qfontmetrics.h> -@@ -100,15 +102,14 @@ - // this is used to find out which devices are currently - // on system - static bool GetDmesgInfo(QListView *lBox, const char *filter, -- void func(QListView *, QCString s, void **, bool)) -+ void func(QListView *, QString s)) - { - QFile *dmesg = new QFile("/var/run/dmesg.boot"); - bool usepipe = false; - FILE *pipe = NULL; - QTextStream *t; - bool seencpu = false; -- void *opaque = NULL; -- QCString s; -+ QString s; - bool found = false; - - if (dmesg->exists() && dmesg->open(IO_ReadOnly)) { -@@ -134,25 +135,20 @@ - s.contains("WARNING: old BSD partition ID!")) - break; - -- if (!filter || s.contains(filter)) { -- if (func) { -- func(lBox, s, &opaque, false); -- } -- else { -+ if (!filter -+ || (filter[0] == '^' && s.find(&filter[1]) == 0) -+ || (filter[0] != '^' && s.contains(filter))) { -+ if (func) -+ func(lBox, s); -+ else - olditem = new QListViewItem(lBox, olditem, s); -- } - found = true; - } - } -- if (func) { -- func(lBox, s, &opaque, true); -- } -- //lBox->triggerUpdate(); - - delete t; -- if (pipe) { -+ if (pipe) - pclose(pipe); -- } - else { - dmesg->close(); - delete dmesg; -@@ -162,32 +158,31 @@ - } - - --void AddIRQLine(QListView *lBox, QCString s, void **opaque, bool final) -+void -+AddIRQLine(QListView *lBox, QString s) - { -- if (!final) { -- char str[3]; -- const char *p = s.data(); -- int pos = s.find(" irq "); -- int irq = (pos<0) ? 0 : atoi(p+pos+5); -+ int pos, irqnum; -+ char numstr[3]; - -- if (irq) { -- sprintf(str, "%2d", irq); -- } -- else { -- str[0] = str[1] = '?'; -- str[2] = 0; -- } -- new QListViewItem(lBox, str, p); -+ pos = s.find(" irq "); -+ irqnum = (pos < 0) ? 0 : atoi(&s.ascii()[pos+5]); -+ if (irqnum) -+ snprintf(numstr, 3, "%02d", irqnum); -+ else { -+ // this should never happen -+ strcpy(numstr, "??"); - } -+ -+ new QListViewItem(lBox, numstr, s); - } - - bool GetInfo_IRQ (QListView *lBox) - { - lBox->addColumn(i18n("IRQ")); - lBox->addColumn(i18n("Device")); -+ lBox->setSorting(0); -+ lBox->setShowSortIndicator(FALSE); - (void) GetDmesgInfo(lBox, " irq ", AddIRQLine); -- sorting_allowed = true; -- lBox->setSorting(1); - return true; - } - -@@ -212,26 +207,27 @@ - - bool GetInfo_Sound (QListView *lbox) - { -+ lbox->setSorting(false); -+ - if (!GetDmesgInfo(lbox, "audio", NULL)) - new QListViewItem(lbox, i18n("No audio devices found.")); - -- // append information on any audio devices found -+ // append information for each audio devices found - QListViewItem *lvitem = lbox->firstChild(); - for(; lvitem; lvitem = lvitem->nextSibling()) { - QString s; - int pos, len; -- const char *start, *end; -+ const char *start; - char *dev; - - s = lvitem->text(0); -- if ((pos = s.find("at ")) >= 0) { -- pos += 3; // skip "at " -- start = end = s.ascii(); -- for(; (*end!=':') && (*end!='\n'); end++); -- len = end - start; -- dev = (char *) malloc(len + 1); -- strncpy(dev, start, len); -- dev[len] = '\0'; -+ // The autoconf message is in form 'audio0 at auvia0: ...' -+ if (s.find("audio") == 0 && (pos = s.find(" at ")) > 0) { -+ pos += 4; // skip " at " -+ start = s.ascii() + pos; -+ len = (int) strcspn(start, ":\n\t "); -+ dev = (char *) malloc(1 + len + 1); -+ sprintf(dev, "^%.*s", len, start); /* safe */ - - GetDmesgInfo(lbox, dev, NULL); - -@@ -252,16 +248,32 @@ - { - if (!GetDmesgInfo(lbox, "scsibus", NULL)) - new QListViewItem(lbox, i18n("No SCSI devices found.")); -+ -+ // remove the 'waiting %d seconds for devices to settle' message -+ QListViewItem *lvitem = lbox->firstChild(); -+ for(; lvitem; lvitem = lvitem->nextSibling()) { -+ QString s = lvitem->text(0); -+ -+ if (s.contains("seconds for devices to settle")) { -+ lbox->removeItem(lvitem); -+ break; -+ } -+ } -+ - return true; - } - - bool GetInfo_Partitions (QListView *lbox) - { -- QCString s; -+ QString s; -+ QString MB; - char *line, *orig_line; - const char *device, *mountpoint, *type, *flags; - FILE *pipe = popen("/sbin/mount", "r"); - QTextStream *t; -+ u_int64_t tsz, fsz; -+ struct statfs sfs; -+ int ok; - - if (!pipe) { - kdError(0) << i18n("Ahh couldn't run /sbin/mount!") << endl; -@@ -269,14 +281,19 @@ - } - t = new QTextStream(pipe, IO_ReadOnly); - -+ MB = QString(" ") + QString(i18n("MB")); - lbox->addColumn(i18n("Device")); - lbox->addColumn(i18n("Mount Point")); - lbox->addColumn(i18n("FS Type")); -+ lbox->addColumn(i18n("Total Size")); -+ lbox->addColumn(i18n("Free Size")); - lbox->addColumn(i18n("Mount Options")); - -- QListViewItem *olditem = 0; - while (!(s = t->readLine().latin1()).isEmpty()) { -- orig_line = line = strdup(s); -+ orig_line = line = strdup(s.ascii()); -+ -+ // the lines returned by /sbin/mount look like: -+ // /dev/wd0a on / type ffs (local, soft dependencies) - - device = strsep(&line, " "); - -@@ -286,10 +303,32 @@ - (void) strsep(&line, " "); // consume word "type" - type = strsep(&line, " "); - -- flags = line; - -- olditem = new QListViewItem(lbox, olditem, device, mountpoint, -- type, flags); -+ // Skip leading '(' and trailing ')' -+ if (line != NULL) { -+ line++; -+ flags = strsep(&line, ")"); -+ } else { -+ flags = ""; -+ } -+ -+ if (statfs(mountpoint, &sfs) == 0) { -+ tsz = ((1LL * sfs.f_blocks * sfs.f_bsize / 1024) + 513) -+ / 1024; -+ fsz = ((1LL * sfs.f_bfree * sfs.f_bsize / 1024) + 513) -+ / 1024; -+ ok = 1; -+ } else { -+ tsz = fsz = 0; -+ ok = 0; -+ } -+ -+ new QListViewItem(lbox, -+ QString(device) + " ", -+ QString(mountpoint) + " ", QString(type) + " ", -+ (ok) ? (Value(tsz, 6) + MB) : " ", -+ (ok) ? (Value(fsz, 6) + MB) : " ", -+ flags); - - free(orig_line); - } diff --git a/x11/kdebase2/patches/patch-ao b/x11/kdebase2/patches/patch-ao deleted file mode 100644 index 107acae8a03..00000000000 --- a/x11/kdebase2/patches/patch-ao +++ /dev/null @@ -1,78 +0,0 @@ -$NetBSD: patch-ao,v 1.2 2001/10/15 22:46:00 skrll Exp $ - ---- kcontrol/kcontrol/Makefile.am.orig Sun Jul 29 05:56:20 2001 -+++ kcontrol/kcontrol/Makefile.am -@@ -22,41 +22,51 @@ - - SUBDIRS = . pics - --CLEANFILES = dummy.cpp -- - bin_PROGRAMS = kcontrol kcmshell kcminit --kde_module_LTLIBRARIES = kcontrol.la kcmshell.la kcminit.la -+kde_module_LTLIBRARIES = libkcontrol_main.la kcontrol.la libkcmshell_main.la \ -+ kcmshell.la libkcminit_main.la kcminit.la - --kcontrol_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp \ -+libkcontrol_main_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp \ - helpwidget.cpp moduleinfo.cpp utils.cpp modules.cpp proxywidget.cpp \ - modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp \ - quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \ - kecdialog.cpp kcrootonly.cpp - --kcontrol_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) -+libkcontrol_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) -+libkcontrol_main_la_LDFLAGS = $(all_libraries) -+ -+kcontrol_la_SOURCES = kcontrol_main.cpp -+kcontrol_la_LIBADD = libkcontrol_main.la - kcontrol_la_LDFLAGS = $(all_libraries) -module -avoid-version - --kcmshell_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp \ -+libkcmshell_main_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp \ - utils.cpp proxywidget.cpp kcdialog.cpp global.cpp \ - kcdialog.skel --kcmshell_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) -+libkcmshell_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) -+libkcmshell_main_la_LDFLAGS = $(all_libraries) -+ -+kcmshell_la_SOURCES = kcmshell_main.cpp -+kcmshell_la_LIBADD = libkcmshell_main.la - kcmshell_la_LDFLAGS = $(all_libraries) -module -avoid-version - -+libkcminit_main_la_SOURCES = kcminit.cpp global.cpp utils.cpp -+libkcminit_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) -+libkcminit_main_la_LDFLAGS = $(all_libraries) - --kcminit_la_SOURCES = kcminit.cpp global.cpp utils.cpp --kcminit_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) -+kcminit_la_SOURCES = kcminit_main.cpp -+kcminit_la_LIBADD = libkcminit_main.la - kcminit_la_LDFLAGS = $(all_libraries) -module -avoid-version - --kcontrol_SOURCES = dummy.cpp --kcontrol_LDADD = kcontrol.la -+kcontrol_SOURCES = kcontrol_main.cpp -+kcontrol_LDADD = libkcontrol_main.la - kcontrol_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic - --kcmshell_SOURCES = dummy.cpp --kcmshell_LDADD = kcmshell.la -+kcmshell_SOURCES = kcmshell_main.cpp -+kcmshell_LDADD = libkcmshell_main.la - kcmshell_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic - --kcminit_SOURCES = dummy.cpp --kcminit_LDADD = kcminit.la -+kcminit_SOURCES = kcminit_main.cpp -+kcminit_LDADD = libkcminit_main.la - kcminit_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic - - rcdir = $(kde_datadir)/kcontrol -@@ -71,6 +81,3 @@ - - messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kcontrol.pot -- --dummy.cpp: -- echo > dummy.cpp diff --git a/x11/kdebase2/patches/patch-ap b/x11/kdebase2/patches/patch-ap deleted file mode 100644 index b1617dce64c..00000000000 --- a/x11/kdebase2/patches/patch-ap +++ /dev/null @@ -1,421 +0,0 @@ -$NetBSD: patch-ap,v 1.3 2001/12/03 15:37:19 skrll Exp $ - ---- kcontrol/kcontrol/Makefile.in.orig Sat Nov 10 07:58:19 2001 -+++ kcontrol/kcontrol/Makefile.in -@@ -296,38 +296,49 @@ - - SUBDIRS = . pics - --CLEANFILES = dummy.cpp -- - bin_PROGRAMS = kcontrol kcmshell kcminit --kde_module_LTLIBRARIES = kcontrol.la kcmshell.la kcminit.la -+kde_module_LTLIBRARIES = libkcontrol_main.la kcontrol.la libkcmshell_main.la kcmshell.la libkcminit_main.la kcminit.la -+ -+ -+libkcontrol_main_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp helpwidget.cpp moduleinfo.cpp utils.cpp modules.cpp proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp kecdialog.cpp kcrootonly.cpp - --kcontrol_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp helpwidget.cpp moduleinfo.cpp utils.cpp modules.cpp proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp kecdialog.cpp kcrootonly.cpp - -+libkcontrol_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) -+libkcontrol_main_la_LDFLAGS = $(all_libraries) - --kcontrol_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) -+kcontrol_la_SOURCES = kcontrol_main.cpp -+kcontrol_la_LIBADD = libkcontrol_main.la - kcontrol_la_LDFLAGS = $(all_libraries) -module -avoid-version - --#>- kcmshell_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp utils.cpp proxywidget.cpp kcdialog.cpp global.cpp kcdialog.skel -+#>- libkcmshell_main_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp utils.cpp proxywidget.cpp kcdialog.cpp global.cpp kcdialog.skel - #>+ 1 --kcmshell_la_SOURCES=kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp utils.cpp proxywidget.cpp kcdialog.cpp global.cpp kcdialog_skel.cpp -+libkcmshell_main_la_SOURCES=kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp utils.cpp proxywidget.cpp kcdialog.cpp global.cpp kcdialog_skel.cpp - --kcmshell_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) -+libkcmshell_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) -+libkcmshell_main_la_LDFLAGS = $(all_libraries) -+ -+kcmshell_la_SOURCES = kcmshell_main.cpp -+kcmshell_la_LIBADD = libkcmshell_main.la - kcmshell_la_LDFLAGS = $(all_libraries) -module -avoid-version - --kcminit_la_SOURCES = kcminit.cpp global.cpp utils.cpp --kcminit_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) -+libkcminit_main_la_SOURCES = kcminit.cpp global.cpp utils.cpp -+libkcminit_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) -+libkcminit_main_la_LDFLAGS = $(all_libraries) -+ -+kcminit_la_SOURCES = kcminit_main.cpp -+kcminit_la_LIBADD = libkcminit_main.la - kcminit_la_LDFLAGS = $(all_libraries) -module -avoid-version - --kcontrol_SOURCES = dummy.cpp --kcontrol_LDADD = kcontrol.la -+kcontrol_SOURCES = kcontrol_main.cpp -+kcontrol_LDADD = libkcontrol_main.la - kcontrol_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic - --kcmshell_SOURCES = dummy.cpp --kcmshell_LDADD = kcmshell.la -+kcmshell_SOURCES = kcmshell_main.cpp -+kcmshell_LDADD = libkcmshell_main.la - kcmshell_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic - --kcminit_SOURCES = dummy.cpp --kcminit_LDADD = kcminit.la -+kcminit_SOURCES = kcminit_main.cpp -+kcminit_LDADD = libkcminit_main.la - kcminit_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic - - rcdir = $(kde_datadir)/kcontrol -@@ -351,54 +362,66 @@ - LIBS = @LIBS@ - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ --kcontrol_la_DEPENDENCIES = --#>- kcontrol_la_OBJECTS = main.lo toplevel.lo indexwidget.lo \ -+libkcontrol_main_la_DEPENDENCIES = -+#>- libkcontrol_main_la_OBJECTS = main.lo toplevel.lo indexwidget.lo \ - #>- searchwidget.lo helpwidget.lo moduleinfo.lo utils.lo modules.lo \ - #>- proxywidget.lo modloader.lo dockcontainer.lo aboutwidget.lo global.lo \ - #>- quickhelp.lo moduletreeview.lo moduleiconview.lo kecdialog.lo \ - #>- kcrootonly.lo - #>+ 9 --kcontrol_la_final_OBJECTS = kcontrol_la.all_cpp.lo --kcontrol_la_nofinal_OBJECTS = main.lo toplevel.lo indexwidget.lo \ -+libkcontrol_main_la_final_OBJECTS = libkcontrol_main_la.all_cpp.lo -+libkcontrol_main_la_nofinal_OBJECTS = main.lo toplevel.lo indexwidget.lo \ - searchwidget.lo helpwidget.lo moduleinfo.lo utils.lo modules.lo \ - proxywidget.lo modloader.lo dockcontainer.lo aboutwidget.lo global.lo \ - quickhelp.lo moduletreeview.lo moduleiconview.lo kecdialog.lo \ - kcrootonly.lo \ -- kcontrol_la_meta_unload.lo --@KDE_USE_FINAL_FALSE@kcontrol_la_OBJECTS = $(kcontrol_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@kcontrol_la_OBJECTS = $(kcontrol_la_final_OBJECTS) --kcmshell_la_DEPENDENCIES = --#>- kcmshell_la_OBJECTS = kcmshell.lo moduleinfo.lo modloader.lo \ -+ libkcontrol_main_la_meta_unload.lo -+@KDE_USE_FINAL_FALSE@libkcontrol_main_la_OBJECTS = $(libkcontrol_main_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libkcontrol_main_la_OBJECTS = $(libkcontrol_main_la_final_OBJECTS) -+kcontrol_la_DEPENDENCIES = libkcontrol_main.la -+#>- kcontrol_la_OBJECTS = kcontrol_main.lo -+#>+ 1 -+kcontrol_la_OBJECTS = kcontrol_main.lo -+libkcmshell_main_la_DEPENDENCIES = -+#>- libkcmshell_main_la_OBJECTS = kcmshell.lo moduleinfo.lo modloader.lo \ - #>- kecdialog.lo utils.lo proxywidget.lo kcdialog.lo global.lo - #>+ 6 --kcmshell_la_final_OBJECTS = kcmshell_la.all_cpp.lo --kcmshell_la_nofinal_OBJECTS = kcmshell.lo moduleinfo.lo modloader.lo \ -+libkcmshell_main_la_final_OBJECTS = libkcmshell_main_la.all_cpp.lo -+libkcmshell_main_la_nofinal_OBJECTS = kcmshell.lo moduleinfo.lo modloader.lo \ - kecdialog.lo utils.lo proxywidget.lo kcdialog.lo global.lo kcdialog_skel.lo \ -- kcmshell_la_meta_unload.lo --@KDE_USE_FINAL_FALSE@kcmshell_la_OBJECTS = $(kcmshell_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@kcmshell_la_OBJECTS = $(kcmshell_la_final_OBJECTS) --kcminit_la_DEPENDENCIES = --#>- kcminit_la_OBJECTS = kcminit.lo global.lo utils.lo -+ libkcmshell_main_la_meta_unload.lo -+@KDE_USE_FINAL_FALSE@libkcmshell_main_la_OBJECTS = $(libkcmshell_main_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libkcmshell_main_la_OBJECTS = $(libkcmshell_main_la_final_OBJECTS) -+kcmshell_la_DEPENDENCIES = libkcmshell_main.la -+#>- kcmshell_la_OBJECTS = kcmshell_main.lo -+#>+ 1 -+kcmshell_la_OBJECTS = kcmshell_main.lo -+libkcminit_main_la_DEPENDENCIES = -+#>- libkcminit_main_la_OBJECTS = kcminit.lo global.lo utils.lo - #>+ 4 --kcminit_la_final_OBJECTS = kcminit_la.all_cpp.lo --kcminit_la_nofinal_OBJECTS = kcminit.lo global.lo utils.lo --@KDE_USE_FINAL_FALSE@kcminit_la_OBJECTS = $(kcminit_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@kcminit_la_OBJECTS = $(kcminit_la_final_OBJECTS) -+libkcminit_main_la_final_OBJECTS = libkcminit_main_la.all_cpp.lo -+libkcminit_main_la_nofinal_OBJECTS = kcminit.lo global.lo utils.lo -+@KDE_USE_FINAL_FALSE@libkcminit_main_la_OBJECTS = $(libkcminit_main_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libkcminit_main_la_OBJECTS = $(libkcminit_main_la_final_OBJECTS) -+kcminit_la_DEPENDENCIES = libkcminit_main.la -+#>- kcminit_la_OBJECTS = kcminit_main.lo -+#>+ 1 -+kcminit_la_OBJECTS = kcminit_main.lo - bin_PROGRAMS = kcontrol$(EXEEXT) kcmshell$(EXEEXT) kcminit$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - --#>- kcontrol_OBJECTS = dummy.$(OBJEXT) -+#>- kcontrol_OBJECTS = kcontrol_main.$(OBJEXT) - #>+ 1 --kcontrol_OBJECTS = dummy.$(OBJEXT) --kcontrol_DEPENDENCIES = kcontrol.la --#>- kcmshell_OBJECTS = dummy.$(OBJEXT) --#>+ 1 --kcmshell_OBJECTS = dummy.$(OBJEXT) --kcmshell_DEPENDENCIES = kcmshell.la --#>- kcminit_OBJECTS = dummy.$(OBJEXT) -+kcontrol_OBJECTS = kcontrol_main.$(OBJEXT) -+kcontrol_DEPENDENCIES = libkcontrol_main.la -+#>- kcmshell_OBJECTS = kcmshell_main.$(OBJEXT) -+#>+ 1 -+kcmshell_OBJECTS = kcmshell_main.$(OBJEXT) -+kcmshell_DEPENDENCIES = libkcmshell_main.la -+#>- kcminit_OBJECTS = kcminit_main.$(OBJEXT) - #>+ 1 --kcminit_OBJECTS = dummy.$(OBJEXT) --kcminit_DEPENDENCIES = kcminit.la -+kcminit_OBJECTS = kcminit_main.$(OBJEXT) -+kcminit_DEPENDENCIES = libkcminit_main.la - CXXFLAGS = @CXXFLAGS@ - #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 1 -@@ -417,15 +440,15 @@ - - #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=indexwidget.h proxywidget.h modules.h moduleinfo.h modloader.h quickhelp.h searchwidget.h kcdialog.h hi48-app-kcontrol.png helpwidget.h moduleiconview.h kcontrolui.rc dockcontainer.h main.h moduletreeview.h utils.h kecdialog.h aboutwidget.h hi16-app-kcontrol.png toplevel.h kcmshell.h modulemenu.cpp hi32-app-kcontrol.png modulemenu.h kcrootonly.h KControl.desktop global.h -+KDE_DIST=kcontrolui.rc indexwidget.h hi32-app-kcontrol.png proxywidget.h dockcontainer.h modulemenu.h quickhelp.h searchwidget.h main.h moduletreeview.h utils.h kecdialog.h kcdialog.h aboutwidget.h hi48-app-kcontrol.png hi16-app-kcontrol.png kcrootonly.h toplevel.h helpwidget.h KControl.desktop modules.h moduleiconview.h moduleinfo.h global.h kcmshell.h modulemenu.cpp modloader.h - - DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - - - TAR = tar - GZIP_ENV = --best --SOURCES = $(kcontrol_la_SOURCES) $(kcmshell_la_SOURCES) $(kcminit_la_SOURCES) $(kcontrol_SOURCES) $(kcmshell_SOURCES) $(kcminit_SOURCES) --OBJECTS = $(kcontrol_la_OBJECTS) $(kcmshell_la_OBJECTS) $(kcminit_la_OBJECTS) $(kcontrol_OBJECTS) $(kcmshell_OBJECTS) $(kcminit_OBJECTS) -+SOURCES = $(libkcontrol_main_la_SOURCES) $(kcontrol_la_SOURCES) $(libkcmshell_main_la_SOURCES) $(kcmshell_la_SOURCES) $(libkcminit_main_la_SOURCES) $(kcminit_la_SOURCES) $(kcontrol_SOURCES) $(kcmshell_SOURCES) $(kcminit_SOURCES) -+OBJECTS = $(libkcontrol_main_la_OBJECTS) $(kcontrol_la_OBJECTS) $(libkcmshell_main_la_OBJECTS) $(kcmshell_la_OBJECTS) $(libkcminit_main_la_OBJECTS) $(kcminit_la_OBJECTS) $(kcontrol_OBJECTS) $(kcmshell_OBJECTS) $(kcminit_OBJECTS) - - #>- all: all-redirect - #>+ 1 -@@ -512,12 +535,21 @@ - - maintainer-clean-libtool: - -+libkcontrol_main.la: $(libkcontrol_main_la_OBJECTS) $(libkcontrol_main_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(kde_moduledir) $(libkcontrol_main_la_LDFLAGS) $(libkcontrol_main_la_OBJECTS) $(libkcontrol_main_la_LIBADD) $(LIBS) -+ - kcontrol.la: $(kcontrol_la_OBJECTS) $(kcontrol_la_DEPENDENCIES) - $(CXXLINK) -rpath $(kde_moduledir) $(kcontrol_la_LDFLAGS) $(kcontrol_la_OBJECTS) $(kcontrol_la_LIBADD) $(LIBS) - -+libkcmshell_main.la: $(libkcmshell_main_la_OBJECTS) $(libkcmshell_main_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(kde_moduledir) $(libkcmshell_main_la_LDFLAGS) $(libkcmshell_main_la_OBJECTS) $(libkcmshell_main_la_LIBADD) $(LIBS) -+ - kcmshell.la: $(kcmshell_la_OBJECTS) $(kcmshell_la_DEPENDENCIES) - $(CXXLINK) -rpath $(kde_moduledir) $(kcmshell_la_LDFLAGS) $(kcmshell_la_OBJECTS) $(kcmshell_la_LIBADD) $(LIBS) - -+libkcminit_main.la: $(libkcminit_main_la_OBJECTS) $(libkcminit_main_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(kde_moduledir) $(libkcminit_main_la_LDFLAGS) $(libkcminit_main_la_OBJECTS) $(libkcminit_main_la_LIBADD) $(LIBS) -+ - kcminit.la: $(kcminit_la_OBJECTS) $(kcminit_la_DEPENDENCIES) - $(CXXLINK) -rpath $(kde_moduledir) $(kcminit_la_LDFLAGS) $(kcminit_la_OBJECTS) $(kcminit_la_LIBADD) $(LIBS) - -@@ -760,7 +792,6 @@ - mostlyclean-generic: - - clean-generic: -- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) -@@ -826,9 +857,6 @@ - messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kcontrol.pot - --dummy.cpp: -- echo > dummy.cpp -- - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: -@@ -940,41 +968,53 @@ - - - #>+ 12 --kcontrol_la_meta_unload.cpp: indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc moduleiconview.moc modules.moc aboutwidget.moc searchwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc -- @echo 'creating kcontrol_la_meta_unload.cpp' -- @-rm -f kcontrol_la_meta_unload.cpp -+libkcontrol_main_la_meta_unload.cpp: indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc moduleiconview.moc modules.moc aboutwidget.moc searchwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc -+ @echo 'creating libkcontrol_main_la_meta_unload.cpp' -+ @-rm -f libkcontrol_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kcontrol_la[] = {' > kcontrol_la_meta_unload.cpp ;\ -- cat indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc moduleiconview.moc modules.moc aboutwidget.moc searchwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kcontrol_la_meta_unload.cpp ;\ -- echo '0};' >> kcontrol_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kcontrol_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kcontrol_la)' >> kcontrol_la_meta_unload.cpp ;\ -- else echo > kcontrol_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkcontrol_main_la[] = {' > libkcontrol_main_la_meta_unload.cpp ;\ -+ cat indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc moduleiconview.moc modules.moc aboutwidget.moc searchwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkcontrol_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkcontrol_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkcontrol_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkcontrol_main_la)' >> libkcontrol_main_la_meta_unload.cpp ;\ -+ else echo > libkcontrol_main_la_meta_unload.cpp; fi - - - #>+ 12 --kcmshell_la_meta_unload.cpp: kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc -- @echo 'creating kcmshell_la_meta_unload.cpp' -- @-rm -f kcmshell_la_meta_unload.cpp -+libkcmshell_main_la_meta_unload.cpp: kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc -+ @echo 'creating libkcmshell_main_la_meta_unload.cpp' -+ @-rm -f libkcmshell_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kcmshell_la[] = {' > kcmshell_la_meta_unload.cpp ;\ -- cat kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kcmshell_la_meta_unload.cpp ;\ -- echo '0};' >> kcmshell_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kcmshell_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kcmshell_la)' >> kcmshell_la_meta_unload.cpp ;\ -- else echo > kcmshell_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkcmshell_main_la[] = {' > libkcmshell_main_la_meta_unload.cpp ;\ -+ cat kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkcmshell_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkcmshell_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkcmshell_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkcmshell_main_la)' >> libkcmshell_main_la_meta_unload.cpp ;\ -+ else echo > libkcmshell_main_la_meta_unload.cpp; fi - - - #>+ 3 - clean-moc-classes: -- -rm -f kcontrol_la_meta_unload.cpp kcmshell_la_meta_unload.cpp -+ -rm -f libkcontrol_main_la_meta_unload.cpp libkcmshell_main_la_meta_unload.cpp - - #>+ 11 --kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/searchwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/utils.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/modloader.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/global.cpp $(srcdir)/quickhelp.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/kecdialog.cpp $(srcdir)/kcrootonly.cpp kcontrol_la_meta_unload.cpp indexwidget.moc main.moc moduleinfo.moc kcmshell.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modulemenu.moc moduleiconview.moc modules.moc kcdialog.moc aboutwidget.moc searchwidget.moc proxywidget.moc dockcontainer.moc quickhelp.moc -+libkcontrol_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/searchwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/utils.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/modloader.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/global.cpp $(srcdir)/quickhelp.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/kecdialog.cpp $(srcdir)/kcrootonly.cpp libkcontrol_main_la_meta_unload.cpp indexwidget.moc main.moc moduleinfo.moc kcmshell.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modulemenu.moc moduleiconview.moc modules.moc kcdialog.moc aboutwidget.moc searchwidget.moc proxywidget.moc dockcontainer.moc quickhelp.moc -+ @echo 'creating libkcontrol_main_la.all_cpp.cpp ...'; \ -+ rm -f libkcontrol_main_la.all_cpp.files libkcontrol_main_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkcontrol_main_la.all_cpp.final; \ -+ for file in main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp helpwidget.cpp moduleinfo.cpp utils.cpp modules.cpp proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp kecdialog.cpp kcrootonly.cpp libkcontrol_main_la_meta_unload.cpp ; do \ -+ echo "#include \"$$file\"" >> libkcontrol_main_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkcontrol_main_la.all_cpp.final; \ -+ done; \ -+ cat libkcontrol_main_la.all_cpp.final libkcontrol_main_la.all_cpp.files > libkcontrol_main_la.all_cpp.cpp; \ -+ rm -f libkcontrol_main_la.all_cpp.final libkcontrol_main_la.all_cpp.files -+ -+#>+ 11 -+kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcontrol_main.cpp - @echo 'creating kcontrol_la.all_cpp.cpp ...'; \ - rm -f kcontrol_la.all_cpp.files kcontrol_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kcontrol_la.all_cpp.final; \ -- for file in main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp helpwidget.cpp moduleinfo.cpp utils.cpp modules.cpp proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp kecdialog.cpp kcrootonly.cpp kcontrol_la_meta_unload.cpp ; do \ -+ for file in kcontrol_main.cpp ; do \ - echo "#include \"$$file\"" >> kcontrol_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcontrol_la.all_cpp.final; \ - done; \ -@@ -982,11 +1022,23 @@ - rm -f kcontrol_la.all_cpp.final kcontrol_la.all_cpp.files - - #>+ 11 --kcmshell_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modloader.cpp $(srcdir)/kecdialog.cpp $(srcdir)/utils.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcdialog.cpp $(srcdir)/global.cpp kcdialog_skel.cpp kcmshell_la_meta_unload.cpp -+libkcmshell_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modloader.cpp $(srcdir)/kecdialog.cpp $(srcdir)/utils.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcdialog.cpp $(srcdir)/global.cpp kcdialog_skel.cpp libkcmshell_main_la_meta_unload.cpp -+ @echo 'creating libkcmshell_main_la.all_cpp.cpp ...'; \ -+ rm -f libkcmshell_main_la.all_cpp.files libkcmshell_main_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkcmshell_main_la.all_cpp.final; \ -+ for file in kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp utils.cpp proxywidget.cpp kcdialog.cpp global.cpp kcdialog_skel.cpp libkcmshell_main_la_meta_unload.cpp ; do \ -+ echo "#include \"$$file\"" >> libkcmshell_main_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkcmshell_main_la.all_cpp.final; \ -+ done; \ -+ cat libkcmshell_main_la.all_cpp.final libkcmshell_main_la.all_cpp.files > libkcmshell_main_la.all_cpp.cpp; \ -+ rm -f libkcmshell_main_la.all_cpp.final libkcmshell_main_la.all_cpp.files -+ -+#>+ 11 -+kcmshell_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell_main.cpp - @echo 'creating kcmshell_la.all_cpp.cpp ...'; \ - rm -f kcmshell_la.all_cpp.files kcmshell_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kcmshell_la.all_cpp.final; \ -- for file in kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp utils.cpp proxywidget.cpp kcdialog.cpp global.cpp kcdialog_skel.cpp kcmshell_la_meta_unload.cpp ; do \ -+ for file in kcmshell_main.cpp ; do \ - echo "#include \"$$file\"" >> kcmshell_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcmshell_la.all_cpp.final; \ - done; \ -@@ -994,11 +1046,23 @@ - rm -f kcmshell_la.all_cpp.final kcmshell_la.all_cpp.files - - #>+ 11 --kcminit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcminit.cpp $(srcdir)/global.cpp $(srcdir)/utils.cpp -+libkcminit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcminit.cpp $(srcdir)/global.cpp $(srcdir)/utils.cpp -+ @echo 'creating libkcminit_main_la.all_cpp.cpp ...'; \ -+ rm -f libkcminit_main_la.all_cpp.files libkcminit_main_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkcminit_main_la.all_cpp.final; \ -+ for file in kcminit.cpp global.cpp utils.cpp ; do \ -+ echo "#include \"$$file\"" >> libkcminit_main_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkcminit_main_la.all_cpp.final; \ -+ done; \ -+ cat libkcminit_main_la.all_cpp.final libkcminit_main_la.all_cpp.files > libkcminit_main_la.all_cpp.cpp; \ -+ rm -f libkcminit_main_la.all_cpp.final libkcminit_main_la.all_cpp.files -+ -+#>+ 11 -+kcminit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcminit_main.cpp - @echo 'creating kcminit_la.all_cpp.cpp ...'; \ - rm -f kcminit_la.all_cpp.files kcminit_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kcminit_la.all_cpp.final; \ -- for file in kcminit.cpp global.cpp utils.cpp ; do \ -+ for file in kcminit_main.cpp ; do \ - echo "#include \"$$file\"" >> kcminit_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcminit_la.all_cpp.final; \ - done; \ -@@ -1006,11 +1070,11 @@ - rm -f kcminit_la.all_cpp.final kcminit_la.all_cpp.files - - #>+ 11 --kcontrol.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+kcontrol.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcontrol_main.cpp - @echo 'creating kcontrol.all_cpp.cpp ...'; \ - rm -f kcontrol.all_cpp.files kcontrol.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kcontrol.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kcontrol_main.cpp ; do \ - echo "#include \"$$file\"" >> kcontrol.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcontrol.all_cpp.final; \ - done; \ -@@ -1018,11 +1082,11 @@ - rm -f kcontrol.all_cpp.final kcontrol.all_cpp.files - - #>+ 11 --kcmshell.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+kcmshell.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell_main.cpp - @echo 'creating kcmshell.all_cpp.cpp ...'; \ - rm -f kcmshell.all_cpp.files kcmshell.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kcmshell.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kcmshell_main.cpp ; do \ - echo "#include \"$$file\"" >> kcmshell.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcmshell.all_cpp.final; \ - done; \ -@@ -1030,11 +1094,11 @@ - rm -f kcmshell.all_cpp.final kcmshell.all_cpp.files - - #>+ 11 --kcminit.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+kcminit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcminit_main.cpp - @echo 'creating kcminit.all_cpp.cpp ...'; \ - rm -f kcminit.all_cpp.files kcminit.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kcminit.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kcminit_main.cpp ; do \ - echo "#include \"$$file\"" >> kcminit.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcminit.all_cpp.final; \ - done; \ -@@ -1043,20 +1107,20 @@ - - #>+ 3 - clean-final: -- -rm -f kcontrol_la.all_cpp.cpp kcmshell_la.all_cpp.cpp kcminit_la.all_cpp.cpp kcontrol.all_cpp.cpp kcmshell.all_cpp.cpp kcminit.all_cpp.cpp -+ -rm -f libkcontrol_main_la.all_cpp.cpp kcontrol_la.all_cpp.cpp libkcmshell_main_la.all_cpp.cpp kcmshell_la.all_cpp.cpp libkcminit_main_la.all_cpp.cpp kcminit_la.all_cpp.cpp kcontrol.all_cpp.cpp kcmshell.all_cpp.cpp kcminit.all_cpp.cpp - - #>+ 2 - final: -- $(MAKE) kcontrol_la_OBJECTS="$(kcontrol_la_final_OBJECTS)" kcmshell_la_OBJECTS="$(kcmshell_la_final_OBJECTS)" kcminit_la_OBJECTS="$(kcminit_la_final_OBJECTS)" all-am -+ $(MAKE) libkcontrol_main_la_OBJECTS="$(libkcontrol_main_la_final_OBJECTS)" libkcmshell_main_la_OBJECTS="$(libkcmshell_main_la_final_OBJECTS)" libkcminit_main_la_OBJECTS="$(libkcminit_main_la_final_OBJECTS)" all-am - #>+ 2 - final-install: -- $(MAKE) kcontrol_la_OBJECTS="$(kcontrol_la_final_OBJECTS)" kcmshell_la_OBJECTS="$(kcmshell_la_final_OBJECTS)" kcminit_la_OBJECTS="$(kcminit_la_final_OBJECTS)" install-am -+ $(MAKE) libkcontrol_main_la_OBJECTS="$(libkcontrol_main_la_final_OBJECTS)" libkcmshell_main_la_OBJECTS="$(libkcmshell_main_la_final_OBJECTS)" libkcminit_main_la_OBJECTS="$(libkcminit_main_la_final_OBJECTS)" install-am - #>+ 2 - no-final: -- $(MAKE) kcontrol_la_OBJECTS="$(kcontrol_la_nofinal_OBJECTS)" kcmshell_la_OBJECTS="$(kcmshell_la_nofinal_OBJECTS)" kcminit_la_OBJECTS="$(kcminit_la_nofinal_OBJECTS)" all-am -+ $(MAKE) libkcontrol_main_la_OBJECTS="$(libkcontrol_main_la_nofinal_OBJECTS)" libkcmshell_main_la_OBJECTS="$(libkcmshell_main_la_nofinal_OBJECTS)" libkcminit_main_la_OBJECTS="$(libkcminit_main_la_nofinal_OBJECTS)" all-am - #>+ 2 - no-final-install: -- $(MAKE) kcontrol_la_OBJECTS="$(kcontrol_la_nofinal_OBJECTS)" kcmshell_la_OBJECTS="$(kcmshell_la_nofinal_OBJECTS)" kcminit_la_OBJECTS="$(kcminit_la_nofinal_OBJECTS)" install-am -+ $(MAKE) libkcontrol_main_la_OBJECTS="$(libkcontrol_main_la_nofinal_OBJECTS)" libkcmshell_main_la_OBJECTS="$(libkcmshell_main_la_nofinal_OBJECTS)" libkcminit_main_la_OBJECTS="$(libkcminit_main_la_nofinal_OBJECTS)" install-am - #>+ 3 - cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase2/patches/patch-aq b/x11/kdebase2/patches/patch-aq deleted file mode 100644 index cd8b2638793..00000000000 --- a/x11/kdebase2/patches/patch-aq +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aq,v 1.2 2001/10/15 22:46:00 skrll Exp $ - ---- kcontrol/kcontrol/kcminit.cpp.orig Sun May 20 15:55:23 2001 -+++ kcontrol/kcontrol/kcminit.cpp -@@ -36,7 +36,7 @@ - KCmdLineLastOption - }; - --int main(int argc, char *argv[]) -+int kcminit_main(int argc, char *argv[]) - { - KLocale::setMainCatalogue("kcontrol"); - KAboutData aboutData( "kcminit", I18N_NOOP("KCMInit"), diff --git a/x11/kdebase2/patches/patch-ar b/x11/kdebase2/patches/patch-ar deleted file mode 100644 index 5966cad0153..00000000000 --- a/x11/kdebase2/patches/patch-ar +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-ar,v 1.2 2001/10/15 22:46:00 skrll Exp $ - ---- kcontrol/kcontrol/kcminit_main.cpp.orig Tue Oct 2 17:50:31 2001 -+++ 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 int kcminit_main(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kcminit_main(argc, argv); -+} diff --git a/x11/kdebase2/patches/patch-as b/x11/kdebase2/patches/patch-as deleted file mode 100644 index e13f1454b2e..00000000000 --- a/x11/kdebase2/patches/patch-as +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-as,v 1.2 2001/10/15 22:46:00 skrll Exp $ - ---- kcontrol/kcontrol/kcmshell.cpp.orig Wed Apr 18 19:52:33 2001 -+++ kcontrol/kcontrol/kcmshell.cpp -@@ -125,7 +125,7 @@ - } - - --int main(int _argc, char *_argv[]) -+int kcmshell_main(int _argc, char *_argv[]) - { - KAboutData aboutData( "kcmshell", I18N_NOOP("KDE Control Module"), - "2.0", diff --git a/x11/kdebase2/patches/patch-at b/x11/kdebase2/patches/patch-at deleted file mode 100644 index 84930d3301f..00000000000 --- a/x11/kdebase2/patches/patch-at +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-at,v 1.2 2001/10/15 22:46:00 skrll Exp $ - ---- kcontrol/kcontrol/kcmshell_main.cpp.orig Tue Oct 2 17:50:31 2001 -+++ 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 int kcmshell_main(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kcmshell_main(argc, argv); -+} diff --git a/x11/kdebase2/patches/patch-au b/x11/kdebase2/patches/patch-au deleted file mode 100644 index efac29344c1..00000000000 --- a/x11/kdebase2/patches/patch-au +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-au,v 1.3 2001/12/03 15:37:19 skrll Exp $ - ---- kcontrol/kcontrol/kcontrol_main.cpp.orig Mon Dec 3 10:00:43 2001 -+++ 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 int kcontrol_main(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kcontrol_main(argc, argv); -+} diff --git a/x11/kdebase2/patches/patch-av b/x11/kdebase2/patches/patch-av deleted file mode 100644 index f1e41aae597..00000000000 --- a/x11/kdebase2/patches/patch-av +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-av,v 1.2 2001/10/15 22:46:01 skrll Exp $ - ---- kcontrol/kcontrol/main.cpp.orig Thu Apr 19 14:57:22 2001 -+++ kcontrol/kcontrol/main.cpp -@@ -75,7 +75,7 @@ - delete toplevel; - } - --int main(int argc, char *argv[]) -+int kcontrol_main(int argc, char *argv[]) - { - KAboutData aboutData( "kcontrol", I18N_NOOP("KDE Control Center"), - "v2.0", I18N_NOOP("The KDE Control Center"), KAboutData::License_GPL, diff --git a/x11/kdebase2/patches/patch-aw b/x11/kdebase2/patches/patch-aw deleted file mode 100644 index 2f7b3320ec0..00000000000 --- a/x11/kdebase2/patches/patch-aw +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aw,v 1.2 2001/10/15 22:46:01 skrll Exp $ - ---- kcontrol/kcontrol/modules.h.orig Sat Jul 15 14:21:39 2000 -+++ kcontrol/kcontrol/modules.h -@@ -20,8 +20,6 @@ - #ifndef __modules_h__ - #define __modules_h__ - --#include <ltdl.h> -- - #include <qobject.h> - #include <qstringlist.h> - #include <qlist.h> diff --git a/x11/kdebase2/patches/patch-ax b/x11/kdebase2/patches/patch-ax deleted file mode 100644 index decee11a279..00000000000 --- a/x11/kdebase2/patches/patch-ax +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ax,v 1.2 2001/10/15 22:46:01 skrll Exp $ - ---- kcontrol/kio/Makefile.am.orig Fri Jun 15 10:02:02 2001 -+++ kcontrol/kio/Makefile.am -@@ -16,7 +16,7 @@ - fakeuaprovider.cpp uagentproviderdlg.cpp kproxydlgui.ui netpref.cpp - - libkcm_kio_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined --libkcm_kio_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KFILE) -+libkcm_kio_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KFILE) ${KDE_RPATH} - - messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kcmkio.pot diff --git a/x11/kdebase2/patches/patch-ay b/x11/kdebase2/patches/patch-ay deleted file mode 100644 index 01f6c121b40..00000000000 --- a/x11/kdebase2/patches/patch-ay +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ay,v 1.3 2001/12/03 15:37:19 skrll Exp $ - ---- kcontrol/kio/Makefile.in.orig Sat Nov 10 07:58:20 2001 -+++ kcontrol/kio/Makefile.in -@@ -291,7 +291,7 @@ - - - libkcm_kio_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined --libkcm_kio_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KFILE) -+libkcm_kio_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KFILE) ${KDE_RPATH} - - check_PROGRAMS = test - test_SOURCES = $(libkcm_kio_la_SOURCES) test.cpp -@@ -360,7 +360,7 @@ - - #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=UA-DESKTOP-FILE-HOWTO cookies.desktop useragent.desktop useragentdlg.h uagentproviderdlg.h proxy.desktop policydlg.h ksmboptdlg.h kcookiesmanagement.h fakeuaprovider.h netpref.desktop kproxydlg.h kcookiesmain.h kproxydlgui.ui kcookiespolicies.h uninstall.desktop smb.desktop uasprovider.desktop netpref.h smbrodlg.h -+KDE_DIST=policydlg.h ksmboptdlg.h kcookiesmanagement.h UA-DESKTOP-FILE-HOWTO kproxydlgui.ui fakeuaprovider.h useragentdlg.h uagentproviderdlg.h cookies.desktop kcookiespolicies.h netpref.desktop uninstall.desktop smb.desktop proxy.desktop useragent.desktop uasprovider.desktop kproxydlg.h netpref.h kcookiesmain.h smbrodlg.h - - DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - diff --git a/x11/kdebase2/patches/patch-az b/x11/kdebase2/patches/patch-az deleted file mode 100644 index e32e240b0fe..00000000000 --- a/x11/kdebase2/patches/patch-az +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-az,v 1.2 2001/10/15 22:46:01 skrll Exp $ - ---- kcontrol/konq/Makefile.am.orig Tue May 15 14:09:00 2001 -+++ kcontrol/konq/Makefile.am -@@ -10,7 +10,7 @@ - desktop.cpp uiserver.stub main.cpp - - libkcm_konq_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined --libkcm_konq_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_KSYCOCA) -+libkcm_konq_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_KSYCOCA) ${KDE_RPATH} - - libkcm_konq_la_DATA = overlapping.png onlyone.png - libkcm_konq_ladir = $(kde_datadir)/kcontrol/pics diff --git a/x11/kdebase2/patches/patch-ba b/x11/kdebase2/patches/patch-ba deleted file mode 100644 index 076ec81b296..00000000000 --- a/x11/kdebase2/patches/patch-ba +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ba,v 1.3 2001/12/03 15:37:19 skrll Exp $ - ---- kcontrol/konq/Makefile.in.orig Sat Nov 10 07:58:20 2001 -+++ kcontrol/konq/Makefile.in -@@ -285,7 +285,7 @@ - - - libkcm_konq_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined --libkcm_konq_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_KSYCOCA) -+libkcm_konq_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_KSYCOCA) ${KDE_RPATH} - - libkcm_konq_la_DATA = overlapping.png onlyone.png - libkcm_konq_ladir = $(kde_datadir)/kcontrol/pics -@@ -338,7 +338,7 @@ - - #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=fontopts.h onlyone.png kcmkonq.desktop desktop.desktop desktop.h main.h rootopts.h overlapping.png virtualdesktops.desktop behaviour.h uninstall.desktop trashopts.h -+KDE_DIST=trashopts.h desktop.h behaviour.h virtualdesktops.desktop onlyone.png desktop.desktop kcmkonq.desktop fontopts.h main.h rootopts.h uninstall.desktop overlapping.png - - DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - diff --git a/x11/kdebase2/patches/patch-bb b/x11/kdebase2/patches/patch-bb deleted file mode 100644 index 7bc8559a16e..00000000000 --- a/x11/kdebase2/patches/patch-bb +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bb,v 1.1 2001/10/15 22:46:01 skrll Exp $ - ---- kcontrol/konqhtml/Makefile.am.orig Mon Jan 8 23:43:56 2001 -+++ kcontrol/konqhtml/Makefile.am -@@ -9,7 +9,7 @@ - javaopts.cpp pluginopts.cpp appearance.cpp \ - khttpoptdlg.cpp policydlg.cpp main.cpp - --libkcm_konqhtml_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -+libkcm_konqhtml_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined ${KDE_RPATH} - libkcm_konqhtml_la_LIBADD = -lkhtml -lkdeui - - data_DATA = konqhtml.desktop diff --git a/x11/kdebase2/patches/patch-bc b/x11/kdebase2/patches/patch-bc deleted file mode 100644 index 76542177819..00000000000 --- a/x11/kdebase2/patches/patch-bc +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-bc,v 1.2 2001/12/03 15:37:19 skrll Exp $ - ---- kcontrol/konqhtml/Makefile.in.orig Sat Nov 10 07:58:20 2001 -+++ kcontrol/konqhtml/Makefile.in -@@ -282,7 +282,7 @@ - libkcm_konqhtml_la_SOURCES = htmlopts.cpp jsopts.cpp javaopts.cpp pluginopts.cpp appearance.cpp khttpoptdlg.cpp policydlg.cpp main.cpp - - --libkcm_konqhtml_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -+libkcm_konqhtml_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined ${KDE_RPATH} - libkcm_konqhtml_la_LIBADD = -lkhtml -lkdeui - - data_DATA = konqhtml.desktop -@@ -328,7 +328,7 @@ - - #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=javaopts.h jsopts.h appearance.h htmlopts.h khttpoptdlg.h policydlg.h main.h pluginopts.h konqhtml.desktop -+KDE_DIST=policydlg.h jsopts.h khttpoptdlg.h konqhtml.desktop main.h htmlopts.h javaopts.h pluginopts.h appearance.h - - DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - diff --git a/x11/kdebase2/patches/patch-bd b/x11/kdebase2/patches/patch-bd deleted file mode 100644 index 77957881105..00000000000 --- a/x11/kdebase2/patches/patch-bd +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-bd,v 1.1 2001/10/15 22:46:01 skrll Exp $ - ---- kdeprint/kjobviewer/Makefile.am.orig Sun Jul 29 05:56:25 2001 -+++ kdeprint/kjobviewer/Makefile.am -@@ -1,15 +1,20 @@ - INCLUDES = $(all_includes) - - bin_PROGRAMS = kjobviewer --lib_LTLIBRARIES = kjobviewer.la -+lib_LTLIBRARIES = libkjobviewer_main.la kjobviewer.la - --kjobviewer_SOURCES = dummy.cpp --kjobviewer_LDADD = kjobviewer.la -+kjobviewer_SOURCES = kjobviewer_main.cpp -+kjobviewer_LDADD = libkjobviewer_main.la - kjobviewer_LDFLAGS = $(KDE_RPATH) $(all_libraries) - --kjobviewer_la_SOURCES = kjobviewer.cpp main.cpp -+libkjobviewer_main_la_SOURCES = kjobviewer.cpp main.cpp -+libkjobviewer_main_la_METASOURCES = AUTO -+libkjobviewer_main_la_LIBADD = -lkdeprint_management $(LIB_KDEUI) -+libkjobviewer_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -+ -+kjobviewer_la_SOURCES = kjobviewer_main.cpp - kjobviewer_la_METASOURCES = AUTO --kjobviewer_la_LIBADD = -lkdeprint_management $(LIB_KDEUI) -+kjobviewer_la_LIBADD = libkjobviewer_main.la - kjobviewer_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH) - - noinst_HEADERS = kjobviewer.h -@@ -21,9 +26,6 @@ - - desktop_DATA = kjobviewer.desktop - desktopdir = $(kde_appsdir)/Utilities -- --dummy.cpp: -- echo > dummy.cpp - - messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kjobviewer.pot diff --git a/x11/kdebase2/patches/patch-be b/x11/kdebase2/patches/patch-be deleted file mode 100644 index 3ac4863ae6d..00000000000 --- a/x11/kdebase2/patches/patch-be +++ /dev/null @@ -1,218 +0,0 @@ -$NetBSD: patch-be,v 1.2 2001/12/03 15:37:19 skrll Exp $ - ---- kdeprint/kjobviewer/Makefile.in.orig Sat Nov 10 07:58:23 2001 -+++ kdeprint/kjobviewer/Makefile.in -@@ -276,15 +276,20 @@ - INCLUDES = $(all_includes) - - bin_PROGRAMS = kjobviewer --lib_LTLIBRARIES = kjobviewer.la -+lib_LTLIBRARIES = libkjobviewer_main.la kjobviewer.la - --kjobviewer_SOURCES = dummy.cpp --kjobviewer_LDADD = kjobviewer.la -+kjobviewer_SOURCES = kjobviewer_main.cpp -+kjobviewer_LDADD = libkjobviewer_main.la - kjobviewer_LDFLAGS = $(KDE_RPATH) $(all_libraries) - --kjobviewer_la_SOURCES = kjobviewer.cpp main.cpp -+libkjobviewer_main_la_SOURCES = kjobviewer.cpp main.cpp -+#>- libkjobviewer_main_la_METASOURCES = AUTO -+libkjobviewer_main_la_LIBADD = -lkdeprint_management $(LIB_KDEUI) -+libkjobviewer_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -+ -+kjobviewer_la_SOURCES = kjobviewer_main.cpp - #>- kjobviewer_la_METASOURCES = AUTO --kjobviewer_la_LIBADD = -lkdeprint_management $(LIB_KDEUI) -+kjobviewer_la_LIBADD = libkjobviewer_main.la - kjobviewer_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH) - - noinst_HEADERS = kjobviewer.h -@@ -308,21 +313,25 @@ - LIBS = @LIBS@ - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ --kjobviewer_la_DEPENDENCIES = --#>- kjobviewer_la_OBJECTS = kjobviewer.lo main.lo -+libkjobviewer_main_la_DEPENDENCIES = -+#>- libkjobviewer_main_la_OBJECTS = kjobviewer.lo main.lo - #>+ 5 --kjobviewer_la_final_OBJECTS = kjobviewer_la.all_cpp.lo --kjobviewer_la_nofinal_OBJECTS = kjobviewer.lo main.lo \ -- kjobviewer_la_meta_unload.lo --@KDE_USE_FINAL_FALSE@kjobviewer_la_OBJECTS = $(kjobviewer_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@kjobviewer_la_OBJECTS = $(kjobviewer_la_final_OBJECTS) -+libkjobviewer_main_la_final_OBJECTS = libkjobviewer_main_la.all_cpp.lo -+libkjobviewer_main_la_nofinal_OBJECTS = kjobviewer.lo main.lo \ -+ libkjobviewer_main_la_meta_unload.lo -+@KDE_USE_FINAL_FALSE@libkjobviewer_main_la_OBJECTS = $(libkjobviewer_main_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libkjobviewer_main_la_OBJECTS = $(libkjobviewer_main_la_final_OBJECTS) -+kjobviewer_la_DEPENDENCIES = libkjobviewer_main.la -+#>- kjobviewer_la_OBJECTS = kjobviewer_main.lo -+#>+ 1 -+kjobviewer_la_OBJECTS = kjobviewer_main.lo - bin_PROGRAMS = kjobviewer$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - --#>- kjobviewer_OBJECTS = dummy.$(OBJEXT) -+#>- kjobviewer_OBJECTS = kjobviewer_main.$(OBJEXT) - #>+ 1 --kjobviewer_OBJECTS = dummy.$(OBJEXT) --kjobviewer_DEPENDENCIES = kjobviewer.la -+kjobviewer_OBJECTS = kjobviewer_main.$(OBJEXT) -+kjobviewer_DEPENDENCIES = libkjobviewer_main.la - CXXFLAGS = @CXXFLAGS@ - #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 1 -@@ -343,15 +352,15 @@ - - #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=kjobviewerui.rc hi32-app-kjobviewer.png kjobviewer.desktop hi16-app-kjobviewer.png -+KDE_DIST=hi32-app-kjobviewer.png hi16-app-kjobviewer.png kjobviewerui.rc kjobviewer.desktop - - DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - - - TAR = tar - GZIP_ENV = --best --SOURCES = $(kjobviewer_la_SOURCES) $(kjobviewer_SOURCES) --OBJECTS = $(kjobviewer_la_OBJECTS) $(kjobviewer_OBJECTS) -+SOURCES = $(libkjobviewer_main_la_SOURCES) $(kjobviewer_la_SOURCES) $(kjobviewer_SOURCES) -+OBJECTS = $(libkjobviewer_main_la_OBJECTS) $(kjobviewer_la_OBJECTS) $(kjobviewer_OBJECTS) - - #>- all: all-redirect - #>+ 1 -@@ -438,6 +447,9 @@ - - maintainer-clean-libtool: - -+libkjobviewer_main.la: $(libkjobviewer_main_la_OBJECTS) $(libkjobviewer_main_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(libdir) $(libkjobviewer_main_la_LDFLAGS) $(libkjobviewer_main_la_OBJECTS) $(libkjobviewer_main_la_LIBADD) $(LIBS) -+ - kjobviewer.la: $(kjobviewer_la_OBJECTS) $(kjobviewer_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(kjobviewer_la_LDFLAGS) $(kjobviewer_la_OBJECTS) $(kjobviewer_la_LIBADD) $(LIBS) - -@@ -652,9 +664,6 @@ - mostlyclean distclean maintainer-clean - - --dummy.cpp: -- echo > dummy.cpp -- - messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kjobviewer.pot - -@@ -667,8 +676,12 @@ - $(MOC) $(srcdir)/kjobviewer.h -o kjobviewer.moc - - #>+ 3 -+kjobviewer.moc: $(srcdir)/kjobviewer.h -+ $(MOC) $(srcdir)/kjobviewer.h -o kjobviewer.moc -+ -+#>+ 3 - clean-metasources: -- -rm -f kjobviewer.moc -+ -rm -f kjobviewer.moc kjobviewer.moc - - #>+ 2 - docs-am: -@@ -691,28 +704,40 @@ - - - #>+ 12 --kjobviewer_la_meta_unload.cpp: kjobviewer.moc -- @echo 'creating kjobviewer_la_meta_unload.cpp' -- @-rm -f kjobviewer_la_meta_unload.cpp -+libkjobviewer_main_la_meta_unload.cpp: kjobviewer.moc -+ @echo 'creating libkjobviewer_main_la_meta_unload.cpp' -+ @-rm -f libkjobviewer_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kjobviewer_la[] = {' > kjobviewer_la_meta_unload.cpp ;\ -- cat kjobviewer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kjobviewer_la_meta_unload.cpp ;\ -- echo '0};' >> kjobviewer_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kjobviewer_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kjobviewer_la)' >> kjobviewer_la_meta_unload.cpp ;\ -- else echo > kjobviewer_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkjobviewer_main_la[] = {' > libkjobviewer_main_la_meta_unload.cpp ;\ -+ cat kjobviewer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkjobviewer_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkjobviewer_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkjobviewer_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkjobviewer_main_la)' >> libkjobviewer_main_la_meta_unload.cpp ;\ -+ else echo > libkjobviewer_main_la_meta_unload.cpp; fi - - - #>+ 3 - clean-moc-classes: -- -rm -f kjobviewer_la_meta_unload.cpp -+ -rm -f libkjobviewer_main_la_meta_unload.cpp -+ -+#>+ 11 -+libkjobviewer_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjobviewer.cpp $(srcdir)/main.cpp libkjobviewer_main_la_meta_unload.cpp kjobviewer.moc -+ @echo 'creating libkjobviewer_main_la.all_cpp.cpp ...'; \ -+ rm -f libkjobviewer_main_la.all_cpp.files libkjobviewer_main_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkjobviewer_main_la.all_cpp.final; \ -+ for file in kjobviewer.cpp main.cpp libkjobviewer_main_la_meta_unload.cpp ; do \ -+ echo "#include \"$$file\"" >> libkjobviewer_main_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkjobviewer_main_la.all_cpp.final; \ -+ done; \ -+ cat libkjobviewer_main_la.all_cpp.final libkjobviewer_main_la.all_cpp.files > libkjobviewer_main_la.all_cpp.cpp; \ -+ rm -f libkjobviewer_main_la.all_cpp.final libkjobviewer_main_la.all_cpp.files - - #>+ 11 --kjobviewer_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjobviewer.cpp $(srcdir)/main.cpp kjobviewer_la_meta_unload.cpp kjobviewer.moc -+kjobviewer_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjobviewer_main.cpp kjobviewer.moc - @echo 'creating kjobviewer_la.all_cpp.cpp ...'; \ - rm -f kjobviewer_la.all_cpp.files kjobviewer_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kjobviewer_la.all_cpp.final; \ -- for file in kjobviewer.cpp main.cpp kjobviewer_la_meta_unload.cpp ; do \ -+ for file in kjobviewer_main.cpp ; do \ - echo "#include \"$$file\"" >> kjobviewer_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kjobviewer_la.all_cpp.final; \ - done; \ -@@ -720,11 +745,11 @@ - rm -f kjobviewer_la.all_cpp.final kjobviewer_la.all_cpp.files - - #>+ 11 --kjobviewer.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+kjobviewer.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjobviewer_main.cpp - @echo 'creating kjobviewer.all_cpp.cpp ...'; \ - rm -f kjobviewer.all_cpp.files kjobviewer.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kjobviewer.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kjobviewer_main.cpp ; do \ - echo "#include \"$$file\"" >> kjobviewer.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kjobviewer.all_cpp.final; \ - done; \ -@@ -733,20 +758,20 @@ - - #>+ 3 - clean-final: -- -rm -f kjobviewer_la.all_cpp.cpp kjobviewer.all_cpp.cpp -+ -rm -f libkjobviewer_main_la.all_cpp.cpp kjobviewer_la.all_cpp.cpp kjobviewer.all_cpp.cpp - - #>+ 2 - final: -- $(MAKE) kjobviewer_la_OBJECTS="$(kjobviewer_la_final_OBJECTS)" all-am -+ $(MAKE) libkjobviewer_main_la_OBJECTS="$(libkjobviewer_main_la_final_OBJECTS)" all-am - #>+ 2 - final-install: -- $(MAKE) kjobviewer_la_OBJECTS="$(kjobviewer_la_final_OBJECTS)" install-am -+ $(MAKE) libkjobviewer_main_la_OBJECTS="$(libkjobviewer_main_la_final_OBJECTS)" install-am - #>+ 2 - no-final: -- $(MAKE) kjobviewer_la_OBJECTS="$(kjobviewer_la_nofinal_OBJECTS)" all-am -+ $(MAKE) libkjobviewer_main_la_OBJECTS="$(libkjobviewer_main_la_nofinal_OBJECTS)" all-am - #>+ 2 - no-final-install: -- $(MAKE) kjobviewer_la_OBJECTS="$(kjobviewer_la_nofinal_OBJECTS)" install-am -+ $(MAKE) libkjobviewer_main_la_OBJECTS="$(libkjobviewer_main_la_nofinal_OBJECTS)" install-am - #>+ 3 - cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -756,4 +781,4 @@ - -rm -f *.rpo - - #>+ 2 --$(srcdir)/kjobviewer.cpp: kjobviewer.moc -+$(srcdir)/kjobviewer.cpp: kjobviewer.moc kjobviewer.moc diff --git a/x11/kdebase2/patches/patch-bf b/x11/kdebase2/patches/patch-bf deleted file mode 100644 index 5f3090b93df..00000000000 --- a/x11/kdebase2/patches/patch-bf +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-bf,v 1.1 2001/10/15 22:46:01 skrll Exp $ - ---- kdeprint/kjobviewer/kjobviewer_main.cpp.orig Tue Oct 2 17:50:32 2001 -+++ 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 int kjobviewer_main(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kjobviewer_main(argc, argv); -+} diff --git a/x11/kdebase2/patches/patch-bg b/x11/kdebase2/patches/patch-bg deleted file mode 100644 index 1b462810d79..00000000000 --- a/x11/kdebase2/patches/patch-bg +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bg,v 1.1 2001/10/15 22:46:01 skrll Exp $ - ---- kdeprint/kjobviewer/main.cpp.orig Fri Mar 30 23:33:28 2001 -+++ kdeprint/kjobviewer/main.cpp -@@ -33,7 +33,7 @@ - }; - - --int main(int argc, char *argv[]) -+int kjobviewer_main(int argc, char *argv[]) - { - KAboutData aboutData("kjobviewer","KJobViewer","0.1","A print job viewer",KAboutData::License_GPL,"(c) 2001, Michael Goffioul"); - aboutData.addAuthor("Michael Goffioul",0,"goffioul@imec.be"); diff --git a/x11/kdebase2/patches/patch-bh b/x11/kdebase2/patches/patch-bh deleted file mode 100644 index e0b16027ba9..00000000000 --- a/x11/kdebase2/patches/patch-bh +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-bh,v 1.2 2001/10/18 15:43:10 skrll Exp $ - ---- kdesktop/Makefile.am.orig Sun Jul 29 05:56:25 2001 -+++ kdesktop/Makefile.am -@@ -1,10 +1,12 @@ - ## Makefile.am of kdebase/kdesktop - - INCLUDES = -I$(top_srcdir)/kcontrol/background -I$(top_srcdir)/libkonq $(all_includes) -+libkdesktop_main_la_LDFLAGS = $(all_libraries) -lkdesu -+libkdesktop_main_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la - kdesktop_la_LDFLAGS = $(all_libraries) -lkdesu -module -avoid-version --kdesktop_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la -+kdesktop_la_LIBADD = libkdesktop_main.la - kdesktop_LDFLAGS = $(KDE_RPATH) $(all_libraries) --kdesktop_LDADD = kdesktop.la -+kdesktop_LDADD = libkdesktop_main.la - - SUBDIRS = . pics patterns programs init kwebdesktop - -@@ -12,15 +14,17 @@ - - bin_PROGRAMS = kdesktop kdmdesktop - bin_SCRIPTS = kdeeject --lib_LTLIBRARIES = kdesktop.la -+lib_LTLIBRARIES = libkdesktop_main.la kdesktop.la - --kdesktop_la_SOURCES = krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc \ -+libkdesktop_main_la_SOURCES = krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc \ - lockeng.cc lockdlg.cc KDesktopIface.skel \ - bgmanager.cc init.cc KScreensaverIface.skel \ - minicli.cpp KBackgroundIface.skel pixmapserver.cc kcustommenu.cc \ - startupid.cpp - --kdesktop_SOURCES = dummy.cc -+kdesktop_la_SOURCES = kdesktop_main.cc -+ -+kdesktop_SOURCES = kdesktop_main.cc - - include_HEADERS = KDesktopIface.h KScreensaverIface.h KBackgroundIface.h - -@@ -38,9 +42,6 @@ - - messages: - $(XGETTEXT) *.cc *.cpp *.h -o $(podir)/kdesktop.pot -- --dummy.cc: -- echo > dummy.cc - - menu_DATA = kdesktop_custom_menu1 kdesktop_custom_menu2 - menudir = $(kde_confdir) diff --git a/x11/kdebase2/patches/patch-bi b/x11/kdebase2/patches/patch-bi deleted file mode 100644 index 3db94a6d357..00000000000 --- a/x11/kdebase2/patches/patch-bi +++ /dev/null @@ -1,240 +0,0 @@ -$NetBSD: patch-bi,v 1.3 2001/12/03 15:37:19 skrll Exp $ - ---- kdesktop/Makefile.in.orig Sat Nov 10 07:58:23 2001 -+++ kdesktop/Makefile.in -@@ -274,10 +274,12 @@ - x_libraries = @x_libraries@ - - INCLUDES = -I$(top_srcdir)/kcontrol/background -I$(top_srcdir)/libkonq $(all_includes) -+libkdesktop_main_la_LDFLAGS = $(all_libraries) -lkdesu -+libkdesktop_main_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la - kdesktop_la_LDFLAGS = $(all_libraries) -lkdesu -module -avoid-version --kdesktop_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la -+kdesktop_la_LIBADD = libkdesktop_main.la - kdesktop_LDFLAGS = $(KDE_RPATH) $(all_libraries) --kdesktop_LDADD = kdesktop.la -+kdesktop_LDADD = libkdesktop_main.la - - SUBDIRS = . pics patterns programs init kwebdesktop - -@@ -285,14 +287,16 @@ - - bin_PROGRAMS = kdesktop kdmdesktop - bin_SCRIPTS = kdeeject --lib_LTLIBRARIES = kdesktop.la -+lib_LTLIBRARIES = libkdesktop_main.la kdesktop.la - --#>- kdesktop_la_SOURCES = krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc lockeng.cc lockdlg.cc KDesktopIface.skel bgmanager.cc init.cc KScreensaverIface.skel minicli.cpp KBackgroundIface.skel pixmapserver.cc kcustommenu.cc startupid.cpp -+#>- libkdesktop_main_la_SOURCES = krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc lockeng.cc lockdlg.cc KDesktopIface.skel bgmanager.cc init.cc KScreensaverIface.skel minicli.cpp KBackgroundIface.skel pixmapserver.cc kcustommenu.cc startupid.cpp - #>+ 1 --kdesktop_la_SOURCES=krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc lockeng.cc lockdlg.cc bgmanager.cc init.cc minicli.cpp pixmapserver.cc kcustommenu.cc startupid.cpp KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc -+libkdesktop_main_la_SOURCES=krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc lockeng.cc lockdlg.cc bgmanager.cc init.cc minicli.cpp pixmapserver.cc kcustommenu.cc startupid.cpp KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc - - --kdesktop_SOURCES = dummy.cc -+kdesktop_la_SOURCES = kdesktop_main.cc -+ -+kdesktop_SOURCES = kdesktop_main.cc - - include_HEADERS = KDesktopIface.h KScreensaverIface.h KBackgroundIface.h - -@@ -324,26 +328,30 @@ - LIBS = @LIBS@ - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ --kdesktop_la_DEPENDENCIES = $(top_builddir)/libkonq/libkonq.la \ -+libkdesktop_main_la_DEPENDENCIES = $(top_builddir)/libkonq/libkonq.la \ - $(top_builddir)/kcontrol/background/libbgnd.la --#>- kdesktop_la_OBJECTS = krootwm.lo xautolock.lo kdiconview.lo desktop.lo \ --#>- main.lo lockeng.lo lockdlg.lo bgmanager.lo init.lo minicli.lo \ --#>- pixmapserver.lo kcustommenu.lo startupid.lo -+#>- libkdesktop_main_la_OBJECTS = krootwm.lo xautolock.lo kdiconview.lo \ -+#>- desktop.lo main.lo lockeng.lo lockdlg.lo bgmanager.lo init.lo \ -+#>- minicli.lo pixmapserver.lo kcustommenu.lo startupid.lo - #>+ 7 --kdesktop_la_final_OBJECTS = kdesktop_la.all_cpp.lo kdesktop_la.all_cc.lo --kdesktop_la_nofinal_OBJECTS = krootwm.lo xautolock.lo kdiconview.lo desktop.lo \ -- main.lo lockeng.lo lockdlg.lo bgmanager.lo init.lo minicli.lo \ -- pixmapserver.lo kcustommenu.lo startupid.lo KDesktopIface_skel.lo KScreensaverIface_skel.lo KBackgroundIface_skel.lo \ -- kdesktop_la_meta_unload.lo --@KDE_USE_FINAL_FALSE@kdesktop_la_OBJECTS = $(kdesktop_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@kdesktop_la_OBJECTS = $(kdesktop_la_final_OBJECTS) -+libkdesktop_main_la_final_OBJECTS = libkdesktop_main_la.all_cpp.lo libkdesktop_main_la.all_cc.lo -+libkdesktop_main_la_nofinal_OBJECTS = krootwm.lo xautolock.lo kdiconview.lo \ -+ desktop.lo main.lo lockeng.lo lockdlg.lo bgmanager.lo init.lo \ -+ minicli.lo pixmapserver.lo kcustommenu.lo startupid.lo KDesktopIface_skel.lo KScreensaverIface_skel.lo KBackgroundIface_skel.lo \ -+ libkdesktop_main_la_meta_unload.lo -+@KDE_USE_FINAL_FALSE@libkdesktop_main_la_OBJECTS = $(libkdesktop_main_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libkdesktop_main_la_OBJECTS = $(libkdesktop_main_la_final_OBJECTS) -+kdesktop_la_DEPENDENCIES = libkdesktop_main.la -+#>- kdesktop_la_OBJECTS = kdesktop_main.lo -+#>+ 1 -+kdesktop_la_OBJECTS = kdesktop_main.lo - bin_PROGRAMS = kdesktop$(EXEEXT) kdmdesktop$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - --#>- kdesktop_OBJECTS = dummy.$(OBJEXT) -+#>- kdesktop_OBJECTS = kdesktop_main.$(OBJEXT) - #>+ 1 --kdesktop_OBJECTS = dummy.$(OBJEXT) --kdesktop_DEPENDENCIES = kdesktop.la -+kdesktop_OBJECTS = kdesktop_main.$(OBJEXT) -+kdesktop_DEPENDENCIES = libkdesktop_main.la - #>- kdmdesktop_OBJECTS = kdmdesktop.$(OBJEXT) - #>+ 5 - kdmdesktop_final_OBJECTS = kdmdesktop.all_cpp.o kdmdesktop.all_cc.o -@@ -375,15 +383,15 @@ - - #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=kdesktop.desktop kdesktop_custom_menu1 kdesktop_custom_menu2 DESIGN kcustommenu.h kdiconview.h kdesktopbindings.cpp kdmdesktop.h kdeeject -+KDE_DIST=DESIGN kdesktop.desktop kdesktop_custom_menu1 kdesktop_custom_menu2 kcustommenu.h kdiconview.h kdesktopbindings.cpp kdeeject kdmdesktop.h - - DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - - - TAR = tar - GZIP_ENV = --best --SOURCES = $(kdesktop_la_SOURCES) $(kdesktop_SOURCES) $(kdmdesktop_SOURCES) --OBJECTS = $(kdesktop_la_OBJECTS) $(kdesktop_OBJECTS) $(kdmdesktop_OBJECTS) -+SOURCES = $(libkdesktop_main_la_SOURCES) $(kdesktop_la_SOURCES) $(kdesktop_SOURCES) $(kdmdesktop_SOURCES) -+OBJECTS = $(libkdesktop_main_la_OBJECTS) $(kdesktop_la_OBJECTS) $(kdesktop_OBJECTS) $(kdmdesktop_OBJECTS) - - #>- all: all-redirect - #>+ 1 -@@ -470,6 +478,9 @@ - - maintainer-clean-libtool: - -+libkdesktop_main.la: $(libkdesktop_main_la_OBJECTS) $(libkdesktop_main_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(libdir) $(libkdesktop_main_la_LDFLAGS) $(libkdesktop_main_la_OBJECTS) $(libkdesktop_main_la_LIBADD) $(LIBS) -+ - kdesktop.la: $(kdesktop_la_OBJECTS) $(kdesktop_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(kdesktop_la_LDFLAGS) $(kdesktop_la_OBJECTS) $(kdesktop_la_LIBADD) $(LIBS) - -@@ -810,9 +821,6 @@ - messages: - $(XGETTEXT) *.cc *.cpp *.h -o $(podir)/kdesktop.pot - --dummy.cc: -- echo > dummy.cc -- - install-data-local: - @test -n "$(DESTDIR)" || test -z "$(PAM)" || $(top_srcdir)/mkpamserv $(PAM) - -@@ -903,16 +911,16 @@ - - - #>+ 12 --kdesktop_la_meta_unload.cc: lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc lockdlg.moc kcustommenu.moc minicli.moc krootwm.moc -- @echo 'creating kdesktop_la_meta_unload.cc' -- @-rm -f kdesktop_la_meta_unload.cc -+libkdesktop_main_la_meta_unload.cc: lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc lockdlg.moc kcustommenu.moc minicli.moc krootwm.moc -+ @echo 'creating libkdesktop_main_la_meta_unload.cc' -+ @-rm -f libkdesktop_main_la_meta_unload.cc - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kdesktop_la[] = {' > kdesktop_la_meta_unload.cc ;\ -- cat lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc lockdlg.moc kcustommenu.moc minicli.moc krootwm.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kdesktop_la_meta_unload.cc ;\ -- echo '0};' >> kdesktop_la_meta_unload.cc ;\ -- echo '#include <kunload.h>' >> kdesktop_la_meta_unload.cc ;\ -- echo '_UNLOAD(kdesktop_la)' >> kdesktop_la_meta_unload.cc ;\ -- else echo > kdesktop_la_meta_unload.cc; fi -+ echo 'static const char * _metalist_libkdesktop_main_la[] = {' > libkdesktop_main_la_meta_unload.cc ;\ -+ cat lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc lockdlg.moc kcustommenu.moc minicli.moc krootwm.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkdesktop_main_la_meta_unload.cc ;\ -+ echo '0};' >> libkdesktop_main_la_meta_unload.cc ;\ -+ echo '#include <kunload.h>' >> libkdesktop_main_la_meta_unload.cc ;\ -+ echo '_UNLOAD(libkdesktop_main_la)' >> libkdesktop_main_la_meta_unload.cc ;\ -+ else echo > libkdesktop_main_la_meta_unload.cc; fi - - - #>+ 12 -@@ -930,26 +938,38 @@ - - #>+ 3 - clean-moc-classes: -- -rm -f kdesktop_la_meta_unload.cc kdmdesktop_meta_unload.cc -+ -rm -f libkdesktop_main_la_meta_unload.cc kdmdesktop_meta_unload.cc - - #>+ 11 --kdesktop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp $(srcdir)/startupid.cpp xautolock.moc pixmapserver.moc lockeng.moc kdmdesktop.moc startupid.moc lockdlg.moc bgmanager.moc kdiconview.moc minicli.moc kcustommenu.moc desktop.moc krootwm.moc -- @echo 'creating kdesktop_la.all_cpp.cpp ...'; \ -- rm -f kdesktop_la.all_cpp.files kdesktop_la.all_cpp.final; \ -- echo "#define KDE_USE_FINAL 1" >> kdesktop_la.all_cpp.final; \ -+libkdesktop_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp $(srcdir)/startupid.cpp xautolock.moc pixmapserver.moc lockeng.moc kdmdesktop.moc startupid.moc lockdlg.moc bgmanager.moc kdiconview.moc minicli.moc kcustommenu.moc desktop.moc krootwm.moc -+ @echo 'creating libkdesktop_main_la.all_cpp.cpp ...'; \ -+ rm -f libkdesktop_main_la.all_cpp.files libkdesktop_main_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkdesktop_main_la.all_cpp.final; \ - for file in minicli.cpp startupid.cpp ; do \ -- echo "#include \"$$file\"" >> kdesktop_la.all_cpp.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kdesktop_la.all_cpp.final; \ -+ echo "#include \"$$file\"" >> libkdesktop_main_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkdesktop_main_la.all_cpp.final; \ -+ done; \ -+ cat libkdesktop_main_la.all_cpp.final libkdesktop_main_la.all_cpp.files > libkdesktop_main_la.all_cpp.cpp; \ -+ rm -f libkdesktop_main_la.all_cpp.final libkdesktop_main_la.all_cpp.files -+ -+#>+ 11 -+libkdesktop_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/krootwm.cc $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc $(srcdir)/desktop.cc $(srcdir)/main.cc $(srcdir)/lockeng.cc $(srcdir)/lockdlg.cc $(srcdir)/bgmanager.cc $(srcdir)/init.cc $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc libkdesktop_main_la_meta_unload.cc xautolock.moc pixmapserver.moc lockeng.moc kdmdesktop.moc startupid.moc lockdlg.moc bgmanager.moc kdiconview.moc minicli.moc kcustommenu.moc desktop.moc krootwm.moc -+ @echo 'creating libkdesktop_main_la.all_cc.cc ...'; \ -+ rm -f libkdesktop_main_la.all_cc.files libkdesktop_main_la.all_cc.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkdesktop_main_la.all_cc.final; \ -+ for file in krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc lockeng.cc lockdlg.cc bgmanager.cc init.cc pixmapserver.cc kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc libkdesktop_main_la_meta_unload.cc ; do \ -+ echo "#include \"$$file\"" >> libkdesktop_main_la.all_cc.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkdesktop_main_la.all_cc.final; \ - done; \ -- cat kdesktop_la.all_cpp.final kdesktop_la.all_cpp.files > kdesktop_la.all_cpp.cpp; \ -- rm -f kdesktop_la.all_cpp.final kdesktop_la.all_cpp.files -+ cat libkdesktop_main_la.all_cc.final libkdesktop_main_la.all_cc.files > libkdesktop_main_la.all_cc.cc; \ -+ rm -f libkdesktop_main_la.all_cc.final libkdesktop_main_la.all_cc.files - - #>+ 11 --kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/krootwm.cc $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc $(srcdir)/desktop.cc $(srcdir)/main.cc $(srcdir)/lockeng.cc $(srcdir)/lockdlg.cc $(srcdir)/bgmanager.cc $(srcdir)/init.cc $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc kdesktop_la_meta_unload.cc xautolock.moc pixmapserver.moc lockeng.moc kdmdesktop.moc startupid.moc lockdlg.moc bgmanager.moc kdiconview.moc minicli.moc kcustommenu.moc desktop.moc krootwm.moc -+kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kdesktop_main.cc - @echo 'creating kdesktop_la.all_cc.cc ...'; \ - rm -f kdesktop_la.all_cc.files kdesktop_la.all_cc.final; \ - echo "#define KDE_USE_FINAL 1" >> kdesktop_la.all_cc.final; \ -- for file in krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc lockeng.cc lockdlg.cc bgmanager.cc init.cc pixmapserver.cc kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc kdesktop_la_meta_unload.cc ; do \ -+ for file in kdesktop_main.cc ; do \ - echo "#include \"$$file\"" >> kdesktop_la.all_cc.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kdesktop_la.all_cc.final; \ - done; \ -@@ -957,11 +977,11 @@ - rm -f kdesktop_la.all_cc.final kdesktop_la.all_cc.files - - #>+ 11 --kdesktop.all_cc.cc: $(srcdir)/Makefile.in dummy.cc -+kdesktop.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kdesktop_main.cc - @echo 'creating kdesktop.all_cc.cc ...'; \ - rm -f kdesktop.all_cc.files kdesktop.all_cc.final; \ - echo "#define KDE_USE_FINAL 1" >> kdesktop.all_cc.final; \ -- for file in dummy.cc ; do \ -+ for file in kdesktop_main.cc ; do \ - echo "#include \"$$file\"" >> kdesktop.all_cc.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kdesktop.all_cc.final; \ - done; \ -@@ -994,20 +1014,20 @@ - - #>+ 3 - clean-final: -- -rm -f kdesktop_la.all_cpp.cpp kdesktop_la.all_cc.cc kdesktop.all_cc.cc kdmdesktop.all_cpp.cpp kdmdesktop.all_cc.cc -+ -rm -f libkdesktop_main_la.all_cpp.cpp libkdesktop_main_la.all_cc.cc kdesktop_la.all_cc.cc kdesktop.all_cc.cc kdmdesktop.all_cpp.cpp kdmdesktop.all_cc.cc - - #>+ 2 - final: -- $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_final_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_final_OBJECTS)" all-am -+ $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_final_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_final_OBJECTS)" all-am - #>+ 2 - final-install: -- $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_final_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_final_OBJECTS)" install-am -+ $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_final_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_final_OBJECTS)" install-am - #>+ 2 - no-final: -- $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_nofinal_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_nofinal_OBJECTS)" all-am -+ $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_nofinal_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_nofinal_OBJECTS)" all-am - #>+ 2 - no-final-install: -- $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_nofinal_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_nofinal_OBJECTS)" install-am -+ $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_nofinal_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_nofinal_OBJECTS)" install-am - #>+ 3 - cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase2/patches/patch-bj b/x11/kdebase2/patches/patch-bj deleted file mode 100644 index aea989a929d..00000000000 --- a/x11/kdebase2/patches/patch-bj +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-bj,v 1.2 2001/10/18 13:23:05 skrll Exp $ - ---- kdesktop/kdesktop_main.cc.orig Thu Oct 18 09:15:16 2001 -+++ 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 int kdesktop_main(int, char **); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kdesktop_main(argc, argv); -+} diff --git a/x11/kdebase2/patches/patch-bk b/x11/kdebase2/patches/patch-bk deleted file mode 100644 index afc88ef9cd0..00000000000 --- a/x11/kdebase2/patches/patch-bk +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bk,v 1.1 2001/10/15 22:46:02 skrll Exp $ - ---- kdesktop/main.cc.orig Sun Jul 29 05:56:28 2001 -+++ kdesktop/main.cc -@@ -74,7 +74,7 @@ - KApplication::kApplication()->quit(); // turn catchable signals into clean shutdown - } - --int main( int argc, char **argv ) -+int kdesktop_main( int argc, char **argv ) - { - //setup signal handling - signal(SIGTERM, signalHandler); diff --git a/x11/kdebase2/patches/patch-bl b/x11/kdebase2/patches/patch-bl deleted file mode 100644 index fe45a82ab8b..00000000000 --- a/x11/kdebase2/patches/patch-bl +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-bl,v 1.1 2001/10/15 22:46:02 skrll Exp $ - ---- khotkeys/khotkeys/Makefile.am.orig Sat May 19 02:07:18 2001 -+++ khotkeys/khotkeys/Makefile.am -@@ -2,13 +2,17 @@ - - bin_PROGRAMS = khotkeys --lib_LTLIBRARIES = khotkeys.la -+lib_LTLIBRARIES = libkhotkeys_main.la khotkeys.la - --khotkeys_la_SOURCES = khkglobalaccel.cpp khotkeys.cpp main.cpp \ -+libkhotkeys_main_la_SOURCES = khkglobalaccel.cpp khotkeys.cpp main.cpp \ - khotkeys.skel --khotkeys_la_LIBADD = ../shared/libshared.la -lksycoca -+libkhotkeys_main_la_LIBADD = ../shared/libshared.la -lksycoca -+libkhotkeys_main_la_LDFLAGS = $(all_libraries) -+ -+khotkeys_la_SOURCES = khotkeys_main.cpp -+khotkeys_la_LIBADD = libkhotkeys_main.la - khotkeys_la_LDFLAGS = $(all_libraries) -module -avoid-version - --khotkeys_SOURCES = dummy.cpp --khotkeys_LDADD = khotkeys.la -+khotkeys_SOURCES = khotkeys_main.cpp -+khotkeys_LDADD = libkhotkeys_main.la - khotkeys_LDFLAGS = $(all_libraries) $(KDE_RPATH) - -@@ -21,5 +25,2 @@ - - METASOURCES = AUTO -- --dummy.cpp: -- echo > dummy.cpp diff --git a/x11/kdebase2/patches/patch-bm b/x11/kdebase2/patches/patch-bm deleted file mode 100644 index 545e06cf46d..00000000000 --- a/x11/kdebase2/patches/patch-bm +++ /dev/null @@ -1,192 +0,0 @@ -$NetBSD: patch-bm,v 1.2 2001/12/03 15:37:19 skrll Exp $ - ---- khotkeys/khotkeys/Makefile.in.orig Sat Nov 10 07:58:25 2001 -+++ khotkeys/khotkeys/Makefile.in -@@ -276,17 +276,21 @@ - x_libraries = @x_libraries@ - - bin_PROGRAMS = khotkeys --lib_LTLIBRARIES = khotkeys.la -+lib_LTLIBRARIES = libkhotkeys_main.la khotkeys.la - --#>- khotkeys_la_SOURCES = khkglobalaccel.cpp khotkeys.cpp main.cpp khotkeys.skel -+#>- libkhotkeys_main_la_SOURCES = khkglobalaccel.cpp khotkeys.cpp main.cpp khotkeys.skel - #>+ 1 --khotkeys_la_SOURCES=khkglobalaccel.cpp khotkeys.cpp main.cpp khotkeys_skel.cpp -+libkhotkeys_main_la_SOURCES=khkglobalaccel.cpp khotkeys.cpp main.cpp khotkeys_skel.cpp - --khotkeys_la_LIBADD = ../shared/libshared.la -lksycoca -+libkhotkeys_main_la_LIBADD = ../shared/libshared.la -lksycoca -+libkhotkeys_main_la_LDFLAGS = $(all_libraries) -+ -+khotkeys_la_SOURCES = khotkeys_main.cpp -+khotkeys_la_LIBADD = libkhotkeys_main.la - khotkeys_la_LDFLAGS = $(all_libraries) -module -avoid-version - --khotkeys_SOURCES = dummy.cpp --khotkeys_LDADD = khotkeys.la -+khotkeys_SOURCES = khotkeys_main.cpp -+khotkeys_LDADD = libkhotkeys_main.la - khotkeys_LDFLAGS = $(all_libraries) $(KDE_RPATH) - - autostart_DATA = khotkeys.desktop -@@ -309,21 +313,25 @@ - LIBS = @LIBS@ - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ --khotkeys_la_DEPENDENCIES = ../shared/libshared.la --#>- khotkeys_la_OBJECTS = khkglobalaccel.lo khotkeys.lo main.lo -+libkhotkeys_main_la_DEPENDENCIES = ../shared/libshared.la -+#>- libkhotkeys_main_la_OBJECTS = khkglobalaccel.lo khotkeys.lo main.lo - #>+ 5 --khotkeys_la_final_OBJECTS = khotkeys_la.all_cpp.lo --khotkeys_la_nofinal_OBJECTS = khkglobalaccel.lo khotkeys.lo main.lo khotkeys_skel.lo \ -- khotkeys_la_meta_unload.lo --@KDE_USE_FINAL_FALSE@khotkeys_la_OBJECTS = $(khotkeys_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@khotkeys_la_OBJECTS = $(khotkeys_la_final_OBJECTS) -+libkhotkeys_main_la_final_OBJECTS = libkhotkeys_main_la.all_cpp.lo -+libkhotkeys_main_la_nofinal_OBJECTS = khkglobalaccel.lo khotkeys.lo main.lo khotkeys_skel.lo \ -+ libkhotkeys_main_la_meta_unload.lo -+@KDE_USE_FINAL_FALSE@libkhotkeys_main_la_OBJECTS = $(libkhotkeys_main_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libkhotkeys_main_la_OBJECTS = $(libkhotkeys_main_la_final_OBJECTS) -+khotkeys_la_DEPENDENCIES = libkhotkeys_main.la -+#>- khotkeys_la_OBJECTS = khotkeys_main.lo -+#>+ 1 -+khotkeys_la_OBJECTS = khotkeys_main.lo - bin_PROGRAMS = khotkeys$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - --#>- khotkeys_OBJECTS = dummy.$(OBJEXT) -+#>- khotkeys_OBJECTS = khotkeys_main.$(OBJEXT) - #>+ 1 --khotkeys_OBJECTS = dummy.$(OBJEXT) --khotkeys_DEPENDENCIES = khotkeys.la -+khotkeys_OBJECTS = khotkeys_main.$(OBJEXT) -+khotkeys_DEPENDENCIES = libkhotkeys_main.la - CXXFLAGS = @CXXFLAGS@ - #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 1 -@@ -351,8 +359,8 @@ - - TAR = tar - GZIP_ENV = --best --SOURCES = $(khotkeys_la_SOURCES) $(khotkeys_SOURCES) --OBJECTS = $(khotkeys_la_OBJECTS) $(khotkeys_OBJECTS) -+SOURCES = $(libkhotkeys_main_la_SOURCES) $(khotkeys_la_SOURCES) $(khotkeys_SOURCES) -+OBJECTS = $(libkhotkeys_main_la_OBJECTS) $(khotkeys_la_OBJECTS) $(khotkeys_OBJECTS) - - #>- all: all-redirect - #>+ 1 -@@ -439,6 +447,9 @@ - - maintainer-clean-libtool: - -+libkhotkeys_main.la: $(libkhotkeys_main_la_OBJECTS) $(libkhotkeys_main_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(libdir) $(libkhotkeys_main_la_LDFLAGS) $(libkhotkeys_main_la_OBJECTS) $(libkhotkeys_main_la_LIBADD) $(LIBS) -+ - khotkeys.la: $(khotkeys_la_OBJECTS) $(khotkeys_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(khotkeys_la_LDFLAGS) $(khotkeys_la_OBJECTS) $(khotkeys_la_LIBADD) $(LIBS) - -@@ -628,9 +639,6 @@ - maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - --dummy.cpp: -- echo > dummy.cpp -- - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: -@@ -668,28 +676,40 @@ - - - #>+ 12 --khotkeys_la_meta_unload.cpp: khotkeys.moc khkglobalaccel.moc -- @echo 'creating khotkeys_la_meta_unload.cpp' -- @-rm -f khotkeys_la_meta_unload.cpp -+libkhotkeys_main_la_meta_unload.cpp: khotkeys.moc khkglobalaccel.moc -+ @echo 'creating libkhotkeys_main_la_meta_unload.cpp' -+ @-rm -f libkhotkeys_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_khotkeys_la[] = {' > khotkeys_la_meta_unload.cpp ;\ -- cat khotkeys.moc khkglobalaccel.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> khotkeys_la_meta_unload.cpp ;\ -- echo '0};' >> khotkeys_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> khotkeys_la_meta_unload.cpp ;\ -- echo '_UNLOAD(khotkeys_la)' >> khotkeys_la_meta_unload.cpp ;\ -- else echo > khotkeys_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkhotkeys_main_la[] = {' > libkhotkeys_main_la_meta_unload.cpp ;\ -+ cat khotkeys.moc khkglobalaccel.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkhotkeys_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkhotkeys_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkhotkeys_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkhotkeys_main_la)' >> libkhotkeys_main_la_meta_unload.cpp ;\ -+ else echo > libkhotkeys_main_la_meta_unload.cpp; fi - - - #>+ 3 - clean-moc-classes: -- -rm -f khotkeys_la_meta_unload.cpp -+ -rm -f libkhotkeys_main_la_meta_unload.cpp -+ -+#>+ 11 -+libkhotkeys_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/khkglobalaccel.cpp $(srcdir)/khotkeys.cpp $(srcdir)/main.cpp khotkeys_skel.cpp libkhotkeys_main_la_meta_unload.cpp khotkeys.moc khkglobalaccel.moc -+ @echo 'creating libkhotkeys_main_la.all_cpp.cpp ...'; \ -+ rm -f libkhotkeys_main_la.all_cpp.files libkhotkeys_main_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkhotkeys_main_la.all_cpp.final; \ -+ for file in khkglobalaccel.cpp khotkeys.cpp main.cpp khotkeys_skel.cpp libkhotkeys_main_la_meta_unload.cpp ; do \ -+ echo "#include \"$$file\"" >> libkhotkeys_main_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkhotkeys_main_la.all_cpp.final; \ -+ done; \ -+ cat libkhotkeys_main_la.all_cpp.final libkhotkeys_main_la.all_cpp.files > libkhotkeys_main_la.all_cpp.cpp; \ -+ rm -f libkhotkeys_main_la.all_cpp.final libkhotkeys_main_la.all_cpp.files - - #>+ 11 --khotkeys_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/khkglobalaccel.cpp $(srcdir)/khotkeys.cpp $(srcdir)/main.cpp khotkeys_skel.cpp khotkeys_la_meta_unload.cpp khotkeys.moc khkglobalaccel.moc -+khotkeys_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/khotkeys_main.cpp - @echo 'creating khotkeys_la.all_cpp.cpp ...'; \ - rm -f khotkeys_la.all_cpp.files khotkeys_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> khotkeys_la.all_cpp.final; \ -- for file in khkglobalaccel.cpp khotkeys.cpp main.cpp khotkeys_skel.cpp khotkeys_la_meta_unload.cpp ; do \ -+ for file in khotkeys_main.cpp ; do \ - echo "#include \"$$file\"" >> khotkeys_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> khotkeys_la.all_cpp.final; \ - done; \ -@@ -697,11 +717,11 @@ - rm -f khotkeys_la.all_cpp.final khotkeys_la.all_cpp.files - - #>+ 11 --khotkeys.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+khotkeys.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/khotkeys_main.cpp - @echo 'creating khotkeys.all_cpp.cpp ...'; \ - rm -f khotkeys.all_cpp.files khotkeys.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> khotkeys.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in khotkeys_main.cpp ; do \ - echo "#include \"$$file\"" >> khotkeys.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> khotkeys.all_cpp.final; \ - done; \ -@@ -710,20 +730,20 @@ - - #>+ 3 - clean-final: -- -rm -f khotkeys_la.all_cpp.cpp khotkeys.all_cpp.cpp -+ -rm -f libkhotkeys_main_la.all_cpp.cpp khotkeys_la.all_cpp.cpp khotkeys.all_cpp.cpp - - #>+ 2 - final: -- $(MAKE) khotkeys_la_OBJECTS="$(khotkeys_la_final_OBJECTS)" all-am -+ $(MAKE) libkhotkeys_main_la_OBJECTS="$(libkhotkeys_main_la_final_OBJECTS)" all-am - #>+ 2 - final-install: -- $(MAKE) khotkeys_la_OBJECTS="$(khotkeys_la_final_OBJECTS)" install-am -+ $(MAKE) libkhotkeys_main_la_OBJECTS="$(libkhotkeys_main_la_final_OBJECTS)" install-am - #>+ 2 - no-final: -- $(MAKE) khotkeys_la_OBJECTS="$(khotkeys_la_nofinal_OBJECTS)" all-am -+ $(MAKE) libkhotkeys_main_la_OBJECTS="$(libkhotkeys_main_la_nofinal_OBJECTS)" all-am - #>+ 2 - no-final-install: -- $(MAKE) khotkeys_la_OBJECTS="$(khotkeys_la_nofinal_OBJECTS)" install-am -+ $(MAKE) libkhotkeys_main_la_OBJECTS="$(libkhotkeys_main_la_nofinal_OBJECTS)" install-am - #>+ 3 - cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase2/patches/patch-bn b/x11/kdebase2/patches/patch-bn deleted file mode 100644 index cd4e290678a..00000000000 --- a/x11/kdebase2/patches/patch-bn +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-bn,v 1.1 2001/10/15 22:46:02 skrll Exp $ - ---- khotkeys/khotkeys/khotkeys_main.cpp.orig Tue Oct 2 17:50:33 2001 -+++ 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 int khotkeys_main(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return khotkeys_main(argc, argv); -+} diff --git a/x11/kdebase2/patches/patch-bo b/x11/kdebase2/patches/patch-bo deleted file mode 100644 index 4687af0aaae..00000000000 --- a/x11/kdebase2/patches/patch-bo +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bo,v 1.1 2001/10/15 22:46:02 skrll Exp $ - ---- khotkeys/khotkeys/main.cpp.orig Fri Feb 23 14:49:27 2001 -+++ khotkeys/khotkeys/main.cpp -@@ -27,7 +27,7 @@ - int khotkeys_screen_number = 0; - - --int main( int argc, char** argv ) -+int khotkeys_main( int argc, char** argv ) - { // no need to i18n these, no GUI - { - // multiheaded hotkeys diff --git a/x11/kdebase2/patches/patch-bp b/x11/kdebase2/patches/patch-bp deleted file mode 100644 index 0c325cdf4c5..00000000000 --- a/x11/kdebase2/patches/patch-bp +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-bp,v 1.4 2001/12/03 15:37:19 skrll Exp $ - ---- kicker/Makefile.am.orig Mon Dec 3 11:00:21 2001 -+++ kicker/Makefile.am -@@ -3,7 +3,7 @@ - SUBDIRS = share core ui . proxy taskmanager taskbar applets extensions data - - bin_PROGRAMS = kicker --lib_LTLIBRARIES = kicker.la -+lib_LTLIBRARIES = kicker.la libkicker.la - - CLEANFILES = dummy.cpp - -@@ -11,8 +11,11 @@ - kicker_la_SOURCES = dummy.cpp - kicker_la_LDFLAGS = $(KDE_PLUGIN) -no-undefined -module - --kicker_LDADD = kicker.la --kicker_SOURCES = dummy.cpp -+libkicker_la_LIBADD = share/libkicker_share.la core/libkicker_core.la ui/libkicker_ui.la $(LIB_KSYCOCA) $(LIB_KFILE) -+libkicker_la_SOURCES = dummy.cpp -+ -+kicker_LDADD = libkicker.la -+kicker_SOURCES = kicker_main.cpp - kicker_LDFLAGS = $(all_libraries) $(KDE_RPATH) - - autostart_DATA = panel.desktop diff --git a/x11/kdebase2/patches/patch-bq b/x11/kdebase2/patches/patch-bq deleted file mode 100644 index abc4001ebf7..00000000000 --- a/x11/kdebase2/patches/patch-bq +++ /dev/null @@ -1,115 +0,0 @@ -$NetBSD: patch-bq,v 1.4 2001/12/03 15:37:19 skrll Exp $ - ---- kicker/Makefile.in.orig Sat Nov 10 07:58:25 2001 -+++ kicker/Makefile.in -@@ -278,7 +278,7 @@ - SUBDIRS = share core ui . proxy taskmanager taskbar applets extensions data - - bin_PROGRAMS = kicker --lib_LTLIBRARIES = kicker.la -+lib_LTLIBRARIES = kicker.la libkicker.la - - CLEANFILES = dummy.cpp - -@@ -286,8 +286,11 @@ - kicker_la_SOURCES = dummy.cpp - kicker_la_LDFLAGS = $(KDE_PLUGIN) -no-undefined -module - --kicker_LDADD = kicker.la --kicker_SOURCES = dummy.cpp -+libkicker_la_LIBADD = share/libkicker_share.la core/libkicker_core.la ui/libkicker_ui.la $(LIB_KSYCOCA) $(LIB_KFILE) -+libkicker_la_SOURCES = dummy.cpp -+ -+kicker_LDADD = libkicker.la -+kicker_SOURCES = kicker_main.cpp - kicker_LDFLAGS = $(all_libraries) $(KDE_RPATH) - - autostart_DATA = panel.desktop -@@ -309,13 +312,19 @@ - #>- kicker_la_OBJECTS = dummy.lo - #>+ 1 - kicker_la_OBJECTS = dummy.lo -+libkicker_la_LDFLAGS = -+libkicker_la_DEPENDENCIES = share/libkicker_share.la \ -+ core/libkicker_core.la ui/libkicker_ui.la -+#>- libkicker_la_OBJECTS = dummy.lo -+#>+ 1 -+libkicker_la_OBJECTS = dummy.lo - bin_PROGRAMS = kicker$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - --#>- kicker_OBJECTS = dummy.$(OBJEXT) -+#>- kicker_OBJECTS = kicker_main.$(OBJEXT) - #>+ 1 --kicker_OBJECTS = dummy.$(OBJEXT) --kicker_DEPENDENCIES = kicker.la -+kicker_OBJECTS = kicker_main.$(OBJEXT) -+kicker_DEPENDENCIES = libkicker.la - CXXFLAGS = @CXXFLAGS@ - #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 1 -@@ -341,8 +350,8 @@ - - TAR = tar - GZIP_ENV = --best --SOURCES = $(kicker_la_SOURCES) $(kicker_SOURCES) --OBJECTS = $(kicker_la_OBJECTS) $(kicker_OBJECTS) -+SOURCES = $(kicker_la_SOURCES) $(libkicker_la_SOURCES) $(kicker_SOURCES) -+OBJECTS = $(kicker_la_OBJECTS) $(libkicker_la_OBJECTS) $(kicker_OBJECTS) - - #>- all: all-redirect - #>+ 1 -@@ -435,6 +444,9 @@ - @KDE_USE_CLOSURE_FALSE@kicker.la: $(kicker_la_OBJECTS) $(kicker_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(kicker_la_LDFLAGS) $(kicker_la_OBJECTS) $(kicker_la_LIBADD) $(LIBS) - -+libkicker.la: $(libkicker_la_OBJECTS) $(libkicker_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(libdir) $(libkicker_la_LDFLAGS) $(libkicker_la_OBJECTS) $(libkicker_la_LIBADD) $(LIBS) -+ - mostlyclean-binPROGRAMS: - - clean-binPROGRAMS: -@@ -731,7 +743,7 @@ - - - #>+ 11 --kicker_la.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+kicker_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dummy.cpp - @echo 'creating kicker_la.all_cpp.cpp ...'; \ - rm -f kicker_la.all_cpp.files kicker_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kicker_la.all_cpp.final; \ -@@ -743,11 +755,23 @@ - rm -f kicker_la.all_cpp.final kicker_la.all_cpp.files - - #>+ 11 --kicker.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libkicker_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dummy.cpp -+ @echo 'creating libkicker_la.all_cpp.cpp ...'; \ -+ rm -f libkicker_la.all_cpp.files libkicker_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkicker_la.all_cpp.final; \ -+ for file in dummy.cpp ; do \ -+ echo "#include \"$$file\"" >> libkicker_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkicker_la.all_cpp.final; \ -+ done; \ -+ cat libkicker_la.all_cpp.final libkicker_la.all_cpp.files > libkicker_la.all_cpp.cpp; \ -+ rm -f libkicker_la.all_cpp.final libkicker_la.all_cpp.files -+ -+#>+ 11 -+kicker.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kicker_main.cpp - @echo 'creating kicker.all_cpp.cpp ...'; \ - rm -f kicker.all_cpp.files kicker.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kicker.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kicker_main.cpp ; do \ - echo "#include \"$$file\"" >> kicker.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kicker.all_cpp.final; \ - done; \ -@@ -756,7 +780,7 @@ - - #>+ 3 - clean-final: -- -rm -f kicker_la.all_cpp.cpp kicker.all_cpp.cpp -+ -rm -f kicker_la.all_cpp.cpp libkicker_la.all_cpp.cpp kicker.all_cpp.cpp - - #>+ 2 - final: diff --git a/x11/kdebase2/patches/patch-br b/x11/kdebase2/patches/patch-br deleted file mode 100644 index 9dba446085a..00000000000 --- a/x11/kdebase2/patches/patch-br +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-br,v 1.1 2001/10/15 22:46:03 skrll Exp $ - ---- kicker/applets/launcher/Makefile.am.orig Tue Apr 10 22:55:48 2001 -+++ kicker/applets/launcher/Makefile.am -@@ -14,7 +14,7 @@ - EXTRA_DIST = $(lnk_DATA) - - libquicklauncher_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -module --libquicklauncher_la_LIBADD = ../../kicker.la $(LIB_KSYCOCA) $(LIB_KDEUI) -+libquicklauncher_la_LIBADD = ../../libkicker.la $(LIB_KSYCOCA) $(LIB_KDEUI) - - messages: - $(XGETTEXT) *.cpp *.h -o $(podir)/quicklauncher.pot diff --git a/x11/kdebase2/patches/patch-bs b/x11/kdebase2/patches/patch-bs deleted file mode 100644 index 13cf01a0f3a..00000000000 --- a/x11/kdebase2/patches/patch-bs +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-bs,v 1.2 2001/12/03 15:37:19 skrll Exp $ - ---- kicker/applets/launcher/Makefile.in.orig Sat Nov 10 07:58:25 2001 -+++ kicker/applets/launcher/Makefile.in -@@ -288,7 +288,7 @@ - EXTRA_DIST = $(lnk_DATA) - - libquicklauncher_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -module --libquicklauncher_la_LIBADD = ../../kicker.la $(LIB_KSYCOCA) $(LIB_KDEUI) -+libquicklauncher_la_LIBADD = ../../libkicker.la $(LIB_KSYCOCA) $(LIB_KDEUI) - mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = -@@ -301,7 +301,7 @@ - LIBS = @LIBS@ - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ --libquicklauncher_la_DEPENDENCIES = ../../kicker.la -+libquicklauncher_la_DEPENDENCIES = ../../libkicker.la - #>- libquicklauncher_la_OBJECTS = quicklauncher.lo quickbutton.lo \ - #>- quickaddappsmenu.lo - #>+ 6 diff --git a/x11/kdebase2/patches/patch-bt b/x11/kdebase2/patches/patch-bt deleted file mode 100644 index 48f88971848..00000000000 --- a/x11/kdebase2/patches/patch-bt +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bt,v 1.1 2001/10/15 22:46:03 skrll Exp $ - ---- kicker/extensions/childpanel/Makefile.am.orig Tue Apr 10 22:55:48 2001 -+++ kicker/extensions/childpanel/Makefile.am -@@ -5,7 +5,7 @@ - libchildpanelextension_la_SOURCES = childpanelextension.cpp childpanelextension.skel - libchildpanelextension_la_METASOURCES = AUTO - libchildpanelextension_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -module --libchildpanelextension_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ../../kicker.la -+libchildpanelextension_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ../../libkicker.la - - noinst_HEADERS = childpanelextension.h - diff --git a/x11/kdebase2/patches/patch-bu b/x11/kdebase2/patches/patch-bu deleted file mode 100644 index abaeb6eccbb..00000000000 --- a/x11/kdebase2/patches/patch-bu +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-bu,v 1.2 2001/12/03 15:37:19 skrll Exp $ - ---- kicker/extensions/childpanel/Makefile.in.orig Sat Nov 10 07:58:26 2001 -+++ kicker/extensions/childpanel/Makefile.in -@@ -282,7 +282,7 @@ - libchildpanelextension_la_SOURCES=childpanelextension.cpp childpanelextension_skel.cpp - #>- libchildpanelextension_la_METASOURCES = AUTO - libchildpanelextension_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -module --libchildpanelextension_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ../../kicker.la -+libchildpanelextension_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ../../libkicker.la - - noinst_HEADERS = childpanelextension.h - -@@ -302,7 +302,7 @@ - LIBS = @LIBS@ - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ --libchildpanelextension_la_DEPENDENCIES = ../../kicker.la -+libchildpanelextension_la_DEPENDENCIES = ../../libkicker.la - #>- libchildpanelextension_la_OBJECTS = childpanelextension.lo - #>+ 5 - libchildpanelextension_la_final_OBJECTS = libchildpanelextension_la.all_cpp.lo diff --git a/x11/kdebase2/patches/patch-bv b/x11/kdebase2/patches/patch-bv deleted file mode 100644 index ef4cd80919e..00000000000 --- a/x11/kdebase2/patches/patch-bv +++ /dev/null @@ -1,55 +0,0 @@ -$NetBSD: patch-bv,v 1.1 2001/10/15 22:46:03 skrll Exp $ - ---- kicker/proxy/Makefile.am.orig Fri Oct 27 15:32:54 2000 -+++ kicker/proxy/Makefile.am -@@ -3,24 +3,32 @@ - CLEANFILES = dummy.cpp - - bin_PROGRAMS = appletproxy extensionproxy --lib_LTLIBRARIES = appletproxy.la extensionproxy.la -+lib_LTLIBRARIES = libappletproxy_sl.la appletproxy.la libextensionproxy_sl.la extensionproxy.la -+ -+libappletproxy_sl_la_LIBADD = $(LIB_KDEUI) ../share/libkicker_share.la -+libappletproxy_sl_la_SOURCES = appletproxy.cpp -+libappletproxy_sl_la_METASOURCES = appletproxy.moc -+libappletproxy_sl_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) - - appletproxy_la_LIBADD = $(LIB_KDEUI) ../share/libkicker_share.la --appletproxy_la_SOURCES = appletproxy.cpp --appletproxy_la_METASOURCES = appletproxy.moc -+appletproxy_la_SOURCES = appletproxy_main.cpp - appletproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version - --appletproxy_LDADD = appletproxy.la --appletproxy_SOURCES = dummy.cpp -+appletproxy_LDADD = libappletproxy_sl.la -+appletproxy_SOURCES = appletproxy_main.cpp - appletproxy_LDFLAGS = $(all_libraries) $(KDE_RPATH) - --extensionproxy_la_LIBADD = $(LIB_KDEUI) ../share/libkicker_share.la --extensionproxy_la_SOURCES = extensionproxy.cpp --extensionproxy_la_METASOURCES = extensionproxy.moc -+libextensionproxy_sl_la_LIBADD = $(LIB_KDEUI) ../share/libkicker_share.la -+libextensionproxy_sl_la_SOURCES = extensionproxy.cpp -+libextensionproxy_sl_la_METASOURCES = extensionproxy.moc -+libextensionproxy_sl_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -+ -+extensionproxy_la_LIBADD = libextensionproxy_sl.la -+extensionproxy_la_SOURCES = extensionproxy_main.cpp - extensionproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version - --extensionproxy_LDADD = extensionproxy.la --extensionproxy_SOURCES = dummy.cpp -+extensionproxy_LDADD = libextensionproxy_sl.la -+extensionproxy_SOURCES = extensionproxy_main.cpp - extensionproxy_LDFLAGS = $(all_libraries) $(KDE_RPATH) - - noinst_HEADERS = appletproxy.h extensionproxy.h -@@ -28,7 +36,3 @@ - messages: - $(XGETTEXT) appletproxy.cpp -o $(podir)/appletproxy.pot - $(XGETTEXT) extensionproxy.cpp -o $(podir)/extensionproxy.pot -- --dummy.cpp: -- echo > dummy.cpp -- diff --git a/x11/kdebase2/patches/patch-bw b/x11/kdebase2/patches/patch-bw deleted file mode 100644 index ca7258c1ec4..00000000000 --- a/x11/kdebase2/patches/patch-bw +++ /dev/null @@ -1,301 +0,0 @@ -$NetBSD: patch-bw,v 1.2 2001/12/03 15:37:19 skrll Exp $ - ---- kicker/proxy/Makefile.in.orig Sat Nov 10 07:58:26 2001 -+++ kicker/proxy/Makefile.in -@@ -278,24 +278,32 @@ - CLEANFILES = dummy.cpp - - bin_PROGRAMS = appletproxy extensionproxy --lib_LTLIBRARIES = appletproxy.la extensionproxy.la -+lib_LTLIBRARIES = libappletproxy_sl.la appletproxy.la libextensionproxy_sl.la extensionproxy.la -+ -+libappletproxy_sl_la_LIBADD = $(LIB_KDEUI) ../share/libkicker_share.la -+libappletproxy_sl_la_SOURCES = appletproxy.cpp -+#>- libappletproxy_sl_la_METASOURCES = appletproxy.moc -+libappletproxy_sl_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) - - appletproxy_la_LIBADD = $(LIB_KDEUI) ../share/libkicker_share.la --appletproxy_la_SOURCES = appletproxy.cpp --#>- appletproxy_la_METASOURCES = appletproxy.moc -+appletproxy_la_SOURCES = appletproxy_main.cpp - appletproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version - --appletproxy_LDADD = appletproxy.la --appletproxy_SOURCES = dummy.cpp -+appletproxy_LDADD = libappletproxy_sl.la -+appletproxy_SOURCES = appletproxy_main.cpp - appletproxy_LDFLAGS = $(all_libraries) $(KDE_RPATH) - --extensionproxy_la_LIBADD = $(LIB_KDEUI) ../share/libkicker_share.la --extensionproxy_la_SOURCES = extensionproxy.cpp --#>- extensionproxy_la_METASOURCES = extensionproxy.moc -+libextensionproxy_sl_la_LIBADD = $(LIB_KDEUI) ../share/libkicker_share.la -+libextensionproxy_sl_la_SOURCES = extensionproxy.cpp -+#>- libextensionproxy_sl_la_METASOURCES = extensionproxy.moc -+libextensionproxy_sl_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -+ -+extensionproxy_la_LIBADD = libextensionproxy_sl.la -+extensionproxy_la_SOURCES = extensionproxy_main.cpp - extensionproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version - --extensionproxy_LDADD = extensionproxy.la --extensionproxy_SOURCES = dummy.cpp -+extensionproxy_LDADD = libextensionproxy_sl.la -+extensionproxy_SOURCES = extensionproxy_main.cpp - extensionproxy_LDFLAGS = $(all_libraries) $(KDE_RPATH) - - noinst_HEADERS = appletproxy.h extensionproxy.h -@@ -311,33 +319,41 @@ - LIBS = @LIBS@ - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ --appletproxy_la_DEPENDENCIES = ../share/libkicker_share.la --#>- appletproxy_la_OBJECTS = appletproxy.lo -+libappletproxy_sl_la_DEPENDENCIES = ../share/libkicker_share.la -+#>- libappletproxy_sl_la_OBJECTS = appletproxy.lo - #>+ 5 --appletproxy_la_final_OBJECTS = appletproxy_la.all_cpp.lo --appletproxy_la_nofinal_OBJECTS = appletproxy.lo \ -- appletproxy_la_meta_unload.lo --@KDE_USE_FINAL_FALSE@appletproxy_la_OBJECTS = $(appletproxy_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@appletproxy_la_OBJECTS = $(appletproxy_la_final_OBJECTS) --extensionproxy_la_DEPENDENCIES = ../share/libkicker_share.la --#>- extensionproxy_la_OBJECTS = extensionproxy.lo -+libappletproxy_sl_la_final_OBJECTS = libappletproxy_sl_la.all_cpp.lo -+libappletproxy_sl_la_nofinal_OBJECTS = appletproxy.lo \ -+ libappletproxy_sl_la_meta_unload.lo -+@KDE_USE_FINAL_FALSE@libappletproxy_sl_la_OBJECTS = $(libappletproxy_sl_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libappletproxy_sl_la_OBJECTS = $(libappletproxy_sl_la_final_OBJECTS) -+appletproxy_la_DEPENDENCIES = ../share/libkicker_share.la -+#>- appletproxy_la_OBJECTS = appletproxy_main.lo -+#>+ 1 -+appletproxy_la_OBJECTS = appletproxy_main.lo -+libextensionproxy_sl_la_DEPENDENCIES = ../share/libkicker_share.la -+#>- libextensionproxy_sl_la_OBJECTS = extensionproxy.lo - #>+ 5 --extensionproxy_la_final_OBJECTS = extensionproxy_la.all_cpp.lo --extensionproxy_la_nofinal_OBJECTS = extensionproxy.lo \ -- extensionproxy_la_meta_unload.lo --@KDE_USE_FINAL_FALSE@extensionproxy_la_OBJECTS = $(extensionproxy_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@extensionproxy_la_OBJECTS = $(extensionproxy_la_final_OBJECTS) -+libextensionproxy_sl_la_final_OBJECTS = libextensionproxy_sl_la.all_cpp.lo -+libextensionproxy_sl_la_nofinal_OBJECTS = extensionproxy.lo \ -+ libextensionproxy_sl_la_meta_unload.lo -+@KDE_USE_FINAL_FALSE@libextensionproxy_sl_la_OBJECTS = $(libextensionproxy_sl_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libextensionproxy_sl_la_OBJECTS = $(libextensionproxy_sl_la_final_OBJECTS) -+extensionproxy_la_DEPENDENCIES = libextensionproxy_sl.la -+#>- extensionproxy_la_OBJECTS = extensionproxy_main.lo -+#>+ 1 -+extensionproxy_la_OBJECTS = extensionproxy_main.lo - bin_PROGRAMS = appletproxy$(EXEEXT) extensionproxy$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - --#>- appletproxy_OBJECTS = dummy.$(OBJEXT) -+#>- appletproxy_OBJECTS = appletproxy_main.$(OBJEXT) - #>+ 1 --appletproxy_OBJECTS = dummy.$(OBJEXT) --appletproxy_DEPENDENCIES = appletproxy.la --#>- extensionproxy_OBJECTS = dummy.$(OBJEXT) -+appletproxy_OBJECTS = appletproxy_main.$(OBJEXT) -+appletproxy_DEPENDENCIES = libappletproxy_sl.la -+#>- extensionproxy_OBJECTS = extensionproxy_main.$(OBJEXT) - #>+ 1 --extensionproxy_OBJECTS = dummy.$(OBJEXT) --extensionproxy_DEPENDENCIES = extensionproxy.la -+extensionproxy_OBJECTS = extensionproxy_main.$(OBJEXT) -+extensionproxy_DEPENDENCIES = libextensionproxy_sl.la - CXXFLAGS = @CXXFLAGS@ - #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 1 -@@ -358,8 +374,8 @@ - - TAR = tar - GZIP_ENV = --best --SOURCES = $(appletproxy_la_SOURCES) $(extensionproxy_la_SOURCES) $(appletproxy_SOURCES) $(extensionproxy_SOURCES) --OBJECTS = $(appletproxy_la_OBJECTS) $(extensionproxy_la_OBJECTS) $(appletproxy_OBJECTS) $(extensionproxy_OBJECTS) -+SOURCES = $(libappletproxy_sl_la_SOURCES) $(appletproxy_la_SOURCES) $(libextensionproxy_sl_la_SOURCES) $(extensionproxy_la_SOURCES) $(appletproxy_SOURCES) $(extensionproxy_SOURCES) -+OBJECTS = $(libappletproxy_sl_la_OBJECTS) $(appletproxy_la_OBJECTS) $(libextensionproxy_sl_la_OBJECTS) $(extensionproxy_la_OBJECTS) $(appletproxy_OBJECTS) $(extensionproxy_OBJECTS) - - #>- all: all-redirect - #>+ 1 -@@ -446,9 +462,15 @@ - - maintainer-clean-libtool: - -+libappletproxy_sl.la: $(libappletproxy_sl_la_OBJECTS) $(libappletproxy_sl_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(libdir) $(libappletproxy_sl_la_LDFLAGS) $(libappletproxy_sl_la_OBJECTS) $(libappletproxy_sl_la_LIBADD) $(LIBS) -+ - appletproxy.la: $(appletproxy_la_OBJECTS) $(appletproxy_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(appletproxy_la_LDFLAGS) $(appletproxy_la_OBJECTS) $(appletproxy_la_LIBADD) $(LIBS) - -+libextensionproxy_sl.la: $(libextensionproxy_sl_la_OBJECTS) $(libextensionproxy_sl_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(libdir) $(libextensionproxy_sl_la_LDFLAGS) $(libextensionproxy_sl_la_OBJECTS) $(libextensionproxy_sl_la_LIBADD) $(LIBS) -+ - extensionproxy.la: $(extensionproxy_la_OBJECTS) $(extensionproxy_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(extensionproxy_la_LDFLAGS) $(extensionproxy_la_OBJECTS) $(extensionproxy_la_LIBADD) $(LIBS) - -@@ -626,9 +648,6 @@ - $(XGETTEXT) appletproxy.cpp -o $(podir)/appletproxy.pot - $(XGETTEXT) extensionproxy.cpp -o $(podir)/extensionproxy.pot - --dummy.cpp: -- echo > dummy.cpp -- - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: -@@ -655,41 +674,53 @@ - - - #>+ 12 --appletproxy_la_meta_unload.cpp: appletproxy.moc -- @echo 'creating appletproxy_la_meta_unload.cpp' -- @-rm -f appletproxy_la_meta_unload.cpp -+libappletproxy_sl_la_meta_unload.cpp: appletproxy.moc -+ @echo 'creating libappletproxy_sl_la_meta_unload.cpp' -+ @-rm -f libappletproxy_sl_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_appletproxy_la[] = {' > appletproxy_la_meta_unload.cpp ;\ -- cat appletproxy.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> appletproxy_la_meta_unload.cpp ;\ -- echo '0};' >> appletproxy_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> appletproxy_la_meta_unload.cpp ;\ -- echo '_UNLOAD(appletproxy_la)' >> appletproxy_la_meta_unload.cpp ;\ -- else echo > appletproxy_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libappletproxy_sl_la[] = {' > libappletproxy_sl_la_meta_unload.cpp ;\ -+ cat appletproxy.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libappletproxy_sl_la_meta_unload.cpp ;\ -+ echo '0};' >> libappletproxy_sl_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libappletproxy_sl_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libappletproxy_sl_la)' >> libappletproxy_sl_la_meta_unload.cpp ;\ -+ else echo > libappletproxy_sl_la_meta_unload.cpp; fi - - - #>+ 12 --extensionproxy_la_meta_unload.cpp: extensionproxy.moc -- @echo 'creating extensionproxy_la_meta_unload.cpp' -- @-rm -f extensionproxy_la_meta_unload.cpp -+libextensionproxy_sl_la_meta_unload.cpp: extensionproxy.moc -+ @echo 'creating libextensionproxy_sl_la_meta_unload.cpp' -+ @-rm -f libextensionproxy_sl_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_extensionproxy_la[] = {' > extensionproxy_la_meta_unload.cpp ;\ -- cat extensionproxy.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> extensionproxy_la_meta_unload.cpp ;\ -- echo '0};' >> extensionproxy_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> extensionproxy_la_meta_unload.cpp ;\ -- echo '_UNLOAD(extensionproxy_la)' >> extensionproxy_la_meta_unload.cpp ;\ -- else echo > extensionproxy_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libextensionproxy_sl_la[] = {' > libextensionproxy_sl_la_meta_unload.cpp ;\ -+ cat extensionproxy.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libextensionproxy_sl_la_meta_unload.cpp ;\ -+ echo '0};' >> libextensionproxy_sl_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libextensionproxy_sl_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libextensionproxy_sl_la)' >> libextensionproxy_sl_la_meta_unload.cpp ;\ -+ else echo > libextensionproxy_sl_la_meta_unload.cpp; fi - - - #>+ 3 - clean-moc-classes: -- -rm -f appletproxy_la_meta_unload.cpp extensionproxy_la_meta_unload.cpp -+ -rm -f libappletproxy_sl_la_meta_unload.cpp libextensionproxy_sl_la_meta_unload.cpp -+ -+#>+ 11 -+libappletproxy_sl_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/appletproxy.cpp libappletproxy_sl_la_meta_unload.cpp appletproxy.moc -+ @echo 'creating libappletproxy_sl_la.all_cpp.cpp ...'; \ -+ rm -f libappletproxy_sl_la.all_cpp.files libappletproxy_sl_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libappletproxy_sl_la.all_cpp.final; \ -+ for file in appletproxy.cpp libappletproxy_sl_la_meta_unload.cpp ; do \ -+ echo "#include \"$$file\"" >> libappletproxy_sl_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libappletproxy_sl_la.all_cpp.final; \ -+ done; \ -+ cat libappletproxy_sl_la.all_cpp.final libappletproxy_sl_la.all_cpp.files > libappletproxy_sl_la.all_cpp.cpp; \ -+ rm -f libappletproxy_sl_la.all_cpp.final libappletproxy_sl_la.all_cpp.files - - #>+ 11 --appletproxy_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/appletproxy.cpp appletproxy_la_meta_unload.cpp appletproxy.moc -+appletproxy_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/appletproxy_main.cpp - @echo 'creating appletproxy_la.all_cpp.cpp ...'; \ - rm -f appletproxy_la.all_cpp.files appletproxy_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> appletproxy_la.all_cpp.final; \ -- for file in appletproxy.cpp appletproxy_la_meta_unload.cpp ; do \ -+ for file in appletproxy_main.cpp ; do \ - echo "#include \"$$file\"" >> appletproxy_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> appletproxy_la.all_cpp.final; \ - done; \ -@@ -697,11 +728,23 @@ - rm -f appletproxy_la.all_cpp.final appletproxy_la.all_cpp.files - - #>+ 11 --extensionproxy_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/extensionproxy.cpp extensionproxy_la_meta_unload.cpp extensionproxy.moc -+libextensionproxy_sl_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/extensionproxy.cpp libextensionproxy_sl_la_meta_unload.cpp extensionproxy.moc -+ @echo 'creating libextensionproxy_sl_la.all_cpp.cpp ...'; \ -+ rm -f libextensionproxy_sl_la.all_cpp.files libextensionproxy_sl_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libextensionproxy_sl_la.all_cpp.final; \ -+ for file in extensionproxy.cpp libextensionproxy_sl_la_meta_unload.cpp ; do \ -+ echo "#include \"$$file\"" >> libextensionproxy_sl_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libextensionproxy_sl_la.all_cpp.final; \ -+ done; \ -+ cat libextensionproxy_sl_la.all_cpp.final libextensionproxy_sl_la.all_cpp.files > libextensionproxy_sl_la.all_cpp.cpp; \ -+ rm -f libextensionproxy_sl_la.all_cpp.final libextensionproxy_sl_la.all_cpp.files -+ -+#>+ 11 -+extensionproxy_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/extensionproxy_main.cpp - @echo 'creating extensionproxy_la.all_cpp.cpp ...'; \ - rm -f extensionproxy_la.all_cpp.files extensionproxy_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> extensionproxy_la.all_cpp.final; \ -- for file in extensionproxy.cpp extensionproxy_la_meta_unload.cpp ; do \ -+ for file in extensionproxy_main.cpp ; do \ - echo "#include \"$$file\"" >> extensionproxy_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> extensionproxy_la.all_cpp.final; \ - done; \ -@@ -709,11 +752,11 @@ - rm -f extensionproxy_la.all_cpp.final extensionproxy_la.all_cpp.files - - #>+ 11 --appletproxy.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+appletproxy.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/appletproxy_main.cpp - @echo 'creating appletproxy.all_cpp.cpp ...'; \ - rm -f appletproxy.all_cpp.files appletproxy.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> appletproxy.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in appletproxy_main.cpp ; do \ - echo "#include \"$$file\"" >> appletproxy.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> appletproxy.all_cpp.final; \ - done; \ -@@ -721,11 +764,11 @@ - rm -f appletproxy.all_cpp.final appletproxy.all_cpp.files - - #>+ 11 --extensionproxy.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+extensionproxy.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/extensionproxy_main.cpp - @echo 'creating extensionproxy.all_cpp.cpp ...'; \ - rm -f extensionproxy.all_cpp.files extensionproxy.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> extensionproxy.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in extensionproxy_main.cpp ; do \ - echo "#include \"$$file\"" >> extensionproxy.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> extensionproxy.all_cpp.final; \ - done; \ -@@ -734,20 +777,20 @@ - - #>+ 3 - clean-final: -- -rm -f appletproxy_la.all_cpp.cpp extensionproxy_la.all_cpp.cpp appletproxy.all_cpp.cpp extensionproxy.all_cpp.cpp -+ -rm -f libappletproxy_sl_la.all_cpp.cpp appletproxy_la.all_cpp.cpp libextensionproxy_sl_la.all_cpp.cpp extensionproxy_la.all_cpp.cpp appletproxy.all_cpp.cpp extensionproxy.all_cpp.cpp - - #>+ 2 - final: -- $(MAKE) appletproxy_la_OBJECTS="$(appletproxy_la_final_OBJECTS)" extensionproxy_la_OBJECTS="$(extensionproxy_la_final_OBJECTS)" all-am -+ $(MAKE) libappletproxy_sl_la_OBJECTS="$(libappletproxy_sl_la_final_OBJECTS)" libextensionproxy_sl_la_OBJECTS="$(libextensionproxy_sl_la_final_OBJECTS)" all-am - #>+ 2 - final-install: -- $(MAKE) appletproxy_la_OBJECTS="$(appletproxy_la_final_OBJECTS)" extensionproxy_la_OBJECTS="$(extensionproxy_la_final_OBJECTS)" install-am -+ $(MAKE) libappletproxy_sl_la_OBJECTS="$(libappletproxy_sl_la_final_OBJECTS)" libextensionproxy_sl_la_OBJECTS="$(libextensionproxy_sl_la_final_OBJECTS)" install-am - #>+ 2 - no-final: -- $(MAKE) appletproxy_la_OBJECTS="$(appletproxy_la_nofinal_OBJECTS)" extensionproxy_la_OBJECTS="$(extensionproxy_la_nofinal_OBJECTS)" all-am -+ $(MAKE) libappletproxy_sl_la_OBJECTS="$(libappletproxy_sl_la_nofinal_OBJECTS)" libextensionproxy_sl_la_OBJECTS="$(libextensionproxy_sl_la_nofinal_OBJECTS)" all-am - #>+ 2 - no-final-install: -- $(MAKE) appletproxy_la_OBJECTS="$(appletproxy_la_nofinal_OBJECTS)" extensionproxy_la_OBJECTS="$(extensionproxy_la_nofinal_OBJECTS)" install-am -+ $(MAKE) libappletproxy_sl_la_OBJECTS="$(libappletproxy_sl_la_nofinal_OBJECTS)" libextensionproxy_sl_la_OBJECTS="$(libextensionproxy_sl_la_nofinal_OBJECTS)" install-am - #>+ 3 - cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase2/patches/patch-bx b/x11/kdebase2/patches/patch-bx deleted file mode 100644 index 1e9e71fcda6..00000000000 --- a/x11/kdebase2/patches/patch-bx +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bx,v 1.1 2001/10/15 22:46:03 skrll Exp $ - ---- kicker/proxy/appletproxy.cpp.orig Tue Feb 6 18:32:06 2001 -+++ kicker/proxy/appletproxy.cpp -@@ -55,7 +55,7 @@ - { 0, 0, 0} - }; - --int main( int argc, char ** argv ) -+int appletproxy_main( int argc, char ** argv ) - { - KAboutData aboutData( "appletproxy", I18N_NOOP("Panel applet proxy.") - , "v0.1.0" diff --git a/x11/kdebase2/patches/patch-by b/x11/kdebase2/patches/patch-by deleted file mode 100644 index 54504c52f72..00000000000 --- a/x11/kdebase2/patches/patch-by +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-by,v 1.1 2001/10/15 22:46:04 skrll Exp $ - ---- kicker/proxy/appletproxy_main.cpp.orig Tue Oct 2 17:50:33 2001 -+++ 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 int appletproxy_main(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return appletproxy_main(argc, argv); -+} diff --git a/x11/kdebase2/patches/patch-bz b/x11/kdebase2/patches/patch-bz deleted file mode 100644 index 1e8a3896c23..00000000000 --- a/x11/kdebase2/patches/patch-bz +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bz,v 1.1 2001/10/15 22:46:04 skrll Exp $ - ---- kicker/proxy/extensionproxy.cpp.orig Tue Feb 6 18:32:06 2001 -+++ kicker/proxy/extensionproxy.cpp -@@ -54,7 +54,7 @@ - { 0, 0, 0} - }; - --int main( int argc, char ** argv ) -+int extensionproxy_main( int argc, char ** argv ) - { - KAboutData aboutData( "extensionproxy", I18N_NOOP("Panel extension proxy.") - , "v0.1.0" diff --git a/x11/kdebase2/patches/patch-ca b/x11/kdebase2/patches/patch-ca deleted file mode 100644 index 0402ae65f00..00000000000 --- a/x11/kdebase2/patches/patch-ca +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-ca,v 1.1 2001/10/15 22:46:04 skrll Exp $ - ---- kicker/proxy/extensionproxy_main.cpp.orig Tue Oct 2 17:50:33 2001 -+++ 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 int extensionproxy_main(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return extensionproxy_main(argc, argv); -+} diff --git a/x11/kdebase2/patches/patch-cb b/x11/kdebase2/patches/patch-cb deleted file mode 100644 index d965917733e..00000000000 --- a/x11/kdebase2/patches/patch-cb +++ /dev/null @@ -1,100 +0,0 @@ -$NetBSD: patch-cb,v 1.1 2001/10/15 22:46:04 skrll Exp $ - ---- kicker/share/pluginmgr.cpp.orig Mon Apr 9 12:04:06 2001 -+++ kicker/share/pluginmgr.cpp -@@ -51,27 +51,28 @@ - - if(!dlregistered){ - dlregistered = true; -- lt_dlinit(); -+ loader = KLibLoader::self(); - } - -- lt_dlhandle handle = lt_dlopen(QFile::encodeName(libStr)); -+ KLibrary* handle = loader->library(QFile::encodeName(libStr)); -+ - if(!handle){ -- kdWarning() << "cannot open applet: " << libStr << " because of " << lt_dlerror() << endl; -+ kdWarning() << "cannot open applet: " << libStr << " because of " << loader->lastErrorMessage() << endl; - return(NULL); - } - -- lt_ptr_t init_func = lt_dlsym(handle, "init"); -+ void* init_func = handle->symbol(QString("init").utf8()); - if(!init_func){ - kdWarning() << libStr << " is not a kicker applet!" << endl; -- lt_dlclose(handle); -+ loader->unloadLibrary(QFile::encodeName(libStr)); - return(NULL); - } - - KPanelApplet* (*init_ptr)(QWidget *, const QString&); - init_ptr = (KPanelApplet* (*)(QWidget *, const QString&))init_func; - KPanelApplet *w = init_ptr(parent, configFile); -- lt_dlhandle *tmp = new lt_dlhandle; -- *tmp = handle; -+ QString* tmp = new QString; -+ *tmp = libStr; - handleDict.insert((long)w, tmp); - return(w); - } -@@ -96,48 +97,42 @@ - - if(!dlregistered){ - dlregistered = true; -- lt_dlinit(); -+ loader = KLibLoader::self(); - } - -- lt_dlhandle handle = lt_dlopen(QFile::encodeName(libStr)); -+ KLibrary* handle = loader->library(QFile::encodeName(libStr)); - if(!handle){ -- kdWarning() << "cannot open extension: " << libStr << " because of " << lt_dlerror() << endl; -+ kdWarning() << "cannot open extension: " << libStr << " because of " << loader->lastErrorMessage() << endl; - return(NULL); - } - -- lt_ptr_t init_func = lt_dlsym(handle, "init"); -+ void* init_func = handle->symbol(QString("init").utf8()); - if(!init_func){ - kdWarning() << libStr << " is not a kicker extension!" << endl; -- lt_dlclose(handle); -+ loader->unloadLibrary(QFile::encodeName(libStr)); - return(NULL); - } - - KPanelExtension* (*init_ptr)(QWidget *, const QString&); - init_ptr = (KPanelExtension* (*)(QWidget *, const QString&))init_func; - KPanelExtension *w = init_ptr(parent, configFile); -- lt_dlhandle *tmp = new lt_dlhandle; -- *tmp = handle; -+ QString* tmp = new QString; -+ *tmp = libStr; - handleDict.insert((long)w, tmp); - return(w); - } - - bool KickerPluginManager::removePlugin(QWidget *w) - { -- lt_dlhandle *handle = handleDict.find((long)w); -+ QString* handle = handleDict.find((long)w); - if(!handle){ - kdWarning() << "Cannot find handle to remove plugin!" << endl; - return(false); - } - handleDict.remove((long)w); - delete w; -- if(!lt_dlclose(*handle)){ -- kdWarning() << "Unable to unload plugin!" << endl; -- return(false); -- } -+ loader->unloadLibrary(QFile::encodeName(*handle)); -+ // kdWarning() << "Unable to unload plugin!" << endl; -+ // return(false); - return(true); - } -- -- -- -- -- diff --git a/x11/kdebase2/patches/patch-cc b/x11/kdebase2/patches/patch-cc deleted file mode 100644 index 4799d2419d3..00000000000 --- a/x11/kdebase2/patches/patch-cc +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-cc,v 1.1 2001/10/15 22:46:04 skrll Exp $ - ---- kicker/share/pluginmgr.h.orig Wed Sep 5 00:16:12 2001 -+++ kicker/share/pluginmgr.h -@@ -26,8 +26,8 @@ - - #include <qstring.h> - #include <qintdict.h> --#define LT_NON_POSIX_NAMESPACE // Make sure lt_ptr_t is defined --#include <ltdl.h> -+ -+#include <klibloader.h> - - class KPanelApplet; - class KPanelExtension; -@@ -43,7 +43,8 @@ - bool removePlugin(QWidget *plugin); - - protected: -- QIntDict<lt_dlhandle> handleDict; -+ QIntDict<QString> handleDict; -+ KLibLoader* loader; - }; - - #endif diff --git a/x11/kdebase2/patches/patch-cd b/x11/kdebase2/patches/patch-cd deleted file mode 100644 index 7e7bf593257..00000000000 --- a/x11/kdebase2/patches/patch-cd +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-cd,v 1.1 2001/10/15 22:46:04 skrll Exp $ - ---- kioslave/info/kde-info2html.conf.orig Wed Aug 2 11:07:17 2000 -+++ kioslave/info/kde-info2html.conf -@@ -22,6 +22,7 @@ - "/usr/share/info", - "/usr/lib/info", - # "/usr/lib/teTeX/info", -+ "@LOCALBASE@/info", - "/usr/local/info", - "/usr/local/lib/info", - "/usr/X11R6/info", diff --git a/x11/kdebase2/patches/patch-ce b/x11/kdebase2/patches/patch-ce deleted file mode 100644 index 554cb28783e..00000000000 --- a/x11/kdebase2/patches/patch-ce +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-ce,v 1.1 2001/10/15 22:46:04 skrll Exp $ - ---- klipper/Makefile.am.orig Wed Sep 5 00:16:17 2001 -+++ klipper/Makefile.am -@@ -1,18 +1,19 @@ - INCLUDES= $(all_includes) - - bin_PROGRAMS = klipper --lib_LTLIBRARIES = klipper.la -+lib_LTLIBRARIES = libklipper_main.la klipper.la - --CLEANFILES = dummy.cpp -- --klipper_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) --klipper_la_SOURCES = main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp -+libklipper_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) -+libklipper_main_la_SOURCES = main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp -+libklipper_main_la_LDFLAGS = $(all_libraries) -module -avoid-version - -+klipper_la_LIBADD = libklipper_main.la -+klipper_la_SOURCES = klipper_main.cpp - klipper_la_METASOURCES = AUTO - klipper_la_LDFLAGS = $(all_libraries) -module -avoid-version - --klipper_LDADD = klipper.la $(LIB_KSYCOCA) --klipper_SOURCES = dummy.cpp -+klipper_LDADD = libklipper_main.la $(LIB_KSYCOCA) -+klipper_SOURCES = klipper_main.cpp - klipper_LDFLAGS = $(all_libraries) $(KDE_RPATH) - - -@@ -30,9 +31,6 @@ - - messages: - $(XGETTEXT) $(klipper_la_SOURCES) klipperbindings.cpp -o $(podir)/klipper.pot -- --dummy.cpp: -- echo > dummy.cpp - - # update script: - updatedir = $(kde_datadir)/kconf_update diff --git a/x11/kdebase2/patches/patch-cf b/x11/kdebase2/patches/patch-cf deleted file mode 100644 index b2fff189dbc..00000000000 --- a/x11/kdebase2/patches/patch-cf +++ /dev/null @@ -1,210 +0,0 @@ -$NetBSD: patch-cf,v 1.3 2001/12/03 15:37:19 skrll Exp $ - ---- klipper/Makefile.in.orig Sat Nov 10 07:58:28 2001 -+++ klipper/Makefile.in -@@ -275,18 +275,19 @@ - INCLUDES = $(all_includes) - - bin_PROGRAMS = klipper --lib_LTLIBRARIES = klipper.la -+lib_LTLIBRARIES = libklipper_main.la klipper.la - --CLEANFILES = dummy.cpp -- --klipper_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) --klipper_la_SOURCES = main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp -+libklipper_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) -+libklipper_main_la_SOURCES = main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp -+libklipper_main_la_LDFLAGS = $(all_libraries) -module -avoid-version - -+klipper_la_LIBADD = libklipper_main.la -+klipper_la_SOURCES = klipper_main.cpp - #>- klipper_la_METASOURCES = AUTO - klipper_la_LDFLAGS = $(all_libraries) -module -avoid-version - --klipper_LDADD = klipper.la $(LIB_KSYCOCA) --klipper_SOURCES = dummy.cpp -+klipper_LDADD = libklipper_main.la $(LIB_KSYCOCA) -+klipper_SOURCES = klipper_main.cpp - klipper_LDFLAGS = $(all_libraries) $(KDE_RPATH) - - appsdir = $(kde_appsdir)/Utilities -@@ -316,21 +317,27 @@ - LIBS = @LIBS@ - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ --klipper_la_DEPENDENCIES = --#>- klipper_la_OBJECTS = main.lo toplevel.lo urlgrabber.lo configdialog.lo --#>+ 5 --klipper_la_final_OBJECTS = klipper_la.all_cpp.lo --klipper_la_nofinal_OBJECTS = main.lo toplevel.lo urlgrabber.lo configdialog.lo \ -- klipper_la_meta_unload.lo --@KDE_USE_FINAL_FALSE@klipper_la_OBJECTS = $(klipper_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@klipper_la_OBJECTS = $(klipper_la_final_OBJECTS) -+libklipper_main_la_DEPENDENCIES = -+#>- libklipper_main_la_OBJECTS = main.lo toplevel.lo urlgrabber.lo \ -+#>- configdialog.lo -+#>+ 6 -+libklipper_main_la_final_OBJECTS = libklipper_main_la.all_cpp.lo -+libklipper_main_la_nofinal_OBJECTS = main.lo toplevel.lo urlgrabber.lo \ -+ configdialog.lo \ -+ libklipper_main_la_meta_unload.lo -+@KDE_USE_FINAL_FALSE@libklipper_main_la_OBJECTS = $(libklipper_main_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libklipper_main_la_OBJECTS = $(libklipper_main_la_final_OBJECTS) -+klipper_la_DEPENDENCIES = libklipper_main.la -+#>- klipper_la_OBJECTS = klipper_main.lo -+#>+ 1 -+klipper_la_OBJECTS = klipper_main.lo - bin_PROGRAMS = klipper$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - --#>- klipper_OBJECTS = dummy.$(OBJEXT) -+#>- klipper_OBJECTS = klipper_main.$(OBJEXT) - #>+ 1 --klipper_OBJECTS = dummy.$(OBJEXT) --klipper_DEPENDENCIES = klipper.la -+klipper_OBJECTS = klipper_main.$(OBJEXT) -+klipper_DEPENDENCIES = libklipper_main.la - CXXFLAGS = @CXXFLAGS@ - #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 1 -@@ -349,15 +356,15 @@ - - #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=klipperrc hi16-app-klipper.png hi32-app-klipper.png klipper-1-2.pl klipperrc.upd klipperbindings.cpp urlgrabber.h toplevel.h klipper.desktop hi48-app-klipper.png configdialog.h -+KDE_DIST=klipperrc hi48-app-klipper.png toplevel.h hi16-app-klipper.png hi32-app-klipper.png klipperbindings.cpp configdialog.h klipper-1-2.pl klipper.desktop klipperrc.upd urlgrabber.h - - DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - - - TAR = tar - GZIP_ENV = --best --SOURCES = $(klipper_la_SOURCES) $(klipper_SOURCES) --OBJECTS = $(klipper_la_OBJECTS) $(klipper_OBJECTS) -+SOURCES = $(libklipper_main_la_SOURCES) $(klipper_la_SOURCES) $(klipper_SOURCES) -+OBJECTS = $(libklipper_main_la_OBJECTS) $(klipper_la_OBJECTS) $(klipper_OBJECTS) - - #>- all: all-redirect - #>+ 1 -@@ -444,6 +451,9 @@ - - maintainer-clean-libtool: - -+libklipper_main.la: $(libklipper_main_la_OBJECTS) $(libklipper_main_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(libdir) $(libklipper_main_la_LDFLAGS) $(libklipper_main_la_OBJECTS) $(libklipper_main_la_LIBADD) $(LIBS) -+ - klipper.la: $(klipper_la_OBJECTS) $(klipper_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(klipper_la_LDFLAGS) $(klipper_la_OBJECTS) $(klipper_la_LIBADD) $(LIBS) - -@@ -644,7 +654,6 @@ - mostlyclean-generic: - - clean-generic: -- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) -@@ -706,9 +715,6 @@ - messages: - $(XGETTEXT) $(klipper_la_SOURCES) klipperbindings.cpp -o $(podir)/klipper.pot - --dummy.cpp: -- echo > dummy.cpp -- - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: -@@ -753,28 +759,40 @@ - - - #>+ 12 --klipper_la_meta_unload.cpp: urlgrabber.moc toplevel.moc configdialog.moc -- @echo 'creating klipper_la_meta_unload.cpp' -- @-rm -f klipper_la_meta_unload.cpp -+libklipper_main_la_meta_unload.cpp: urlgrabber.moc toplevel.moc configdialog.moc -+ @echo 'creating libklipper_main_la_meta_unload.cpp' -+ @-rm -f libklipper_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_klipper_la[] = {' > klipper_la_meta_unload.cpp ;\ -- cat urlgrabber.moc toplevel.moc configdialog.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> klipper_la_meta_unload.cpp ;\ -- echo '0};' >> klipper_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> klipper_la_meta_unload.cpp ;\ -- echo '_UNLOAD(klipper_la)' >> klipper_la_meta_unload.cpp ;\ -- else echo > klipper_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libklipper_main_la[] = {' > libklipper_main_la_meta_unload.cpp ;\ -+ cat urlgrabber.moc toplevel.moc configdialog.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libklipper_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libklipper_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libklipper_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libklipper_main_la)' >> libklipper_main_la_meta_unload.cpp ;\ -+ else echo > libklipper_main_la_meta_unload.cpp; fi - - - #>+ 3 - clean-moc-classes: -- -rm -f klipper_la_meta_unload.cpp -+ -rm -f libklipper_main_la_meta_unload.cpp -+ -+#>+ 11 -+libklipper_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp libklipper_main_la_meta_unload.cpp -+ @echo 'creating libklipper_main_la.all_cpp.cpp ...'; \ -+ rm -f libklipper_main_la.all_cpp.files libklipper_main_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libklipper_main_la.all_cpp.final; \ -+ for file in main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp libklipper_main_la_meta_unload.cpp ; do \ -+ echo "#include \"$$file\"" >> libklipper_main_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libklipper_main_la.all_cpp.final; \ -+ done; \ -+ cat libklipper_main_la.all_cpp.final libklipper_main_la.all_cpp.files > libklipper_main_la.all_cpp.cpp; \ -+ rm -f libklipper_main_la.all_cpp.final libklipper_main_la.all_cpp.files - - #>+ 11 --klipper_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp klipper_la_meta_unload.cpp urlgrabber.moc toplevel.moc configdialog.moc -+klipper_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klipper_main.cpp urlgrabber.moc toplevel.moc configdialog.moc - @echo 'creating klipper_la.all_cpp.cpp ...'; \ - rm -f klipper_la.all_cpp.files klipper_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> klipper_la.all_cpp.final; \ -- for file in main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp klipper_la_meta_unload.cpp ; do \ -+ for file in klipper_main.cpp ; do \ - echo "#include \"$$file\"" >> klipper_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klipper_la.all_cpp.final; \ - done; \ -@@ -782,11 +800,11 @@ - rm -f klipper_la.all_cpp.final klipper_la.all_cpp.files - - #>+ 11 --klipper.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+klipper.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klipper_main.cpp - @echo 'creating klipper.all_cpp.cpp ...'; \ - rm -f klipper.all_cpp.files klipper.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> klipper.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in klipper_main.cpp ; do \ - echo "#include \"$$file\"" >> klipper.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klipper.all_cpp.final; \ - done; \ -@@ -795,20 +813,20 @@ - - #>+ 3 - clean-final: -- -rm -f klipper_la.all_cpp.cpp klipper.all_cpp.cpp -+ -rm -f libklipper_main_la.all_cpp.cpp klipper_la.all_cpp.cpp klipper.all_cpp.cpp - - #>+ 2 - final: -- $(MAKE) klipper_la_OBJECTS="$(klipper_la_final_OBJECTS)" all-am -+ $(MAKE) libklipper_main_la_OBJECTS="$(libklipper_main_la_final_OBJECTS)" all-am - #>+ 2 - final-install: -- $(MAKE) klipper_la_OBJECTS="$(klipper_la_final_OBJECTS)" install-am -+ $(MAKE) libklipper_main_la_OBJECTS="$(libklipper_main_la_final_OBJECTS)" install-am - #>+ 2 - no-final: -- $(MAKE) klipper_la_OBJECTS="$(klipper_la_nofinal_OBJECTS)" all-am -+ $(MAKE) libklipper_main_la_OBJECTS="$(libklipper_main_la_nofinal_OBJECTS)" all-am - #>+ 2 - no-final-install: -- $(MAKE) klipper_la_OBJECTS="$(klipper_la_nofinal_OBJECTS)" install-am -+ $(MAKE) libklipper_main_la_OBJECTS="$(libklipper_main_la_nofinal_OBJECTS)" install-am - #>+ 3 - cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase2/patches/patch-cg b/x11/kdebase2/patches/patch-cg deleted file mode 100644 index a833abcee4b..00000000000 --- a/x11/kdebase2/patches/patch-cg +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-cg,v 1.1 2001/10/15 22:46:04 skrll Exp $ - ---- klipper/klipper_main.cpp.orig Tue Oct 2 17:50:34 2001 -+++ 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 int klipper_main(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return klipper_main(argc, argv); -+} diff --git a/x11/kdebase2/patches/patch-ch b/x11/kdebase2/patches/patch-ch deleted file mode 100644 index 063955a1a59..00000000000 --- a/x11/kdebase2/patches/patch-ch +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ch,v 1.1 2001/10/15 22:46:05 skrll Exp $ - ---- klipper/main.cpp.orig Fri Sep 7 20:23:58 2001 -+++ klipper/main.cpp -@@ -25,7 +25,7 @@ - - static const char *version = "v0.9.1"; - --int main(int argc, char *argv[]) -+int klipper_main(int argc, char *argv[]) - { - KAboutData aboutData("klipper", I18N_NOOP("Klipper"), - version, description, KAboutData::License_Artistic, diff --git a/x11/kdebase2/patches/patch-ci b/x11/kdebase2/patches/patch-ci deleted file mode 100644 index de193e3e1e5..00000000000 --- a/x11/kdebase2/patches/patch-ci +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-ci,v 1.1 2001/10/15 22:46:05 skrll Exp $ - ---- kmenuedit/Makefile.am.orig Thu Jun 7 15:26:30 2001 -+++ kmenuedit/Makefile.am -@@ -1,17 +1,18 @@ - INCLUDES = $(all_includes) - - bin_PROGRAMS = kmenuedit --lib_LTLIBRARIES = kmenuedit.la -+lib_LTLIBRARIES = libkmenuedit_main.la kmenuedit.la - --CLEANFILES = dummy.cpp -+libkmenuedit_main_la_SOURCES = namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp -+libkmenuedit_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE) -+libkmenuedit_main_la_LDFLAGS = $(all_libraries) - --kmenuedit_la_SOURCES = namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp -- --kmenuedit_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE) -+kmenuedit_la_SOURCES = kmenuedit_main.cpp -+kmenuedit_la_LIBADD = libkmenuedit_main.la - kmenuedit_la_LDFLAGS = $(all_libraries) -module -avoid-version - --kmenuedit_SOURCES = dummy.cpp --kmenuedit_LDADD = kmenuedit.la -+kmenuedit_SOURCES = kmenuedit_main.cpp -+kmenuedit_LDADD = libkmenuedit_main.la - kmenuedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) - - noinst_HEADERS = kmenuedit.h menueditview.h treeview.h desktopfileeditor.h basictab.h namedlg.h khotkeys.h diff --git a/x11/kdebase2/patches/patch-cj b/x11/kdebase2/patches/patch-cj deleted file mode 100644 index 104fcf2bc2c..00000000000 --- a/x11/kdebase2/patches/patch-cj +++ /dev/null @@ -1,198 +0,0 @@ -$NetBSD: patch-cj,v 1.2 2001/12/03 15:37:19 skrll Exp $ - ---- kmenuedit/Makefile.in.orig Sat Nov 10 07:58:28 2001 -+++ kmenuedit/Makefile.in -@@ -276,17 +276,18 @@ - INCLUDES = $(all_includes) - - bin_PROGRAMS = kmenuedit --lib_LTLIBRARIES = kmenuedit.la -+lib_LTLIBRARIES = libkmenuedit_main.la kmenuedit.la - --CLEANFILES = dummy.cpp -+libkmenuedit_main_la_SOURCES = namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp -+libkmenuedit_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE) -+libkmenuedit_main_la_LDFLAGS = $(all_libraries) - --kmenuedit_la_SOURCES = namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp -- --kmenuedit_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE) -+kmenuedit_la_SOURCES = kmenuedit_main.cpp -+kmenuedit_la_LIBADD = libkmenuedit_main.la - kmenuedit_la_LDFLAGS = $(all_libraries) -module -avoid-version - --kmenuedit_SOURCES = dummy.cpp --kmenuedit_LDADD = kmenuedit.la -+kmenuedit_SOURCES = kmenuedit_main.cpp -+kmenuedit_LDADD = libkmenuedit_main.la - kmenuedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) - - noinst_HEADERS = kmenuedit.h menueditview.h treeview.h desktopfileeditor.h basictab.h namedlg.h khotkeys.h -@@ -316,23 +317,27 @@ - LIBS = @LIBS@ - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ --kmenuedit_la_DEPENDENCIES = --#>- kmenuedit_la_OBJECTS = namedlg.lo basictab.lo treeview.lo \ -+libkmenuedit_main_la_DEPENDENCIES = -+#>- libkmenuedit_main_la_OBJECTS = namedlg.lo basictab.lo treeview.lo \ - #>- desktopfileeditor.lo menueditview.lo kmenuedit.lo main.lo khotkeys.lo - #>+ 6 --kmenuedit_la_final_OBJECTS = kmenuedit_la.all_cpp.lo --kmenuedit_la_nofinal_OBJECTS = namedlg.lo basictab.lo treeview.lo \ -+libkmenuedit_main_la_final_OBJECTS = libkmenuedit_main_la.all_cpp.lo -+libkmenuedit_main_la_nofinal_OBJECTS = namedlg.lo basictab.lo treeview.lo \ - desktopfileeditor.lo menueditview.lo kmenuedit.lo main.lo khotkeys.lo \ -- kmenuedit_la_meta_unload.lo --@KDE_USE_FINAL_FALSE@kmenuedit_la_OBJECTS = $(kmenuedit_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@kmenuedit_la_OBJECTS = $(kmenuedit_la_final_OBJECTS) -+ libkmenuedit_main_la_meta_unload.lo -+@KDE_USE_FINAL_FALSE@libkmenuedit_main_la_OBJECTS = $(libkmenuedit_main_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libkmenuedit_main_la_OBJECTS = $(libkmenuedit_main_la_final_OBJECTS) -+kmenuedit_la_DEPENDENCIES = libkmenuedit_main.la -+#>- kmenuedit_la_OBJECTS = kmenuedit_main.lo -+#>+ 1 -+kmenuedit_la_OBJECTS = kmenuedit_main.lo - bin_PROGRAMS = kmenuedit$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - --#>- kmenuedit_OBJECTS = dummy.$(OBJEXT) -+#>- kmenuedit_OBJECTS = kmenuedit_main.$(OBJEXT) - #>+ 1 --kmenuedit_OBJECTS = dummy.$(OBJEXT) --kmenuedit_DEPENDENCIES = kmenuedit.la -+kmenuedit_OBJECTS = kmenuedit_main.$(OBJEXT) -+kmenuedit_DEPENDENCIES = libkmenuedit_main.la - CXXFLAGS = @CXXFLAGS@ - #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 1 -@@ -353,15 +358,15 @@ - - #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=kmenueditui.rc hi32-app-kmenuedit.png hi16-app-kmenuedit.png kmenuedit.desktop hi48-app-kmenuedit.png -+KDE_DIST=hi32-app-kmenuedit.png kmenuedit.desktop hi16-app-kmenuedit.png hi48-app-kmenuedit.png kmenueditui.rc - - DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - - - TAR = tar - GZIP_ENV = --best --SOURCES = $(kmenuedit_la_SOURCES) $(kmenuedit_SOURCES) --OBJECTS = $(kmenuedit_la_OBJECTS) $(kmenuedit_OBJECTS) -+SOURCES = $(libkmenuedit_main_la_SOURCES) $(kmenuedit_la_SOURCES) $(kmenuedit_SOURCES) -+OBJECTS = $(libkmenuedit_main_la_OBJECTS) $(kmenuedit_la_OBJECTS) $(kmenuedit_OBJECTS) - - #>- all: all-redirect - #>+ 1 -@@ -448,6 +453,9 @@ - - maintainer-clean-libtool: - -+libkmenuedit_main.la: $(libkmenuedit_main_la_OBJECTS) $(libkmenuedit_main_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(libdir) $(libkmenuedit_main_la_LDFLAGS) $(libkmenuedit_main_la_OBJECTS) $(libkmenuedit_main_la_LIBADD) $(LIBS) -+ - kmenuedit.la: $(kmenuedit_la_OBJECTS) $(kmenuedit_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(kmenuedit_la_LDFLAGS) $(kmenuedit_la_OBJECTS) $(kmenuedit_la_LIBADD) $(LIBS) - -@@ -676,7 +684,6 @@ - mostlyclean-generic: - - clean-generic: -- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) -@@ -797,28 +804,40 @@ - - - #>+ 12 --kmenuedit_la_meta_unload.cpp: basictab.moc treeview.moc desktopfileeditor.moc menueditview.moc kmenuedit.moc -- @echo 'creating kmenuedit_la_meta_unload.cpp' -- @-rm -f kmenuedit_la_meta_unload.cpp -+libkmenuedit_main_la_meta_unload.cpp: basictab.moc treeview.moc desktopfileeditor.moc menueditview.moc kmenuedit.moc -+ @echo 'creating libkmenuedit_main_la_meta_unload.cpp' -+ @-rm -f libkmenuedit_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kmenuedit_la[] = {' > kmenuedit_la_meta_unload.cpp ;\ -- cat basictab.moc treeview.moc desktopfileeditor.moc menueditview.moc kmenuedit.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kmenuedit_la_meta_unload.cpp ;\ -- echo '0};' >> kmenuedit_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kmenuedit_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kmenuedit_la)' >> kmenuedit_la_meta_unload.cpp ;\ -- else echo > kmenuedit_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkmenuedit_main_la[] = {' > libkmenuedit_main_la_meta_unload.cpp ;\ -+ cat basictab.moc treeview.moc desktopfileeditor.moc menueditview.moc kmenuedit.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkmenuedit_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkmenuedit_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkmenuedit_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkmenuedit_main_la)' >> libkmenuedit_main_la_meta_unload.cpp ;\ -+ else echo > libkmenuedit_main_la_meta_unload.cpp; fi - - - #>+ 3 - clean-moc-classes: -- -rm -f kmenuedit_la_meta_unload.cpp -+ -rm -f libkmenuedit_main_la_meta_unload.cpp -+ -+#>+ 11 -+libkmenuedit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/namedlg.cpp $(srcdir)/basictab.cpp $(srcdir)/treeview.cpp $(srcdir)/desktopfileeditor.cpp $(srcdir)/menueditview.cpp $(srcdir)/kmenuedit.cpp $(srcdir)/main.cpp $(srcdir)/khotkeys.cpp libkmenuedit_main_la_meta_unload.cpp basictab.moc treeview.moc menueditview.moc desktopfileeditor.moc kmenuedit.moc -+ @echo 'creating libkmenuedit_main_la.all_cpp.cpp ...'; \ -+ rm -f libkmenuedit_main_la.all_cpp.files libkmenuedit_main_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkmenuedit_main_la.all_cpp.final; \ -+ for file in namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp libkmenuedit_main_la_meta_unload.cpp ; do \ -+ echo "#include \"$$file\"" >> libkmenuedit_main_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkmenuedit_main_la.all_cpp.final; \ -+ done; \ -+ cat libkmenuedit_main_la.all_cpp.final libkmenuedit_main_la.all_cpp.files > libkmenuedit_main_la.all_cpp.cpp; \ -+ rm -f libkmenuedit_main_la.all_cpp.final libkmenuedit_main_la.all_cpp.files - - #>+ 11 --kmenuedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/namedlg.cpp $(srcdir)/basictab.cpp $(srcdir)/treeview.cpp $(srcdir)/desktopfileeditor.cpp $(srcdir)/menueditview.cpp $(srcdir)/kmenuedit.cpp $(srcdir)/main.cpp $(srcdir)/khotkeys.cpp kmenuedit_la_meta_unload.cpp basictab.moc treeview.moc menueditview.moc desktopfileeditor.moc kmenuedit.moc -+kmenuedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmenuedit_main.cpp - @echo 'creating kmenuedit_la.all_cpp.cpp ...'; \ - rm -f kmenuedit_la.all_cpp.files kmenuedit_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kmenuedit_la.all_cpp.final; \ -- for file in namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp kmenuedit_la_meta_unload.cpp ; do \ -+ for file in kmenuedit_main.cpp ; do \ - echo "#include \"$$file\"" >> kmenuedit_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmenuedit_la.all_cpp.final; \ - done; \ -@@ -826,11 +845,11 @@ - rm -f kmenuedit_la.all_cpp.final kmenuedit_la.all_cpp.files - - #>+ 11 --kmenuedit.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+kmenuedit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmenuedit_main.cpp - @echo 'creating kmenuedit.all_cpp.cpp ...'; \ - rm -f kmenuedit.all_cpp.files kmenuedit.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kmenuedit.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kmenuedit_main.cpp ; do \ - echo "#include \"$$file\"" >> kmenuedit.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmenuedit.all_cpp.final; \ - done; \ -@@ -839,20 +858,20 @@ - - #>+ 3 - clean-final: -- -rm -f kmenuedit_la.all_cpp.cpp kmenuedit.all_cpp.cpp -+ -rm -f libkmenuedit_main_la.all_cpp.cpp kmenuedit_la.all_cpp.cpp kmenuedit.all_cpp.cpp - - #>+ 2 - final: -- $(MAKE) kmenuedit_la_OBJECTS="$(kmenuedit_la_final_OBJECTS)" all-am -+ $(MAKE) libkmenuedit_main_la_OBJECTS="$(libkmenuedit_main_la_final_OBJECTS)" all-am - #>+ 2 - final-install: -- $(MAKE) kmenuedit_la_OBJECTS="$(kmenuedit_la_final_OBJECTS)" install-am -+ $(MAKE) libkmenuedit_main_la_OBJECTS="$(libkmenuedit_main_la_final_OBJECTS)" install-am - #>+ 2 - no-final: -- $(MAKE) kmenuedit_la_OBJECTS="$(kmenuedit_la_nofinal_OBJECTS)" all-am -+ $(MAKE) libkmenuedit_main_la_OBJECTS="$(libkmenuedit_main_la_nofinal_OBJECTS)" all-am - #>+ 2 - no-final-install: -- $(MAKE) kmenuedit_la_OBJECTS="$(kmenuedit_la_nofinal_OBJECTS)" install-am -+ $(MAKE) libkmenuedit_main_la_OBJECTS="$(libkmenuedit_main_la_nofinal_OBJECTS)" install-am - #>+ 3 - cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase2/patches/patch-ck b/x11/kdebase2/patches/patch-ck deleted file mode 100644 index 80467950850..00000000000 --- a/x11/kdebase2/patches/patch-ck +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-ck,v 1.1 2001/10/15 22:46:05 skrll Exp $ - ---- kmenuedit/kmenuedit_main.cpp.orig Tue Oct 2 17:50:34 2001 -+++ 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 int kmenuedit_main(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kmenuedit_main(argc, argv); -+} diff --git a/x11/kdebase2/patches/patch-cl b/x11/kdebase2/patches/patch-cl deleted file mode 100644 index 9ae5a903792..00000000000 --- a/x11/kdebase2/patches/patch-cl +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-cl,v 1.1 2001/10/15 22:46:05 skrll Exp $ - ---- kmenuedit/main.cpp.orig Wed Jun 6 16:28:35 2001 -+++ kmenuedit/main.cpp -@@ -30,7 +30,7 @@ - static const char *description = I18N_NOOP("KDE Menu editor"); - static const char *version = "0.3"; - --int main( int argc, char **argv ) -+int kmenuedit_main( int argc, char **argv ) - { - KAboutData aboutData("kmenuedit", I18N_NOOP("KDE Menu Editor"), - version, description, KAboutData::License_GPL, diff --git a/x11/kdebase2/patches/patch-cm b/x11/kdebase2/patches/patch-cm deleted file mode 100644 index 4659921c3cf..00000000000 --- a/x11/kdebase2/patches/patch-cm +++ /dev/null @@ -1,51 +0,0 @@ -$NetBSD: patch-cm,v 1.1 2001/10/15 22:46:05 skrll Exp $ - ---- konqueror/Makefile.am.orig Fri Jun 15 09:36:56 2001 -+++ konqueror/Makefile.am -@@ -3,7 +3,7 @@ - - SUBDIRS = . kfmexec client iconview dirtree listview keditbookmarks kfindpart shellcmdplugin about pics sidebar - --lib_LTLIBRARIES = konqueror.la -+lib_LTLIBRARIES = libkonqueror_main.la konqueror.la - - konqdatadir = $(kde_datadir)/konqueror - konqdata_DATA = konqueror.rc -@@ -20,7 +20,7 @@ - - bin_PROGRAMS = konqueror - --konqueror_la_SOURCES = konq_main.cc \ -+libkonqueror_main_la_SOURCES = konq_main.cc \ - KonquerorIface.cc KonquerorIface.skel \ - KonqMainWindowIface.cc KonqMainWindowIface.skel \ - KonqViewIface.cc KonqViewIface.skel \ -@@ -34,11 +34,15 @@ - konq_combo.cc \ - konq_browseriface.cc - -+libkonqueror_main_la_LDFLAGS = $(all_libraries) -module -avoid-version -+libkonqueror_main_la_LIBADD = ../libkonq/libkonq.la -+ -+konqueror_la_SOURCES = konqueror_main.cc - konqueror_la_LDFLAGS = $(all_libraries) -module -avoid-version --konqueror_la_LIBADD = ../libkonq/libkonq.la -+konqueror_la_LIBADD = libkonqueror_main.la ../libkonq/libkonq.la - --konqueror_SOURCES = dummy.cc --konqueror_LDADD = konqueror.la -+konqueror_SOURCES = konqueror_main.cc -+konqueror_LDADD = libkonqueror_main.la - konqueror_LDFLAGS = $(KDE_RPATH) $(all_libraries) - - # Hmm, this experiment of a static konq failed, don't trust it... -@@ -52,9 +56,6 @@ - #konqueror_static_SOURCES = dummy.cc - #konqueror_static_LDADD = konqueror.la *view/*.la dirtree/*.la $(libdir)/libkhtml.la - #konqueror_static_LDFLAGS = $(all_libraries) -static -- --dummy.cc: -- echo > dummy.cc - - messages: rc.cpp - $(EXTRACTRC) */*.rc >> rc.cpp diff --git a/x11/kdebase2/patches/patch-cn b/x11/kdebase2/patches/patch-cn deleted file mode 100644 index 5f7781fa220..00000000000 --- a/x11/kdebase2/patches/patch-cn +++ /dev/null @@ -1,215 +0,0 @@ -$NetBSD: patch-cn,v 1.2 2001/12/03 15:37:19 skrll Exp $ - ---- konqueror/Makefile.in.orig Sat Nov 10 07:58:30 2001 -+++ konqueror/Makefile.in -@@ -276,7 +276,7 @@ - - SUBDIRS = . kfmexec client iconview dirtree listview keditbookmarks kfindpart shellcmdplugin about pics sidebar - --lib_LTLIBRARIES = konqueror.la -+lib_LTLIBRARIES = libkonqueror_main.la konqueror.la - - konqdatadir = $(kde_datadir)/konqueror - konqdata_DATA = konqueror.rc -@@ -293,16 +293,20 @@ - - bin_PROGRAMS = konqueror - --#>- konqueror_la_SOURCES = konq_main.cc KonquerorIface.cc KonquerorIface.skel KonqMainWindowIface.cc KonqMainWindowIface.skel KonqViewIface.cc KonqViewIface.skel konq_mainwindow.cc konq_guiclients.cc konq_run.cc konq_view.cc konq_viewmgr.cc konq_misc.cc konq_frame.cc konq_actions.cc konq_profiledlg.cc konq_factory.cc konq_combo.cc konq_browseriface.cc -+#>- libkonqueror_main_la_SOURCES = konq_main.cc KonquerorIface.cc KonquerorIface.skel KonqMainWindowIface.cc KonqMainWindowIface.skel KonqViewIface.cc KonqViewIface.skel konq_mainwindow.cc konq_guiclients.cc konq_run.cc konq_view.cc konq_viewmgr.cc konq_misc.cc konq_frame.cc konq_actions.cc konq_profiledlg.cc konq_factory.cc konq_combo.cc konq_browseriface.cc - #>+ 1 --konqueror_la_SOURCES=konq_main.cc KonquerorIface.cc KonqMainWindowIface.cc KonqViewIface.cc konq_mainwindow.cc konq_guiclients.cc konq_run.cc konq_view.cc konq_viewmgr.cc konq_misc.cc konq_frame.cc konq_actions.cc konq_profiledlg.cc konq_factory.cc konq_combo.cc konq_browseriface.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc -+libkonqueror_main_la_SOURCES=konq_main.cc KonquerorIface.cc KonqMainWindowIface.cc KonqViewIface.cc konq_mainwindow.cc konq_guiclients.cc konq_run.cc konq_view.cc konq_viewmgr.cc konq_misc.cc konq_frame.cc konq_actions.cc konq_profiledlg.cc konq_factory.cc konq_combo.cc konq_browseriface.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc - - -+libkonqueror_main_la_LDFLAGS = $(all_libraries) -module -avoid-version -+libkonqueror_main_la_LIBADD = ../libkonq/libkonq.la -+ -+konqueror_la_SOURCES = konqueror_main.cc - konqueror_la_LDFLAGS = $(all_libraries) -module -avoid-version --konqueror_la_LIBADD = ../libkonq/libkonq.la -+konqueror_la_LIBADD = libkonqueror_main.la ../libkonq/libkonq.la - --konqueror_SOURCES = dummy.cc --konqueror_LDADD = konqueror.la -+konqueror_SOURCES = konqueror_main.cc -+konqueror_LDADD = libkonqueror_main.la - konqueror_LDFLAGS = $(KDE_RPATH) $(all_libraries) - - data_DATA = konquerorsu.desktop kfmclient.desktop kfmclient_dir.desktop kfmclient_html.desktop -@@ -331,29 +335,33 @@ - LIBS = @LIBS@ - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ --konqueror_la_DEPENDENCIES = ../libkonq/libkonq.la --#>- konqueror_la_OBJECTS = konq_main.lo KonquerorIface.lo \ -+libkonqueror_main_la_DEPENDENCIES = ../libkonq/libkonq.la -+#>- libkonqueror_main_la_OBJECTS = konq_main.lo KonquerorIface.lo \ - #>- KonqMainWindowIface.lo KonqViewIface.lo konq_mainwindow.lo \ - #>- konq_guiclients.lo konq_run.lo konq_view.lo konq_viewmgr.lo \ - #>- konq_misc.lo konq_frame.lo konq_actions.lo konq_profiledlg.lo \ - #>- konq_factory.lo konq_combo.lo konq_browseriface.lo - #>+ 9 --konqueror_la_final_OBJECTS = konqueror_la.all_cc.lo --konqueror_la_nofinal_OBJECTS = konq_main.lo KonquerorIface.lo \ -+libkonqueror_main_la_final_OBJECTS = libkonqueror_main_la.all_cc.lo -+libkonqueror_main_la_nofinal_OBJECTS = konq_main.lo KonquerorIface.lo \ - KonqMainWindowIface.lo KonqViewIface.lo konq_mainwindow.lo \ - konq_guiclients.lo konq_run.lo konq_view.lo konq_viewmgr.lo \ - konq_misc.lo konq_frame.lo konq_actions.lo konq_profiledlg.lo \ - konq_factory.lo konq_combo.lo konq_browseriface.lo KonquerorIface_skel.lo KonqMainWindowIface_skel.lo KonqViewIface_skel.lo \ -- konqueror_la_meta_unload.lo --@KDE_USE_FINAL_FALSE@konqueror_la_OBJECTS = $(konqueror_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@konqueror_la_OBJECTS = $(konqueror_la_final_OBJECTS) -+ libkonqueror_main_la_meta_unload.lo -+@KDE_USE_FINAL_FALSE@libkonqueror_main_la_OBJECTS = $(libkonqueror_main_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libkonqueror_main_la_OBJECTS = $(libkonqueror_main_la_final_OBJECTS) -+konqueror_la_DEPENDENCIES = libkonqueror_main.la ../libkonq/libkonq.la -+#>- konqueror_la_OBJECTS = konqueror_main.lo -+#>+ 1 -+konqueror_la_OBJECTS = konqueror_main.lo - bin_PROGRAMS = konqueror$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - --#>- konqueror_OBJECTS = dummy.$(OBJEXT) -+#>- konqueror_OBJECTS = konqueror_main.$(OBJEXT) - #>+ 1 --konqueror_OBJECTS = dummy.$(OBJEXT) --konqueror_DEPENDENCIES = konqueror.la -+konqueror_OBJECTS = konqueror_main.$(OBJEXT) -+konqueror_DEPENDENCIES = libkonqueror_main.la - CXXFLAGS = @CXXFLAGS@ - #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 1 -@@ -375,15 +383,15 @@ - - #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=konq_misc.h konq_browseriface.h DESIGN_config konq_viewmgr.h konq_mainwindow.h kfmclient_dir.desktop kfmclient_html.desktop kfmclient.desktop konq_view.h konq_actions.h Home.desktop konq_profiledlg.h DESIGN convert_kdelnk.sh profile_midnightcommander.desktop konqueror.rc profile_filemanagement.desktop IDEAS konqueror.desktop konq_run.h konq_main.h konquerorsu.desktop konqfilemgr.desktop konqbrowser.desktop profile_filepreview.desktop profile_webbrowsing.desktop konq_openurlrequest.h konqueror_config.desktop konq_guiclients.h KonqMainWindowIface.h konq_frame.h konq_factory.h version.h konq_combo.h KonqViewIface.h -+KDE_DIST=konqfilemgr.desktop DESIGN convert_kdelnk.sh konq_misc.h konq_browseriface.h DESIGN_config profile_midnightcommander.desktop konqueror_config.desktop konqueror.rc konqbrowser.desktop konq_viewmgr.h konq_guiclients.h profile_filemanagement.desktop konq_mainwindow.h kfmclient_dir.desktop kfmclient_html.desktop kfmclient.desktop konq_view.h konq_actions.h KonqMainWindowIface.h IDEAS konqueror.desktop konq_frame.h konq_factory.h version.h konq_run.h konq_combo.h konq_main.h profile_filepreview.desktop Home.desktop konquerorsu.desktop profile_webbrowsing.desktop konq_profiledlg.h konq_openurlrequest.h KonqViewIface.h - - DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - - - TAR = tar - GZIP_ENV = --best --SOURCES = $(konqueror_la_SOURCES) $(konqueror_SOURCES) --OBJECTS = $(konqueror_la_OBJECTS) $(konqueror_OBJECTS) -+SOURCES = $(libkonqueror_main_la_SOURCES) $(konqueror_la_SOURCES) $(konqueror_SOURCES) -+OBJECTS = $(libkonqueror_main_la_OBJECTS) $(konqueror_la_OBJECTS) $(konqueror_OBJECTS) - - #>- all: all-redirect - #>+ 1 -@@ -470,6 +478,9 @@ - - maintainer-clean-libtool: - -+libkonqueror_main.la: $(libkonqueror_main_la_OBJECTS) $(libkonqueror_main_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(libdir) $(libkonqueror_main_la_LDFLAGS) $(libkonqueror_main_la_OBJECTS) $(libkonqueror_main_la_LIBADD) $(LIBS) -+ - konqueror.la: $(konqueror_la_OBJECTS) $(konqueror_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(konqueror_la_LDFLAGS) $(konqueror_la_OBJECTS) $(konqueror_la_LIBADD) $(LIBS) - -@@ -871,9 +882,6 @@ - #konqueror_static_LDADD = konqueror.la *view/*.la dirtree/*.la $(libdir)/libkhtml.la - #konqueror_static_LDFLAGS = $(all_libraries) -static - --dummy.cc: -- echo > dummy.cc -- - messages: rc.cpp - $(EXTRACTRC) */*.rc >> rc.cpp - $(EXTRACTRC) dirtree/history_module/*.ui >> rc.cpp -@@ -979,28 +987,40 @@ - - - #>+ 12 --konqueror_la_meta_unload.cc: konq_view.moc konq_browseriface.moc konq_mainwindow.moc konq_profiledlg.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_run.moc konq_frame.moc -- @echo 'creating konqueror_la_meta_unload.cc' -- @-rm -f konqueror_la_meta_unload.cc -+libkonqueror_main_la_meta_unload.cc: konq_view.moc konq_browseriface.moc konq_mainwindow.moc konq_profiledlg.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_run.moc konq_frame.moc -+ @echo 'creating libkonqueror_main_la_meta_unload.cc' -+ @-rm -f libkonqueror_main_la_meta_unload.cc - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_konqueror_la[] = {' > konqueror_la_meta_unload.cc ;\ -- cat konq_view.moc konq_browseriface.moc konq_mainwindow.moc konq_profiledlg.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_run.moc konq_frame.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> konqueror_la_meta_unload.cc ;\ -- echo '0};' >> konqueror_la_meta_unload.cc ;\ -- echo '#include <kunload.h>' >> konqueror_la_meta_unload.cc ;\ -- echo '_UNLOAD(konqueror_la)' >> konqueror_la_meta_unload.cc ;\ -- else echo > konqueror_la_meta_unload.cc; fi -+ echo 'static const char * _metalist_libkonqueror_main_la[] = {' > libkonqueror_main_la_meta_unload.cc ;\ -+ cat konq_view.moc konq_browseriface.moc konq_mainwindow.moc konq_profiledlg.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_run.moc konq_frame.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkonqueror_main_la_meta_unload.cc ;\ -+ echo '0};' >> libkonqueror_main_la_meta_unload.cc ;\ -+ echo '#include <kunload.h>' >> libkonqueror_main_la_meta_unload.cc ;\ -+ echo '_UNLOAD(libkonqueror_main_la)' >> libkonqueror_main_la_meta_unload.cc ;\ -+ else echo > libkonqueror_main_la_meta_unload.cc; fi - - - #>+ 3 - clean-moc-classes: -- -rm -f konqueror_la_meta_unload.cc -+ -rm -f libkonqueror_main_la_meta_unload.cc -+ -+#>+ 11 -+libkonqueror_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc $(srcdir)/KonquerorIface.cc $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_mainwindow.cc $(srcdir)/konq_guiclients.cc $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc $(srcdir)/konq_viewmgr.cc $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_actions.cc $(srcdir)/konq_profiledlg.cc $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc libkonqueror_main_la_meta_unload.cc konq_view.moc konq_browseriface.moc konq_profiledlg.moc konq_mainwindow.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_frame.moc konq_run.moc -+ @echo 'creating libkonqueror_main_la.all_cc.cc ...'; \ -+ rm -f libkonqueror_main_la.all_cc.files libkonqueror_main_la.all_cc.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkonqueror_main_la.all_cc.final; \ -+ for file in konq_main.cc KonquerorIface.cc KonqMainWindowIface.cc KonqViewIface.cc konq_mainwindow.cc konq_guiclients.cc konq_run.cc konq_view.cc konq_viewmgr.cc konq_misc.cc konq_frame.cc konq_actions.cc konq_profiledlg.cc konq_factory.cc konq_combo.cc konq_browseriface.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc libkonqueror_main_la_meta_unload.cc ; do \ -+ echo "#include \"$$file\"" >> libkonqueror_main_la.all_cc.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkonqueror_main_la.all_cc.final; \ -+ done; \ -+ cat libkonqueror_main_la.all_cc.final libkonqueror_main_la.all_cc.files > libkonqueror_main_la.all_cc.cc; \ -+ rm -f libkonqueror_main_la.all_cc.final libkonqueror_main_la.all_cc.files - - #>+ 11 --konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc $(srcdir)/KonquerorIface.cc $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_mainwindow.cc $(srcdir)/konq_guiclients.cc $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc $(srcdir)/konq_viewmgr.cc $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_actions.cc $(srcdir)/konq_profiledlg.cc $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc konqueror_la_meta_unload.cc konq_view.moc konq_browseriface.moc konq_profiledlg.moc konq_mainwindow.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_frame.moc konq_run.moc -+konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konqueror_main.cc - @echo 'creating konqueror_la.all_cc.cc ...'; \ - rm -f konqueror_la.all_cc.files konqueror_la.all_cc.final; \ - echo "#define KDE_USE_FINAL 1" >> konqueror_la.all_cc.final; \ -- for file in konq_main.cc KonquerorIface.cc KonqMainWindowIface.cc KonqViewIface.cc konq_mainwindow.cc konq_guiclients.cc konq_run.cc konq_view.cc konq_viewmgr.cc konq_misc.cc konq_frame.cc konq_actions.cc konq_profiledlg.cc konq_factory.cc konq_combo.cc konq_browseriface.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc konqueror_la_meta_unload.cc ; do \ -+ for file in konqueror_main.cc ; do \ - echo "#include \"$$file\"" >> konqueror_la.all_cc.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konqueror_la.all_cc.final; \ - done; \ -@@ -1008,11 +1028,11 @@ - rm -f konqueror_la.all_cc.final konqueror_la.all_cc.files - - #>+ 11 --konqueror.all_cc.cc: $(srcdir)/Makefile.in dummy.cc -+konqueror.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konqueror_main.cc - @echo 'creating konqueror.all_cc.cc ...'; \ - rm -f konqueror.all_cc.files konqueror.all_cc.final; \ - echo "#define KDE_USE_FINAL 1" >> konqueror.all_cc.final; \ -- for file in dummy.cc ; do \ -+ for file in konqueror_main.cc ; do \ - echo "#include \"$$file\"" >> konqueror.all_cc.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konqueror.all_cc.final; \ - done; \ -@@ -1021,20 +1041,20 @@ - - #>+ 3 - clean-final: -- -rm -f konqueror_la.all_cc.cc konqueror.all_cc.cc -+ -rm -f libkonqueror_main_la.all_cc.cc konqueror_la.all_cc.cc konqueror.all_cc.cc - - #>+ 2 - final: -- $(MAKE) konqueror_la_OBJECTS="$(konqueror_la_final_OBJECTS)" all-am -+ $(MAKE) libkonqueror_main_la_OBJECTS="$(libkonqueror_main_la_final_OBJECTS)" all-am - #>+ 2 - final-install: -- $(MAKE) konqueror_la_OBJECTS="$(konqueror_la_final_OBJECTS)" install-am -+ $(MAKE) libkonqueror_main_la_OBJECTS="$(libkonqueror_main_la_final_OBJECTS)" install-am - #>+ 2 - no-final: -- $(MAKE) konqueror_la_OBJECTS="$(konqueror_la_nofinal_OBJECTS)" all-am -+ $(MAKE) libkonqueror_main_la_OBJECTS="$(libkonqueror_main_la_nofinal_OBJECTS)" all-am - #>+ 2 - no-final-install: -- $(MAKE) konqueror_la_OBJECTS="$(konqueror_la_nofinal_OBJECTS)" install-am -+ $(MAKE) libkonqueror_main_la_OBJECTS="$(libkonqueror_main_la_nofinal_OBJECTS)" install-am - #>+ 3 - cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase2/patches/patch-co b/x11/kdebase2/patches/patch-co deleted file mode 100644 index bb952d520fd..00000000000 --- a/x11/kdebase2/patches/patch-co +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-co,v 1.1 2001/10/15 22:46:05 skrll Exp $ - ---- konqueror/client/Makefile.am.orig Wed Aug 9 18:10:36 2000 -+++ konqueror/client/Makefile.am -@@ -1,12 +1,16 @@ - AM_CPPFLAGS = -DQT_NO_CAST_ASCII - - bin_PROGRAMS = kfmclient --lib_LTLIBRARIES = kfmclient.la -+lib_LTLIBRARIES = libkfmclient_main.la kfmclient.la - - INCLUDES= -I.. $(all_includes) -+libkfmclient_main_la_LDFLAGS = $(all_libraries) -+libkfmclient_main_la_LIBADD = $(LIB_KFILE) -+libkfmclient_main_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub -+ - kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version --kfmclient_la_LIBADD = $(LIB_KFILE) --kfmclient_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub -+kfmclient_la_LIBADD = libkfmclient_main.la -+kfmclient_la_SOURCES = kfmclient_main.cc - - noinst_HEADERS = kfmclient.h - METASOURCES = AUTO -@@ -14,12 +18,9 @@ - KonquerorIface_DIR = $(srcdir)/.. - KDesktopIface_DIR = $(top_srcdir)/kdesktop - --kfmclient_SOURCES = dummy.cc -+kfmclient_SOURCES = kfmclient_main.cc - kfmclient_LDFLAGS = $(KDE_RPATH) $(all_libraries) --kfmclient_LDADD = kfmclient.la -- --dummy.cc: -- echo > dummy.cc -+kfmclient_LDADD = libkfmclient_main.la - - messages: - $(XGETTEXT) -kaliasLocal *.h *.cc -o $(podir)/kfmclient.pot diff --git a/x11/kdebase2/patches/patch-cp b/x11/kdebase2/patches/patch-cp deleted file mode 100644 index b577dbb9665..00000000000 --- a/x11/kdebase2/patches/patch-cp +++ /dev/null @@ -1,200 +0,0 @@ -$NetBSD: patch-cp,v 1.2 2001/12/03 15:37:19 skrll Exp $ - ---- konqueror/client/Makefile.in.orig Sat Nov 10 07:58:30 2001 -+++ konqueror/client/Makefile.in -@@ -276,14 +276,18 @@ - AM_CPPFLAGS = -DQT_NO_CAST_ASCII - - bin_PROGRAMS = kfmclient --lib_LTLIBRARIES = kfmclient.la -+lib_LTLIBRARIES = libkfmclient_main.la kfmclient.la - - INCLUDES = -I.. $(all_includes) --kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version --kfmclient_la_LIBADD = $(LIB_KFILE) --#>- kfmclient_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub -+libkfmclient_main_la_LDFLAGS = $(all_libraries) -+libkfmclient_main_la_LIBADD = $(LIB_KFILE) -+#>- libkfmclient_main_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub - #>+ 1 --kfmclient_la_SOURCES=kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc -+libkfmclient_main_la_SOURCES=kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc -+ -+kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version -+kfmclient_la_LIBADD = libkfmclient_main.la -+kfmclient_la_SOURCES = kfmclient_main.cc - - noinst_HEADERS = kfmclient.h - #>- METASOURCES = AUTO -@@ -291,9 +295,9 @@ - KonquerorIface_DIR = $(srcdir)/.. - KDesktopIface_DIR = $(top_srcdir)/kdesktop - --kfmclient_SOURCES = dummy.cc -+kfmclient_SOURCES = kfmclient_main.cc - kfmclient_LDFLAGS = $(KDE_RPATH) $(all_libraries) --kfmclient_LDADD = kfmclient.la -+kfmclient_LDADD = libkfmclient_main.la - mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs - CONFIG_HEADER = ../../config.h - CONFIG_CLEAN_FILES = -@@ -306,21 +310,25 @@ - LIBS = @LIBS@ - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ --kfmclient_la_DEPENDENCIES = --#>- kfmclient_la_OBJECTS = kfmclient.lo -+libkfmclient_main_la_DEPENDENCIES = -+#>- libkfmclient_main_la_OBJECTS = kfmclient.lo - #>+ 5 --kfmclient_la_final_OBJECTS = kfmclient_la.all_cc.lo --kfmclient_la_nofinal_OBJECTS = kfmclient.lo KonquerorIface_stub.lo KDesktopIface_stub.lo \ -- kfmclient_la_meta_unload.lo --@KDE_USE_FINAL_FALSE@kfmclient_la_OBJECTS = $(kfmclient_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@kfmclient_la_OBJECTS = $(kfmclient_la_final_OBJECTS) -+libkfmclient_main_la_final_OBJECTS = libkfmclient_main_la.all_cc.lo -+libkfmclient_main_la_nofinal_OBJECTS = kfmclient.lo KonquerorIface_stub.lo KDesktopIface_stub.lo \ -+ libkfmclient_main_la_meta_unload.lo -+@KDE_USE_FINAL_FALSE@libkfmclient_main_la_OBJECTS = $(libkfmclient_main_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libkfmclient_main_la_OBJECTS = $(libkfmclient_main_la_final_OBJECTS) -+kfmclient_la_DEPENDENCIES = libkfmclient_main.la -+#>- kfmclient_la_OBJECTS = kfmclient_main.lo -+#>+ 1 -+kfmclient_la_OBJECTS = kfmclient_main.lo - bin_PROGRAMS = kfmclient$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - --#>- kfmclient_OBJECTS = dummy.$(OBJEXT) -+#>- kfmclient_OBJECTS = kfmclient_main.$(OBJEXT) - #>+ 1 --kfmclient_OBJECTS = dummy.$(OBJEXT) --kfmclient_DEPENDENCIES = kfmclient.la -+kfmclient_OBJECTS = kfmclient_main.$(OBJEXT) -+kfmclient_DEPENDENCIES = libkfmclient_main.la - CXXFLAGS = @CXXFLAGS@ - #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 1 -@@ -341,8 +349,8 @@ - - TAR = tar - GZIP_ENV = --best --SOURCES = $(kfmclient_la_SOURCES) $(kfmclient_SOURCES) --OBJECTS = $(kfmclient_la_OBJECTS) $(kfmclient_OBJECTS) -+SOURCES = $(libkfmclient_main_la_SOURCES) $(kfmclient_la_SOURCES) $(kfmclient_SOURCES) -+OBJECTS = $(libkfmclient_main_la_OBJECTS) $(kfmclient_la_OBJECTS) $(kfmclient_OBJECTS) - - #>- all: all-redirect - #>+ 1 -@@ -429,6 +437,9 @@ - - maintainer-clean-libtool: - -+libkfmclient_main.la: $(libkfmclient_main_la_OBJECTS) $(libkfmclient_main_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(libdir) $(libkfmclient_main_la_LDFLAGS) $(libkfmclient_main_la_OBJECTS) $(libkfmclient_main_la_LIBADD) $(LIBS) -+ - kfmclient.la: $(kfmclient_la_OBJECTS) $(kfmclient_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(kfmclient_la_LDFLAGS) $(kfmclient_la_OBJECTS) $(kfmclient_la_LIBADD) $(LIBS) - -@@ -597,9 +608,6 @@ - mostlyclean distclean maintainer-clean - - --dummy.cc: -- echo > dummy.cc -- - messages: - $(XGETTEXT) -kaliasLocal *.h *.cc -o $(podir)/kfmclient.pot - -@@ -641,28 +649,40 @@ - - - #>+ 12 --kfmclient_la_meta_unload.cc: kfmclient.moc -- @echo 'creating kfmclient_la_meta_unload.cc' -- @-rm -f kfmclient_la_meta_unload.cc -+libkfmclient_main_la_meta_unload.cc: kfmclient.moc -+ @echo 'creating libkfmclient_main_la_meta_unload.cc' -+ @-rm -f libkfmclient_main_la_meta_unload.cc - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kfmclient_la[] = {' > kfmclient_la_meta_unload.cc ;\ -- cat kfmclient.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kfmclient_la_meta_unload.cc ;\ -- echo '0};' >> kfmclient_la_meta_unload.cc ;\ -- echo '#include <kunload.h>' >> kfmclient_la_meta_unload.cc ;\ -- echo '_UNLOAD(kfmclient_la)' >> kfmclient_la_meta_unload.cc ;\ -- else echo > kfmclient_la_meta_unload.cc; fi -+ echo 'static const char * _metalist_libkfmclient_main_la[] = {' > libkfmclient_main_la_meta_unload.cc ;\ -+ cat kfmclient.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkfmclient_main_la_meta_unload.cc ;\ -+ echo '0};' >> libkfmclient_main_la_meta_unload.cc ;\ -+ echo '#include <kunload.h>' >> libkfmclient_main_la_meta_unload.cc ;\ -+ echo '_UNLOAD(libkfmclient_main_la)' >> libkfmclient_main_la_meta_unload.cc ;\ -+ else echo > libkfmclient_main_la_meta_unload.cc; fi - - - #>+ 3 - clean-moc-classes: -- -rm -f kfmclient_la_meta_unload.cc -+ -rm -f libkfmclient_main_la_meta_unload.cc -+ -+#>+ 11 -+libkfmclient_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc libkfmclient_main_la_meta_unload.cc kfmclient.moc -+ @echo 'creating libkfmclient_main_la.all_cc.cc ...'; \ -+ rm -f libkfmclient_main_la.all_cc.files libkfmclient_main_la.all_cc.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkfmclient_main_la.all_cc.final; \ -+ for file in kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc libkfmclient_main_la_meta_unload.cc ; do \ -+ echo "#include \"$$file\"" >> libkfmclient_main_la.all_cc.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkfmclient_main_la.all_cc.final; \ -+ done; \ -+ cat libkfmclient_main_la.all_cc.final libkfmclient_main_la.all_cc.files > libkfmclient_main_la.all_cc.cc; \ -+ rm -f libkfmclient_main_la.all_cc.final libkfmclient_main_la.all_cc.files - - #>+ 11 --kfmclient_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc kfmclient_la_meta_unload.cc kfmclient.moc -+kfmclient_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kfmclient_main.cc - @echo 'creating kfmclient_la.all_cc.cc ...'; \ - rm -f kfmclient_la.all_cc.files kfmclient_la.all_cc.final; \ - echo "#define KDE_USE_FINAL 1" >> kfmclient_la.all_cc.final; \ -- for file in kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc kfmclient_la_meta_unload.cc ; do \ -+ for file in kfmclient_main.cc ; do \ - echo "#include \"$$file\"" >> kfmclient_la.all_cc.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kfmclient_la.all_cc.final; \ - done; \ -@@ -670,11 +690,11 @@ - rm -f kfmclient_la.all_cc.final kfmclient_la.all_cc.files - - #>+ 11 --kfmclient.all_cc.cc: $(srcdir)/Makefile.in dummy.cc -+kfmclient.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kfmclient_main.cc - @echo 'creating kfmclient.all_cc.cc ...'; \ - rm -f kfmclient.all_cc.files kfmclient.all_cc.final; \ - echo "#define KDE_USE_FINAL 1" >> kfmclient.all_cc.final; \ -- for file in dummy.cc ; do \ -+ for file in kfmclient_main.cc ; do \ - echo "#include \"$$file\"" >> kfmclient.all_cc.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kfmclient.all_cc.final; \ - done; \ -@@ -683,20 +703,20 @@ - - #>+ 3 - clean-final: -- -rm -f kfmclient_la.all_cc.cc kfmclient.all_cc.cc -+ -rm -f libkfmclient_main_la.all_cc.cc kfmclient_la.all_cc.cc kfmclient.all_cc.cc - - #>+ 2 - final: -- $(MAKE) kfmclient_la_OBJECTS="$(kfmclient_la_final_OBJECTS)" all-am -+ $(MAKE) libkfmclient_main_la_OBJECTS="$(libkfmclient_main_la_final_OBJECTS)" all-am - #>+ 2 - final-install: -- $(MAKE) kfmclient_la_OBJECTS="$(kfmclient_la_final_OBJECTS)" install-am -+ $(MAKE) libkfmclient_main_la_OBJECTS="$(libkfmclient_main_la_final_OBJECTS)" install-am - #>+ 2 - no-final: -- $(MAKE) kfmclient_la_OBJECTS="$(kfmclient_la_nofinal_OBJECTS)" all-am -+ $(MAKE) libkfmclient_main_la_OBJECTS="$(libkfmclient_main_la_nofinal_OBJECTS)" all-am - #>+ 2 - no-final-install: -- $(MAKE) kfmclient_la_OBJECTS="$(kfmclient_la_nofinal_OBJECTS)" install-am -+ $(MAKE) libkfmclient_main_la_OBJECTS="$(libkfmclient_main_la_nofinal_OBJECTS)" install-am - #>+ 3 - cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase2/patches/patch-cq b/x11/kdebase2/patches/patch-cq deleted file mode 100644 index 036685f5e6a..00000000000 --- a/x11/kdebase2/patches/patch-cq +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-cq,v 1.1 2001/10/15 22:46:06 skrll Exp $ - ---- konqueror/client/kfmclient.cc.orig Sun Jul 29 05:56:40 2001 -+++ konqueror/client/kfmclient.cc -@@ -63,7 +63,7 @@ - {0,0,0} - }; - --int main( int argc, char **argv ) -+int kfmclient_main( int argc, char **argv ) - { - KCmdLineArgs::init(argc, argv, appName, description, version, false); - diff --git a/x11/kdebase2/patches/patch-cr b/x11/kdebase2/patches/patch-cr deleted file mode 100644 index cbc160af1b5..00000000000 --- a/x11/kdebase2/patches/patch-cr +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-cr,v 1.1 2001/10/15 22:46:06 skrll Exp $ - ---- konqueror/client/kfmclient_main.cc.orig Tue Oct 2 17:50:34 2001 -+++ 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 int kfmclient_main(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kfmclient_main(argc, argv); -+} diff --git a/x11/kdebase2/patches/patch-cs b/x11/kdebase2/patches/patch-cs deleted file mode 100644 index e7fb339a186..00000000000 --- a/x11/kdebase2/patches/patch-cs +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-cs,v 1.1 2001/10/15 22:46:06 skrll Exp $ - ---- konqueror/keditbookmarks/Makefile.am.orig Wed Dec 20 13:51:26 2000 -+++ konqueror/keditbookmarks/Makefile.am -@@ -2,22 +2,23 @@ - - METASOURCES = AUTO - --lib_LTLIBRARIES = keditbookmarks.la -+lib_LTLIBRARIES = libkeditbookmarks_main.la keditbookmarks.la - --keditbookmarks_la_SOURCES = main.cpp toplevel.cpp commands.cpp -+libkeditbookmarks_main_la_SOURCES = main.cpp toplevel.cpp commands.cpp -+libkeditbookmarks_main_la_LIBADD = $(top_builddir)/libkonq/libkonq.la -+libkeditbookmarks_main_la_LDFLAGS = $(all_libraries) -+libkeditbookmarks_main_la_METASOURCES = AUTO - --keditbookmarks_la_LIBADD = $(top_builddir)/libkonq/libkonq.la -+keditbookmarks_la_SOURCES = keditbookmarks_main.cpp -+keditbookmarks_la_LIBADD = libkeditbookmarks_main.la - keditbookmarks_la_LDFLAGS = $(all_libraries) -module -avoid-version - keditbookmarks_la_METASOURCES = AUTO - - bin_PROGRAMS = keditbookmarks - --keditbookmarks_SOURCES = dummy.cpp --keditbookmarks_LDADD = keditbookmarks.la -+keditbookmarks_SOURCES = keditbookmarks_main.cpp -+keditbookmarks_LDADD = libkeditbookmarks_main.la - keditbookmarks_LDFLAGS = $(all_libraries) $(KDE_RPATH) -- --dummy.cpp: -- echo > dummy.cpp - - rcdir = $(kde_datadir)/keditbookmarks - rc_DATA = keditbookmarksui.rc diff --git a/x11/kdebase2/patches/patch-ct b/x11/kdebase2/patches/patch-ct deleted file mode 100644 index 7e8525c8eec..00000000000 --- a/x11/kdebase2/patches/patch-ct +++ /dev/null @@ -1,227 +0,0 @@ -$NetBSD: patch-ct,v 1.2 2001/12/03 15:37:19 skrll Exp $ - ---- konqueror/keditbookmarks/Makefile.in.orig Sat Nov 10 07:58:31 2001 -+++ konqueror/keditbookmarks/Makefile.in -@@ -276,18 +276,22 @@ - - METASOURCES = AUTO - --lib_LTLIBRARIES = keditbookmarks.la -+lib_LTLIBRARIES = libkeditbookmarks_main.la keditbookmarks.la - --keditbookmarks_la_SOURCES = main.cpp toplevel.cpp commands.cpp -+libkeditbookmarks_main_la_SOURCES = main.cpp toplevel.cpp commands.cpp -+libkeditbookmarks_main_la_LIBADD = $(top_builddir)/libkonq/libkonq.la -+libkeditbookmarks_main_la_LDFLAGS = $(all_libraries) -+#>- libkeditbookmarks_main_la_METASOURCES = AUTO - --keditbookmarks_la_LIBADD = $(top_builddir)/libkonq/libkonq.la -+keditbookmarks_la_SOURCES = keditbookmarks_main.cpp -+keditbookmarks_la_LIBADD = libkeditbookmarks_main.la - keditbookmarks_la_LDFLAGS = $(all_libraries) -module -avoid-version - #>- keditbookmarks_la_METASOURCES = AUTO - - bin_PROGRAMS = keditbookmarks - --keditbookmarks_SOURCES = dummy.cpp --keditbookmarks_LDADD = keditbookmarks.la -+keditbookmarks_SOURCES = keditbookmarks_main.cpp -+keditbookmarks_LDADD = libkeditbookmarks_main.la - keditbookmarks_LDFLAGS = $(all_libraries) $(KDE_RPATH) - - rcdir = $(kde_datadir)/keditbookmarks -@@ -309,21 +313,26 @@ - LIBS = @LIBS@ - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ --keditbookmarks_la_DEPENDENCIES = $(top_builddir)/libkonq/libkonq.la --#>- keditbookmarks_la_OBJECTS = main.lo toplevel.lo commands.lo -+libkeditbookmarks_main_la_DEPENDENCIES = \ -+ $(top_builddir)/libkonq/libkonq.la -+#>- libkeditbookmarks_main_la_OBJECTS = main.lo toplevel.lo commands.lo - #>+ 5 --keditbookmarks_la_final_OBJECTS = keditbookmarks_la.all_cpp.lo --keditbookmarks_la_nofinal_OBJECTS = main.lo toplevel.lo commands.lo \ -- keditbookmarks_la_meta_unload.lo --@KDE_USE_FINAL_FALSE@keditbookmarks_la_OBJECTS = $(keditbookmarks_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@keditbookmarks_la_OBJECTS = $(keditbookmarks_la_final_OBJECTS) -+libkeditbookmarks_main_la_final_OBJECTS = libkeditbookmarks_main_la.all_cpp.lo -+libkeditbookmarks_main_la_nofinal_OBJECTS = main.lo toplevel.lo commands.lo \ -+ libkeditbookmarks_main_la_meta_unload.lo -+@KDE_USE_FINAL_FALSE@libkeditbookmarks_main_la_OBJECTS = $(libkeditbookmarks_main_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libkeditbookmarks_main_la_OBJECTS = $(libkeditbookmarks_main_la_final_OBJECTS) -+keditbookmarks_la_DEPENDENCIES = libkeditbookmarks_main.la -+#>- keditbookmarks_la_OBJECTS = keditbookmarks_main.lo -+#>+ 1 -+keditbookmarks_la_OBJECTS = keditbookmarks_main.lo - bin_PROGRAMS = keditbookmarks$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - --#>- keditbookmarks_OBJECTS = dummy.$(OBJEXT) -+#>- keditbookmarks_OBJECTS = keditbookmarks_main.$(OBJEXT) - #>+ 1 --keditbookmarks_OBJECTS = dummy.$(OBJEXT) --keditbookmarks_DEPENDENCIES = keditbookmarks.la -+keditbookmarks_OBJECTS = keditbookmarks_main.$(OBJEXT) -+keditbookmarks_DEPENDENCIES = libkeditbookmarks_main.la - CXXFLAGS = @CXXFLAGS@ - #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 1 -@@ -342,15 +351,15 @@ - - #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=kinsertionsort.h hi32-app-keditbookmarks.png commands.h toplevel.h hi16-app-keditbookmarks.png keditbookmarks.desktop keditbookmarksui.rc -+KDE_DIST=commands.h kinsertionsort.h keditbookmarks.desktop hi16-app-keditbookmarks.png hi32-app-keditbookmarks.png toplevel.h keditbookmarksui.rc - - DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - - - TAR = tar - GZIP_ENV = --best --SOURCES = $(keditbookmarks_la_SOURCES) $(keditbookmarks_SOURCES) --OBJECTS = $(keditbookmarks_la_OBJECTS) $(keditbookmarks_OBJECTS) -+SOURCES = $(libkeditbookmarks_main_la_SOURCES) $(keditbookmarks_la_SOURCES) $(keditbookmarks_SOURCES) -+OBJECTS = $(libkeditbookmarks_main_la_OBJECTS) $(keditbookmarks_la_OBJECTS) $(keditbookmarks_OBJECTS) - - #>- all: all-redirect - #>+ 1 -@@ -437,6 +446,9 @@ - - maintainer-clean-libtool: - -+libkeditbookmarks_main.la: $(libkeditbookmarks_main_la_OBJECTS) $(libkeditbookmarks_main_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(libdir) $(libkeditbookmarks_main_la_LDFLAGS) $(libkeditbookmarks_main_la_OBJECTS) $(libkeditbookmarks_main_la_LIBADD) $(LIBS) -+ - keditbookmarks.la: $(keditbookmarks_la_OBJECTS) $(keditbookmarks_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(keditbookmarks_la_LDFLAGS) $(keditbookmarks_la_OBJECTS) $(keditbookmarks_la_LIBADD) $(LIBS) - -@@ -651,9 +663,6 @@ - mostlyclean distclean maintainer-clean - - --dummy.cpp: -- echo > dummy.cpp -- - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: -@@ -667,8 +676,16 @@ - $(MOC) $(srcdir)/toplevel.h -o toplevel.moc - - #>+ 3 -+commands.moc: $(srcdir)/commands.h -+ $(MOC) $(srcdir)/commands.h -o commands.moc -+ -+#>+ 3 -+toplevel.moc: $(srcdir)/toplevel.h -+ $(MOC) $(srcdir)/toplevel.h -o toplevel.moc -+ -+#>+ 3 - clean-metasources: -- -rm -f commands.moc toplevel.moc -+ -rm -f commands.moc toplevel.moc commands.moc toplevel.moc - - #>+ 2 - docs-am: -@@ -691,28 +708,40 @@ - - - #>+ 12 --keditbookmarks_la_meta_unload.cpp: commands.moc toplevel.moc -- @echo 'creating keditbookmarks_la_meta_unload.cpp' -- @-rm -f keditbookmarks_la_meta_unload.cpp -+libkeditbookmarks_main_la_meta_unload.cpp: commands.moc toplevel.moc -+ @echo 'creating libkeditbookmarks_main_la_meta_unload.cpp' -+ @-rm -f libkeditbookmarks_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_keditbookmarks_la[] = {' > keditbookmarks_la_meta_unload.cpp ;\ -- cat commands.moc toplevel.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> keditbookmarks_la_meta_unload.cpp ;\ -- echo '0};' >> keditbookmarks_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> keditbookmarks_la_meta_unload.cpp ;\ -- echo '_UNLOAD(keditbookmarks_la)' >> keditbookmarks_la_meta_unload.cpp ;\ -- else echo > keditbookmarks_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkeditbookmarks_main_la[] = {' > libkeditbookmarks_main_la_meta_unload.cpp ;\ -+ cat commands.moc toplevel.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkeditbookmarks_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkeditbookmarks_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkeditbookmarks_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkeditbookmarks_main_la)' >> libkeditbookmarks_main_la_meta_unload.cpp ;\ -+ else echo > libkeditbookmarks_main_la_meta_unload.cpp; fi - - - #>+ 3 - clean-moc-classes: -- -rm -f keditbookmarks_la_meta_unload.cpp -+ -rm -f libkeditbookmarks_main_la_meta_unload.cpp -+ -+#>+ 11 -+libkeditbookmarks_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/commands.cpp libkeditbookmarks_main_la_meta_unload.cpp commands.moc toplevel.moc -+ @echo 'creating libkeditbookmarks_main_la.all_cpp.cpp ...'; \ -+ rm -f libkeditbookmarks_main_la.all_cpp.files libkeditbookmarks_main_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkeditbookmarks_main_la.all_cpp.final; \ -+ for file in main.cpp toplevel.cpp commands.cpp libkeditbookmarks_main_la_meta_unload.cpp ; do \ -+ echo "#include \"$$file\"" >> libkeditbookmarks_main_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkeditbookmarks_main_la.all_cpp.final; \ -+ done; \ -+ cat libkeditbookmarks_main_la.all_cpp.final libkeditbookmarks_main_la.all_cpp.files > libkeditbookmarks_main_la.all_cpp.cpp; \ -+ rm -f libkeditbookmarks_main_la.all_cpp.final libkeditbookmarks_main_la.all_cpp.files - - #>+ 11 --keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/commands.cpp keditbookmarks_la_meta_unload.cpp commands.moc toplevel.moc -+keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/keditbookmarks_main.cpp commands.moc toplevel.moc - @echo 'creating keditbookmarks_la.all_cpp.cpp ...'; \ - rm -f keditbookmarks_la.all_cpp.files keditbookmarks_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> keditbookmarks_la.all_cpp.final; \ -- for file in main.cpp toplevel.cpp commands.cpp keditbookmarks_la_meta_unload.cpp ; do \ -+ for file in keditbookmarks_main.cpp ; do \ - echo "#include \"$$file\"" >> keditbookmarks_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> keditbookmarks_la.all_cpp.final; \ - done; \ -@@ -720,11 +749,11 @@ - rm -f keditbookmarks_la.all_cpp.final keditbookmarks_la.all_cpp.files - - #>+ 11 --keditbookmarks.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+keditbookmarks.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/keditbookmarks_main.cpp - @echo 'creating keditbookmarks.all_cpp.cpp ...'; \ - rm -f keditbookmarks.all_cpp.files keditbookmarks.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> keditbookmarks.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in keditbookmarks_main.cpp ; do \ - echo "#include \"$$file\"" >> keditbookmarks.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> keditbookmarks.all_cpp.final; \ - done; \ -@@ -733,20 +762,20 @@ - - #>+ 3 - clean-final: -- -rm -f keditbookmarks_la.all_cpp.cpp keditbookmarks.all_cpp.cpp -+ -rm -f libkeditbookmarks_main_la.all_cpp.cpp keditbookmarks_la.all_cpp.cpp keditbookmarks.all_cpp.cpp - - #>+ 2 - final: -- $(MAKE) keditbookmarks_la_OBJECTS="$(keditbookmarks_la_final_OBJECTS)" all-am -+ $(MAKE) libkeditbookmarks_main_la_OBJECTS="$(libkeditbookmarks_main_la_final_OBJECTS)" all-am - #>+ 2 - final-install: -- $(MAKE) keditbookmarks_la_OBJECTS="$(keditbookmarks_la_final_OBJECTS)" install-am -+ $(MAKE) libkeditbookmarks_main_la_OBJECTS="$(libkeditbookmarks_main_la_final_OBJECTS)" install-am - #>+ 2 - no-final: -- $(MAKE) keditbookmarks_la_OBJECTS="$(keditbookmarks_la_nofinal_OBJECTS)" all-am -+ $(MAKE) libkeditbookmarks_main_la_OBJECTS="$(libkeditbookmarks_main_la_nofinal_OBJECTS)" all-am - #>+ 2 - no-final-install: -- $(MAKE) keditbookmarks_la_OBJECTS="$(keditbookmarks_la_nofinal_OBJECTS)" install-am -+ $(MAKE) libkeditbookmarks_main_la_OBJECTS="$(libkeditbookmarks_main_la_nofinal_OBJECTS)" install-am - #>+ 3 - cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -756,5 +785,5 @@ - -rm -f *.rpo - - #>+ 3 --$(srcdir)/toplevel.cpp: toplevel.moc --$(srcdir)/commands.cpp: commands.moc -+$(srcdir)/toplevel.cpp: toplevel.moc toplevel.moc -+$(srcdir)/commands.cpp: commands.moc commands.moc diff --git a/x11/kdebase2/patches/patch-cu b/x11/kdebase2/patches/patch-cu deleted file mode 100644 index 47103c70044..00000000000 --- a/x11/kdebase2/patches/patch-cu +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-cu,v 1.1 2001/10/15 22:46:06 skrll Exp $ - ---- konqueror/keditbookmarks/keditbookmarks_main.cpp.orig Tue Oct 2 17:50:35 2001 -+++ 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 int keditbookmarks_main(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return keditbookmarks_main(argc, argv); -+} diff --git a/x11/kdebase2/patches/patch-cv b/x11/kdebase2/patches/patch-cv deleted file mode 100644 index fd5baf9b3fb..00000000000 --- a/x11/kdebase2/patches/patch-cv +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-cv,v 1.1 2001/10/15 22:46:06 skrll Exp $ - ---- konqueror/keditbookmarks/main.cpp.orig Mon Feb 12 20:04:52 2001 -+++ konqueror/keditbookmarks/main.cpp -@@ -32,7 +32,7 @@ - { 0, 0, 0} - }; - --int main(int argc, char ** argv) -+int keditbookmarks_main(int argc, char ** argv) - { - KLocale::setMainCatalogue("konqueror"); - KAboutData aboutData( "keditbookmarks", I18N_NOOP("KEditBookmarks"), "1.0", diff --git a/x11/kdebase2/patches/patch-cw b/x11/kdebase2/patches/patch-cw deleted file mode 100644 index 1260297f894..00000000000 --- a/x11/kdebase2/patches/patch-cw +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-cw,v 1.1 2001/10/15 22:46:06 skrll Exp $ - ---- konqueror/konq_main.cc.orig Wed Jun 20 09:35:50 2001 -+++ konqueror/konq_main.cc -@@ -47,7 +47,7 @@ - { 0, 0, 0} - }; - --int main( int argc, char **argv ) -+int konqueror_main( int argc, char **argv ) - { - KCmdLineArgs::init( argc, argv, KonqFactory::aboutData() ); - diff --git a/x11/kdebase2/patches/patch-cx b/x11/kdebase2/patches/patch-cx deleted file mode 100644 index 14c2db4c411..00000000000 --- a/x11/kdebase2/patches/patch-cx +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-cx,v 1.1 2001/10/15 22:46:07 skrll Exp $ - ---- konqueror/konqueror_main.cc.orig Tue Oct 2 17:50:35 2001 -+++ 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 int konqueror_main(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return konqueror_main(argc, argv); -+} diff --git a/x11/kdebase2/patches/patch-cy b/x11/kdebase2/patches/patch-cy deleted file mode 100644 index 887466fa9da..00000000000 --- a/x11/kdebase2/patches/patch-cy +++ /dev/null @@ -1,65 +0,0 @@ -$NetBSD: patch-cy,v 1.2 2001/12/03 15:37:19 skrll Exp $ - ---- konsole/src/Makefile.am.orig Thu Jun 14 19:53:50 2001 -+++ konsole/src/Makefile.am -@@ -16,7 +16,8 @@ - - # you can add here more. This one gets installed - bin_PROGRAMS = konsole konsole_grantpty kwrited #kcmkonsole --lib_LTLIBRARIES = libkonsolepart.la kwrited.la konsole.la -+lib_LTLIBRARIES = libkonsolepart.la libkwrited_main.la kwrited.la \ -+ libkonsole_main.la konsole.la - # libkonsolepart is a part, but konsole.la links directly to it, so we can't - # install it under kde_module - -@@ -34,24 +35,32 @@ - libkonsolepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - libkonsolepart_la_LIBADD = $(LIB_KPARTS) $(LIBUTIL) - -+libkwrited_main_la_SOURCES = kwrited.C -+libkwrited_main_la_LIBADD = libkonsolepart.la -+libkwrited_main_la_LDFLAGS = $(all_libraries) -+ - # kwrited kdeinit module --kwrited_la_SOURCES = kwrited.C --kwrited_la_LIBADD = libkonsolepart.la -+kwrited_la_SOURCES = kwrited_main.cpp -+kwrited_la_LIBADD = libkwrited_main.la - kwrited_la_LDFLAGS = $(all_libraries) -module -avoid-version - - # kwrited executable --kwrited_SOURCES = dummy.C --kwrited_LDADD = kwrited.la -+kwrited_SOURCES = kwrited_main.cpp -+kwrited_LDADD = libkwrited_main.la - kwrited_LDFLAGS = $(all_libraries) $(KDE_RPATH) - -+libkonsole_main_la_SOURCES = main.C konsole.C -+libkonsole_main_la_LIBADD = libkonsolepart.la -+libkonsole_main_la_LDFLAGS = $(all_libraries) -+ - # konsole kdeinit module --konsole_la_SOURCES = main.C konsole.C --konsole_la_LIBADD = libkonsolepart.la -+konsole_la_SOURCES = konsole_main.cpp -+konsole_la_LIBADD = libkonsole_main.la - konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version - - # konsole executable - has all the sources, doesn't link kparts, saves startup time - konsole_SOURCES = TEPty.C BlockArray.C main.C konsole.C schema.C session.C TEWidget.C TEmuVt102.C \ -- TEScreen.C TEmulation.C TEHistory.C keytrans.C -+ TEScreen.C TEmulation.C TEHistory.C keytrans.C konsole_main.cpp - konsole_LDADD = $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIBUTIL) - konsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) - -@@ -88,10 +97,6 @@ - done - $(XGETTEXT) rc.cpp *.C -o $(podir)/konsole.pot - rm -f schemas.C -- --dummy.C: -- echo > dummy.C -- - - rcdir = $(kde_datadir)/konsole - rc_DATA = konsole_part.rc diff --git a/x11/kdebase2/patches/patch-cz b/x11/kdebase2/patches/patch-cz deleted file mode 100644 index ebb5699f236..00000000000 --- a/x11/kdebase2/patches/patch-cz +++ /dev/null @@ -1,382 +0,0 @@ -$NetBSD: patch-cz,v 1.2 2001/12/03 15:37:19 skrll Exp $ - ---- konsole/src/Makefile.in.orig Sat Nov 10 07:58:33 2001 -+++ konsole/src/Makefile.in -@@ -291,7 +291,8 @@ - - # you can add here more. This one gets installed - bin_PROGRAMS = konsole konsole_grantpty kwrited #kcmkonsole --lib_LTLIBRARIES = libkonsolepart.la kwrited.la konsole.la -+lib_LTLIBRARIES = libkonsolepart.la libkwrited_main.la kwrited.la libkonsole_main.la konsole.la -+ - # libkonsolepart is a part, but konsole.la links directly to it, so we can't - # install it under kde_module - -@@ -301,23 +302,31 @@ - libkonsolepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - libkonsolepart_la_LIBADD = $(LIB_KPARTS) $(LIBUTIL) - -+libkwrited_main_la_SOURCES = kwrited.C -+libkwrited_main_la_LIBADD = libkonsolepart.la -+libkwrited_main_la_LDFLAGS = $(all_libraries) -+ - # kwrited kdeinit module --kwrited_la_SOURCES = kwrited.C --kwrited_la_LIBADD = libkonsolepart.la -+kwrited_la_SOURCES = kwrited_main.cpp -+kwrited_la_LIBADD = libkwrited_main.la - kwrited_la_LDFLAGS = $(all_libraries) -module -avoid-version - - # kwrited executable --kwrited_SOURCES = dummy.C --kwrited_LDADD = kwrited.la -+kwrited_SOURCES = kwrited_main.cpp -+kwrited_LDADD = libkwrited_main.la - kwrited_LDFLAGS = $(all_libraries) $(KDE_RPATH) - -+libkonsole_main_la_SOURCES = main.C konsole.C -+libkonsole_main_la_LIBADD = libkonsolepart.la -+libkonsole_main_la_LDFLAGS = $(all_libraries) -+ - # konsole kdeinit module --konsole_la_SOURCES = main.C konsole.C --konsole_la_LIBADD = libkonsolepart.la -+konsole_la_SOURCES = konsole_main.cpp -+konsole_la_LIBADD = libkonsole_main.la - konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version - - # konsole executable - has all the sources, doesn't link kparts, saves startup time --konsole_SOURCES = TEPty.C BlockArray.C main.C konsole.C schema.C session.C TEWidget.C TEmuVt102.C TEScreen.C TEmulation.C TEHistory.C keytrans.C -+konsole_SOURCES = TEPty.C BlockArray.C main.C konsole.C schema.C session.C TEWidget.C TEmuVt102.C TEScreen.C TEmulation.C TEHistory.C keytrans.C konsole_main.cpp - - konsole_LDADD = $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIBUTIL) - konsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) -@@ -371,22 +380,30 @@ - libkonsolepart_la_meta_unload.lo - @KDE_USE_FINAL_FALSE@libkonsolepart_la_OBJECTS = $(libkonsolepart_la_nofinal_OBJECTS) - @KDE_USE_FINAL_TRUE@libkonsolepart_la_OBJECTS = $(libkonsolepart_la_final_OBJECTS) --kwrited_la_DEPENDENCIES = libkonsolepart.la --#>- kwrited_la_OBJECTS = kwrited.lo -+libkwrited_main_la_DEPENDENCIES = libkonsolepart.la -+#>- libkwrited_main_la_OBJECTS = kwrited.lo - #>+ 5 --kwrited_la_final_OBJECTS = kwrited_la.all_C.lo --kwrited_la_nofinal_OBJECTS = kwrited.lo \ -- kwrited_la_meta_unload.lo --@KDE_USE_FINAL_FALSE@kwrited_la_OBJECTS = $(kwrited_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@kwrited_la_OBJECTS = $(kwrited_la_final_OBJECTS) --konsole_la_DEPENDENCIES = libkonsolepart.la --#>- konsole_la_OBJECTS = main.lo konsole.lo -+libkwrited_main_la_final_OBJECTS = libkwrited_main_la.all_C.lo -+libkwrited_main_la_nofinal_OBJECTS = kwrited.lo \ -+ libkwrited_main_la_meta_unload.lo -+@KDE_USE_FINAL_FALSE@libkwrited_main_la_OBJECTS = $(libkwrited_main_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libkwrited_main_la_OBJECTS = $(libkwrited_main_la_final_OBJECTS) -+kwrited_la_DEPENDENCIES = libkwrited_main.la -+#>- kwrited_la_OBJECTS = kwrited_main.lo -+#>+ 1 -+kwrited_la_OBJECTS = kwrited_main.lo -+libkonsole_main_la_DEPENDENCIES = libkonsolepart.la -+#>- libkonsole_main_la_OBJECTS = main.lo konsole.lo - #>+ 5 --konsole_la_final_OBJECTS = konsole_la.all_C.lo --konsole_la_nofinal_OBJECTS = main.lo konsole.lo \ -- konsole_la_meta_unload.lo --@KDE_USE_FINAL_FALSE@konsole_la_OBJECTS = $(konsole_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@konsole_la_OBJECTS = $(konsole_la_final_OBJECTS) -+libkonsole_main_la_final_OBJECTS = libkonsole_main_la.all_C.lo -+libkonsole_main_la_nofinal_OBJECTS = main.lo konsole.lo \ -+ libkonsole_main_la_meta_unload.lo -+@KDE_USE_FINAL_FALSE@libkonsole_main_la_OBJECTS = $(libkonsole_main_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libkonsole_main_la_OBJECTS = $(libkonsole_main_la_final_OBJECTS) -+konsole_la_DEPENDENCIES = libkonsole_main.la -+#>- konsole_la_OBJECTS = konsole_main.lo -+#>+ 1 -+konsole_la_OBJECTS = konsole_main.lo - bin_PROGRAMS = konsole$(EXEEXT) konsole_grantpty$(EXEEXT) \ - kwrited$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) -@@ -394,13 +411,13 @@ - #>- konsole_OBJECTS = TEPty.$(OBJEXT) BlockArray.$(OBJEXT) main.$(OBJEXT) \ - #>- konsole.$(OBJEXT) schema.$(OBJEXT) session.$(OBJEXT) TEWidget.$(OBJEXT) \ - #>- TEmuVt102.$(OBJEXT) TEScreen.$(OBJEXT) TEmulation.$(OBJEXT) \ --#>- TEHistory.$(OBJEXT) keytrans.$(OBJEXT) -+#>- TEHistory.$(OBJEXT) keytrans.$(OBJEXT) konsole_main.$(OBJEXT) - #>+ 8 --konsole_final_OBJECTS = konsole.all_C.o -+konsole_final_OBJECTS = konsole.all_cpp.o konsole.all_C.o - konsole_nofinal_OBJECTS = TEPty.$(OBJEXT) BlockArray.$(OBJEXT) main.$(OBJEXT) \ - konsole.$(OBJEXT) schema.$(OBJEXT) session.$(OBJEXT) TEWidget.$(OBJEXT) \ - TEmuVt102.$(OBJEXT) TEScreen.$(OBJEXT) TEmulation.$(OBJEXT) \ -- TEHistory.$(OBJEXT) keytrans.$(OBJEXT) \ -+ TEHistory.$(OBJEXT) keytrans.$(OBJEXT) konsole_main.$(OBJEXT) \ - konsole_meta_unload.o - @KDE_USE_FINAL_FALSE@konsole_OBJECTS = $(konsole_nofinal_OBJECTS) - @KDE_USE_FINAL_TRUE@konsole_OBJECTS = $(konsole_final_OBJECTS) -@@ -410,10 +427,10 @@ - konsole_grantpty_OBJECTS = konsole_grantpty.$(OBJEXT) - konsole_grantpty_LDADD = $(LDADD) - konsole_grantpty_DEPENDENCIES = --#>- kwrited_OBJECTS = dummy.$(OBJEXT) -+#>- kwrited_OBJECTS = kwrited_main.$(OBJEXT) - #>+ 1 --kwrited_OBJECTS = dummy.$(OBJEXT) --kwrited_DEPENDENCIES = kwrited.la -+kwrited_OBJECTS = kwrited_main.$(OBJEXT) -+kwrited_DEPENDENCIES = libkwrited_main.la - CXXFLAGS = @CXXFLAGS@ - #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 1 -@@ -437,21 +454,21 @@ - - #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=x-konsole.desktop konsolerc sample.shell konsole_part.rc -+KDE_DIST=sample.shell konsole_part.rc x-konsole.desktop konsolerc - - DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - - - TAR = tar - GZIP_ENV = --best --SOURCES = $(libkonsolepart_la_SOURCES) $(kwrited_la_SOURCES) $(konsole_la_SOURCES) $(konsole_SOURCES) $(konsole_grantpty_SOURCES) $(kwrited_SOURCES) --OBJECTS = $(libkonsolepart_la_OBJECTS) $(kwrited_la_OBJECTS) $(konsole_la_OBJECTS) $(konsole_OBJECTS) $(konsole_grantpty_OBJECTS) $(kwrited_OBJECTS) -+SOURCES = $(libkonsolepart_la_SOURCES) $(libkwrited_main_la_SOURCES) $(kwrited_la_SOURCES) $(libkonsole_main_la_SOURCES) $(konsole_la_SOURCES) $(konsole_SOURCES) $(konsole_grantpty_SOURCES) $(kwrited_SOURCES) -+OBJECTS = $(libkonsolepart_la_OBJECTS) $(libkwrited_main_la_OBJECTS) $(kwrited_la_OBJECTS) $(libkonsole_main_la_OBJECTS) $(konsole_la_OBJECTS) $(konsole_OBJECTS) $(konsole_grantpty_OBJECTS) $(kwrited_OBJECTS) - - #>- all: all-redirect - #>+ 1 - all: docs-am all-redirect - .SUFFIXES: --.SUFFIXES: .C .S .c .lo .o .obj .s -+.SUFFIXES: .C .S .c .cpp .lo .o .obj .s - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - #>- cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps konsole/src/Makefile - #>+ 2 -@@ -538,9 +555,15 @@ - @KDE_USE_CLOSURE_FALSE@libkonsolepart.la: $(libkonsolepart_la_OBJECTS) $(libkonsolepart_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(libkonsolepart_la_LDFLAGS) $(libkonsolepart_la_OBJECTS) $(libkonsolepart_la_LIBADD) $(LIBS) - -+libkwrited_main.la: $(libkwrited_main_la_OBJECTS) $(libkwrited_main_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(libdir) $(libkwrited_main_la_LDFLAGS) $(libkwrited_main_la_OBJECTS) $(libkwrited_main_la_LIBADD) $(LIBS) -+ - kwrited.la: $(kwrited_la_OBJECTS) $(kwrited_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(kwrited_la_LDFLAGS) $(kwrited_la_OBJECTS) $(kwrited_la_LIBADD) $(LIBS) - -+libkonsole_main.la: $(libkonsole_main_la_OBJECTS) $(libkonsole_main_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(libdir) $(libkonsole_main_la_LDFLAGS) $(libkonsole_main_la_OBJECTS) $(libkonsole_main_la_LIBADD) $(LIBS) -+ - konsole.la: $(konsole_la_OBJECTS) $(konsole_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(konsole_la_LDFLAGS) $(konsole_la_OBJECTS) $(konsole_la_LIBADD) $(LIBS) - -@@ -586,6 +609,12 @@ - $(CXXCOMPILE) -c `cygpath -w $<` - .C.lo: - $(LTCXXCOMPILE) -c $< -+.cpp.o: -+ $(CXXCOMPILE) -c $< -+.cpp.obj: -+ $(CXXCOMPILE) -c `cygpath -w $<` -+.cpp.lo: -+ $(LTCXXCOMPILE) -c $< - - install-dataDATA: $(data_DATA) - @$(NORMAL_INSTALL) -@@ -802,9 +831,6 @@ - $(XGETTEXT) rc.cpp *.C -o $(podir)/konsole.pot - rm -f schemas.C - --dummy.C: -- echo > dummy.C -- - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: -@@ -881,29 +907,29 @@ - - - #>+ 12 --kwrited_la_meta_unload.C: kwrited.moc -- @echo 'creating kwrited_la_meta_unload.C' -- @-rm -f kwrited_la_meta_unload.C -+libkwrited_main_la_meta_unload.C: kwrited.moc -+ @echo 'creating libkwrited_main_la_meta_unload.C' -+ @-rm -f libkwrited_main_la_meta_unload.C - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kwrited_la[] = {' > kwrited_la_meta_unload.C ;\ -- cat kwrited.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kwrited_la_meta_unload.C ;\ -- echo '0};' >> kwrited_la_meta_unload.C ;\ -- echo '#include <kunload.h>' >> kwrited_la_meta_unload.C ;\ -- echo '_UNLOAD(kwrited_la)' >> kwrited_la_meta_unload.C ;\ -- else echo > kwrited_la_meta_unload.C; fi -+ echo 'static const char * _metalist_libkwrited_main_la[] = {' > libkwrited_main_la_meta_unload.C ;\ -+ cat kwrited.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkwrited_main_la_meta_unload.C ;\ -+ echo '0};' >> libkwrited_main_la_meta_unload.C ;\ -+ echo '#include <kunload.h>' >> libkwrited_main_la_meta_unload.C ;\ -+ echo '_UNLOAD(libkwrited_main_la)' >> libkwrited_main_la_meta_unload.C ;\ -+ else echo > libkwrited_main_la_meta_unload.C; fi - - - #>+ 12 --konsole_la_meta_unload.C: konsole.moc -- @echo 'creating konsole_la_meta_unload.C' -- @-rm -f konsole_la_meta_unload.C -+libkonsole_main_la_meta_unload.C: konsole.moc -+ @echo 'creating libkonsole_main_la_meta_unload.C' -+ @-rm -f libkonsole_main_la_meta_unload.C - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_konsole_la[] = {' > konsole_la_meta_unload.C ;\ -- cat konsole.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> konsole_la_meta_unload.C ;\ -- echo '0};' >> konsole_la_meta_unload.C ;\ -- echo '#include <kunload.h>' >> konsole_la_meta_unload.C ;\ -- echo '_UNLOAD(konsole_la)' >> konsole_la_meta_unload.C ;\ -- else echo > konsole_la_meta_unload.C; fi -+ echo 'static const char * _metalist_libkonsole_main_la[] = {' > libkonsole_main_la_meta_unload.C ;\ -+ cat konsole.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkonsole_main_la_meta_unload.C ;\ -+ echo '0};' >> libkonsole_main_la_meta_unload.C ;\ -+ echo '#include <kunload.h>' >> libkonsole_main_la_meta_unload.C ;\ -+ echo '_UNLOAD(libkonsole_main_la)' >> libkonsole_main_la_meta_unload.C ;\ -+ else echo > libkonsole_main_la_meta_unload.C; fi - - - #>+ 12 -@@ -921,7 +947,7 @@ - - #>+ 3 - clean-moc-classes: -- -rm -f libkonsolepart_la_meta_unload.C kwrited_la_meta_unload.C konsole_la_meta_unload.C konsole_meta_unload.C -+ -rm -f libkonsolepart_la_meta_unload.C libkwrited_main_la_meta_unload.C libkonsole_main_la_meta_unload.C konsole_meta_unload.C - - #>+ 11 - libkonsolepart_la.all_C.C: $(srcdir)/Makefile.in $(srcdir)/TEPty.C $(srcdir)/BlockArray.C $(srcdir)/schema.C $(srcdir)/session.C $(srcdir)/TEWidget.C $(srcdir)/TEmuVt102.C $(srcdir)/TEScreen.C $(srcdir)/TEmulation.C $(srcdir)/TEHistory.C $(srcdir)/keytrans.C $(srcdir)/konsole_part.C libkonsolepart_la_meta_unload.C konsole_part.moc konsole.moc TEWidget.moc TEmulation.moc session.moc TEmuVt102.moc kwrited.moc TEPty.moc -@@ -936,28 +962,64 @@ - rm -f libkonsolepart_la.all_C.final libkonsolepart_la.all_C.files - - #>+ 11 --kwrited_la.all_C.C: $(srcdir)/Makefile.in $(srcdir)/kwrited.C kwrited_la_meta_unload.C -- @echo 'creating kwrited_la.all_C.C ...'; \ -- rm -f kwrited_la.all_C.files kwrited_la.all_C.final; \ -- echo "#define KDE_USE_FINAL 1" >> kwrited_la.all_C.final; \ -- for file in kwrited.C kwrited_la_meta_unload.C ; do \ -- echo "#include \"$$file\"" >> kwrited_la.all_C.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrited_la.all_C.final; \ -+libkwrited_main_la.all_C.C: $(srcdir)/Makefile.in $(srcdir)/kwrited.C libkwrited_main_la_meta_unload.C -+ @echo 'creating libkwrited_main_la.all_C.C ...'; \ -+ rm -f libkwrited_main_la.all_C.files libkwrited_main_la.all_C.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkwrited_main_la.all_C.final; \ -+ for file in kwrited.C libkwrited_main_la_meta_unload.C ; do \ -+ echo "#include \"$$file\"" >> libkwrited_main_la.all_C.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkwrited_main_la.all_C.final; \ -+ done; \ -+ cat libkwrited_main_la.all_C.final libkwrited_main_la.all_C.files > libkwrited_main_la.all_C.C; \ -+ rm -f libkwrited_main_la.all_C.final libkwrited_main_la.all_C.files -+ -+#>+ 11 -+kwrited_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwrited_main.cpp -+ @echo 'creating kwrited_la.all_cpp.cpp ...'; \ -+ rm -f kwrited_la.all_cpp.files kwrited_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> kwrited_la.all_cpp.final; \ -+ for file in kwrited_main.cpp ; do \ -+ echo "#include \"$$file\"" >> kwrited_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrited_la.all_cpp.final; \ -+ done; \ -+ cat kwrited_la.all_cpp.final kwrited_la.all_cpp.files > kwrited_la.all_cpp.cpp; \ -+ rm -f kwrited_la.all_cpp.final kwrited_la.all_cpp.files -+ -+#>+ 11 -+libkonsole_main_la.all_C.C: $(srcdir)/Makefile.in $(srcdir)/main.C $(srcdir)/konsole.C libkonsole_main_la_meta_unload.C -+ @echo 'creating libkonsole_main_la.all_C.C ...'; \ -+ rm -f libkonsole_main_la.all_C.files libkonsole_main_la.all_C.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkonsole_main_la.all_C.final; \ -+ for file in main.C konsole.C libkonsole_main_la_meta_unload.C ; do \ -+ echo "#include \"$$file\"" >> libkonsole_main_la.all_C.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkonsole_main_la.all_C.final; \ -+ done; \ -+ cat libkonsole_main_la.all_C.final libkonsole_main_la.all_C.files > libkonsole_main_la.all_C.C; \ -+ rm -f libkonsole_main_la.all_C.final libkonsole_main_la.all_C.files -+ -+#>+ 11 -+konsole_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/konsole_main.cpp -+ @echo 'creating konsole_la.all_cpp.cpp ...'; \ -+ rm -f konsole_la.all_cpp.files konsole_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> konsole_la.all_cpp.final; \ -+ for file in konsole_main.cpp ; do \ -+ echo "#include \"$$file\"" >> konsole_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konsole_la.all_cpp.final; \ - done; \ -- cat kwrited_la.all_C.final kwrited_la.all_C.files > kwrited_la.all_C.C; \ -- rm -f kwrited_la.all_C.final kwrited_la.all_C.files -+ cat konsole_la.all_cpp.final konsole_la.all_cpp.files > konsole_la.all_cpp.cpp; \ -+ rm -f konsole_la.all_cpp.final konsole_la.all_cpp.files - - #>+ 11 --konsole_la.all_C.C: $(srcdir)/Makefile.in $(srcdir)/main.C $(srcdir)/konsole.C konsole_la_meta_unload.C -- @echo 'creating konsole_la.all_C.C ...'; \ -- rm -f konsole_la.all_C.files konsole_la.all_C.final; \ -- echo "#define KDE_USE_FINAL 1" >> konsole_la.all_C.final; \ -- for file in main.C konsole.C konsole_la_meta_unload.C ; do \ -- echo "#include \"$$file\"" >> konsole_la.all_C.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konsole_la.all_C.final; \ -+konsole.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/konsole_main.cpp -+ @echo 'creating konsole.all_cpp.cpp ...'; \ -+ rm -f konsole.all_cpp.files konsole.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> konsole.all_cpp.final; \ -+ for file in konsole_main.cpp ; do \ -+ echo "#include \"$$file\"" >> konsole.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konsole.all_cpp.final; \ - done; \ -- cat konsole_la.all_C.final konsole_la.all_C.files > konsole_la.all_C.C; \ -- rm -f konsole_la.all_C.final konsole_la.all_C.files -+ cat konsole.all_cpp.final konsole.all_cpp.files > konsole.all_cpp.cpp; \ -+ rm -f konsole.all_cpp.final konsole.all_cpp.files - - #>+ 11 - konsole.all_C.C: $(srcdir)/Makefile.in $(srcdir)/TEPty.C $(srcdir)/BlockArray.C $(srcdir)/main.C $(srcdir)/konsole.C $(srcdir)/schema.C $(srcdir)/session.C $(srcdir)/TEWidget.C $(srcdir)/TEmuVt102.C $(srcdir)/TEScreen.C $(srcdir)/TEmulation.C $(srcdir)/TEHistory.C $(srcdir)/keytrans.C konsole_meta_unload.C -@@ -972,33 +1034,33 @@ - rm -f konsole.all_C.final konsole.all_C.files - - #>+ 11 --kwrited.all_C.C: $(srcdir)/Makefile.in dummy.C -- @echo 'creating kwrited.all_C.C ...'; \ -- rm -f kwrited.all_C.files kwrited.all_C.final; \ -- echo "#define KDE_USE_FINAL 1" >> kwrited.all_C.final; \ -- for file in dummy.C ; do \ -- echo "#include \"$$file\"" >> kwrited.all_C.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrited.all_C.final; \ -+kwrited.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwrited_main.cpp -+ @echo 'creating kwrited.all_cpp.cpp ...'; \ -+ rm -f kwrited.all_cpp.files kwrited.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> kwrited.all_cpp.final; \ -+ for file in kwrited_main.cpp ; do \ -+ echo "#include \"$$file\"" >> kwrited.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrited.all_cpp.final; \ - done; \ -- cat kwrited.all_C.final kwrited.all_C.files > kwrited.all_C.C; \ -- rm -f kwrited.all_C.final kwrited.all_C.files -+ cat kwrited.all_cpp.final kwrited.all_cpp.files > kwrited.all_cpp.cpp; \ -+ rm -f kwrited.all_cpp.final kwrited.all_cpp.files - - #>+ 3 - clean-final: -- -rm -f libkonsolepart_la.all_C.C kwrited_la.all_C.C konsole_la.all_C.C konsole.all_C.C kwrited.all_C.C -+ -rm -f libkonsolepart_la.all_C.C libkwrited_main_la.all_C.C kwrited_la.all_cpp.cpp libkonsole_main_la.all_C.C konsole_la.all_cpp.cpp konsole.all_cpp.cpp konsole.all_C.C kwrited.all_cpp.cpp - - #>+ 2 - final: -- $(MAKE) libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" kwrited_la_OBJECTS="$(kwrited_la_final_OBJECTS)" konsole_la_OBJECTS="$(konsole_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" all-am -+ $(MAKE) libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" libkwrited_main_la_OBJECTS="$(libkwrited_main_la_final_OBJECTS)" libkonsole_main_la_OBJECTS="$(libkonsole_main_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" all-am - #>+ 2 - final-install: -- $(MAKE) libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" kwrited_la_OBJECTS="$(kwrited_la_final_OBJECTS)" konsole_la_OBJECTS="$(konsole_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" install-am -+ $(MAKE) libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" libkwrited_main_la_OBJECTS="$(libkwrited_main_la_final_OBJECTS)" libkonsole_main_la_OBJECTS="$(libkonsole_main_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" install-am - #>+ 2 - no-final: -- $(MAKE) libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" kwrited_la_OBJECTS="$(kwrited_la_nofinal_OBJECTS)" konsole_la_OBJECTS="$(konsole_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" all-am -+ $(MAKE) libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" libkwrited_main_la_OBJECTS="$(libkwrited_main_la_nofinal_OBJECTS)" libkonsole_main_la_OBJECTS="$(libkonsole_main_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" all-am - #>+ 2 - no-final-install: -- $(MAKE) libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" kwrited_la_OBJECTS="$(kwrited_la_nofinal_OBJECTS)" konsole_la_OBJECTS="$(konsole_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" install-am -+ $(MAKE) libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" libkwrited_main_la_OBJECTS="$(libkwrited_main_la_nofinal_OBJECTS)" libkonsole_main_la_OBJECTS="$(libkonsole_main_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" install-am - #>+ 3 - cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase2/patches/patch-da b/x11/kdebase2/patches/patch-da deleted file mode 100644 index 932fe4870d1..00000000000 --- a/x11/kdebase2/patches/patch-da +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-da,v 1.1 2001/10/15 22:46:07 skrll Exp $ - ---- konsole/src/konsole_main.cpp.orig Tue Oct 2 17:50:35 2001 -+++ konsole/src/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 int konsole_main(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return konsole_main(argc, argv); -+} diff --git a/x11/kdebase2/patches/patch-db b/x11/kdebase2/patches/patch-db deleted file mode 100644 index 75d05ef94a1..00000000000 --- a/x11/kdebase2/patches/patch-db +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-db,v 1.1 2001/10/15 22:46:07 skrll Exp $ - ---- konsole/src/kwrited.C.orig Sat Mar 17 14:30:43 2001 -+++ konsole/src/kwrited.C -@@ -80,7 +80,7 @@ - ::exit(0); - } - --int main(int argc, char* argv[]) -+int kwrited_main(int argc, char* argv[]) - { - KLocale::setMainCatalogue("konsole"); - KCmdLineArgs::init(argc, argv, "kwrited", diff --git a/x11/kdebase2/patches/patch-dc b/x11/kdebase2/patches/patch-dc deleted file mode 100644 index 2ff03ee5698..00000000000 --- a/x11/kdebase2/patches/patch-dc +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-dc,v 1.1 2001/10/15 22:46:08 skrll Exp $ - ---- konsole/src/kwrited_main.cpp.orig Tue Oct 2 17:50:35 2001 -+++ konsole/src/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 int kwrited_main(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kwrited_main(argc, argv); -+} diff --git a/x11/kdebase2/patches/patch-dd b/x11/kdebase2/patches/patch-dd deleted file mode 100644 index 807a4ec83df..00000000000 --- a/x11/kdebase2/patches/patch-dd +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-dd,v 1.2 2001/12/03 15:37:19 skrll Exp $ - ---- konsole/src/main.C.orig Wed Sep 5 00:16:57 2001 -+++ konsole/src/main.C -@@ -108,7 +108,7 @@ - - - /* --| main |------------------------------------------------------ */ --int main(int argc, char* argv[]) -+int konsole_main(int argc, char* argv[]) - { - setgid(getgid()); setuid(getuid()); // drop privileges - diff --git a/x11/kdebase2/patches/patch-de b/x11/kdebase2/patches/patch-de deleted file mode 100644 index e1504b8d1d0..00000000000 --- a/x11/kdebase2/patches/patch-de +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-de,v 1.3 2002/05/20 19:09:49 cjep Exp $ ---- ksysguard/ksysguardd/FreeBSD/CPU.c.orig Mon Nov 26 01:14:58 2001 -+++ ksysguard/ksysguardd/FreeBSD/CPU.c Mon Nov 26 01:15:11 2001 -@@ -19,7 +19,11 @@ - */ - - #include <sys/dkstat.h> -+#ifdef __NetBSD__ -+#include <sys/sched.h> /* CPUSTATES */ -+#else - #include <devstat.h> -+#endif - #include <fcntl.h> - #include <kvm.h> - #include <nlist.h> diff --git a/x11/kdebase2/patches/patch-df b/x11/kdebase2/patches/patch-df deleted file mode 100644 index 53ef5455cce..00000000000 --- a/x11/kdebase2/patches/patch-df +++ /dev/null @@ -1,85 +0,0 @@ -$NetBSD: patch-df,v 1.3 2002/05/20 19:09:49 cjep Exp $ ---- ksysguard/ksysguardd/FreeBSD/Memory.c.orig Sat Nov 10 18:17:04 2001 -+++ ksysguard/ksysguardd/FreeBSD/Memory.c Mon Nov 26 12:00:04 2001 -@@ -32,7 +32,12 @@ - #include <sys/types.h> - #include <sys/vmmeter.h> - #include <unistd.h> -+/* Everything post 1.5.x uses uvm/uvm_* includes */ -+#if __NetBSD_Version__ >= 105010000 -+#include <uvm/uvm_param.h> -+#else - #include <vm/vm_param.h> -+#endif - - #include "Command.h" - #include "Memory.h" -@@ -82,15 +87,25 @@ - struct vmtotal p; - FILE *file; - char buf[256]; -+ int rc; -+#ifndef __NetBSD__ - struct kvm_swap kswap[16]; - int i, swap_count, hlen, pagesize = getpagesize(); - long blocksize; -+#endif - - len = sizeof (Total); -+#ifdef __NetBSD__ -+ mib[0] = CTL_HW; -+ mib[1] = HW_PHYSMEM; -+ sysctl(mib, sizeof(mib), &Total, &len, NULL, 0); -+#else - sysctlbyname("hw.physmem", &Total, &len, NULL, 0); -+#endif - Total /= 1024; - - /* Borrowed from pstat */ -+#ifndef __NetBSD__ - swap_count = kvm_getswapinfo(kd, kswap, 16, SWIF_DEV_PREFIX); - getbsize(&hlen, &blocksize); - -@@ -101,24 +116,42 @@ - SUsed = CONVERT(kswap[0].ksw_used); - SFree = CONVERT(kswap[0].ksw_total - kswap[0].ksw_used); - } -+#endif - -+#ifdef __NetBSD__ -+ /* NetBSD doesn't know about vfs.bufspace */ -+ Buffers = -1; -+#else - len = sizeof (Buffers); - if ((sysctlbyname("vfs.bufspace", &Buffers, &len, NULL, 0) == -1) || !len) - Buffers = 0; /* Doesn't work under FreeBSD v2.2.x */ -+#endif - Buffers /= 1024; - - -+#ifdef __NetBSD__ -+ /* NetBSD doesn't know about vm.stats */ -+ Cached = -1; -+#else - len = sizeof (Cached); - if ((sysctlbyname("vm.stats.vm.v_cache_count", &Cached, &len, NULL, 0) == -1) || !len) - Cached = 0; /* Doesn't work under FreeBSD v2.2.x */ -+#endif - Cached *= getpagesize() / 1024; - - -+#ifdef __NetBSD__ -+ /* No idea where to get them right now. -+ * I don't want to start kmem-digging... */ -+ MFree = -1; -+ Used = -1; -+#else - /* initializes the pointer to the vmmeter struct */ - len = sizeof (p); - sysctlbyname("vm.vmmeter", &p, &len, NULL, 0); - MFree = p.t_free * getpagesize() / 1024; - Used = p.t_arm * getpagesize() / 1024 + Buffers + Cached; -+#endif - - return 0; - } diff --git a/x11/kdebase2/patches/patch-dg b/x11/kdebase2/patches/patch-dg deleted file mode 100644 index 8351e0371c2..00000000000 --- a/x11/kdebase2/patches/patch-dg +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-dg,v 1.1 2001/10/15 22:46:08 skrll Exp $ - ---- kwin/Makefile.am.orig Sun Jul 29 05:56:47 2001 -+++ kwin/Makefile.am -@@ -3,14 +3,14 @@ - SUBDIRS = . pics clients - - bin_PROGRAMS = kwin --lib_LTLIBRARIES = kwin.la -+lib_LTLIBRARIES = libkwin.la - - # workspace.cpp has to be first in order not to break --enable-final --kwin_la_SOURCES = workspace.cpp atoms.cpp client.cpp main.cpp \ -+libkwin_la_SOURCES = workspace.cpp atoms.cpp client.cpp main.cpp \ - tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \ - killwindow.cpp kwinbutton.cpp --kwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA) --kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version -+libkwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA) -+libkwin_la_LDFLAGS = $(all_libraries) -module -avoid-version - - include_HEADERS = KWinInterface.h - -@@ -18,7 +18,7 @@ - kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h - - kwin_SOURCES = kwin_main.cpp --kwin_LDADD = kwin.la -+kwin_LDADD = libkwin.la - kwin_LDFLAGS = $(all_libraries) $(KDE_RPATH) - - KDE_ICON = kwin -@@ -34,4 +34,3 @@ - - sounddir= $(kde_sounddir) - sound_DATA = pop.wav -- diff --git a/x11/kdebase2/patches/patch-dh b/x11/kdebase2/patches/patch-dh deleted file mode 100644 index 859f3c820ca..00000000000 --- a/x11/kdebase2/patches/patch-dh +++ /dev/null @@ -1,175 +0,0 @@ -$NetBSD: patch-dh,v 1.2 2001/12/03 15:37:19 skrll Exp $ - ---- kwin/Makefile.in.orig Sat Nov 10 07:58:36 2001 -+++ kwin/Makefile.in -@@ -277,15 +277,15 @@ - SUBDIRS = . pics clients - - bin_PROGRAMS = kwin --lib_LTLIBRARIES = kwin.la -+lib_LTLIBRARIES = libkwin.la - - # workspace.cpp has to be first in order not to break --enable-final --#>- kwin_la_SOURCES = workspace.cpp atoms.cpp client.cpp main.cpp tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel killwindow.cpp kwinbutton.cpp -+#>- libkwin_la_SOURCES = workspace.cpp atoms.cpp client.cpp main.cpp tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel killwindow.cpp kwinbutton.cpp - #>+ 1 --kwin_la_SOURCES=workspace.cpp atoms.cpp client.cpp main.cpp tabbox.cpp options.cpp plugins.cpp events.cpp killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp -+libkwin_la_SOURCES=workspace.cpp atoms.cpp client.cpp main.cpp tabbox.cpp options.cpp plugins.cpp events.cpp killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp - --kwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA) --kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version -+libkwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA) -+libkwin_la_LDFLAGS = $(all_libraries) -module -avoid-version - - include_HEADERS = KWinInterface.h - -@@ -293,7 +293,7 @@ - kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h - - kwin_SOURCES = kwin_main.cpp --kwin_LDADD = kwin.la -+kwin_LDADD = libkwin.la - kwin_LDFLAGS = $(all_libraries) $(KDE_RPATH) - - KDE_ICON = kwin -@@ -318,23 +318,23 @@ - LIBS = @LIBS@ - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ --kwin_la_DEPENDENCIES = --#>- kwin_la_OBJECTS = workspace.lo atoms.lo client.lo main.lo tabbox.lo \ -+libkwin_la_DEPENDENCIES = -+#>- libkwin_la_OBJECTS = workspace.lo atoms.lo client.lo main.lo tabbox.lo \ - #>- options.lo plugins.lo events.lo killwindow.lo kwinbutton.lo - #>+ 6 --kwin_la_final_OBJECTS = kwin_la.all_cpp.lo --kwin_la_nofinal_OBJECTS = workspace.lo atoms.lo client.lo main.lo tabbox.lo \ -+libkwin_la_final_OBJECTS = libkwin_la.all_cpp.lo -+libkwin_la_nofinal_OBJECTS = workspace.lo atoms.lo client.lo main.lo tabbox.lo \ - options.lo plugins.lo events.lo killwindow.lo kwinbutton.lo KWinInterface_skel.lo \ -- kwin_la_meta_unload.lo --@KDE_USE_FINAL_FALSE@kwin_la_OBJECTS = $(kwin_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@kwin_la_OBJECTS = $(kwin_la_final_OBJECTS) -+ libkwin_la_meta_unload.lo -+@KDE_USE_FINAL_FALSE@libkwin_la_OBJECTS = $(libkwin_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libkwin_la_OBJECTS = $(libkwin_la_final_OBJECTS) - bin_PROGRAMS = kwin$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - - #>- kwin_OBJECTS = kwin_main.$(OBJEXT) - #>+ 1 - kwin_OBJECTS = kwin_main.$(OBJEXT) --kwin_DEPENDENCIES = kwin.la -+kwin_DEPENDENCIES = libkwin.la - CXXFLAGS = @CXXFLAGS@ - #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 1 -@@ -355,15 +355,15 @@ - - #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=NEWCOLORSCHEME.README stdclient_bitmaps.h tabbox.h hi48-app-kwin.png LICENSE main.h hi32-app-kwin.png pop.wav plugins.h killwindow.h kwinbindings.cpp events.h atoms.h eventsrc hi16-app-kwin.png -+KDE_DIST=plugins.h LICENSE killwindow.h main.h NEWCOLORSCHEME.README hi32-app-kwin.png tabbox.h hi48-app-kwin.png kwinbindings.cpp pop.wav stdclient_bitmaps.h events.h atoms.h eventsrc hi16-app-kwin.png - - DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - - - TAR = tar - GZIP_ENV = --best --SOURCES = $(kwin_la_SOURCES) $(kwin_SOURCES) --OBJECTS = $(kwin_la_OBJECTS) $(kwin_OBJECTS) -+SOURCES = $(libkwin_la_SOURCES) $(kwin_SOURCES) -+OBJECTS = $(libkwin_la_OBJECTS) $(kwin_OBJECTS) - - #>- all: all-redirect - #>+ 1 -@@ -450,8 +450,8 @@ - - maintainer-clean-libtool: - --kwin.la: $(kwin_la_OBJECTS) $(kwin_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(libdir) $(kwin_la_LDFLAGS) $(kwin_la_OBJECTS) $(kwin_la_LIBADD) $(LIBS) -+libkwin.la: $(libkwin_la_OBJECTS) $(libkwin_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(libdir) $(libkwin_la_LDFLAGS) $(libkwin_la_OBJECTS) $(libkwin_la_LIBADD) $(LIBS) - - mostlyclean-binPROGRAMS: - -@@ -847,33 +847,33 @@ - - - #>+ 12 --kwin_la_meta_unload.cpp: workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc -- @echo 'creating kwin_la_meta_unload.cpp' -- @-rm -f kwin_la_meta_unload.cpp -+libkwin_la_meta_unload.cpp: workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc -+ @echo 'creating libkwin_la_meta_unload.cpp' -+ @-rm -f libkwin_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kwin_la[] = {' > kwin_la_meta_unload.cpp ;\ -- cat workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kwin_la_meta_unload.cpp ;\ -- echo '0};' >> kwin_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kwin_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kwin_la)' >> kwin_la_meta_unload.cpp ;\ -- else echo > kwin_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkwin_la[] = {' > libkwin_la_meta_unload.cpp ;\ -+ cat workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkwin_la_meta_unload.cpp ;\ -+ echo '0};' >> libkwin_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkwin_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkwin_la)' >> libkwin_la_meta_unload.cpp ;\ -+ else echo > libkwin_la_meta_unload.cpp; fi - - - #>+ 3 - clean-moc-classes: -- -rm -f kwin_la_meta_unload.cpp -+ -rm -f libkwin_la_meta_unload.cpp - - #>+ 11 --kwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/atoms.cpp $(srcdir)/client.cpp $(srcdir)/main.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/kwinbutton.cpp KWinInterface_skel.cpp kwin_la_meta_unload.cpp workspace.moc client.moc tabbox.moc options.moc kwinbutton.moc plugins.moc -- @echo 'creating kwin_la.all_cpp.cpp ...'; \ -- rm -f kwin_la.all_cpp.files kwin_la.all_cpp.final; \ -- echo "#define KDE_USE_FINAL 1" >> kwin_la.all_cpp.final; \ -- for file in workspace.cpp atoms.cpp client.cpp main.cpp tabbox.cpp options.cpp plugins.cpp events.cpp killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp kwin_la_meta_unload.cpp ; do \ -- echo "#include \"$$file\"" >> kwin_la.all_cpp.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwin_la.all_cpp.final; \ -+libkwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/atoms.cpp $(srcdir)/client.cpp $(srcdir)/main.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/kwinbutton.cpp KWinInterface_skel.cpp libkwin_la_meta_unload.cpp workspace.moc client.moc tabbox.moc options.moc kwinbutton.moc plugins.moc -+ @echo 'creating libkwin_la.all_cpp.cpp ...'; \ -+ rm -f libkwin_la.all_cpp.files libkwin_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkwin_la.all_cpp.final; \ -+ for file in workspace.cpp atoms.cpp client.cpp main.cpp tabbox.cpp options.cpp plugins.cpp events.cpp killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp libkwin_la_meta_unload.cpp ; do \ -+ echo "#include \"$$file\"" >> libkwin_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkwin_la.all_cpp.final; \ - done; \ -- cat kwin_la.all_cpp.final kwin_la.all_cpp.files > kwin_la.all_cpp.cpp; \ -- rm -f kwin_la.all_cpp.final kwin_la.all_cpp.files -+ cat libkwin_la.all_cpp.final libkwin_la.all_cpp.files > libkwin_la.all_cpp.cpp; \ -+ rm -f libkwin_la.all_cpp.final libkwin_la.all_cpp.files - - #>+ 11 - kwin.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwin_main.cpp -@@ -889,20 +889,20 @@ - - #>+ 3 - clean-final: -- -rm -f kwin_la.all_cpp.cpp kwin.all_cpp.cpp -+ -rm -f libkwin_la.all_cpp.cpp kwin.all_cpp.cpp - - #>+ 2 - final: -- $(MAKE) kwin_la_OBJECTS="$(kwin_la_final_OBJECTS)" all-am -+ $(MAKE) libkwin_la_OBJECTS="$(libkwin_la_final_OBJECTS)" all-am - #>+ 2 - final-install: -- $(MAKE) kwin_la_OBJECTS="$(kwin_la_final_OBJECTS)" install-am -+ $(MAKE) libkwin_la_OBJECTS="$(libkwin_la_final_OBJECTS)" install-am - #>+ 2 - no-final: -- $(MAKE) kwin_la_OBJECTS="$(kwin_la_nofinal_OBJECTS)" all-am -+ $(MAKE) libkwin_la_OBJECTS="$(libkwin_la_nofinal_OBJECTS)" all-am - #>+ 2 - no-final-install: -- $(MAKE) kwin_la_OBJECTS="$(kwin_la_nofinal_OBJECTS)" install-am -+ $(MAKE) libkwin_la_OBJECTS="$(libkwin_la_nofinal_OBJECTS)" install-am - #>+ 3 - cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase2/patches/patch-di b/x11/kdebase2/patches/patch-di deleted file mode 100644 index 54417c432b7..00000000000 --- a/x11/kdebase2/patches/patch-di +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-di,v 1.1 2001/10/15 22:46:08 skrll Exp $ - ---- kwin/clients/b2/Makefile.am.orig Tue Jun 19 15:32:08 2001 -+++ kwin/clients/b2/Makefile.am -@@ -4,7 +4,7 @@ - kde_module_LTLIBRARIES = libkwinb2.la - - libkwinb2_la_SOURCES = b2client.cpp --libkwinb2_la_LIBADD = ../../kwin.la -+libkwinb2_la_LIBADD = ../../libkwin.la - libkwinb2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - - METASOURCES = AUTO diff --git a/x11/kdebase2/patches/patch-dj b/x11/kdebase2/patches/patch-dj deleted file mode 100644 index 8a229cd8f01..00000000000 --- a/x11/kdebase2/patches/patch-dj +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-dj,v 1.2 2001/12/03 15:37:19 skrll Exp $ - ---- kwin/clients/b2/Makefile.in.orig Sat Nov 10 07:58:36 2001 -+++ kwin/clients/b2/Makefile.in -@@ -278,7 +278,7 @@ - kde_module_LTLIBRARIES = libkwinb2.la - - libkwinb2_la_SOURCES = b2client.cpp --libkwinb2_la_LIBADD = ../../kwin.la -+libkwinb2_la_LIBADD = ../../libkwin.la - libkwinb2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - - #>- METASOURCES = AUTO -@@ -300,7 +300,7 @@ - LIBS = @LIBS@ - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ --libkwinb2_la_DEPENDENCIES = ../../kwin.la -+libkwinb2_la_DEPENDENCIES = ../../libkwin.la - #>- libkwinb2_la_OBJECTS = b2client.lo - #>+ 5 - libkwinb2_la_final_OBJECTS = libkwinb2_la.all_cpp.lo -@@ -328,7 +328,7 @@ - - #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=b2.desktop bitmaps.h -+KDE_DIST=bitmaps.h b2.desktop - - DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - diff --git a/x11/kdebase2/patches/patch-dk b/x11/kdebase2/patches/patch-dk deleted file mode 100644 index b950f75910a..00000000000 --- a/x11/kdebase2/patches/patch-dk +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-dk,v 1.1 2001/10/15 22:46:09 skrll Exp $ - ---- kwin/clients/default/Makefile.am.orig Thu Jun 7 12:35:06 2001 -+++ kwin/clients/default/Makefile.am -@@ -6,7 +6,7 @@ - kde_module_LTLIBRARIES = libkwindefault.la - - libkwindefault_la_SOURCES = kdedefault.cpp --libkwindefault_la_LIBADD = ../../kwin.la -+libkwindefault_la_LIBADD = ../../libkwin.la - libkwindefault_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - - METASOURCES = AUTO diff --git a/x11/kdebase2/patches/patch-dl b/x11/kdebase2/patches/patch-dl deleted file mode 100644 index 44aab37d92b..00000000000 --- a/x11/kdebase2/patches/patch-dl +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-dl,v 1.2 2001/12/03 15:37:19 skrll Exp $ - ---- kwin/clients/default/Makefile.in.orig Sat Nov 10 07:58:36 2001 -+++ kwin/clients/default/Makefile.in -@@ -280,7 +280,7 @@ - kde_module_LTLIBRARIES = libkwindefault.la - - libkwindefault_la_SOURCES = kdedefault.cpp --libkwindefault_la_LIBADD = ../../kwin.la -+libkwindefault_la_LIBADD = ../../libkwin.la - libkwindefault_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - - #>- METASOURCES = AUTO -@@ -297,7 +297,7 @@ - LIBS = @LIBS@ - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ --libkwindefault_la_DEPENDENCIES = ../../kwin.la -+libkwindefault_la_DEPENDENCIES = ../../libkwin.la - #>- libkwindefault_la_OBJECTS = kdedefault.lo - #>+ 5 - libkwindefault_la_final_OBJECTS = libkwindefault_la.all_cpp.lo diff --git a/x11/kdebase2/patches/patch-dm b/x11/kdebase2/patches/patch-dm deleted file mode 100644 index dbe520cf5e4..00000000000 --- a/x11/kdebase2/patches/patch-dm +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-dm,v 1.1 2001/10/15 22:46:09 skrll Exp $ - ---- kwin/clients/icewm/Makefile.am.orig Mon Apr 16 15:55:07 2001 -+++ kwin/clients/icewm/Makefile.am -@@ -5,7 +5,7 @@ - kde_module_LTLIBRARIES = libkwinicewm.la - - libkwinicewm_la_SOURCES = icewm.cpp --libkwinicewm_la_LIBADD = ../../kwin.la -+libkwinicewm_la_LIBADD = ../../libkwin.la - libkwinicewm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - - METASOURCES = AUTO diff --git a/x11/kdebase2/patches/patch-dn b/x11/kdebase2/patches/patch-dn deleted file mode 100644 index 4fa8382d330..00000000000 --- a/x11/kdebase2/patches/patch-dn +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-dn,v 1.2 2001/12/03 15:37:20 skrll Exp $ - ---- kwin/clients/icewm/Makefile.in.orig Sat Nov 10 07:58:37 2001 -+++ kwin/clients/icewm/Makefile.in -@@ -280,7 +280,7 @@ - kde_module_LTLIBRARIES = libkwinicewm.la - - libkwinicewm_la_SOURCES = icewm.cpp --libkwinicewm_la_LIBADD = ../../kwin.la -+libkwinicewm_la_LIBADD = ../../libkwin.la - libkwinicewm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - - #>- METASOURCES = AUTO -@@ -302,7 +302,7 @@ - LIBS = @LIBS@ - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ --libkwinicewm_la_DEPENDENCIES = ../../kwin.la -+libkwinicewm_la_DEPENDENCIES = ../../libkwin.la - #>- libkwinicewm_la_OBJECTS = icewm.lo - #>+ 5 - libkwinicewm_la_final_OBJECTS = libkwinicewm_la.all_cpp.lo diff --git a/x11/kdebase2/patches/patch-do b/x11/kdebase2/patches/patch-do deleted file mode 100644 index 0b862807b30..00000000000 --- a/x11/kdebase2/patches/patch-do +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-do,v 1.1 2001/10/15 22:46:09 skrll Exp $ - ---- kwin/clients/kde/Makefile.am.orig Mon Dec 4 18:47:46 2000 -+++ kwin/clients/kde/Makefile.am -@@ -16,7 +16,7 @@ - TitleBar.cpp \ - TitleText.cpp \ - Static.cpp --libkwindefault_la_LIBADD = ../../kwin.la -+libkwindefault_la_LIBADD = ../../libkwin.la - libkwindefault_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - - METASOURCES = AUTO diff --git a/x11/kdebase2/patches/patch-dp b/x11/kdebase2/patches/patch-dp deleted file mode 100644 index ae4d594ac5e..00000000000 --- a/x11/kdebase2/patches/patch-dp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-dp,v 1.1 2001/10/15 22:46:09 skrll Exp $ - ---- kwin/clients/kde1/Makefile.am.orig Mon Dec 4 18:47:47 2000 -+++ kwin/clients/kde1/Makefile.am -@@ -4,7 +4,7 @@ - kde_module_LTLIBRARIES = libkwinkde1.la - - libkwinkde1_la_SOURCES = kde1client.cpp --libkwinkde1_la_LIBADD = ../../kwin.la -+libkwinkde1_la_LIBADD = ../../libkwin.la - libkwinkde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - - METASOURCES = AUTO diff --git a/x11/kdebase2/patches/patch-dq b/x11/kdebase2/patches/patch-dq deleted file mode 100644 index 292c3d09078..00000000000 --- a/x11/kdebase2/patches/patch-dq +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-dq,v 1.2 2001/12/03 15:37:20 skrll Exp $ - ---- kwin/clients/kde1/Makefile.in.orig Sat Nov 10 07:58:37 2001 -+++ kwin/clients/kde1/Makefile.in -@@ -278,7 +278,7 @@ - kde_module_LTLIBRARIES = libkwinkde1.la - - libkwinkde1_la_SOURCES = kde1client.cpp --libkwinkde1_la_LIBADD = ../../kwin.la -+libkwinkde1_la_LIBADD = ../../libkwin.la - libkwinkde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - - #>- METASOURCES = AUTO -@@ -299,7 +299,7 @@ - LIBS = @LIBS@ - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ --libkwinkde1_la_DEPENDENCIES = ../../kwin.la -+libkwinkde1_la_DEPENDENCIES = ../../libkwin.la - #>- libkwinkde1_la_OBJECTS = kde1client.lo - #>+ 5 - libkwinkde1_la_final_OBJECTS = libkwinkde1_la.all_cpp.lo -@@ -327,7 +327,7 @@ - - #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=kde1.desktop kde1client_bitmaps.h -+KDE_DIST=kde1client_bitmaps.h kde1.desktop - - DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - diff --git a/x11/kdebase2/patches/patch-dr b/x11/kdebase2/patches/patch-dr deleted file mode 100644 index 760b28fd7b7..00000000000 --- a/x11/kdebase2/patches/patch-dr +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-dr,v 1.1 2001/10/15 22:46:09 skrll Exp $ - ---- kwin/clients/kstep/Makefile.am.orig Sun Jun 24 18:12:39 2001 -+++ kwin/clients/kstep/Makefile.am -@@ -4,7 +4,7 @@ - kde_module_LTLIBRARIES = libkwinkstep.la - - libkwinkstep_la_SOURCES = nextclient.cpp --libkwinkstep_la_LIBADD = ../../kwin.la -+libkwinkstep_la_LIBADD = ../../libkwin.la - libkwinkstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - - METASOURCES = AUTO diff --git a/x11/kdebase2/patches/patch-ds b/x11/kdebase2/patches/patch-ds deleted file mode 100644 index 307f0d44629..00000000000 --- a/x11/kdebase2/patches/patch-ds +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ds,v 1.2 2001/12/03 15:37:20 skrll Exp $ - ---- kwin/clients/kstep/Makefile.in.orig Sat Nov 10 07:58:37 2001 -+++ kwin/clients/kstep/Makefile.in -@@ -278,7 +278,7 @@ - kde_module_LTLIBRARIES = libkwinkstep.la - - libkwinkstep_la_SOURCES = nextclient.cpp --libkwinkstep_la_LIBADD = ../../kwin.la -+libkwinkstep_la_LIBADD = ../../libkwin.la - libkwinkstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - - #>- METASOURCES = AUTO -@@ -300,7 +300,7 @@ - LIBS = @LIBS@ - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ --libkwinkstep_la_DEPENDENCIES = ../../kwin.la -+libkwinkstep_la_DEPENDENCIES = ../../libkwin.la - #>- libkwinkstep_la_OBJECTS = nextclient.lo - #>+ 5 - libkwinkstep_la_final_OBJECTS = libkwinkstep_la.all_cpp.lo diff --git a/x11/kdebase2/patches/patch-dt b/x11/kdebase2/patches/patch-dt deleted file mode 100644 index 60577dbdcd6..00000000000 --- a/x11/kdebase2/patches/patch-dt +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-dt,v 1.1 2001/10/15 22:46:10 skrll Exp $ - ---- kwin/clients/kwmtheme/Makefile.am.orig Sun Jun 24 07:10:59 2001 -+++ kwin/clients/kwmtheme/Makefile.am -@@ -4,7 +4,7 @@ - kde_module_LTLIBRARIES = libkwinkwmtheme.la - - libkwinkwmtheme_la_SOURCES = kwmthemeclient.cpp --libkwinkwmtheme_la_LIBADD = ../../kwin.la -+libkwinkwmtheme_la_LIBADD = ../../libkwin.la - libkwinkwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - - METASOURCES = AUTO diff --git a/x11/kdebase2/patches/patch-du b/x11/kdebase2/patches/patch-du deleted file mode 100644 index 5e38654e6e4..00000000000 --- a/x11/kdebase2/patches/patch-du +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-du,v 1.2 2001/12/03 15:37:20 skrll Exp $ - ---- kwin/clients/kwmtheme/Makefile.in.orig Sat Nov 10 07:58:37 2001 -+++ kwin/clients/kwmtheme/Makefile.in -@@ -279,7 +279,7 @@ - kde_module_LTLIBRARIES = libkwinkwmtheme.la - - libkwinkwmtheme_la_SOURCES = kwmthemeclient.cpp --libkwinkwmtheme_la_LIBADD = ../../kwin.la -+libkwinkwmtheme_la_LIBADD = ../../libkwin.la - libkwinkwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - - #>- METASOURCES = AUTO -@@ -296,7 +296,7 @@ - LIBS = @LIBS@ - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ --libkwinkwmtheme_la_DEPENDENCIES = ../../kwin.la -+libkwinkwmtheme_la_DEPENDENCIES = ../../libkwin.la - #>- libkwinkwmtheme_la_OBJECTS = kwmthemeclient.lo - #>+ 5 - libkwinkwmtheme_la_final_OBJECTS = libkwinkwmtheme_la.all_cpp.lo diff --git a/x11/kdebase2/patches/patch-dv b/x11/kdebase2/patches/patch-dv deleted file mode 100644 index 38039e71bb9..00000000000 --- a/x11/kdebase2/patches/patch-dv +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-dv,v 1.1 2001/10/15 22:46:10 skrll Exp $ - ---- kwin/clients/laptop/Makefile.am.orig Wed Jun 20 12:17:03 2001 -+++ kwin/clients/laptop/Makefile.am -@@ -4,7 +4,7 @@ - kde_module_LTLIBRARIES = libkwinlaptop.la - - libkwinlaptop_la_SOURCES = laptopclient.cpp --libkwinlaptop_la_LIBADD = ../../kwin.la -+libkwinlaptop_la_LIBADD = ../../libkwin.la - libkwinlaptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - - METASOURCES = AUTO diff --git a/x11/kdebase2/patches/patch-dw b/x11/kdebase2/patches/patch-dw deleted file mode 100644 index 935012ef4a5..00000000000 --- a/x11/kdebase2/patches/patch-dw +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-dw,v 1.2 2001/12/03 15:37:20 skrll Exp $ - ---- kwin/clients/laptop/Makefile.in.orig Sat Nov 10 07:58:37 2001 -+++ kwin/clients/laptop/Makefile.in -@@ -278,7 +278,7 @@ - kde_module_LTLIBRARIES = libkwinlaptop.la - - libkwinlaptop_la_SOURCES = laptopclient.cpp --libkwinlaptop_la_LIBADD = ../../kwin.la -+libkwinlaptop_la_LIBADD = ../../libkwin.la - libkwinlaptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - - #>- METASOURCES = AUTO -@@ -300,7 +300,7 @@ - LIBS = @LIBS@ - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ --libkwinlaptop_la_DEPENDENCIES = ../../kwin.la -+libkwinlaptop_la_DEPENDENCIES = ../../libkwin.la - #>- libkwinlaptop_la_OBJECTS = laptopclient.lo - #>+ 5 - libkwinlaptop_la_final_OBJECTS = libkwinlaptop_la.all_cpp.lo diff --git a/x11/kdebase2/patches/patch-dx b/x11/kdebase2/patches/patch-dx deleted file mode 100644 index ac483060950..00000000000 --- a/x11/kdebase2/patches/patch-dx +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-dx,v 1.1 2001/10/15 22:46:10 skrll Exp $ - ---- kwin/clients/modernsystem/Makefile.am.orig Tue Jun 19 16:26:47 2001 -+++ kwin/clients/modernsystem/Makefile.am -@@ -7,7 +7,7 @@ - kde_module_LTLIBRARIES = libkwinmodernsys.la - - libkwinmodernsys_la_SOURCES = modernsys.cpp --libkwinmodernsys_la_LIBADD = ../../kwin.la -+libkwinmodernsys_la_LIBADD = ../../libkwin.la - libkwinmodernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - - METASOURCES = AUTO diff --git a/x11/kdebase2/patches/patch-dy b/x11/kdebase2/patches/patch-dy deleted file mode 100644 index 05c8e953573..00000000000 --- a/x11/kdebase2/patches/patch-dy +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-dy,v 1.2 2001/12/03 15:37:20 skrll Exp $ - ---- kwin/clients/modernsystem/Makefile.in.orig Sat Nov 10 07:58:37 2001 -+++ kwin/clients/modernsystem/Makefile.in -@@ -282,7 +282,7 @@ - kde_module_LTLIBRARIES = libkwinmodernsys.la - - libkwinmodernsys_la_SOURCES = modernsys.cpp --libkwinmodernsys_la_LIBADD = ../../kwin.la -+libkwinmodernsys_la_LIBADD = ../../libkwin.la - libkwinmodernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - - #>- METASOURCES = AUTO -@@ -304,7 +304,7 @@ - LIBS = @LIBS@ - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ --libkwinmodernsys_la_DEPENDENCIES = ../../kwin.la -+libkwinmodernsys_la_DEPENDENCIES = ../../libkwin.la - #>- libkwinmodernsys_la_OBJECTS = modernsys.lo - #>+ 5 - libkwinmodernsys_la_final_OBJECTS = libkwinmodernsys_la.all_cpp.lo -@@ -332,7 +332,7 @@ - - #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=buttondata.h btnhighcolor.h modernsystem.desktop -+KDE_DIST=btnhighcolor.h modernsystem.desktop buttondata.h - - DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - diff --git a/x11/kdebase2/patches/patch-dz b/x11/kdebase2/patches/patch-dz deleted file mode 100644 index 334de07e8d0..00000000000 --- a/x11/kdebase2/patches/patch-dz +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-dz,v 1.1 2001/10/15 22:46:10 skrll Exp $ - ---- kwin/clients/mwm/Makefile.am.orig Mon Dec 4 18:47:47 2000 -+++ kwin/clients/mwm/Makefile.am -@@ -4,7 +4,7 @@ - kde_module_LTLIBRARIES = libkwinmwm.la - - libkwinmwm_la_SOURCES = mwmclient.cpp --libkwinmwm_la_LIBADD = ../../kwin.la -+libkwinmwm_la_LIBADD = ../../libkwin.la - libkwinmwm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - - METASOURCES = AUTO diff --git a/x11/kdebase2/patches/patch-ea b/x11/kdebase2/patches/patch-ea deleted file mode 100644 index fe81f0ca3ab..00000000000 --- a/x11/kdebase2/patches/patch-ea +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ea,v 1.2 2001/12/03 15:37:20 skrll Exp $ - ---- kwin/clients/mwm/Makefile.in.orig Sat Nov 10 07:58:37 2001 -+++ kwin/clients/mwm/Makefile.in -@@ -278,7 +278,7 @@ - kde_module_LTLIBRARIES = libkwinmwm.la - - libkwinmwm_la_SOURCES = mwmclient.cpp --libkwinmwm_la_LIBADD = ../../kwin.la -+libkwinmwm_la_LIBADD = ../../libkwin.la - libkwinmwm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - - #>- METASOURCES = AUTO -@@ -300,7 +300,7 @@ - LIBS = @LIBS@ - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ --libkwinmwm_la_DEPENDENCIES = ../../kwin.la -+libkwinmwm_la_DEPENDENCIES = ../../libkwin.la - #>- libkwinmwm_la_OBJECTS = mwmclient.lo - #>+ 5 - libkwinmwm_la_final_OBJECTS = libkwinmwm_la.all_cpp.lo diff --git a/x11/kdebase2/patches/patch-eb b/x11/kdebase2/patches/patch-eb deleted file mode 100644 index 9127691020b..00000000000 --- a/x11/kdebase2/patches/patch-eb +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-eb,v 1.1 2001/10/15 22:46:10 skrll Exp $ - ---- kwin/clients/quartz/Makefile.am.orig Sat May 26 03:34:47 2001 -+++ kwin/clients/quartz/Makefile.am -@@ -6,7 +6,7 @@ - kde_module_LTLIBRARIES = libkwinquartz.la - - libkwinquartz_la_SOURCES = quartz.cpp --libkwinquartz_la_LIBADD = ../../kwin.la -+libkwinquartz_la_LIBADD = ../../libkwin.la - libkwinquartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - - METASOURCES = AUTO diff --git a/x11/kdebase2/patches/patch-ec b/x11/kdebase2/patches/patch-ec deleted file mode 100644 index 61db836ed32..00000000000 --- a/x11/kdebase2/patches/patch-ec +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ec,v 1.2 2001/12/03 15:37:20 skrll Exp $ - ---- kwin/clients/quartz/Makefile.in.orig Sat Nov 10 07:58:38 2001 -+++ kwin/clients/quartz/Makefile.in -@@ -280,7 +280,7 @@ - kde_module_LTLIBRARIES = libkwinquartz.la - - libkwinquartz_la_SOURCES = quartz.cpp --libkwinquartz_la_LIBADD = ../../kwin.la -+libkwinquartz_la_LIBADD = ../../libkwin.la - libkwinquartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - - #>- METASOURCES = AUTO -@@ -302,7 +302,7 @@ - LIBS = @LIBS@ - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ --libkwinquartz_la_DEPENDENCIES = ../../kwin.la -+libkwinquartz_la_DEPENDENCIES = ../../libkwin.la - #>- libkwinquartz_la_OBJECTS = quartz.lo - #>+ 5 - libkwinquartz_la_final_OBJECTS = libkwinquartz_la.all_cpp.lo diff --git a/x11/kdebase2/patches/patch-ed b/x11/kdebase2/patches/patch-ed deleted file mode 100644 index 921eb3e6c00..00000000000 --- a/x11/kdebase2/patches/patch-ed +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ed,v 1.1 2001/10/15 22:46:10 skrll Exp $ - ---- kwin/clients/redmond/Makefile.am.orig Mon Jul 16 07:53:11 2001 -+++ kwin/clients/redmond/Makefile.am -@@ -4,7 +4,7 @@ - kde_module_LTLIBRARIES = libkwinredmond.la - - libkwinredmond_la_SOURCES = redmond.cpp --libkwinredmond_la_LIBADD = ../../kwin.la -+libkwinredmond_la_LIBADD = ../../libkwin.la - libkwinredmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - - METASOURCES = AUTO diff --git a/x11/kdebase2/patches/patch-ee b/x11/kdebase2/patches/patch-ee deleted file mode 100644 index 0ad55cd6451..00000000000 --- a/x11/kdebase2/patches/patch-ee +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ee,v 1.2 2001/12/03 15:37:20 skrll Exp $ - ---- kwin/clients/redmond/Makefile.in.orig Sat Nov 10 07:58:38 2001 -+++ kwin/clients/redmond/Makefile.in -@@ -278,7 +278,7 @@ - kde_module_LTLIBRARIES = libkwinredmond.la - - libkwinredmond_la_SOURCES = redmond.cpp --libkwinredmond_la_LIBADD = ../../kwin.la -+libkwinredmond_la_LIBADD = ../../libkwin.la - libkwinredmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - - #>- METASOURCES = AUTO -@@ -300,7 +300,7 @@ - LIBS = @LIBS@ - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ --libkwinredmond_la_DEPENDENCIES = ../../kwin.la -+libkwinredmond_la_DEPENDENCIES = ../../libkwin.la - #>- libkwinredmond_la_OBJECTS = redmond.lo - #>+ 5 - libkwinredmond_la_final_OBJECTS = libkwinredmond_la.all_cpp.lo diff --git a/x11/kdebase2/patches/patch-ef b/x11/kdebase2/patches/patch-ef deleted file mode 100644 index 2fe5985db5b..00000000000 --- a/x11/kdebase2/patches/patch-ef +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ef,v 1.1 2001/10/15 22:46:10 skrll Exp $ - ---- kwin/clients/riscos/Makefile.am.orig Mon Dec 4 18:47:47 2000 -+++ kwin/clients/riscos/Makefile.am -@@ -12,7 +12,7 @@ - StickyButton.cpp \ - HelpButton.cpp \ - Static.cpp --libkwinriscos_la_LIBADD = ../../kwin.la -+libkwinriscos_la_LIBADD = ../../libkwin.la - libkwinriscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - - METASOURCES = AUTO diff --git a/x11/kdebase2/patches/patch-eg b/x11/kdebase2/patches/patch-eg deleted file mode 100644 index 89c12274b4a..00000000000 --- a/x11/kdebase2/patches/patch-eg +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-eg,v 1.2 2001/12/03 15:37:20 skrll Exp $ - ---- kwin/clients/riscos/Makefile.in.orig Sat Nov 10 07:58:38 2001 -+++ kwin/clients/riscos/Makefile.in -@@ -279,7 +279,7 @@ - - libkwinriscos_la_SOURCES = Button.cpp CloseButton.cpp IconifyButton.cpp LowerButton.cpp Manager.cpp MaximiseButton.cpp StickyButton.cpp HelpButton.cpp Static.cpp - --libkwinriscos_la_LIBADD = ../../kwin.la -+libkwinriscos_la_LIBADD = ../../libkwin.la - libkwinriscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - - #>- METASOURCES = AUTO -@@ -302,7 +302,7 @@ - LIBS = @LIBS@ - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ --libkwinriscos_la_DEPENDENCIES = ../../kwin.la -+libkwinriscos_la_DEPENDENCIES = ../../libkwin.la - #>- libkwinriscos_la_OBJECTS = Button.lo CloseButton.lo IconifyButton.lo \ - #>- LowerButton.lo Manager.lo MaximiseButton.lo StickyButton.lo \ - #>- HelpButton.lo Static.lo -@@ -334,7 +334,7 @@ - - #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=Palette.h riscos.desktop -+KDE_DIST=riscos.desktop Palette.h - - DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - diff --git a/x11/kdebase2/patches/patch-eh b/x11/kdebase2/patches/patch-eh deleted file mode 100644 index 20f14366121..00000000000 --- a/x11/kdebase2/patches/patch-eh +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-eh,v 1.1 2001/10/15 22:46:11 skrll Exp $ - ---- kwin/clients/system/Makefile.am.orig Wed Jun 20 12:42:49 2001 -+++ kwin/clients/system/Makefile.am -@@ -4,7 +4,7 @@ - kde_module_LTLIBRARIES = libkwinsystem.la - - libkwinsystem_la_SOURCES = systemclient.cpp --libkwinsystem_la_LIBADD = ../../kwin.la -+libkwinsystem_la_LIBADD = ../../libkwin.la - libkwinsystem_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - - METASOURCES = AUTO diff --git a/x11/kdebase2/patches/patch-ei b/x11/kdebase2/patches/patch-ei deleted file mode 100644 index 0b2992f6b3b..00000000000 --- a/x11/kdebase2/patches/patch-ei +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ei,v 1.2 2001/12/03 15:37:20 skrll Exp $ - ---- kwin/clients/system/Makefile.in.orig Sat Nov 10 07:58:38 2001 -+++ kwin/clients/system/Makefile.in -@@ -278,7 +278,7 @@ - kde_module_LTLIBRARIES = libkwinsystem.la - - libkwinsystem_la_SOURCES = systemclient.cpp --libkwinsystem_la_LIBADD = ../../kwin.la -+libkwinsystem_la_LIBADD = ../../libkwin.la - libkwinsystem_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - - #>- METASOURCES = AUTO -@@ -300,7 +300,7 @@ - LIBS = @LIBS@ - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ --libkwinsystem_la_DEPENDENCIES = ../../kwin.la -+libkwinsystem_la_DEPENDENCIES = ../../libkwin.la - #>- libkwinsystem_la_OBJECTS = systemclient.lo - #>+ 5 - libkwinsystem_la_final_OBJECTS = libkwinsystem_la.all_cpp.lo diff --git a/x11/kdebase2/patches/patch-ej b/x11/kdebase2/patches/patch-ej deleted file mode 100644 index efa3d2379e7..00000000000 --- a/x11/kdebase2/patches/patch-ej +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ej,v 1.1 2001/10/15 22:46:11 skrll Exp $ - ---- kwin/clients/web/Makefile.am.orig Fri May 18 21:22:57 2001 -+++ kwin/clients/web/Makefile.am -@@ -21,7 +21,7 @@ - WebButtonMaximize.h \ - WebButtonSticky.h - --libkwinweb_la_LIBADD = ../../kwin.la -+libkwinweb_la_LIBADD = ../../libkwin.la - libkwinweb_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - METASOURCES = AUTO - diff --git a/x11/kdebase2/patches/patch-ek b/x11/kdebase2/patches/patch-ek deleted file mode 100644 index bf506a2f7ef..00000000000 --- a/x11/kdebase2/patches/patch-ek +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ek,v 1.2 2001/12/03 15:37:20 skrll Exp $ - ---- kwin/clients/web/Makefile.in.orig Sat Nov 10 07:58:38 2001 -+++ kwin/clients/web/Makefile.in -@@ -282,7 +282,7 @@ - noinst_HEADERS = Web.h WebButton.h WebButtonClose.h WebButtonHelp.h WebButtonIconify.h WebButtonLower.h WebButtonMaximize.h WebButtonSticky.h - - --libkwinweb_la_LIBADD = ../../kwin.la -+libkwinweb_la_LIBADD = ../../libkwin.la - libkwinweb_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - #>- METASOURCES = AUTO - -@@ -301,7 +301,7 @@ - LIBS = @LIBS@ - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ --libkwinweb_la_DEPENDENCIES = ../../kwin.la -+libkwinweb_la_DEPENDENCIES = ../../libkwin.la - #>- libkwinweb_la_OBJECTS = Web.lo WebButton.lo WebButtonClose.lo \ - #>- WebButtonHelp.lo WebButtonIconify.lo WebButtonLower.lo \ - #>- WebButtonMaximize.lo WebButtonSticky.lo diff --git a/x11/kdebase2/patches/patch-el b/x11/kdebase2/patches/patch-el deleted file mode 100644 index 7c74735f0a6..00000000000 --- a/x11/kdebase2/patches/patch-el +++ /dev/null @@ -1,101 +0,0 @@ -$NetBSD: patch-el,v 1.1 2001/10/15 22:46:11 skrll Exp $ - ---- kwin/plugins.cpp.orig Thu Jun 7 12:35:06 2001 -+++ kwin/plugins.cpp -@@ -19,10 +19,6 @@ - - #include "plugins.h" - --#if 0 --#define lt_ptr lt_ptr_t --#endif -- - using namespace KWinInternal; - - const char* defaultPlugin = "libkwindefault"; -@@ -42,10 +38,10 @@ - { - if(handle) { - // Call the plugin's cleanup function -- lt_ptr_t deinit_func = lt_dlsym(handle, "deinit"); -+ void* deinit_func = handle->symbol(QString("deinit").utf8()); - if (deinit_func) - ((void (*)())deinit_func)(); -- lt_dlclose(handle); -+ loader->unloadLibrary(QFile::encodeName(pluginStr)); - } - } - -@@ -74,12 +70,13 @@ - void PluginMgr::loadPlugin(QString nameStr) - { - static bool dlregistered = false; -- lt_dlhandle oldHandle = handle; -+ KLibrary* oldHandle = handle; -+ QString oldPlugin = pluginStr; - handle = 0; - - if(!dlregistered) { - dlregistered = true; -- lt_dlinit(); -+ loader = KLibLoader::self(); - } - - QString path = KLibLoader::findLibrary(nameStr.latin1()); -@@ -99,14 +96,14 @@ - return; - - // Try loading the requested plugin -- handle = lt_dlopen(path.latin1()); -+ handle = loader->library(path.latin1()); - - // If that fails, fall back to the default plugin - if (!handle) { - nameStr = defaultPlugin; - path = KLibLoader::findLibrary(nameStr.latin1()); - if (!path.isEmpty()) -- handle = lt_dlopen(path.latin1()); -+ handle = loader->library(path.latin1()); - } - - if (!handle) -@@ -114,16 +111,16 @@ - "and could not be loaded!")); - - // Call the plugin's initialisation function -- lt_ptr_t init_func = lt_dlsym(handle, "init"); -+ void* init_func = handle->symbol(QString("init").utf8()); - if (init_func) - ((void (*)())init_func)(); - -- lt_ptr_t alloc_func = lt_dlsym(handle, "allocate"); -+ void* alloc_func = handle->symbol(QString("allocate").utf8()); - if(alloc_func) { - alloc_ptr = (Client* (*)(Workspace *ws, WId w, int tool))alloc_func; - } else { - qWarning("KWin: The library %s is not a KWin plugin.", path.latin1()); -- lt_dlclose(handle); -+ loader->unloadLibrary(QFile::encodeName(pluginStr)); - exit(1); - } - -@@ -132,16 +129,16 @@ - - // Call the old plugin's cleanup function - if(oldHandle) { -- lt_ptr_t deinit_func = lt_dlsym(oldHandle, "deinit"); -+ void* deinit_func = oldHandle->symbol(QString("deinit").utf8()); - if (deinit_func) - ((void (*)())deinit_func)(); -- lt_dlclose(oldHandle); -+ loader->unloadLibrary(QFile::encodeName(oldPlugin)); - } - } - - void PluginMgr::resetPlugin() - { -- lt_ptr_t reset_func = lt_dlsym(handle, "reset"); -+ void* reset_func = handle->symbol(QString("reset").utf8()); - if (reset_func) - ((void (*)())reset_func)(); - } diff --git a/x11/kdebase2/patches/patch-em b/x11/kdebase2/patches/patch-em deleted file mode 100644 index 9c3c0755ed5..00000000000 --- a/x11/kdebase2/patches/patch-em +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-em,v 1.1 2001/10/15 22:46:11 skrll Exp $ - ---- kwin/plugins.h.orig Wed Sep 5 00:17:21 2001 -+++ kwin/plugins.h -@@ -8,8 +8,8 @@ - - #include <qpopupmenu.h> - #include <qstringlist.h> --#define LT_NON_POSIX_NAMESPACE --#include <ltdl.h> -+ -+#include <klibloader.h> - - class QFileInfo; - -@@ -35,7 +35,8 @@ - protected: - void shutdownKWin(const QString& error_msg); - Client* (*alloc_ptr)(Workspace *ws, WId w, int tool); -- lt_dlhandle handle; -+ KLibLoader* loader; -+ KLibrary* handle; - QString pluginStr; - }; - diff --git a/x11/kdebase2/patches/patch-en b/x11/kdebase2/patches/patch-en deleted file mode 100644 index 9c264b4f9e8..00000000000 --- a/x11/kdebase2/patches/patch-en +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-en,v 1.1 2001/10/15 22:46:11 skrll Exp $ - ---- kxkb/Makefile.am.orig Tue May 15 22:36:28 2001 -+++ kxkb/Makefile.am -@@ -3,20 +3,24 @@ - - bin_PROGRAMS = kxkb - --kxkb_SOURCES = dummy.cpp -+kxkb_SOURCES = kxkb_main.cpp - kxkb_LDFLAGS = $(all_libraries) $(KDE_RPATH) --kxkb_LDADD = kxkb.la -+kxkb_LDADD = libkxkb_main.la - --lib_LTLIBRARIES = libkcm_keyboard.la kxkb.la -+lib_LTLIBRARIES = libkcm_keyboard.la libkxkb_main.la kxkb.la - - libkcm_keyboard_la_SOURCES = rules.cpp kcmlayout.cpp pixmap.cpp kcmmisc.cpp - - libkcm_keyboard_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined - libkcm_keyboard_la_LIBADD = @XTESTLIB@ $(LIB_KFILE) - --kxkb_la_SOURCES = rules.cpp kxkb.cpp extension.cpp pixmap.cpp -+libkxkb_main_la_SOURCES = rules.cpp kxkb.cpp extension.cpp pixmap.cpp -+libkxkb_main_la_LDFLAGS = $(all_libraries) -+libkxkb_main_la_LIBADD = -lX11 -lXext $(LIB_KDEUI) -+ -+kxkb_la_SOURCES = kxkb_main.cpp - kxkb_la_LDFLAGS = $(all_libraries) -module -avoid-version --kxkb_la_LIBADD = -lX11 -lXext $(LIB_KDEUI) -+kxkb_la_LIBADD = libkxkb_main.la - - data_DATA = keyboard.desktop - datadir = $(kde_appsdir)/Settings/Peripherals -@@ -31,6 +35,3 @@ - messages: - $(XGETTEXT) $(kxkb_la_SOURCES) kxkbbindings.cpp -o $(podir)/kxkb.pot - $(XGETTEXT) $(libkcm_keyboard_la_SOURCES) kxkbbindings.cpp -o $(podir)/kcmlayout.pot -- --dummy.cpp: -- echo > dummy.cpp diff --git a/x11/kdebase2/patches/patch-eo b/x11/kdebase2/patches/patch-eo deleted file mode 100644 index 47766fa60e3..00000000000 --- a/x11/kdebase2/patches/patch-eo +++ /dev/null @@ -1,207 +0,0 @@ -$NetBSD: patch-eo,v 1.2 2001/12/03 15:37:20 skrll Exp $ - ---- kxkb/Makefile.in.orig Sat Nov 10 07:58:38 2001 -+++ kxkb/Makefile.in -@@ -277,20 +277,24 @@ - - bin_PROGRAMS = kxkb - --kxkb_SOURCES = dummy.cpp -+kxkb_SOURCES = kxkb_main.cpp - kxkb_LDFLAGS = $(all_libraries) $(KDE_RPATH) --kxkb_LDADD = kxkb.la -+kxkb_LDADD = libkxkb_main.la - --lib_LTLIBRARIES = libkcm_keyboard.la kxkb.la -+lib_LTLIBRARIES = libkcm_keyboard.la libkxkb_main.la kxkb.la - - libkcm_keyboard_la_SOURCES = rules.cpp kcmlayout.cpp pixmap.cpp kcmmisc.cpp - - libkcm_keyboard_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined - libkcm_keyboard_la_LIBADD = @XTESTLIB@ $(LIB_KFILE) - --kxkb_la_SOURCES = rules.cpp kxkb.cpp extension.cpp pixmap.cpp -+libkxkb_main_la_SOURCES = rules.cpp kxkb.cpp extension.cpp pixmap.cpp -+libkxkb_main_la_LDFLAGS = $(all_libraries) -+libkxkb_main_la_LIBADD = -lX11 -lXext $(LIB_KDEUI) -+ -+kxkb_la_SOURCES = kxkb_main.cpp - kxkb_la_LDFLAGS = $(all_libraries) -module -avoid-version --kxkb_la_LIBADD = -lX11 -lXext $(LIB_KDEUI) -+kxkb_la_LIBADD = libkxkb_main.la - - data_DATA = keyboard.desktop - datadir = $(kde_appsdir)/Settings/Peripherals -@@ -317,21 +321,25 @@ - libkcm_keyboard_la_meta_unload.lo - @KDE_USE_FINAL_FALSE@libkcm_keyboard_la_OBJECTS = $(libkcm_keyboard_la_nofinal_OBJECTS) - @KDE_USE_FINAL_TRUE@libkcm_keyboard_la_OBJECTS = $(libkcm_keyboard_la_final_OBJECTS) --kxkb_la_DEPENDENCIES = --#>- kxkb_la_OBJECTS = rules.lo kxkb.lo extension.lo pixmap.lo -+libkxkb_main_la_DEPENDENCIES = -+#>- libkxkb_main_la_OBJECTS = rules.lo kxkb.lo extension.lo pixmap.lo - #>+ 5 --kxkb_la_final_OBJECTS = kxkb_la.all_cpp.lo --kxkb_la_nofinal_OBJECTS = rules.lo kxkb.lo extension.lo pixmap.lo \ -- kxkb_la_meta_unload.lo --@KDE_USE_FINAL_FALSE@kxkb_la_OBJECTS = $(kxkb_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@kxkb_la_OBJECTS = $(kxkb_la_final_OBJECTS) -+libkxkb_main_la_final_OBJECTS = libkxkb_main_la.all_cpp.lo -+libkxkb_main_la_nofinal_OBJECTS = rules.lo kxkb.lo extension.lo pixmap.lo \ -+ libkxkb_main_la_meta_unload.lo -+@KDE_USE_FINAL_FALSE@libkxkb_main_la_OBJECTS = $(libkxkb_main_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libkxkb_main_la_OBJECTS = $(libkxkb_main_la_final_OBJECTS) -+kxkb_la_DEPENDENCIES = libkxkb_main.la -+#>- kxkb_la_OBJECTS = kxkb_main.lo -+#>+ 1 -+kxkb_la_OBJECTS = kxkb_main.lo - bin_PROGRAMS = kxkb$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - --#>- kxkb_OBJECTS = dummy.$(OBJEXT) -+#>- kxkb_OBJECTS = kxkb_main.$(OBJEXT) - #>+ 1 --kxkb_OBJECTS = dummy.$(OBJEXT) --kxkb_DEPENDENCIES = kxkb.la -+kxkb_OBJECTS = kxkb_main.$(OBJEXT) -+kxkb_DEPENDENCIES = libkxkb_main.la - CXXFLAGS = @CXXFLAGS@ - #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 1 -@@ -350,15 +358,15 @@ - - #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=test.cpp kcmmisc.h configure.in.in kxkbbindings.cpp pixmap.h keyboard.desktop LICENSE kcmlayout.h extension.h uninstall.desktop kxkb.h kxkb.desktop rules.h -+KDE_DIST=pixmap.h kxkb.h test.cpp kcmmisc.h configure.in.in kcmlayout.h kxkbbindings.cpp extension.h kxkb.desktop LICENSE keyboard.desktop uninstall.desktop rules.h - - DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - - - TAR = tar - GZIP_ENV = --best --SOURCES = $(libkcm_keyboard_la_SOURCES) $(kxkb_la_SOURCES) $(kxkb_SOURCES) --OBJECTS = $(libkcm_keyboard_la_OBJECTS) $(kxkb_la_OBJECTS) $(kxkb_OBJECTS) -+SOURCES = $(libkcm_keyboard_la_SOURCES) $(libkxkb_main_la_SOURCES) $(kxkb_la_SOURCES) $(kxkb_SOURCES) -+OBJECTS = $(libkcm_keyboard_la_OBJECTS) $(libkxkb_main_la_OBJECTS) $(kxkb_la_OBJECTS) $(kxkb_OBJECTS) - - #>- all: all-redirect - #>+ 1 -@@ -451,6 +459,9 @@ - @KDE_USE_CLOSURE_FALSE@libkcm_keyboard.la: $(libkcm_keyboard_la_OBJECTS) $(libkcm_keyboard_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(libkcm_keyboard_la_LDFLAGS) $(libkcm_keyboard_la_OBJECTS) $(libkcm_keyboard_la_LIBADD) $(LIBS) - -+libkxkb_main.la: $(libkxkb_main_la_OBJECTS) $(libkxkb_main_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(libdir) $(libkxkb_main_la_LDFLAGS) $(libkxkb_main_la_OBJECTS) $(libkxkb_main_la_LIBADD) $(LIBS) -+ - kxkb.la: $(kxkb_la_OBJECTS) $(kxkb_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(kxkb_la_LDFLAGS) $(kxkb_la_OBJECTS) $(kxkb_la_LIBADD) $(LIBS) - -@@ -673,9 +684,6 @@ - $(XGETTEXT) $(kxkb_la_SOURCES) kxkbbindings.cpp -o $(podir)/kxkb.pot - $(XGETTEXT) $(libkcm_keyboard_la_SOURCES) kxkbbindings.cpp -o $(podir)/kcmlayout.pot - --dummy.cpp: -- echo > dummy.cpp -- - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: -@@ -732,21 +740,21 @@ - - - #>+ 12 --kxkb_la_meta_unload.cpp: kxkb.moc -- @echo 'creating kxkb_la_meta_unload.cpp' -- @-rm -f kxkb_la_meta_unload.cpp -+libkxkb_main_la_meta_unload.cpp: kxkb.moc -+ @echo 'creating libkxkb_main_la_meta_unload.cpp' -+ @-rm -f libkxkb_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kxkb_la[] = {' > kxkb_la_meta_unload.cpp ;\ -- cat kxkb.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kxkb_la_meta_unload.cpp ;\ -- echo '0};' >> kxkb_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kxkb_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kxkb_la)' >> kxkb_la_meta_unload.cpp ;\ -- else echo > kxkb_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkxkb_main_la[] = {' > libkxkb_main_la_meta_unload.cpp ;\ -+ cat kxkb.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkxkb_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkxkb_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkxkb_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkxkb_main_la)' >> libkxkb_main_la_meta_unload.cpp ;\ -+ else echo > libkxkb_main_la_meta_unload.cpp; fi - - - #>+ 3 - clean-moc-classes: -- -rm -f libkcm_keyboard_la_meta_unload.cpp kxkb_la_meta_unload.cpp -+ -rm -f libkcm_keyboard_la_meta_unload.cpp libkxkb_main_la_meta_unload.cpp - - #>+ 11 - libkcm_keyboard_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/rules.cpp $(srcdir)/kcmlayout.cpp $(srcdir)/pixmap.cpp $(srcdir)/kcmmisc.cpp libkcm_keyboard_la_meta_unload.cpp kcmlayout.moc kxkb.moc kcmmisc.moc -@@ -761,11 +769,23 @@ - rm -f libkcm_keyboard_la.all_cpp.final libkcm_keyboard_la.all_cpp.files - - #>+ 11 --kxkb_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/rules.cpp $(srcdir)/kxkb.cpp $(srcdir)/extension.cpp $(srcdir)/pixmap.cpp kxkb_la_meta_unload.cpp -+libkxkb_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/rules.cpp $(srcdir)/kxkb.cpp $(srcdir)/extension.cpp $(srcdir)/pixmap.cpp libkxkb_main_la_meta_unload.cpp -+ @echo 'creating libkxkb_main_la.all_cpp.cpp ...'; \ -+ rm -f libkxkb_main_la.all_cpp.files libkxkb_main_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkxkb_main_la.all_cpp.final; \ -+ for file in rules.cpp kxkb.cpp extension.cpp pixmap.cpp libkxkb_main_la_meta_unload.cpp ; do \ -+ echo "#include \"$$file\"" >> libkxkb_main_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkxkb_main_la.all_cpp.final; \ -+ done; \ -+ cat libkxkb_main_la.all_cpp.final libkxkb_main_la.all_cpp.files > libkxkb_main_la.all_cpp.cpp; \ -+ rm -f libkxkb_main_la.all_cpp.final libkxkb_main_la.all_cpp.files -+ -+#>+ 11 -+kxkb_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kxkb_main.cpp - @echo 'creating kxkb_la.all_cpp.cpp ...'; \ - rm -f kxkb_la.all_cpp.files kxkb_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kxkb_la.all_cpp.final; \ -- for file in rules.cpp kxkb.cpp extension.cpp pixmap.cpp kxkb_la_meta_unload.cpp ; do \ -+ for file in kxkb_main.cpp ; do \ - echo "#include \"$$file\"" >> kxkb_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kxkb_la.all_cpp.final; \ - done; \ -@@ -773,11 +793,11 @@ - rm -f kxkb_la.all_cpp.final kxkb_la.all_cpp.files - - #>+ 11 --kxkb.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+kxkb.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kxkb_main.cpp - @echo 'creating kxkb.all_cpp.cpp ...'; \ - rm -f kxkb.all_cpp.files kxkb.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kxkb.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kxkb_main.cpp ; do \ - echo "#include \"$$file\"" >> kxkb.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kxkb.all_cpp.final; \ - done; \ -@@ -786,20 +806,20 @@ - - #>+ 3 - clean-final: -- -rm -f libkcm_keyboard_la.all_cpp.cpp kxkb_la.all_cpp.cpp kxkb.all_cpp.cpp -+ -rm -f libkcm_keyboard_la.all_cpp.cpp libkxkb_main_la.all_cpp.cpp kxkb_la.all_cpp.cpp kxkb.all_cpp.cpp - - #>+ 2 - final: -- $(MAKE) libkcm_keyboard_la_OBJECTS="$(libkcm_keyboard_la_final_OBJECTS)" kxkb_la_OBJECTS="$(kxkb_la_final_OBJECTS)" all-am -+ $(MAKE) libkcm_keyboard_la_OBJECTS="$(libkcm_keyboard_la_final_OBJECTS)" libkxkb_main_la_OBJECTS="$(libkxkb_main_la_final_OBJECTS)" all-am - #>+ 2 - final-install: -- $(MAKE) libkcm_keyboard_la_OBJECTS="$(libkcm_keyboard_la_final_OBJECTS)" kxkb_la_OBJECTS="$(kxkb_la_final_OBJECTS)" install-am -+ $(MAKE) libkcm_keyboard_la_OBJECTS="$(libkcm_keyboard_la_final_OBJECTS)" libkxkb_main_la_OBJECTS="$(libkxkb_main_la_final_OBJECTS)" install-am - #>+ 2 - no-final: -- $(MAKE) libkcm_keyboard_la_OBJECTS="$(libkcm_keyboard_la_nofinal_OBJECTS)" kxkb_la_OBJECTS="$(kxkb_la_nofinal_OBJECTS)" all-am -+ $(MAKE) libkcm_keyboard_la_OBJECTS="$(libkcm_keyboard_la_nofinal_OBJECTS)" libkxkb_main_la_OBJECTS="$(libkxkb_main_la_nofinal_OBJECTS)" all-am - #>+ 2 - no-final-install: -- $(MAKE) libkcm_keyboard_la_OBJECTS="$(libkcm_keyboard_la_nofinal_OBJECTS)" kxkb_la_OBJECTS="$(kxkb_la_nofinal_OBJECTS)" install-am -+ $(MAKE) libkcm_keyboard_la_OBJECTS="$(libkcm_keyboard_la_nofinal_OBJECTS)" libkxkb_main_la_OBJECTS="$(libkxkb_main_la_nofinal_OBJECTS)" install-am - #>+ 3 - cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase2/patches/patch-ep b/x11/kdebase2/patches/patch-ep deleted file mode 100644 index 9b89a0da06b..00000000000 --- a/x11/kdebase2/patches/patch-ep +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ep,v 1.1 2001/10/15 22:46:11 skrll Exp $ - ---- kxkb/kxkb.cpp.orig Fri Jun 1 05:04:36 2001 -+++ kxkb/kxkb.cpp -@@ -216,7 +216,7 @@ - I18N_NOOP("A utility to switch keyboard maps."); - - --int main(int argc, char *argv[]) -+int kxkb_main(int argc, char *argv[]) - { - KAboutData about("kxkb", I18N_NOOP("KDE Keyboard Tool"), "0.1", - DESCRIPTION, KAboutData::License_QPL, diff --git a/x11/kdebase2/patches/patch-eq b/x11/kdebase2/patches/patch-eq deleted file mode 100644 index 4b82f331b7f..00000000000 --- a/x11/kdebase2/patches/patch-eq +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-eq,v 1.1 2001/10/15 22:46:11 skrll Exp $ - ---- kxkb/kxkb_main.cpp.orig Tue Oct 2 17:50:38 2001 -+++ 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 int kxkb_main(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kxkb_main(argc, argv); -+} diff --git a/x11/kdebase2/patches/patch-er b/x11/kdebase2/patches/patch-er deleted file mode 100644 index cdbc758527b..00000000000 --- a/x11/kdebase2/patches/patch-er +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-er,v 1.1 2001/10/15 22:46:11 skrll Exp $ - ---- kxmlrpc/Makefile.am.orig Thu Sep 7 22:14:17 2000 -+++ kxmlrpc/Makefile.am -@@ -4,15 +4,19 @@ - INCLUDES = $(all_includes) - - bin_PROGRAMS = kxmlrpcd --kxmlrpcd_LDADD = kxmlrpcd.la -+kxmlrpcd_LDADD = libkxmlrpcd_main.la - kxmlrpcd_LDFLAGS = $(KDE_RPATH) --kxmlrpcd_SOURCES = dummy.cpp -+kxmlrpcd_SOURCES = kxmlrpcd_main.cpp - --lib_LTLIBRARIES = kxmlrpcd.la libkcm_xmlrpcd.la --kxmlrpcd_la_LIBADD = $(LIB_KSYCOCA) --kxmlrpcd_la_LDFLAGS = $(all_libraries) -module -avoid-version --kxmlrpcd_la_SOURCES = kxmlrpcserver.cpp kxmlrpcparser.cpp \ -+lib_LTLIBRARIES = libkxmlrpcd_main.la kxmlrpcd.la libkcm_xmlrpcd.la -+libkxmlrpcd_main_la_LIBADD = $(LIB_KSYCOCA) -+libkxmlrpcd_main_la_LDFLAGS = $(all_libraries) -+libkxmlrpcd_main_la_SOURCES = kxmlrpcserver.cpp kxmlrpcparser.cpp \ - kxmlrpcdaemon.cpp kxmlrpcutil.cpp -+ -+kxmlrpcd_la_LIBADD = libkxmlrpcd_main.la -+kxmlrpcd_la_LDFLAGS = $(all_libraries) -module -avoid-version -+kxmlrpcd_la_SOURCES = kxmlrpcd_main.cpp - kxmlrpcd_la_METASOURCES = AUTO - - libkcm_xmlrpcd_la_LIBADD = $(LIB_KDECORE) -@@ -26,6 +30,3 @@ - - messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kxmlrpcd.pot -- --dummy.cpp: -- echo > dummy.cpp diff --git a/x11/kdebase2/patches/patch-es b/x11/kdebase2/patches/patch-es deleted file mode 100644 index 423e377636d..00000000000 --- a/x11/kdebase2/patches/patch-es +++ /dev/null @@ -1,204 +0,0 @@ -$NetBSD: patch-es,v 1.2 2001/12/03 15:37:20 skrll Exp $ - ---- kxmlrpc/Makefile.in.orig Sat Nov 10 07:58:38 2001 -+++ kxmlrpc/Makefile.in -@@ -279,15 +279,19 @@ - INCLUDES = $(all_includes) - - bin_PROGRAMS = kxmlrpcd --kxmlrpcd_LDADD = kxmlrpcd.la -+kxmlrpcd_LDADD = libkxmlrpcd_main.la - kxmlrpcd_LDFLAGS = $(KDE_RPATH) --kxmlrpcd_SOURCES = dummy.cpp -+kxmlrpcd_SOURCES = kxmlrpcd_main.cpp -+ -+lib_LTLIBRARIES = libkxmlrpcd_main.la kxmlrpcd.la libkcm_xmlrpcd.la -+libkxmlrpcd_main_la_LIBADD = $(LIB_KSYCOCA) -+libkxmlrpcd_main_la_LDFLAGS = $(all_libraries) -+libkxmlrpcd_main_la_SOURCES = kxmlrpcserver.cpp kxmlrpcparser.cpp kxmlrpcdaemon.cpp kxmlrpcutil.cpp - --lib_LTLIBRARIES = kxmlrpcd.la libkcm_xmlrpcd.la --kxmlrpcd_la_LIBADD = $(LIB_KSYCOCA) --kxmlrpcd_la_LDFLAGS = $(all_libraries) -module -avoid-version --kxmlrpcd_la_SOURCES = kxmlrpcserver.cpp kxmlrpcparser.cpp kxmlrpcdaemon.cpp kxmlrpcutil.cpp - -+kxmlrpcd_la_LIBADD = libkxmlrpcd_main.la -+kxmlrpcd_la_LDFLAGS = $(all_libraries) -module -avoid-version -+kxmlrpcd_la_SOURCES = kxmlrpcd_main.cpp - #>- kxmlrpcd_la_METASOURCES = AUTO - - libkcm_xmlrpcd_la_LIBADD = $(LIB_KDECORE) -@@ -310,16 +314,20 @@ - LIBS = @LIBS@ - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ --kxmlrpcd_la_DEPENDENCIES = --#>- kxmlrpcd_la_OBJECTS = kxmlrpcserver.lo kxmlrpcparser.lo \ -+libkxmlrpcd_main_la_DEPENDENCIES = -+#>- libkxmlrpcd_main_la_OBJECTS = kxmlrpcserver.lo kxmlrpcparser.lo \ - #>- kxmlrpcdaemon.lo kxmlrpcutil.lo - #>+ 6 --kxmlrpcd_la_final_OBJECTS = kxmlrpcd_la.all_cpp.lo --kxmlrpcd_la_nofinal_OBJECTS = kxmlrpcserver.lo kxmlrpcparser.lo \ -+libkxmlrpcd_main_la_final_OBJECTS = libkxmlrpcd_main_la.all_cpp.lo -+libkxmlrpcd_main_la_nofinal_OBJECTS = kxmlrpcserver.lo kxmlrpcparser.lo \ - kxmlrpcdaemon.lo kxmlrpcutil.lo \ -- kxmlrpcd_la_meta_unload.lo --@KDE_USE_FINAL_FALSE@kxmlrpcd_la_OBJECTS = $(kxmlrpcd_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@kxmlrpcd_la_OBJECTS = $(kxmlrpcd_la_final_OBJECTS) -+ libkxmlrpcd_main_la_meta_unload.lo -+@KDE_USE_FINAL_FALSE@libkxmlrpcd_main_la_OBJECTS = $(libkxmlrpcd_main_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libkxmlrpcd_main_la_OBJECTS = $(libkxmlrpcd_main_la_final_OBJECTS) -+kxmlrpcd_la_DEPENDENCIES = libkxmlrpcd_main.la -+#>- kxmlrpcd_la_OBJECTS = kxmlrpcd_main.lo -+#>+ 1 -+kxmlrpcd_la_OBJECTS = kxmlrpcd_main.lo - libkcm_xmlrpcd_la_DEPENDENCIES = - #>- libkcm_xmlrpcd_la_OBJECTS = kxmlrpcinit.lo - #>+ 1 -@@ -327,10 +335,10 @@ - bin_PROGRAMS = kxmlrpcd$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - --#>- kxmlrpcd_OBJECTS = dummy.$(OBJEXT) -+#>- kxmlrpcd_OBJECTS = kxmlrpcd_main.$(OBJEXT) - #>+ 1 --kxmlrpcd_OBJECTS = dummy.$(OBJEXT) --kxmlrpcd_DEPENDENCIES = kxmlrpcd.la -+kxmlrpcd_OBJECTS = kxmlrpcd_main.$(OBJEXT) -+kxmlrpcd_DEPENDENCIES = libkxmlrpcd_main.la - CXXFLAGS = @CXXFLAGS@ - #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 1 -@@ -351,15 +359,15 @@ - - #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=kxmlrpcd.desktop LICENSE -+KDE_DIST=LICENSE kxmlrpcd.desktop - - DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - - - TAR = tar - GZIP_ENV = --best --SOURCES = $(kxmlrpcd_la_SOURCES) $(libkcm_xmlrpcd_la_SOURCES) $(kxmlrpcd_SOURCES) --OBJECTS = $(kxmlrpcd_la_OBJECTS) $(libkcm_xmlrpcd_la_OBJECTS) $(kxmlrpcd_OBJECTS) -+SOURCES = $(libkxmlrpcd_main_la_SOURCES) $(kxmlrpcd_la_SOURCES) $(libkcm_xmlrpcd_la_SOURCES) $(kxmlrpcd_SOURCES) -+OBJECTS = $(libkxmlrpcd_main_la_OBJECTS) $(kxmlrpcd_la_OBJECTS) $(libkcm_xmlrpcd_la_OBJECTS) $(kxmlrpcd_OBJECTS) - - #>- all: all-redirect - #>+ 1 -@@ -446,6 +454,9 @@ - - maintainer-clean-libtool: - -+libkxmlrpcd_main.la: $(libkxmlrpcd_main_la_OBJECTS) $(libkxmlrpcd_main_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(libdir) $(libkxmlrpcd_main_la_LDFLAGS) $(libkxmlrpcd_main_la_OBJECTS) $(libkxmlrpcd_main_la_LIBADD) $(LIBS) -+ - kxmlrpcd.la: $(kxmlrpcd_la_OBJECTS) $(kxmlrpcd_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(kxmlrpcd_la_LDFLAGS) $(kxmlrpcd_la_OBJECTS) $(kxmlrpcd_la_LIBADD) $(LIBS) - -@@ -644,9 +655,6 @@ - messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kxmlrpcd.pot - --dummy.cpp: -- echo > dummy.cpp -- - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: -@@ -682,28 +690,40 @@ - - - #>+ 12 --kxmlrpcd_la_meta_unload.cpp: kxmlrpcserver.moc -- @echo 'creating kxmlrpcd_la_meta_unload.cpp' -- @-rm -f kxmlrpcd_la_meta_unload.cpp -+libkxmlrpcd_main_la_meta_unload.cpp: kxmlrpcserver.moc -+ @echo 'creating libkxmlrpcd_main_la_meta_unload.cpp' -+ @-rm -f libkxmlrpcd_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kxmlrpcd_la[] = {' > kxmlrpcd_la_meta_unload.cpp ;\ -- cat kxmlrpcserver.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kxmlrpcd_la_meta_unload.cpp ;\ -- echo '0};' >> kxmlrpcd_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kxmlrpcd_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kxmlrpcd_la)' >> kxmlrpcd_la_meta_unload.cpp ;\ -- else echo > kxmlrpcd_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkxmlrpcd_main_la[] = {' > libkxmlrpcd_main_la_meta_unload.cpp ;\ -+ cat kxmlrpcserver.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkxmlrpcd_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkxmlrpcd_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkxmlrpcd_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkxmlrpcd_main_la)' >> libkxmlrpcd_main_la_meta_unload.cpp ;\ -+ else echo > libkxmlrpcd_main_la_meta_unload.cpp; fi - - - #>+ 3 - clean-moc-classes: -- -rm -f kxmlrpcd_la_meta_unload.cpp -+ -rm -f libkxmlrpcd_main_la_meta_unload.cpp -+ -+#>+ 11 -+libkxmlrpcd_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kxmlrpcserver.cpp $(srcdir)/kxmlrpcparser.cpp $(srcdir)/kxmlrpcdaemon.cpp $(srcdir)/kxmlrpcutil.cpp libkxmlrpcd_main_la_meta_unload.cpp -+ @echo 'creating libkxmlrpcd_main_la.all_cpp.cpp ...'; \ -+ rm -f libkxmlrpcd_main_la.all_cpp.files libkxmlrpcd_main_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkxmlrpcd_main_la.all_cpp.final; \ -+ for file in kxmlrpcserver.cpp kxmlrpcparser.cpp kxmlrpcdaemon.cpp kxmlrpcutil.cpp libkxmlrpcd_main_la_meta_unload.cpp ; do \ -+ echo "#include \"$$file\"" >> libkxmlrpcd_main_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkxmlrpcd_main_la.all_cpp.final; \ -+ done; \ -+ cat libkxmlrpcd_main_la.all_cpp.final libkxmlrpcd_main_la.all_cpp.files > libkxmlrpcd_main_la.all_cpp.cpp; \ -+ rm -f libkxmlrpcd_main_la.all_cpp.final libkxmlrpcd_main_la.all_cpp.files - - #>+ 11 --kxmlrpcd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kxmlrpcserver.cpp $(srcdir)/kxmlrpcparser.cpp $(srcdir)/kxmlrpcdaemon.cpp $(srcdir)/kxmlrpcutil.cpp kxmlrpcd_la_meta_unload.cpp kxmlrpcserver.moc -+kxmlrpcd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kxmlrpcd_main.cpp kxmlrpcserver.moc - @echo 'creating kxmlrpcd_la.all_cpp.cpp ...'; \ - rm -f kxmlrpcd_la.all_cpp.files kxmlrpcd_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kxmlrpcd_la.all_cpp.final; \ -- for file in kxmlrpcserver.cpp kxmlrpcparser.cpp kxmlrpcdaemon.cpp kxmlrpcutil.cpp kxmlrpcd_la_meta_unload.cpp ; do \ -+ for file in kxmlrpcd_main.cpp ; do \ - echo "#include \"$$file\"" >> kxmlrpcd_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kxmlrpcd_la.all_cpp.final; \ - done; \ -@@ -723,11 +743,11 @@ - rm -f libkcm_xmlrpcd_la.all_cpp.final libkcm_xmlrpcd_la.all_cpp.files - - #>+ 11 --kxmlrpcd.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+kxmlrpcd.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kxmlrpcd_main.cpp - @echo 'creating kxmlrpcd.all_cpp.cpp ...'; \ - rm -f kxmlrpcd.all_cpp.files kxmlrpcd.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kxmlrpcd.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kxmlrpcd_main.cpp ; do \ - echo "#include \"$$file\"" >> kxmlrpcd.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kxmlrpcd.all_cpp.final; \ - done; \ -@@ -736,20 +756,20 @@ - - #>+ 3 - clean-final: -- -rm -f kxmlrpcd_la.all_cpp.cpp libkcm_xmlrpcd_la.all_cpp.cpp kxmlrpcd.all_cpp.cpp -+ -rm -f libkxmlrpcd_main_la.all_cpp.cpp kxmlrpcd_la.all_cpp.cpp libkcm_xmlrpcd_la.all_cpp.cpp kxmlrpcd.all_cpp.cpp - - #>+ 2 - final: -- $(MAKE) kxmlrpcd_la_OBJECTS="$(kxmlrpcd_la_final_OBJECTS)" all-am -+ $(MAKE) libkxmlrpcd_main_la_OBJECTS="$(libkxmlrpcd_main_la_final_OBJECTS)" all-am - #>+ 2 - final-install: -- $(MAKE) kxmlrpcd_la_OBJECTS="$(kxmlrpcd_la_final_OBJECTS)" install-am -+ $(MAKE) libkxmlrpcd_main_la_OBJECTS="$(libkxmlrpcd_main_la_final_OBJECTS)" install-am - #>+ 2 - no-final: -- $(MAKE) kxmlrpcd_la_OBJECTS="$(kxmlrpcd_la_nofinal_OBJECTS)" all-am -+ $(MAKE) libkxmlrpcd_main_la_OBJECTS="$(libkxmlrpcd_main_la_nofinal_OBJECTS)" all-am - #>+ 2 - no-final-install: -- $(MAKE) kxmlrpcd_la_OBJECTS="$(kxmlrpcd_la_nofinal_OBJECTS)" install-am -+ $(MAKE) libkxmlrpcd_main_la_OBJECTS="$(libkxmlrpcd_main_la_nofinal_OBJECTS)" install-am - #>+ 3 - cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase2/patches/patch-et b/x11/kdebase2/patches/patch-et deleted file mode 100644 index fbe40fbdd17..00000000000 --- a/x11/kdebase2/patches/patch-et +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-et,v 1.1 2001/10/15 22:46:11 skrll Exp $ - ---- kxmlrpc/kxmlrpcd_main.cpp.orig Tue Oct 2 17:50:38 2001 -+++ kxmlrpc/kxmlrpcd_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 int kxmlrpcd_main(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return kxmlrpcd_main(argc, argv); -+} diff --git a/x11/kdebase2/patches/patch-eu b/x11/kdebase2/patches/patch-eu deleted file mode 100644 index 210abaff457..00000000000 --- a/x11/kdebase2/patches/patch-eu +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-eu,v 1.1 2001/10/15 22:46:11 skrll Exp $ - ---- kxmlrpc/kxmlrpcdaemon.cpp.orig Tue Apr 3 22:20:01 2001 -+++ kxmlrpc/kxmlrpcdaemon.cpp -@@ -356,7 +356,7 @@ - { 0, 0, 0 } - }; - --int main(int argc, char **argv) -+int kxmlrpcd_main(int argc, char **argv) - { - KAboutData about("kxmlrpcd", I18N_NOOP("KXmlRpc Daemon"), - version, description, KAboutData::License_BSD); diff --git a/x11/kdebase2/patches/patch-ev b/x11/kdebase2/patches/patch-ev deleted file mode 100644 index 4087bd12c1c..00000000000 --- a/x11/kdebase2/patches/patch-ev +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-ev,v 1.1 2001/10/15 22:46:11 skrll Exp $ - ---- legacyimport/Makefile.am.orig Wed May 16 02:41:36 2001 -+++ legacyimport/Makefile.am -@@ -1,14 +1,18 @@ - INCLUDES = $(all_includes) - - bin_PROGRAMS = klegacyimport --lib_LTLIBRARIES = klegacyimport.la -+lib_LTLIBRARIES = libklegacyimport_main.la klegacyimport.la - --klegacyimport_la_SOURCES = legacyimport.cpp --klegacyimport_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE) -+libklegacyimport_main_la_SOURCES = legacyimport.cpp -+libklegacyimport_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE) -+libklegacyimport_main_la_LDFLAGS = $(all_libraries) -+ -+klegacyimport_la_SOURCES = klegacyimport_main.cpp -+klegacyimport_la_LIBADD = libklegacyimport_main.la - klegacyimport_la_LDFLAGS = $(all_libraries) -module -avoid-version - --klegacyimport_SOURCES = dummy.cpp --klegacyimport_LDADD = klegacyimport.la -+klegacyimport_SOURCES = klegacyimport_main.cpp -+klegacyimport_LDADD = libklegacyimport_main.la - klegacyimport_LDFLAGS = $(all_libraries) $(KDE_RPATH) - - noinst_HEADERS = legacyimport.h diff --git a/x11/kdebase2/patches/patch-ew b/x11/kdebase2/patches/patch-ew deleted file mode 100644 index 3c088f5207d..00000000000 --- a/x11/kdebase2/patches/patch-ew +++ /dev/null @@ -1,186 +0,0 @@ -$NetBSD: patch-ew,v 1.2 2001/12/03 15:37:20 skrll Exp $ - ---- legacyimport/Makefile.in.orig Sat Nov 10 07:58:39 2001 -+++ legacyimport/Makefile.in -@@ -276,14 +276,18 @@ - INCLUDES = $(all_includes) - - bin_PROGRAMS = klegacyimport --lib_LTLIBRARIES = klegacyimport.la -+lib_LTLIBRARIES = libklegacyimport_main.la klegacyimport.la - --klegacyimport_la_SOURCES = legacyimport.cpp --klegacyimport_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE) -+libklegacyimport_main_la_SOURCES = legacyimport.cpp -+libklegacyimport_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE) -+libklegacyimport_main_la_LDFLAGS = $(all_libraries) -+ -+klegacyimport_la_SOURCES = klegacyimport_main.cpp -+klegacyimport_la_LIBADD = libklegacyimport_main.la - klegacyimport_la_LDFLAGS = $(all_libraries) -module -avoid-version - --klegacyimport_SOURCES = dummy.cpp --klegacyimport_LDADD = klegacyimport.la -+klegacyimport_SOURCES = klegacyimport_main.cpp -+klegacyimport_LDADD = libklegacyimport_main.la - klegacyimport_LDFLAGS = $(all_libraries) $(KDE_RPATH) - - noinst_HEADERS = legacyimport.h -@@ -305,21 +309,25 @@ - LIBS = @LIBS@ - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ --klegacyimport_la_DEPENDENCIES = --#>- klegacyimport_la_OBJECTS = legacyimport.lo -+libklegacyimport_main_la_DEPENDENCIES = -+#>- libklegacyimport_main_la_OBJECTS = legacyimport.lo - #>+ 5 --klegacyimport_la_final_OBJECTS = klegacyimport_la.all_cpp.lo --klegacyimport_la_nofinal_OBJECTS = legacyimport.lo \ -- klegacyimport_la_meta_unload.lo --@KDE_USE_FINAL_FALSE@klegacyimport_la_OBJECTS = $(klegacyimport_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@klegacyimport_la_OBJECTS = $(klegacyimport_la_final_OBJECTS) -+libklegacyimport_main_la_final_OBJECTS = libklegacyimport_main_la.all_cpp.lo -+libklegacyimport_main_la_nofinal_OBJECTS = legacyimport.lo \ -+ libklegacyimport_main_la_meta_unload.lo -+@KDE_USE_FINAL_FALSE@libklegacyimport_main_la_OBJECTS = $(libklegacyimport_main_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libklegacyimport_main_la_OBJECTS = $(libklegacyimport_main_la_final_OBJECTS) -+klegacyimport_la_DEPENDENCIES = libklegacyimport_main.la -+#>- klegacyimport_la_OBJECTS = klegacyimport_main.lo -+#>+ 1 -+klegacyimport_la_OBJECTS = klegacyimport_main.lo - bin_PROGRAMS = klegacyimport$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - --#>- klegacyimport_OBJECTS = dummy.$(OBJEXT) -+#>- klegacyimport_OBJECTS = klegacyimport_main.$(OBJEXT) - #>+ 1 --klegacyimport_OBJECTS = dummy.$(OBJEXT) --klegacyimport_DEPENDENCIES = klegacyimport.la -+klegacyimport_OBJECTS = klegacyimport_main.$(OBJEXT) -+klegacyimport_DEPENDENCIES = libklegacyimport_main.la - CXXFLAGS = @CXXFLAGS@ - #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 1 -@@ -340,15 +348,15 @@ - - #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=klegacyimport.desktop -+KDE_DIST=klegacyimport.desktop dummy.cpp - - DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - - - TAR = tar - GZIP_ENV = --best --SOURCES = $(klegacyimport_la_SOURCES) $(klegacyimport_SOURCES) --OBJECTS = $(klegacyimport_la_OBJECTS) $(klegacyimport_OBJECTS) -+SOURCES = $(libklegacyimport_main_la_SOURCES) $(klegacyimport_la_SOURCES) $(klegacyimport_SOURCES) -+OBJECTS = $(libklegacyimport_main_la_OBJECTS) $(klegacyimport_la_OBJECTS) $(klegacyimport_OBJECTS) - - #>- all: all-redirect - #>+ 1 -@@ -435,6 +443,9 @@ - - maintainer-clean-libtool: - -+libklegacyimport_main.la: $(libklegacyimport_main_la_OBJECTS) $(libklegacyimport_main_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(libdir) $(libklegacyimport_main_la_LDFLAGS) $(libklegacyimport_main_la_OBJECTS) $(libklegacyimport_main_la_LIBADD) $(LIBS) -+ - klegacyimport.la: $(klegacyimport_la_OBJECTS) $(klegacyimport_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(klegacyimport_la_LDFLAGS) $(klegacyimport_la_OBJECTS) $(klegacyimport_la_LIBADD) $(LIBS) - -@@ -649,28 +660,40 @@ - - - #>+ 12 --klegacyimport_la_meta_unload.cpp: legacyimport.moc -- @echo 'creating klegacyimport_la_meta_unload.cpp' -- @-rm -f klegacyimport_la_meta_unload.cpp -+libklegacyimport_main_la_meta_unload.cpp: legacyimport.moc -+ @echo 'creating libklegacyimport_main_la_meta_unload.cpp' -+ @-rm -f libklegacyimport_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_klegacyimport_la[] = {' > klegacyimport_la_meta_unload.cpp ;\ -- cat legacyimport.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> klegacyimport_la_meta_unload.cpp ;\ -- echo '0};' >> klegacyimport_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> klegacyimport_la_meta_unload.cpp ;\ -- echo '_UNLOAD(klegacyimport_la)' >> klegacyimport_la_meta_unload.cpp ;\ -- else echo > klegacyimport_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libklegacyimport_main_la[] = {' > libklegacyimport_main_la_meta_unload.cpp ;\ -+ cat legacyimport.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libklegacyimport_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libklegacyimport_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libklegacyimport_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libklegacyimport_main_la)' >> libklegacyimport_main_la_meta_unload.cpp ;\ -+ else echo > libklegacyimport_main_la_meta_unload.cpp; fi - - - #>+ 3 - clean-moc-classes: -- -rm -f klegacyimport_la_meta_unload.cpp -+ -rm -f libklegacyimport_main_la_meta_unload.cpp -+ -+#>+ 11 -+libklegacyimport_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/legacyimport.cpp libklegacyimport_main_la_meta_unload.cpp legacyimport.moc -+ @echo 'creating libklegacyimport_main_la.all_cpp.cpp ...'; \ -+ rm -f libklegacyimport_main_la.all_cpp.files libklegacyimport_main_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libklegacyimport_main_la.all_cpp.final; \ -+ for file in legacyimport.cpp libklegacyimport_main_la_meta_unload.cpp ; do \ -+ echo "#include \"$$file\"" >> libklegacyimport_main_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libklegacyimport_main_la.all_cpp.final; \ -+ done; \ -+ cat libklegacyimport_main_la.all_cpp.final libklegacyimport_main_la.all_cpp.files > libklegacyimport_main_la.all_cpp.cpp; \ -+ rm -f libklegacyimport_main_la.all_cpp.final libklegacyimport_main_la.all_cpp.files - - #>+ 11 --klegacyimport_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/legacyimport.cpp klegacyimport_la_meta_unload.cpp legacyimport.moc -+klegacyimport_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klegacyimport_main.cpp - @echo 'creating klegacyimport_la.all_cpp.cpp ...'; \ - rm -f klegacyimport_la.all_cpp.files klegacyimport_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> klegacyimport_la.all_cpp.final; \ -- for file in legacyimport.cpp klegacyimport_la_meta_unload.cpp ; do \ -+ for file in klegacyimport_main.cpp ; do \ - echo "#include \"$$file\"" >> klegacyimport_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klegacyimport_la.all_cpp.final; \ - done; \ -@@ -678,11 +701,11 @@ - rm -f klegacyimport_la.all_cpp.final klegacyimport_la.all_cpp.files - - #>+ 11 --klegacyimport.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dummy.cpp -+klegacyimport.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klegacyimport_main.cpp - @echo 'creating klegacyimport.all_cpp.cpp ...'; \ - rm -f klegacyimport.all_cpp.files klegacyimport.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> klegacyimport.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in klegacyimport_main.cpp ; do \ - echo "#include \"$$file\"" >> klegacyimport.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klegacyimport.all_cpp.final; \ - done; \ -@@ -691,20 +714,20 @@ - - #>+ 3 - clean-final: -- -rm -f klegacyimport_la.all_cpp.cpp klegacyimport.all_cpp.cpp -+ -rm -f libklegacyimport_main_la.all_cpp.cpp klegacyimport_la.all_cpp.cpp klegacyimport.all_cpp.cpp - - #>+ 2 - final: -- $(MAKE) klegacyimport_la_OBJECTS="$(klegacyimport_la_final_OBJECTS)" all-am -+ $(MAKE) libklegacyimport_main_la_OBJECTS="$(libklegacyimport_main_la_final_OBJECTS)" all-am - #>+ 2 - final-install: -- $(MAKE) klegacyimport_la_OBJECTS="$(klegacyimport_la_final_OBJECTS)" install-am -+ $(MAKE) libklegacyimport_main_la_OBJECTS="$(libklegacyimport_main_la_final_OBJECTS)" install-am - #>+ 2 - no-final: -- $(MAKE) klegacyimport_la_OBJECTS="$(klegacyimport_la_nofinal_OBJECTS)" all-am -+ $(MAKE) libklegacyimport_main_la_OBJECTS="$(libklegacyimport_main_la_nofinal_OBJECTS)" all-am - #>+ 2 - no-final-install: -- $(MAKE) klegacyimport_la_OBJECTS="$(klegacyimport_la_nofinal_OBJECTS)" install-am -+ $(MAKE) libklegacyimport_main_la_OBJECTS="$(libklegacyimport_main_la_nofinal_OBJECTS)" install-am - #>+ 3 - cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase2/patches/patch-ex b/x11/kdebase2/patches/patch-ex deleted file mode 100644 index 5f73a298904..00000000000 --- a/x11/kdebase2/patches/patch-ex +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-ex,v 1.1 2001/10/15 22:46:12 skrll Exp $ - ---- legacyimport/klegacyimport_main.cpp.orig Tue Oct 2 17:50:38 2001 -+++ 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 int klegacyimport_main(int, char* []); -+ -+int main( int argc, char* argv[] ) -+{ -+ return klegacyimport_main(argc, argv); -+} diff --git a/x11/kdebase2/patches/patch-ey b/x11/kdebase2/patches/patch-ey deleted file mode 100644 index a87b242b4ee..00000000000 --- a/x11/kdebase2/patches/patch-ey +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ey,v 1.1 2001/10/15 22:46:12 skrll Exp $ - ---- legacyimport/legacyimport.cpp.orig Sun May 27 01:27:57 2001 -+++ legacyimport/legacyimport.cpp -@@ -161,7 +161,7 @@ - kapp->quit(); - } - --int main(int argc, char **argv) -+int klegacyimport_main(int argc, char **argv) - { - KAboutData aboutData("klegacyimport", I18N_NOOP("KLegacyImport"), - "v0.1", I18N_NOOP("Importer for legacy themes"), diff --git a/x11/kdebase2/patches/patch-ez b/x11/kdebase2/patches/patch-ez deleted file mode 100644 index 1816980ae18..00000000000 --- a/x11/kdebase2/patches/patch-ez +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-ez,v 1.2 2001/12/03 15:37:20 skrll Exp $ - ---- kicker/kicker_main.cpp.orig Mon Dec 3 10:00:55 2001 -+++ 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/kdebase2/patches/patch-fa b/x11/kdebase2/patches/patch-fa deleted file mode 100644 index 067b2d0cd1a..00000000000 --- a/x11/kdebase2/patches/patch-fa +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-fa,v 1.2 2001/12/03 15:37:20 skrll Exp $ - ---- kicker/core/main.cpp.orig Fri Aug 3 21:14:29 2001 -+++ kicker/core/main.cpp -@@ -122,7 +122,9 @@ - QApplication::exit(); - } - --int main( int argc, char ** argv ) -+extern "C" int kdemain(int, char **); -+ -+int kdemain( int argc, char ** argv ) - { - { - QCString multiHead = getenv("KDE_MULTIHEAD"); diff --git a/x11/kdebase2/patches/patch-fb b/x11/kdebase2/patches/patch-fb deleted file mode 100644 index 684e5c73c7e..00000000000 --- a/x11/kdebase2/patches/patch-fb +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-fb,v 1.1 2001/11/13 21:10:46 jlam Exp $ - ---- kdesktop/kdeeject.orig Sat May 5 16:05:58 2001 -+++ kdesktop/kdeeject -@@ -1,6 +1,6 @@ - #!/bin/sh - # Script used by kdesktop to eject a removable media (CDROM/Tape/SCSI/Floppy) --# Relies on the 'eject' program, 'cdcontrol' on *BSD -+# Relies on the 'eject' program, 'cdcontrol' on FreeBSD - # - # Copyright GPL v2 by David Faure <david@mandrakesoft.com> - # -@@ -13,7 +13,7 @@ - # I guess this is the reason for making this a kde app... - OS=`uname -s` - case "$OS" in -- *BSD) -+ FreeBSD) - dev=`echo $1 | sed -E -e 's#/dev/##' -e 's/([0-9])./\1/'` - cdcontrol -f $dev eject >/dev/null 2>&1 - ;; diff --git a/x11/kdebase2/patches/patch-fc b/x11/kdebase2/patches/patch-fc deleted file mode 100644 index d51b650b59e..00000000000 --- a/x11/kdebase2/patches/patch-fc +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-fc,v 1.1 2001/11/13 21:10:46 jlam Exp $ - ---- kdesktop/init.cc.orig Tue Sep 4 19:12:48 2001 -+++ kdesktop/init.cc -@@ -80,9 +80,13 @@ - { - if (force || !QFile::exists(dir + "/.directory")) { - QCString cmd; -- cmd.sprintf( "cp %s %s/.directory", -+ QCString dest; -+ dest.sprintf( "%s/.directory", QFile::encodeName(dir).data() ); -+ cmd.sprintf( "cp %s %s", - QFile::encodeName(locate("data", QString("kdesktop/") + fileName)).data(), -- QFile::encodeName(dir).data() ); -+ dest.data() ); -+ system( cmd ); -+ cmd.sprintf( "chmod u+w %s", dest.data() ); - system( cmd ); - } - } -@@ -106,10 +110,13 @@ - for (QStringList::ConstIterator it = list.begin(); it != list.end(); it++) { - QCString cmd = "cp '"; - KDesktopFile desk( *it ); -+ QCString dest = QFile::encodeName(desktopPath + desk.readName()); - cmd += QFile::encodeName(*it); - cmd += "' '"; -- cmd += QFile::encodeName(desktopPath + desk.readName()); -+ cmd += dest; - cmd += "'"; -+ system( cmd ); -+ cmd = "chmod u+w '" + dest + "'"; - system( cmd ); - } - } diff --git a/x11/kdebase2/patches/patch-fd b/x11/kdebase2/patches/patch-fd deleted file mode 100644 index 63ace961508..00000000000 --- a/x11/kdebase2/patches/patch-fd +++ /dev/null @@ -1,8 +0,0 @@ -$NetBSD: patch-fd,v 1.1 2001/12/04 20:35:37 skrll Exp $ - ---- ksysguard/ksysguardd/FreeBSD/ksysguardd.c.orig Sat Nov 10 05:17:04 2001 -+++ ksysguard/ksysguardd/FreeBSD/ksysguardd.c -@@ -21,2 +21,3 @@ - */ -+#include "config.h" - diff --git a/x11/kdebase2/patches/patch-fe b/x11/kdebase2/patches/patch-fe deleted file mode 100644 index 8b7069cd45b..00000000000 --- a/x11/kdebase2/patches/patch-fe +++ /dev/null @@ -1,57 +0,0 @@ -$NetBSD: patch-fe,v 1.1 2003/08/14 20:10:19 jmc Exp $ - ---- ksysguard/ksysguardd/FreeBSD/ProcessList.c.orig 2003-08-14 14:27:23.000000000 +0000 -+++ ksysguard/ksysguardd/FreeBSD/ProcessList.c 2003-08-14 14:47:10.000000000 +0000 -@@ -37,6 +37,10 @@ - #include <sys/user.h> - #include <unistd.h> - -+#if defined __NetBSD__ -+#include <sys/param.h> -+#endif -+ - #include "../../gui/SignalIDs.h" - #include "Command.h" - #include "ProcessList.h" -@@ -164,9 +168,12 @@ - - ProcessInfo* ps; - struct passwd* pwent; -- int mib[4]; -+ int mib[6]; - struct kinfo_proc p; - size_t len; -+#if defined(__NetBSD__) && (__NetBSD_Version__ > 106120000) -+ struct kinfo_proc2 p2; -+#endif - - if ((ps = findProcessInList(pid)) == 0) - { -@@ -187,7 +194,14 @@ - len = sizeof (p); - if (sysctl(mib, 4, &p, &len, NULL, 0) == -1 || !len) - return -1; -- -+#if defined(__NetBSD__) && (__NetBSD_Version__ > 106120000) -+ mib[1] = KERN_PROC2; -+ mib[5] = sizeof(struct kinfo_proc2); -+ mib[6] = 1; -+ len = sizeof(p2); -+ if (sysctl(mib, 6, &p2, &len, NULL, 0) == -1 || !len) -+ return -1; -+#endif - #if __FreeBSD_version >= 500015 - ps->pid = p.ki_pid; - ps->ppid = p.ki_ppid; -@@ -200,7 +214,11 @@ - ps->ppid = p.kp_eproc.e_ppid; - ps->uid = p.kp_eproc.e_ucred.cr_uid; - ps->gid = p.kp_eproc.e_pgid; -+#if defined(__NetBSD__) && (__NetBSD_Version__ > 106120000) -+ ps->priority = p2.p_priority; -+#else - ps->priority = p.kp_proc.p_priority; -+#endif - ps->niceLevel = p.kp_proc.p_nice; - #endif - |