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.05; author skrll; state Exp; branches; next ; desc @@ 1.3 log @Remove KDE2 packages (and their dependencies) as proposed on tech-pkg. @ text @$NetBSD: patch-cj,v 1.2 2001/12/03 15:37:19 skrll Exp $ --- kmenuedit/Makefile.in.orig Sat Nov 10 07:58:28 2001 +++ kmenuedit/Makefile.in @@@@ -276,17 +276,18 @@@@ INCLUDES = $(all_includes) bin_PROGRAMS = kmenuedit -lib_LTLIBRARIES = kmenuedit.la +lib_LTLIBRARIES = libkmenuedit_main.la kmenuedit.la -CLEANFILES = dummy.cpp +libkmenuedit_main_la_SOURCES = namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp +libkmenuedit_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE) +libkmenuedit_main_la_LDFLAGS = $(all_libraries) -kmenuedit_la_SOURCES = namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp - -kmenuedit_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE) +kmenuedit_la_SOURCES = kmenuedit_main.cpp +kmenuedit_la_LIBADD = libkmenuedit_main.la kmenuedit_la_LDFLAGS = $(all_libraries) -module -avoid-version -kmenuedit_SOURCES = dummy.cpp -kmenuedit_LDADD = kmenuedit.la +kmenuedit_SOURCES = kmenuedit_main.cpp +kmenuedit_LDADD = libkmenuedit_main.la kmenuedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) noinst_HEADERS = kmenuedit.h menueditview.h treeview.h desktopfileeditor.h basictab.h namedlg.h khotkeys.h @@@@ -316,23 +317,27 @@@@ LIBS = @@LIBS@@ X_CFLAGS = @@X_CFLAGS@@ X_LIBS = @@X_LIBS@@ -kmenuedit_la_DEPENDENCIES = -#>- kmenuedit_la_OBJECTS = namedlg.lo basictab.lo treeview.lo \ +libkmenuedit_main_la_DEPENDENCIES = +#>- libkmenuedit_main_la_OBJECTS = namedlg.lo basictab.lo treeview.lo \ #>- desktopfileeditor.lo menueditview.lo kmenuedit.lo main.lo khotkeys.lo #>+ 6 -kmenuedit_la_final_OBJECTS = kmenuedit_la.all_cpp.lo -kmenuedit_la_nofinal_OBJECTS = namedlg.lo basictab.lo treeview.lo \ +libkmenuedit_main_la_final_OBJECTS = libkmenuedit_main_la.all_cpp.lo +libkmenuedit_main_la_nofinal_OBJECTS = namedlg.lo basictab.lo treeview.lo \ desktopfileeditor.lo menueditview.lo kmenuedit.lo main.lo khotkeys.lo \ - kmenuedit_la_meta_unload.lo -@@KDE_USE_FINAL_FALSE@@kmenuedit_la_OBJECTS = $(kmenuedit_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kmenuedit_la_OBJECTS = $(kmenuedit_la_final_OBJECTS) + libkmenuedit_main_la_meta_unload.lo +@@KDE_USE_FINAL_FALSE@@libkmenuedit_main_la_OBJECTS = $(libkmenuedit_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkmenuedit_main_la_OBJECTS = $(libkmenuedit_main_la_final_OBJECTS) +kmenuedit_la_DEPENDENCIES = libkmenuedit_main.la +#>- kmenuedit_la_OBJECTS = kmenuedit_main.lo +#>+ 1 +kmenuedit_la_OBJECTS = kmenuedit_main.lo bin_PROGRAMS = kmenuedit$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -#>- kmenuedit_OBJECTS = dummy.$(OBJEXT) +#>- kmenuedit_OBJECTS = kmenuedit_main.$(OBJEXT) #>+ 1 -kmenuedit_OBJECTS = dummy.$(OBJEXT) -kmenuedit_DEPENDENCIES = kmenuedit.la +kmenuedit_OBJECTS = kmenuedit_main.$(OBJEXT) +kmenuedit_DEPENDENCIES = libkmenuedit_main.la CXXFLAGS = @@CXXFLAGS@@ #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) #>+ 1 @@@@ -353,15 +358,15 @@@@ #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=kmenueditui.rc hi32-app-kmenuedit.png hi16-app-kmenuedit.png kmenuedit.desktop hi48-app-kmenuedit.png +KDE_DIST=hi32-app-kmenuedit.png kmenuedit.desktop hi16-app-kmenuedit.png hi48-app-kmenuedit.png kmenueditui.rc DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) TAR = tar GZIP_ENV = --best -SOURCES = $(kmenuedit_la_SOURCES) $(kmenuedit_SOURCES) -OBJECTS = $(kmenuedit_la_OBJECTS) $(kmenuedit_OBJECTS) +SOURCES = $(libkmenuedit_main_la_SOURCES) $(kmenuedit_la_SOURCES) $(kmenuedit_SOURCES) +OBJECTS = $(libkmenuedit_main_la_OBJECTS) $(kmenuedit_la_OBJECTS) $(kmenuedit_OBJECTS) #>- all: all-redirect #>+ 1 @@@@ -448,6 +453,9 @@@@ maintainer-clean-libtool: +libkmenuedit_main.la: $(libkmenuedit_main_la_OBJECTS) $(libkmenuedit_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkmenuedit_main_la_LDFLAGS) $(libkmenuedit_main_la_OBJECTS) $(libkmenuedit_main_la_LIBADD) $(LIBS) + kmenuedit.la: $(kmenuedit_la_OBJECTS) $(kmenuedit_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kmenuedit_la_LDFLAGS) $(kmenuedit_la_OBJECTS) $(kmenuedit_la_LIBADD) $(LIBS) @@@@ -676,7 +684,6 @@@@ mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) @@@@ -797,28 +804,40 @@@@ #>+ 12 -kmenuedit_la_meta_unload.cpp: basictab.moc treeview.moc desktopfileeditor.moc menueditview.moc kmenuedit.moc - @@echo 'creating kmenuedit_la_meta_unload.cpp' - @@-rm -f kmenuedit_la_meta_unload.cpp +libkmenuedit_main_la_meta_unload.cpp: basictab.moc treeview.moc desktopfileeditor.moc menueditview.moc kmenuedit.moc + @@echo 'creating libkmenuedit_main_la_meta_unload.cpp' + @@-rm -f libkmenuedit_main_la_meta_unload.cpp @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kmenuedit_la[] = {' > kmenuedit_la_meta_unload.cpp ;\ - cat basictab.moc treeview.moc desktopfileeditor.moc menueditview.moc kmenuedit.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kmenuedit_la_meta_unload.cpp ;\ - echo '0};' >> kmenuedit_la_meta_unload.cpp ;\ - echo '#include ' >> kmenuedit_la_meta_unload.cpp ;\ - echo '_UNLOAD(kmenuedit_la)' >> kmenuedit_la_meta_unload.cpp ;\ - else echo > kmenuedit_la_meta_unload.cpp; fi + echo 'static const char * _metalist_libkmenuedit_main_la[] = {' > libkmenuedit_main_la_meta_unload.cpp ;\ + cat basictab.moc treeview.moc desktopfileeditor.moc menueditview.moc kmenuedit.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkmenuedit_main_la_meta_unload.cpp ;\ + echo '0};' >> libkmenuedit_main_la_meta_unload.cpp ;\ + echo '#include ' >> libkmenuedit_main_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkmenuedit_main_la)' >> libkmenuedit_main_la_meta_unload.cpp ;\ + else echo > libkmenuedit_main_la_meta_unload.cpp; fi #>+ 3 clean-moc-classes: - -rm -f kmenuedit_la_meta_unload.cpp + -rm -f libkmenuedit_main_la_meta_unload.cpp + +#>+ 11 +libkmenuedit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/namedlg.cpp $(srcdir)/basictab.cpp $(srcdir)/treeview.cpp $(srcdir)/desktopfileeditor.cpp $(srcdir)/menueditview.cpp $(srcdir)/kmenuedit.cpp $(srcdir)/main.cpp $(srcdir)/khotkeys.cpp libkmenuedit_main_la_meta_unload.cpp basictab.moc treeview.moc menueditview.moc desktopfileeditor.moc kmenuedit.moc + @@echo 'creating libkmenuedit_main_la.all_cpp.cpp ...'; \ + rm -f libkmenuedit_main_la.all_cpp.files libkmenuedit_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkmenuedit_main_la.all_cpp.final; \ + for file in namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp libkmenuedit_main_la_meta_unload.cpp ; do \ + echo "#include \"$$file\"" >> libkmenuedit_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkmenuedit_main_la.all_cpp.final; \ + done; \ + cat libkmenuedit_main_la.all_cpp.final libkmenuedit_main_la.all_cpp.files > libkmenuedit_main_la.all_cpp.cpp; \ + rm -f libkmenuedit_main_la.all_cpp.final libkmenuedit_main_la.all_cpp.files #>+ 11 -kmenuedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/namedlg.cpp $(srcdir)/basictab.cpp $(srcdir)/treeview.cpp $(srcdir)/desktopfileeditor.cpp $(srcdir)/menueditview.cpp $(srcdir)/kmenuedit.cpp $(srcdir)/main.cpp $(srcdir)/khotkeys.cpp kmenuedit_la_meta_unload.cpp basictab.moc treeview.moc menueditview.moc desktopfileeditor.moc kmenuedit.moc +kmenuedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmenuedit_main.cpp @@echo 'creating kmenuedit_la.all_cpp.cpp ...'; \ rm -f kmenuedit_la.all_cpp.files kmenuedit_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kmenuedit_la.all_cpp.final; \ - for file in namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp kmenuedit_la_meta_unload.cpp ; do \ + for file in kmenuedit_main.cpp ; do \ echo "#include \"$$file\"" >> kmenuedit_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmenuedit_la.all_cpp.final; \ done; \ @@@@ -826,11 +845,11 @@@@ rm -f kmenuedit_la.all_cpp.final kmenuedit_la.all_cpp.files #>+ 11 -kmenuedit.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kmenuedit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmenuedit_main.cpp @@echo 'creating kmenuedit.all_cpp.cpp ...'; \ rm -f kmenuedit.all_cpp.files kmenuedit.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kmenuedit.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kmenuedit_main.cpp ; do \ echo "#include \"$$file\"" >> kmenuedit.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmenuedit.all_cpp.final; \ done; \ @@@@ -839,20 +858,20 @@@@ #>+ 3 clean-final: - -rm -f kmenuedit_la.all_cpp.cpp kmenuedit.all_cpp.cpp + -rm -f libkmenuedit_main_la.all_cpp.cpp kmenuedit_la.all_cpp.cpp kmenuedit.all_cpp.cpp #>+ 2 final: - $(MAKE) kmenuedit_la_OBJECTS="$(kmenuedit_la_final_OBJECTS)" all-am + $(MAKE) libkmenuedit_main_la_OBJECTS="$(libkmenuedit_main_la_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) kmenuedit_la_OBJECTS="$(kmenuedit_la_final_OBJECTS)" install-am + $(MAKE) libkmenuedit_main_la_OBJECTS="$(libkmenuedit_main_la_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) kmenuedit_la_OBJECTS="$(kmenuedit_la_nofinal_OBJECTS)" all-am + $(MAKE) libkmenuedit_main_la_OBJECTS="$(libkmenuedit_main_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) kmenuedit_la_OBJECTS="$(kmenuedit_la_nofinal_OBJECTS)" install-am + $(MAKE) libkmenuedit_main_la_OBJECTS="$(libkmenuedit_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean @ 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 --- kmenuedit/Makefile.in.orig Sat Sep 8 01:36:37 2001 d5 4 a8 1 @@@@ -277 +277 @@@@ d11 1 a11 1 @@@@ -279 +279,3 @@@@ d16 1 a16 1 @@@@ -281,3 +283,2 @@@@ d22 2 a23 1 @@@@ -286,2 +287,2 @@@@ d28 7 a34 1 @@@@ -317,2 +318,2 @@@@ d39 2 a40 1 @@@@ -321,2 +322,2 @@@@ d45 2 a46 2 @@@@ -324,3 +325,7 @@@@ -kmenuedit_la_meta_unload.lo d49 1 a49 1 +libkmenuedit_main_la_meta_unload.lo d56 3 a58 1 @@@@ -330 +335 @@@@ d61 1 a61 1 @@@@ -332,2 +337,2 @@@@ d66 7 a72 1 @@@@ -354 +359 @@@@ d75 6 a80 1 @@@@ -361,2 +366,2 @@@@ d85 7 a91 1 @@@@ -448,0 +454,3 @@@@ d95 7 a101 16 @@@@ -561 +569 @@@@ - test "$$subdir" = "." && dot_seen=yes; \ + test "$$subdir" != "." || dot_seen=yes; \ @@@@ -619,11 +626,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 @@@@ -688 +684,0 @@@@ d103 7 a109 1 @@@@ -809,8 +805,8 @@@@ a112 5 - @@echo 'static const char * _metalist_kmenuedit_la[] = {' > kmenuedit_la_meta_unload.cpp - @@cat basictab.moc treeview.moc desktopfileeditor.moc menueditview.moc kmenuedit.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kmenuedit_la_meta_unload.cpp - @@echo '0};' >> kmenuedit_la_meta_unload.cpp - @@echo '#include ' >> kmenuedit_la_meta_unload.cpp - @@echo '_UNLOAD(kmenuedit_la)' >> kmenuedit_la_meta_unload.cpp d116 17 a132 6 + @@echo 'static const char * _metalist_libkmenuedit_main_la[] = {' > libkmenuedit_main_la_meta_unload.cpp + @@cat basictab.moc treeview.moc desktopfileeditor.moc menueditview.moc kmenuedit.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkmenuedit_main_la_meta_unload.cpp + @@echo '0};' >> libkmenuedit_main_la_meta_unload.cpp + @@echo '#include ' >> libkmenuedit_main_la_meta_unload.cpp + @@echo '_UNLOAD(libkmenuedit_main_la)' >> libkmenuedit_main_la_meta_unload.cpp @@@@ -821 +817,13 @@@@ d147 2 a148 1 @@@@ -824 +832 @@@@ d151 3 a153 1 @@@@ -828 +836 @@@@ d156 7 a162 1 @@@@ -836 +844 @@@@ d165 3 a167 1 @@@@ -840 +848 @@@@ d170 7 a176 1 @@@@ -849 +857 @@@@ d179 3 a181 1 @@@@ -853 +861 @@@@ d184 6 a189 1 @@@@ -856 +864 @@@@ d192 7 @