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.32; author wiz; state dead; branches; next 1.2; 1.2 date 2001.12.03.15.37.19; author skrll; state Exp; branches; next 1.1; 1.1 date 2001.10.15.22.46.07; author skrll; state Exp; branches; next ; desc @@ 1.3 log @Remove KDE2 packages (and their dependencies) as proposed on tech-pkg. @ text @$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 ' >> 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 ' >> 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 ' >> 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 ' >> 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 @ 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 @d3 1 a3 1 --- konsole/src/Makefile.in.orig Sat Sep 8 01:36:44 2001 d5 4 a8 1 @@@@ -292 +292,2 @@@@ d12 7 a18 1 @@@@ -301,0 +303,4 @@@@ d23 1 a23 1 @@@@ -303,2 +308,2 @@@@ d28 3 a30 1 @@@@ -308,2 +313,2 @@@@ d35 2 a36 1 @@@@ -311,0 +317,4 @@@@ d41 1 a41 1 @@@@ -313,2 +322,2 @@@@ d46 3 a48 1 @@@@ -318 +327 @@@@ d51 7 a57 1 @@@@ -372,2 +381,2 @@@@ d62 1 a62 1 @@@@ -375,7 +384,11 @@@@ d65 1 a65 1 -kwrited_la_meta_unload.lo d72 1 a72 1 +libkwrited_main_la_meta_unload.lo d81 1 a81 1 @@@@ -383,5 +396,9 @@@@ d84 1 a84 1 -konsole_la_meta_unload.lo d89 1 a89 1 +libkonsole_main_la_meta_unload.lo d96 7 a102 1 @@@@ -395 +412 @@@@ d105 1 a105 1 @@@@ -397 +414 @@@@ d107 13 a119 5 +konsole_final_OBJECTS = konsole_main.o konsole.all_C.o @@@@ -401 +418 @@@@ -TEHistory.$(OBJEXT) keytrans.$(OBJEXT) \ +TEHistory.$(OBJEXT) keytrans.$(OBJEXT) konsole_main.$(OBJEXT) \ @@@@ -411 +428 @@@@ d122 1 a122 1 @@@@ -413,2 +430,2 @@@@ d127 7 a133 1 @@@@ -438 +455 @@@@ d136 6 a141 1 @@@@ -445,2 +462,2 @@@@ d146 5 a150 1 @@@@ -452 +469 @@@@ d153 7 a159 1 @@@@ -538,0 +556,3 @@@@ d163 3 a165 1 @@@@ -541,0 +562,3 @@@@ d169 7 a175 1 @@@@ -586,0 +610,6 @@@@ d182 7 a188 13 @@@@ -679,11 +707,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 @@@@ -814,3 +831,0 @@@@ d192 7 a198 1 @@@@ -891,8 +906,8 @@@@ a201 5 - @@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 ' >> kwrited_la_meta_unload.C - @@echo '_UNLOAD(kwrited_la)' >> kwrited_la_meta_unload.C d205 16 a220 6 + @@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 ' >> libkwrited_main_la_meta_unload.C + @@echo '_UNLOAD(libkwrited_main_la)' >> libkwrited_main_la_meta_unload.C @@@@ -902,8 +917,8 @@@@ a223 5 - @@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 ' >> konsole_la_meta_unload.C - @@echo '_UNLOAD(konsole_la)' >> konsole_la_meta_unload.C d227 20 a246 6 + @@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 ' >> libkonsole_main_la_meta_unload.C + @@echo '_UNLOAD(libkonsole_main_la)' >> libkonsole_main_la_meta_unload.C @@@@ -925 +940 @@@@ d249 7 a255 1 @@@@ -940,7 +955,7 @@@@ d270 37 a306 1 @@@@ -948,2 +963,2 @@@@ d309 4 a312 3 + 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 @@@@ -952,7 +967,7 @@@@ d320 8 a327 8 +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; \ @@@@ -960,2 +975,2 @@@@ d330 9 a338 4 + 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 @@@@ -975,12 +989,0 @@@@ -#>+ 11 d346 8 a353 1 - done; \ d356 5 a360 2 - @@@@ -989 +992 @@@@ d362 4 a365 2 + -rm -f libkonsolepart_la.all_C.C libkwrited_main_la.all_C.C libkonsole_main_la.all_C.C konsole.all_C.C @@@@ -993 +996 @@@@ d368 6 a373 1 @@@@ -996 +999 @@@@ d376 7 @