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.20; author skrll; state Exp; branches; next 1.1; 1.1 date 2001.10.15.22.46.11; author skrll; state Exp; branches; next ; desc @@ 1.3 log @Remove KDE2 packages (and their dependencies) as proposed on tech-pkg. @ text @$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 ' >> 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 ' >> 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 @ 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 --- kxkb/Makefile.in.orig Sat Sep 8 01:36:51 2001 d5 4 a8 1 @@@@ -278 +278 @@@@ d11 1 a11 1 @@@@ -280 +280 @@@@ d14 1 a14 1 @@@@ -282 +282 @@@@ d17 6 a22 1 @@@@ -289 +289,5 @@@@ d29 1 a29 1 @@@@ -291 +295 @@@@ d32 7 a38 1 @@@@ -318,2 +322,2 @@@@ d43 1 a43 1 @@@@ -321,5 +325,9 @@@@ d46 1 a46 1 -kxkb_la_meta_unload.lo d51 1 a51 1 +libkxkb_main_la_meta_unload.lo d58 3 a60 1 @@@@ -329 +337 @@@@ d63 1 a63 1 @@@@ -331,2 +339,2 @@@@ d68 7 a74 1 @@@@ -351 +359 @@@@ d77 6 a82 1 @@@@ -358,2 +366,2 @@@@ d87 7 a93 1 @@@@ -451,0 +460,3 @@@@ d97 7 a103 13 @@@@ -562,11 +572,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 @@@@ -685,3 +684,0 @@@@ d107 7 a113 1 @@@@ -742,8 +739,8 @@@@ a116 5 - @@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 ' >> kxkb_la_meta_unload.cpp - @@echo '_UNLOAD(kxkb_la)' >> kxkb_la_meta_unload.cpp d120 17 a136 6 + @@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 ' >> libkxkb_main_la_meta_unload.cpp + @@echo '_UNLOAD(libkxkb_main_la)' >> libkxkb_main_la_meta_unload.cpp @@@@ -754 +751 @@@@ d139 7 a145 1 @@@@ -769 +766,13 @@@@ d160 3 a162 1 @@@@ -773 +782 @@@@ d165 7 a171 1 @@@@ -781 +790 @@@@ d174 3 a176 1 @@@@ -785 +794 @@@@ d179 7 a185 1 @@@@ -794 +803 @@@@ d188 3 a190 1 @@@@ -798 +807 @@@@ d193 6 a198 1 @@@@ -801 +810 @@@@ d201 7 @