head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.44 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.42 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.40 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.38 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.36 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.34 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.32 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.30 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.28 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.26 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.24 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.22 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.20 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.18 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.16 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.14 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.12 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.10 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.8 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.6 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.4 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.2 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.2.0.18 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.16 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.14 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.12 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.10 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.6 netbsd-1-6-1-base:1.2 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2; locks; strict; comment @# @; 1.3 date 2005.01.03.14.32.33; author wiz; state dead; branches; next 1.2; 1.2 date 2001.12.03.15.37.21; author skrll; state Exp; branches; next 1.1; 1.1 date 2001.10.15.22.46.25; author skrll; state Exp; branches; next ; desc @@ 1.3 log @Remove KDE2 packages (and their dependencies) as proposed on tech-pkg. @ text @$NetBSD: patch-be,v 1.2 2001/12/03 15:37:21 skrll Exp $ --- kio/kded/Makefile.in.orig Tue Nov 13 20:57:18 2001 +++ kio/kded/Makefile.in @@@@ -278,27 +278,35 @@@@ INCLUDES = -I$(srcdir)/.. -I$(top_srcdir) $(all_includes) -lib_LTLIBRARIES = kded.la kbuildsycoca.la +lib_LTLIBRARIES = libkded_main.la kded.la libkbuildsycoca_main.la kbuildsycoca.la + +libkded_main_la_LDFLAGS = $(all_libraries) +libkded_main_la_LIBADD = $(LIB_KSYCOCA) +libkded_main_la_SOURCES = kded.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kdedmodule.cpp + kded_la_LDFLAGS = $(all_libraries) -module -avoid-version -kded_la_LIBADD = $(LIB_KSYCOCA) -kded_la_SOURCES = kded.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kdedmodule.cpp +kded_la_LIBADD = libkded_main.la +kded_la_SOURCES = kded_main.cpp +libkbuildsycoca_main_la_LDFLAGS = $(all_libraries) +libkbuildsycoca_main_la_LIBADD = $(LIB_KSYCOCA) +libkbuildsycoca_main_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kbuildimageiofactory.cpp kbuildprotocolinfofactory.cpp kctimefactory.cpp -kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version -kbuildsycoca_la_LIBADD = $(LIB_KSYCOCA) -kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kbuildimageiofactory.cpp kbuildprotocolinfofactory.cpp kctimefactory.cpp +kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version +kbuildsycoca_la_LIBADD = libkbuildsycoca_main.la +kbuildsycoca_la_SOURCES = kbuildsycoca_main.cpp bin_PROGRAMS = kded kbuildsycoca kdontchangethehostname kded_LDFLAGS = $(all_libraries) $(KDE_RPATH) -kded_LDADD = $(LIB_KSYCOCA) kded.la -kded_SOURCES = dummy.cpp +kded_LDADD = $(LIB_KSYCOCA) libkded_main.la +kded_SOURCES = kded_main.cpp kbuildsycoca_LDFLAGS = $(all_libraries) $(KDE_RPATH) -kbuildsycoca_LDADD = $(LIB_KSYCOCA) kbuildsycoca.la -kbuildsycoca_SOURCES = dummy.cpp +kbuildsycoca_LDADD = $(LIB_KSYCOCA) libkbuildsycoca_main.la +kbuildsycoca_SOURCES = kbuildsycoca_main.cpp kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) kdontchangethehostname_LDADD = $(LIB_KDECORE) @@@@ -323,40 +331,50 @@@@ CPPFLAGS = @@CPPFLAGS@@ LDFLAGS = @@LDFLAGS@@ LIBS = @@LIBS@@ -kded_la_DEPENDENCIES = -#>- kded_la_OBJECTS = kded.lo kbuildservicetypefactory.lo \ +libkded_main_la_DEPENDENCIES = +#>- libkded_main_la_OBJECTS = kded.lo kbuildservicetypefactory.lo \ #>- kbuildservicefactory.lo kbuildservicegroupfactory.lo kdedmodule.lo #>+ 6 -kded_la_final_OBJECTS = kded_la.all_cpp.lo -kded_la_nofinal_OBJECTS = kded.lo kbuildservicetypefactory.lo \ +libkded_main_la_final_OBJECTS = libkded_main_la.all_cpp.lo +libkded_main_la_nofinal_OBJECTS = kded.lo kbuildservicetypefactory.lo \ kbuildservicefactory.lo kbuildservicegroupfactory.lo kdedmodule.lo \ - kded_la_meta_unload.lo -@@KDE_USE_FINAL_FALSE@@kded_la_OBJECTS = $(kded_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kded_la_OBJECTS = $(kded_la_final_OBJECTS) -kbuildsycoca_la_DEPENDENCIES = -#>- kbuildsycoca_la_OBJECTS = kbuildsycoca.lo kbuildservicetypefactory.lo \ -#>- kbuildservicefactory.lo kbuildservicegroupfactory.lo \ -#>- kbuildimageiofactory.lo kbuildprotocolinfofactory.lo kctimefactory.lo -#>+ 7 -kbuildsycoca_la_final_OBJECTS = kbuildsycoca_la.all_cpp.lo -kbuildsycoca_la_nofinal_OBJECTS = kbuildsycoca.lo kbuildservicetypefactory.lo \ - kbuildservicefactory.lo kbuildservicegroupfactory.lo \ - kbuildimageiofactory.lo kbuildprotocolinfofactory.lo kctimefactory.lo \ - kbuildsycoca_la_meta_unload.lo -@@KDE_USE_FINAL_FALSE@@kbuildsycoca_la_OBJECTS = $(kbuildsycoca_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kbuildsycoca_la_OBJECTS = $(kbuildsycoca_la_final_OBJECTS) + libkded_main_la_meta_unload.lo +@@KDE_USE_FINAL_FALSE@@libkded_main_la_OBJECTS = $(libkded_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkded_main_la_OBJECTS = $(libkded_main_la_final_OBJECTS) +kded_la_DEPENDENCIES = libkded_main.la +#>- kded_la_OBJECTS = kded_main.lo +#>+ 1 +kded_la_OBJECTS = kded_main.lo +libkbuildsycoca_main_la_DEPENDENCIES = +#>- libkbuildsycoca_main_la_OBJECTS = kbuildsycoca.lo \ +#>- kbuildservicetypefactory.lo kbuildservicefactory.lo \ +#>- kbuildservicegroupfactory.lo kbuildimageiofactory.lo \ +#>- kbuildprotocolinfofactory.lo kctimefactory.lo +#>+ 8 +libkbuildsycoca_main_la_final_OBJECTS = libkbuildsycoca_main_la.all_cpp.lo +libkbuildsycoca_main_la_nofinal_OBJECTS = kbuildsycoca.lo \ + kbuildservicetypefactory.lo kbuildservicefactory.lo \ + kbuildservicegroupfactory.lo kbuildimageiofactory.lo \ + kbuildprotocolinfofactory.lo kctimefactory.lo \ + libkbuildsycoca_main_la_meta_unload.lo +@@KDE_USE_FINAL_FALSE@@libkbuildsycoca_main_la_OBJECTS = $(libkbuildsycoca_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkbuildsycoca_main_la_OBJECTS = $(libkbuildsycoca_main_la_final_OBJECTS) +kbuildsycoca_la_DEPENDENCIES = libkbuildsycoca_main.la +#>- kbuildsycoca_la_OBJECTS = kbuildsycoca_main.lo +#>+ 1 +kbuildsycoca_la_OBJECTS = kbuildsycoca_main.lo bin_PROGRAMS = kded$(EXEEXT) kbuildsycoca$(EXEEXT) \ kdontchangethehostname$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -#>- kded_OBJECTS = dummy.$(OBJEXT) +#>- kded_OBJECTS = kded_main.$(OBJEXT) #>+ 1 -kded_OBJECTS = dummy.$(OBJEXT) -kded_DEPENDENCIES = kded.la -#>- kbuildsycoca_OBJECTS = dummy.$(OBJEXT) +kded_OBJECTS = kded_main.$(OBJEXT) +kded_DEPENDENCIES = libkded_main.la +#>- kbuildsycoca_OBJECTS = kbuildsycoca_main.$(OBJEXT) #>+ 1 -kbuildsycoca_OBJECTS = dummy.$(OBJEXT) -kbuildsycoca_DEPENDENCIES = kbuildsycoca.la +kbuildsycoca_OBJECTS = kbuildsycoca_main.$(OBJEXT) +kbuildsycoca_DEPENDENCIES = libkbuildsycoca_main.la #>- kdontchangethehostname_OBJECTS = khostname.$(OBJEXT) #>+ 1 kdontchangethehostname_OBJECTS = khostname.$(OBJEXT) @@@@ -381,15 +399,15 @@@@ #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=HOWTO README.kded DESIGN kdedmodule.desktop kded.h kctimefactory.h +KDE_DIST=README.kded DESIGN kdedmodule.desktop kded.h HOWTO kctimefactory.h DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) TAR = tar GZIP_ENV = --best -SOURCES = $(kded_la_SOURCES) $(kbuildsycoca_la_SOURCES) $(kded_SOURCES) $(kbuildsycoca_SOURCES) $(kdontchangethehostname_SOURCES) -OBJECTS = $(kded_la_OBJECTS) $(kbuildsycoca_la_OBJECTS) $(kded_OBJECTS) $(kbuildsycoca_OBJECTS) $(kdontchangethehostname_OBJECTS) +SOURCES = $(libkded_main_la_SOURCES) $(kded_la_SOURCES) $(libkbuildsycoca_main_la_SOURCES) $(kbuildsycoca_la_SOURCES) $(kded_SOURCES) $(kbuildsycoca_SOURCES) $(kdontchangethehostname_SOURCES) +OBJECTS = $(libkded_main_la_OBJECTS) $(kded_la_OBJECTS) $(libkbuildsycoca_main_la_OBJECTS) $(kbuildsycoca_la_OBJECTS) $(kded_OBJECTS) $(kbuildsycoca_OBJECTS) $(kdontchangethehostname_OBJECTS) #>- all: all-redirect #>+ 1 @@@@ -476,9 +494,15 @@@@ maintainer-clean-libtool: +libkded_main.la: $(libkded_main_la_OBJECTS) $(libkded_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkded_main_la_LDFLAGS) $(libkded_main_la_OBJECTS) $(libkded_main_la_LIBADD) $(LIBS) + kded.la: $(kded_la_OBJECTS) $(kded_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kded_la_LDFLAGS) $(kded_la_OBJECTS) $(kded_la_LIBADD) $(LIBS) +libkbuildsycoca_main.la: $(libkbuildsycoca_main_la_OBJECTS) $(libkbuildsycoca_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkbuildsycoca_main_la_LDFLAGS) $(libkbuildsycoca_main_la_OBJECTS) $(libkbuildsycoca_main_la_LIBADD) $(LIBS) + kbuildsycoca.la: $(kbuildsycoca_la_OBJECTS) $(kbuildsycoca_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kbuildsycoca_la_LDFLAGS) $(kbuildsycoca_la_OBJECTS) $(kbuildsycoca_la_LIBADD) $(LIBS) @@@@ -692,9 +716,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: @@@@ -725,41 +746,53 @@@@ #>+ 12 -kded_la_meta_unload.cpp: kded.moc kdedmodule.moc - @@echo 'creating kded_la_meta_unload.cpp' - @@-rm -f kded_la_meta_unload.cpp +libkded_main_la_meta_unload.cpp: kded.moc kdedmodule.moc + @@echo 'creating libkded_main_la_meta_unload.cpp' + @@-rm -f libkded_main_la_meta_unload.cpp @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kded_la[] = {' > kded_la_meta_unload.cpp ;\ - cat kded.moc kdedmodule.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kded_la_meta_unload.cpp ;\ - echo '0};' >> kded_la_meta_unload.cpp ;\ - echo '#include ' >> kded_la_meta_unload.cpp ;\ - echo '_UNLOAD(kded_la)' >> kded_la_meta_unload.cpp ;\ - else echo > kded_la_meta_unload.cpp; fi + echo 'static const char * _metalist_libkded_main_la[] = {' > libkded_main_la_meta_unload.cpp ;\ + cat kded.moc kdedmodule.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkded_main_la_meta_unload.cpp ;\ + echo '0};' >> libkded_main_la_meta_unload.cpp ;\ + echo '#include ' >> libkded_main_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkded_main_la)' >> libkded_main_la_meta_unload.cpp ;\ + else echo > libkded_main_la_meta_unload.cpp; fi #>+ 12 -kbuildsycoca_la_meta_unload.cpp: kbuildsycoca.moc - @@echo 'creating kbuildsycoca_la_meta_unload.cpp' - @@-rm -f kbuildsycoca_la_meta_unload.cpp +libkbuildsycoca_main_la_meta_unload.cpp: kbuildsycoca.moc + @@echo 'creating libkbuildsycoca_main_la_meta_unload.cpp' + @@-rm -f libkbuildsycoca_main_la_meta_unload.cpp @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kbuildsycoca_la[] = {' > kbuildsycoca_la_meta_unload.cpp ;\ - cat kbuildsycoca.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kbuildsycoca_la_meta_unload.cpp ;\ - echo '0};' >> kbuildsycoca_la_meta_unload.cpp ;\ - echo '#include ' >> kbuildsycoca_la_meta_unload.cpp ;\ - echo '_UNLOAD(kbuildsycoca_la)' >> kbuildsycoca_la_meta_unload.cpp ;\ - else echo > kbuildsycoca_la_meta_unload.cpp; fi + echo 'static const char * _metalist_libkbuildsycoca_main_la[] = {' > libkbuildsycoca_main_la_meta_unload.cpp ;\ + cat kbuildsycoca.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkbuildsycoca_main_la_meta_unload.cpp ;\ + echo '0};' >> libkbuildsycoca_main_la_meta_unload.cpp ;\ + echo '#include ' >> libkbuildsycoca_main_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkbuildsycoca_main_la)' >> libkbuildsycoca_main_la_meta_unload.cpp ;\ + else echo > libkbuildsycoca_main_la_meta_unload.cpp; fi #>+ 3 clean-moc-classes: - -rm -f kded_la_meta_unload.cpp kbuildsycoca_la_meta_unload.cpp + -rm -f libkded_main_la_meta_unload.cpp libkbuildsycoca_main_la_meta_unload.cpp + +#>+ 11 +libkded_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kdedmodule.cpp libkded_main_la_meta_unload.cpp kded.moc kdedmodule.moc kbuildsycoca.moc + @@echo 'creating libkded_main_la.all_cpp.cpp ...'; \ + rm -f libkded_main_la.all_cpp.files libkded_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkded_main_la.all_cpp.final; \ + for file in kded.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kdedmodule.cpp libkded_main_la_meta_unload.cpp ; do \ + echo "#include \"$$file\"" >> libkded_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkded_main_la.all_cpp.final; \ + done; \ + cat libkded_main_la.all_cpp.final libkded_main_la.all_cpp.files > libkded_main_la.all_cpp.cpp; \ + rm -f libkded_main_la.all_cpp.final libkded_main_la.all_cpp.files #>+ 11 -kded_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kdedmodule.cpp kded_la_meta_unload.cpp kded.moc kdedmodule.moc kbuildsycoca.moc +kded_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded_main.cpp @@echo 'creating kded_la.all_cpp.cpp ...'; \ rm -f kded_la.all_cpp.files kded_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kded_la.all_cpp.final; \ - for file in kded.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kdedmodule.cpp kded_la_meta_unload.cpp ; do \ + for file in kded_main.cpp ; do \ echo "#include \"$$file\"" >> kded_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kded_la.all_cpp.final; \ done; \ @@@@ -767,11 +800,23 @@@@ rm -f kded_la.all_cpp.final kded_la.all_cpp.files #>+ 11 -kbuildsycoca_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kbuildimageiofactory.cpp $(srcdir)/kbuildprotocolinfofactory.cpp $(srcdir)/kctimefactory.cpp kbuildsycoca_la_meta_unload.cpp +libkbuildsycoca_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kbuildimageiofactory.cpp $(srcdir)/kbuildprotocolinfofactory.cpp $(srcdir)/kctimefactory.cpp libkbuildsycoca_main_la_meta_unload.cpp + @@echo 'creating libkbuildsycoca_main_la.all_cpp.cpp ...'; \ + rm -f libkbuildsycoca_main_la.all_cpp.files libkbuildsycoca_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkbuildsycoca_main_la.all_cpp.final; \ + for file in kbuildsycoca.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kbuildimageiofactory.cpp kbuildprotocolinfofactory.cpp kctimefactory.cpp libkbuildsycoca_main_la_meta_unload.cpp ; do \ + echo "#include \"$$file\"" >> libkbuildsycoca_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkbuildsycoca_main_la.all_cpp.final; \ + done; \ + cat libkbuildsycoca_main_la.all_cpp.final libkbuildsycoca_main_la.all_cpp.files > libkbuildsycoca_main_la.all_cpp.cpp; \ + rm -f libkbuildsycoca_main_la.all_cpp.final libkbuildsycoca_main_la.all_cpp.files + +#>+ 11 +kbuildsycoca_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca_main.cpp @@echo 'creating kbuildsycoca_la.all_cpp.cpp ...'; \ rm -f kbuildsycoca_la.all_cpp.files kbuildsycoca_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kbuildsycoca_la.all_cpp.final; \ - for file in kbuildsycoca.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kbuildimageiofactory.cpp kbuildprotocolinfofactory.cpp kctimefactory.cpp kbuildsycoca_la_meta_unload.cpp ; do \ + for file in kbuildsycoca_main.cpp ; do \ echo "#include \"$$file\"" >> kbuildsycoca_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kbuildsycoca_la.all_cpp.final; \ done; \ @@@@ -779,11 +824,11 @@@@ rm -f kbuildsycoca_la.all_cpp.final kbuildsycoca_la.all_cpp.files #>+ 11 -kded.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kded.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded_main.cpp @@echo 'creating kded.all_cpp.cpp ...'; \ rm -f kded.all_cpp.files kded.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kded.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kded_main.cpp ; do \ echo "#include \"$$file\"" >> kded.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kded.all_cpp.final; \ done; \ @@@@ -791,11 +836,11 @@@@ rm -f kded.all_cpp.final kded.all_cpp.files #>+ 11 -kbuildsycoca.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kbuildsycoca.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca_main.cpp @@echo 'creating kbuildsycoca.all_cpp.cpp ...'; \ rm -f kbuildsycoca.all_cpp.files kbuildsycoca.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kbuildsycoca.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kbuildsycoca_main.cpp ; do \ echo "#include \"$$file\"" >> kbuildsycoca.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kbuildsycoca.all_cpp.final; \ done; \ @@@@ -816,20 +861,20 @@@@ #>+ 3 clean-final: - -rm -f kded_la.all_cpp.cpp kbuildsycoca_la.all_cpp.cpp kded.all_cpp.cpp kbuildsycoca.all_cpp.cpp kdontchangethehostname.all_cpp.cpp + -rm -f libkded_main_la.all_cpp.cpp kded_la.all_cpp.cpp libkbuildsycoca_main_la.all_cpp.cpp kbuildsycoca_la.all_cpp.cpp kded.all_cpp.cpp kbuildsycoca.all_cpp.cpp kdontchangethehostname.all_cpp.cpp #>+ 2 final: - $(MAKE) kded_la_OBJECTS="$(kded_la_final_OBJECTS)" kbuildsycoca_la_OBJECTS="$(kbuildsycoca_la_final_OBJECTS)" all-am + $(MAKE) libkded_main_la_OBJECTS="$(libkded_main_la_final_OBJECTS)" libkbuildsycoca_main_la_OBJECTS="$(libkbuildsycoca_main_la_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) kded_la_OBJECTS="$(kded_la_final_OBJECTS)" kbuildsycoca_la_OBJECTS="$(kbuildsycoca_la_final_OBJECTS)" install-am + $(MAKE) libkded_main_la_OBJECTS="$(libkded_main_la_final_OBJECTS)" libkbuildsycoca_main_la_OBJECTS="$(libkbuildsycoca_main_la_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) kded_la_OBJECTS="$(kded_la_nofinal_OBJECTS)" kbuildsycoca_la_OBJECTS="$(kbuildsycoca_la_nofinal_OBJECTS)" all-am + $(MAKE) libkded_main_la_OBJECTS="$(libkded_main_la_nofinal_OBJECTS)" libkbuildsycoca_main_la_OBJECTS="$(libkbuildsycoca_main_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) kded_la_OBJECTS="$(kded_la_nofinal_OBJECTS)" kbuildsycoca_la_OBJECTS="$(kbuildsycoca_la_nofinal_OBJECTS)" install-am + $(MAKE) libkded_main_la_OBJECTS="$(libkded_main_la_nofinal_OBJECTS)" libkbuildsycoca_main_la_OBJECTS="$(libkbuildsycoca_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean @ 1.2 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.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 @a0 1 Cannot strip away RCS IDs, please handle manually! d3 1 a3 1 --- kio/kded/Makefile.in.orig Wed Sep 12 06:10:13 2001 d5 4 a8 7 @@@@ -2 +2 @@@@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am @@@@ -4 +4 @@@@ -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. @@@@ -285 +285,6 @@@@ d16 2 a17 1 @@@@ -288,2 +293,2 @@@@ d22 1 a22 1 @@@@ -290,0 +296,3 @@@@ d26 1 a26 1 @@@@ -292,3 +299,0 @@@@ d30 1 a30 1 @@@@ -295,0 +301,3 @@@@ d34 4 a37 1 @@@@ -300,2 +308,2 @@@@ d42 2 a43 1 @@@@ -304,2 +312,2 @@@@ d48 7 a54 1 @@@@ -330,2 +338,2 @@@@ d59 2 a60 1 @@@@ -334,2 +342,2 @@@@ d65 2 a66 2 @@@@ -337,15 +345,25 @@@@ -kded_la_meta_unload.lo d76 3 a78 3 -kbuildservicefactory.lo kbuildservicegroupfactory.lo \ -kbuildimageiofactory.lo kbuildprotocolinfofactory.lo kctimefactory.lo \ -kbuildsycoca_la_meta_unload.lo d81 1 a81 1 +libkded_main_la_meta_unload.lo d96 4 a99 4 +kbuildservicetypefactory.lo kbuildservicefactory.lo \ +kbuildservicegroupfactory.lo kbuildimageiofactory.lo \ +kbuildprotocolinfofactory.lo kctimefactory.lo \ +libkbuildsycoca_main_la_meta_unload.lo d106 4 a109 1 @@@@ -356 +374 @@@@ d112 1 a112 1 @@@@ -358,3 +376,3 @@@@ d119 1 a119 1 @@@@ -362,2 +380,2 @@@@ d124 7 a130 1 @@@@ -388 +406 @@@@ d133 6 a138 1 @@@@ -395,2 +413,2 @@@@ d143 7 a149 1 @@@@ -482,0 +501,3 @@@@ d153 3 a155 1 @@@@ -485,0 +507,3 @@@@ d159 7 a165 13 @@@@ -600,11 +623,0 @@@@ -#>- @@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 @@@@ -710,3 +722,0 @@@@ d169 7 a175 1 @@@@ -743,8 +753,8 @@@@ a178 5 - @@echo 'static const char * _metalist_kded_la[] = {' > kded_la_meta_unload.cpp - @@cat kded.moc kdedmodule.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kded_la_meta_unload.cpp - @@echo '0};' >> kded_la_meta_unload.cpp - @@echo '#include ' >> kded_la_meta_unload.cpp - @@echo '_UNLOAD(kded_la)' >> kded_la_meta_unload.cpp d182 16 a197 6 + @@echo 'static const char * _metalist_libkded_main_la[] = {' > libkded_main_la_meta_unload.cpp + @@cat kded.moc kdedmodule.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkded_main_la_meta_unload.cpp + @@echo '0};' >> libkded_main_la_meta_unload.cpp + @@echo '#include ' >> libkded_main_la_meta_unload.cpp + @@echo '_UNLOAD(libkded_main_la)' >> libkded_main_la_meta_unload.cpp @@@@ -754,8 +764,8 @@@@ a200 5 - @@echo 'static const char * _metalist_kbuildsycoca_la[] = {' > kbuildsycoca_la_meta_unload.cpp - @@cat kbuildsycoca.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kbuildsycoca_la_meta_unload.cpp - @@echo '0};' >> kbuildsycoca_la_meta_unload.cpp - @@echo '#include ' >> kbuildsycoca_la_meta_unload.cpp - @@echo '_UNLOAD(kbuildsycoca_la)' >> kbuildsycoca_la_meta_unload.cpp d204 17 a220 6 + @@echo 'static const char * _metalist_libkbuildsycoca_main_la[] = {' > libkbuildsycoca_main_la_meta_unload.cpp + @@cat kbuildsycoca.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkbuildsycoca_main_la_meta_unload.cpp + @@echo '0};' >> libkbuildsycoca_main_la_meta_unload.cpp + @@echo '#include ' >> libkbuildsycoca_main_la_meta_unload.cpp + @@echo '_UNLOAD(libkbuildsycoca_main_la)' >> libkbuildsycoca_main_la_meta_unload.cpp @@@@ -766 +776,13 @@@@ d235 2 a236 1 @@@@ -769 +791 @@@@ d239 3 a241 1 @@@@ -773 +795 @@@@ d244 7 a250 1 @@@@ -781 +803,13 @@@@ d265 3 a267 1 @@@@ -785 +819 @@@@ d270 7 a276 1 @@@@ -793 +827 @@@@ d279 3 a281 1 @@@@ -797 +831 @@@@ d284 7 a290 1 @@@@ -805 +839 @@@@ d293 3 a295 1 @@@@ -809 +843 @@@@ d298 7 a304 1 @@@@ -830 +864 @@@@ d307 3 a309 1 @@@@ -834 +868 @@@@ d312 6 a317 1 @@@@ -837 +871 @@@@ d320 7 @