head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.44 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.42 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.40 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.38 pkgsrc-2011Q2-base:1.4 pkgsrc-2009Q4:1.4.0.36 pkgsrc-2009Q4-base:1.4 pkgsrc-2008Q4:1.4.0.34 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.32 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.30 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.28 pkgsrc-2008Q2-base:1.4 pkgsrc-2008Q1:1.4.0.26 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.24 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.22 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.20 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.18 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.16 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.14 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.12 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.10 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.8 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.6 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.4 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.2 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.3.0.18 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.16 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.14 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.12 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.10 pkgsrc-2003Q4-base:1.3 netbsd-1-6-1:1.3.0.6 netbsd-1-6-1-base:1.3 netbsd-1-6:1.3.0.8 netbsd-1-6-RELEASE-base:1.3 pkgviews:1.3.0.4 pkgviews-base:1.3 buildlink2:1.3.0.2 buildlink2-base:1.3 netbsd-1-5-PATCH003:1.3; locks; strict; comment @# @; 1.4 date 2005.01.03.14.32.32; author wiz; state dead; branches; next 1.3; 1.3 date 2001.12.03.15.37.19; author skrll; state Exp; branches; next 1.2; 1.2 date 2001.10.18.15.43.11; author skrll; state Exp; branches; next 1.1; 1.1 date 2001.10.15.22.46.02; author skrll; state Exp; branches; next ; desc @@ 1.4 log @Remove KDE2 packages (and their dependencies) as proposed on tech-pkg. @ text @$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 ' >> 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 ' >> 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 @ 1.3 log @Update to KDE 2.2.2 Closes pkg/14728 from Mark Davies . Changes from him with updates from myself. From www.kde.org... The principal improvements over KDE 2.2.1, release two months ago, include: o security-related - SSL certificate loading - symlink vulnerability in .wmrc access by KDM introduced in 2.2 - security problem with eFax (used by klprfax) - potential problem in PAM invocation by KDM - potential harmful side-effect of failed KDM session starts o new features - added support for CodeWeavers' CrossOver plug-in (provides support for QuickTime, etc.) - added support for the wheelmouse for scrolling through the KGhostview PS/PDF viewer component - ability to search for multiple patterns at a time in the file search dialog - debugging multi-threaded applications with KDevelop o improvements/fixes - handling of HTTP links that redirect to FTP - POST using SSL through a proxy and sending headers through proxies - saving of recently-selected files in the file dialog - handling of non-ASCII characters over SMB - toolbar button captions with certain styles - selecting items with the mouse in Konqueror - sorting in Konqueror's textview - saving current settings as a theme in the theme manager - crashes in KMail with certain mails - crash on invoking the KDM chooser - non-Latin languages with KDevelop performance - icon loading optimized - file dialog speedups - stop spinning SMB client processes - handling of large files in Kate @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Make kicker and kdesktop not only compile and work in some cases, but all cases. Apologies for the mess. If anyone is in the middle of a build I suggest you do: cd x11/kdebase2/work/kdebase-2.2.1 for p in ../../patches/patch-b[hipq] ../../patches/patch-ez \ ../patches/patch-fa; do patch < $p done and start the build again. @ text @d3 1 a3 1 --- kdesktop/Makefile.in.orig Sat Sep 8 01:36:30 2001 d5 1 a5 1 @@@@ -272,10 +272,12 @@@@ d20 1 a20 1 @@@@ -283,14 +285,16 @@@@ d41 1 a41 1 @@@@ -322,26 +326,30 @@@@ d47 1 a47 1 $(top_builddir)/kcontrol/background/libbgnd.la d57 3 a59 3 -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 d64 3 a66 3 +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 d85 2 a86 2 kdmdesktop_final_OBJECTS = kdmdesktop.o kdmdesktop.all_cc.o @@@@ -373,15 +381,15 @@@@ d91 1 a91 1 +KDE_DIST=DESIGN kdesktop.desktop kdesktop_custom_menu1 kdesktop_custom_menu2 kdmdesktop kcustommenu.h KBackgroundIface.kidl kdiconview.h KScreensaverIface.kidl kdesktop libkdesktop_main_la_meta_unload.cc kdesktop.core kdesktopbindings.cpp kdeeject KDesktopIface.kidl kdmdesktop_meta_unload.cc kdmdesktop.h d105 1 a105 1 @@@@ -468,6 +476,9 @@@@ d115 1 a115 28 @@@@ -624,7 +635,7 @@@@ dot_seen=no; \ rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ rev="$$subdir $$rev"; \ - test "$$subdir" = "." && dot_seen=yes; \ + test "$$subdir" != "." || dot_seen=yes; \ done; \ test "$$dot_seen" = "no" && rev=". $$rev"; \ target=`echo $@@ | sed s/-recursive//`; \ @@@@ -682,17 +693,6 @@@@ subdir = kdesktop distdir: $(DISTFILES) -#>- @@for file in $(DISTFILES); do \ -#>- d=$(srcdir); \ -#>- if test -d $$d/$$file; then \ -#>- cp -pr $$/$$file $(distdir)/$$file; \ -#>- else \ -#>- test -f $(distdir)/$$file \ -#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ -#>- fi; \ -#>- done -#>+ 10 @@for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ @@@@ -819,9 +819,6 @@@@ d125 1 a125 1 @@@@ -912,14 +909,14 @@@@ d128 1 a128 1 #>+ 10 a131 5 - @@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 ' >> kdesktop_la_meta_unload.cc - @@echo '_UNLOAD(kdesktop_la)' >> kdesktop_la_meta_unload.cc d135 13 a147 5 + @@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 ' >> libkdesktop_main_la_meta_unload.cc + @@echo '_UNLOAD(libkdesktop_main_la)' >> libkdesktop_main_la_meta_unload.cc d150 2 a151 2 #>+ 10 @@@@ -935,26 +932,38 @@@@ d159 1 a159 1 -kdesktop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp $(srcdir)/startupid.cpp d163 1 a163 1 +libkdesktop_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp $(srcdir)/startupid.cpp d177 1 a177 1 +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 $(srcdir)/KDesktopIface_skel.cc $(srcdir)/KScreensaverIface_skel.cc $(srcdir)/KBackgroundIface_skel.cc $(srcdir)/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 d201 1 a201 1 @@@@ -962,11 +971,11 @@@@ d215 1 a215 10 @@@@ -974,7 +983,7 @@@@ rm -f kdesktop.all_cc.final kdesktop.all_cc.files #>+ 11 -kdmdesktop.all_cc.cc: $(srcdir)/Makefile.in kdmdesktop_meta_unload.cc +kdmdesktop.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kdmdesktop_meta_unload.cc @@echo 'creating kdmdesktop.all_cc.cc ...'; \ rm -f kdmdesktop.all_cc.files kdmdesktop.all_cc.final; \ echo "#define KDE_USE_FINAL 1" >> kdmdesktop.all_cc.final; \ @@@@ -987,14 +996,14 @@@@ d219 2 a220 2 - -rm -f kdesktop_la.all_cpp.cpp kdesktop_la.all_cc.cc kdesktop.all_cc.cc 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_cc.cc d227 4 d234 4 @ 1.1 log @Update to KDE 2.2.1 With apologies to Al I wouldn't know where to start with a summary of the changes between 2.1 and 2.2.1 - there are just too many. A couple of hopefully static URLS that contain useful information are http://www.kde.org/announcements/changelog2_1to2_2.html http://www.kde.org/announcements/changelog2_2to2_2_1.html Support for a.out for kde{libs,base} added by me. The libtool/a.out combination doesn't like the linking of modules into binaries. A better way of doing this will appear in future versions of KDE/pkgsrc. @ text @d5 4 a8 1 @@@@ -274,0 +275,2 @@@@ d11 1 a11 1 @@@@ -276 +278 @@@@ d13 2 a14 2 +kdesktop_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la @@@@ -278 +280 @@@@ d17 7 a23 1 @@@@ -286 +288 @@@@ d26 1 a26 1 @@@@ -288 +290 @@@@ d29 1 a29 1 @@@@ -290 +292 @@@@ d32 2 a33 1 @@@@ -293 +295,3 @@@@ d38 7 a44 1 @@@@ -325 +329 @@@@ d47 1 a47 1 @@@@ -327,3 +331,3 @@@@ d54 1 a54 1 @@@@ -331,7 +335,12 @@@@ d69 1 a69 2 +kdesktop_la_DEPENDENCIES = $(top_builddir)/libkonq/libkonq.la \ +$(top_builddir)/kcontrol/background/libbgnd.la d73 3 a75 1 @@@@ -341 +350 @@@@ d78 1 a78 1 @@@@ -343,2 +352,2 @@@@ d83 7 a89 1 @@@@ -376 +385 @@@@ d91 7 a97 2 +KDE_DIST=DESIGN kdesktop.desktop kdesktop_custom_menu1 kdesktop_custom_menu2 kcustommenu.h kdiconview.h kdesktopbindings.cpp kdeeject kdmdesktop.h @@@@ -383,2 +392,2 @@@@ d102 7 a108 1 @@@@ -470,0 +480,3 @@@@ d112 7 a118 1 @@@@ -627 +639 @@@@ d121 7 a127 1 @@@@ -685,11 +696,0 @@@@ d139 7 a145 1 @@@@ -822,3 +822,0 @@@@ d149 7 a155 1 @@@@ -915,8 +913,8 @@@@ d172 7 a178 1 @@@@ -938 +936 @@@@ d181 2 a182 1 @@@@ -941,4 +939,4 @@@@ d191 1 a191 1 @@@@ -946,2 +944,14 @@@@ d201 1 a201 1 +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 d208 1 a208 1 @@@@ -949,2 +959,2 @@@@ d213 2 a214 1 @@@@ -953 +963 @@@@ d216 4 a219 2 +kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in kdesktop_main.cc @@@@ -957 +967 @@@@ d222 7 a228 1 @@@@ -965 +975 @@@@ d230 4 a233 2 +kdesktop.all_cc.cc: $(srcdir)/Makefile.in kdesktop_main.cc @@@@ -969 +979 @@@@ d236 16 a251 1 @@@@ -990 +1000 @@@@ d254 3 a256 1 @@@@ -994 +1004 @@@@ d259 2 a260 1 @@@@ -997 +1007 @@@@ d263 3 @