head 1.8; access; symbols pkgsrc-2013Q2:1.8.0.20 pkgsrc-2013Q2-base:1.8 pkgsrc-2012Q4:1.8.0.18 pkgsrc-2012Q4-base:1.8 pkgsrc-2011Q4:1.8.0.16 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q2:1.8.0.14 pkgsrc-2011Q2-base:1.8 pkgsrc-2009Q4:1.8.0.12 pkgsrc-2009Q4-base:1.8 pkgsrc-2008Q4:1.8.0.10 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.8 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.6 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.4 pkgsrc-2008Q2-base:1.8 pkgsrc-2008Q1:1.8.0.2 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.7.0.2 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.6.0.30 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.28 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.26 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.24 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.22 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.6.0.20 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.18 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.16 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.14 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.12 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.10 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.8 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.6 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.4 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.6.0.2 pkgsrc-2004Q1-base:1.6 pkgsrc-2003Q4:1.5.0.2 pkgsrc-2003Q4-base:1.5 netbsd-1-6-1:1.3.0.2 netbsd-1-6-1-base:1.3 netbsd-1-6:1.1.1.1.0.4 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.1.1.0.6 pkgviews-base:1.1 buildlink2-base:1.1 buildlink2:1.1.1.1.0.2 pkg-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.8 date 2008.02.20.09.49.56; author markd; state dead; branches; next 1.7; 1.7 date 2007.10.20.10.36.15; author markd; state Exp; branches; next 1.6; 1.6 date 2004.02.04.13.58.39; author markd; state dead; branches; next 1.5; 1.5 date 2003.05.22.02.42.41; author markd; state Exp; branches; next 1.4; 1.4 date 2003.03.11.13.10.35; author markd; state Exp; branches; next 1.3; 1.3 date 2003.01.02.09.12.39; author skrll; state Exp; branches; next 1.2; 1.2 date 2002.08.25.19.23.51; author jlam; state Exp; branches; next 1.1; 1.1 date 2002.05.31.13.16.46; author skrll; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.05.31.13.16.46; author skrll; state Exp; branches 1.1.1.1.2.1; next ; 1.1.1.1.2.1 date 2002.05.31.13.16.46; author jlam; state dead; branches; next 1.1.1.1.2.2; 1.1.1.1.2.2 date 2002.06.23.19.06.16; author jlam; state Exp; branches; next ; desc @@ 1.8 log @Update to kde 3.5.9 minor bugfixes. @ text @$NetBSD: patch-ak,v 1.7 2007/10/20 10:36:15 markd Exp $ svn revision 726097 --- kioslave/http/http.cc 2007/09/26 17:08:43 717341 +++ kioslave/http/http.cc 2007/10/17 04:11:51 726097 @@@@ -3409,10 +3409,6 @@@@ } while (!m_bEOF && (len || noHeader) && (headerSize < maxHeaderSize) && (gets(buffer, sizeof(buffer)-1))); - // Send the current response before processing starts or it - // might never get sent... - forwardHttpResponseHeader(); - // Now process the HTTP/1.1 upgrade QStringList::Iterator opt = upgradeOffers.begin(); for( ; opt != upgradeOffers.end(); ++opt) { @@@@ -3818,6 +3814,10 @@@@ mimeType( m_strMimeType ); } + // Do not move send response header before any redirection as it seems + // to screw up some sites. See BR# 150904. + forwardHttpResponseHeader(); + if (m_request.method == HTTP_HEAD) return true; @@@@ -3830,10 +3830,10 @@@@ // Check... createCacheEntry(m_strMimeType, expireDate); // Create a cache entry if (!m_request.fcache) - { - m_request.bCachedWrite = false; // Error creating cache entry. - kdDebug(7113) << "(" << m_pid << ") Error creating cache entry for " << m_request.url.url()<<"!\n"; - } + { + m_request.bCachedWrite = false; // Error creating cache entry. + kdDebug(7113) << "(" << m_pid << ") Error creating cache entry for " << m_request.url.url()<<"!\n"; + } m_request.expireDate = expireDate; m_maxCacheSize = config()->readNumEntry("MaxCacheSize", DEFAULT_MAX_CACHE_SIZE) / 2; } @ 1.7 log @Update to KDE 3.5.8 core libs * Small performance improvements. * Reworked KCmdLineArgs::makeURL to make "kpdf a:b" work when a:b is an existing file in the current directory. * Be more robust against addressbar spoofing. * A hostname may resolve to multiple addresses. When connection to one timeouts, we should not immediately give up. Instead, we try the other addresses. http ioslave * Fix crash on broken servers. * Fix Connection failed Url Frame Redirection. * Fix session cookies not always accepted. * Fix persistent cookies are treated like session cookies. * Fix a cross-site cookie injection vulnerability. * Fix for correctly propagating HTTP response headers > 8K. * Fix http responses containing just a header cause Konqueror to wait indefinitely for a response. * Fix problem with cookies in konqueror when server specified as IP adress. * Fix per-site cookie policy does not apply to cookies set for subdomains. KHTML * Fix handling of font-variant:inherit. * Fix GMail/Firefox yet again. * Fix confused cursor shapes if mail and new-window links appear on the same page. * Fix cannot type text into boxes on riteaid.com. * Optimize descendant selector matching. * Fix invalid placing of image. * Default to "UTF-8" per section 2 of the draft W3C "The XMLHttpRequest Object" specification. kjs * Do not convert accented latin1 characters into undrawable char in websites using advanced JavaScript. @ text @d1 1 a1 1 $NetBSD$ @ 1.6 log @Update to KDE-3.2.0. Changes: Libraries * Hidden methods in DCOP interfaces - DCOPIDLng Alexander Kellett * Documentation parsing (kdoc based) and inclusion in generated .dcopidl files (note: kdebindings dcopidlng only) Alexander Kellett * Kalyptus based rewrite of DCOPIDL - DCOPIDLng Alexander Kellett * Thumbnail generator for DVI files. Stefan Kebekus * Thumbnail generator for Xcursor files. Fredrik Hoeglund * KMainWindow can now maintain the statusbar and corresponding action (duplicate (99% of the time broken) code removed from countless applications in KDE). Benjamin Meyer * KMainWindow, KToolbar, and several other core classes now will only stores settings if those settings are not the default values (helping to reduce the huge size of config files). Benjamin Meyer * Add support for International Domain Names (IDN). Thiago Macieira, Waldo Bastian * KDE Password Registry and Wallet. George Staikos * SSL session ID reuse. George Staikos * KCookiejar: Support HttpOnly cookies. Waldo Bastian * KLocale: support for different calendar systems Hans Petter Bieker * KCalendarSystem: support for Hebrew calendar system Hans Petter Bieker * Support data urls. See rfc 2397. Leo Savernik * New tab widget classes KTabBar and KTabWidget in kdeui Stephan Binner * New KFile permissions panel Tim Jansen * Support for mimetype inheritance and aliases David Faure * KDialogBase: Replace setButtonOkText() & co. with setButtonOk() that takes a KGuiItem instead (deprecating the old methods) Martijn Klingens * Move KPrefs from libkdepim to kdelibs. Cornelius Schumacher * Support for "extra fields" in KIO slaves and in Konqueror / KFileDialog David Faure * Add KSplashScreen, a splash screen class based on QSplashScreen (with support for KDE's Xinerama options) Chris Howells * KPasteTextAction: enhanced action for pasting text by offering a list with the clipboard history. Andras Mantia KHTML * Non-modal find dialog David Faure KDEfx * Added KCPUInfo class which makes it possible for applications to do runtime checks for architecture specific CPU features, such MMX, 3DNow! and AltiVec. Fredrik Hoeglund * Added MMX and SSE2 optimizations to the blending functions in KImageEffect, that among other things are used to blend the translucent menus when the menu effect is set to software blend, and to tint icons when they're selected in icon views. Fredrik Hoeglund Kate Part * File type specific settings Christoph Cullmann * vi style cmd line Christoph Cullmann * Support variable lines in files Anders Lund * Color Schemes Christoph Cullmann * Indentation based code folding Christoph Cullmann * Implement more DCOP interfaces and clean up the ktexteditor dcop interfaces Christoph Cullmann KImgIO * Add PCX image plugin, supports reading and writing 1, 4, 8 and 24bpp images Nadeem Hasan * Add TGA image plugin, supports reading and writing true color TGA images (compressed and uncompressed) Dominik Seichter Interfaces * Interfaces for KBytesEdit widget part Friedrich W. H. Kossebau KSpell * Adding ability to spell check HTML, TeX and nroff documents. Zack Rusin * Completely reworking the spell checking dialog. Adding language selection combo. Zack Rusin @ text @d1 1 a1 1 $NetBSD: patch-ak,v 1.5 2003/05/22 02:42:41 markd Exp $ d3 22 a24 21 --- kconf_update/Makefile.in.orig Thu May 8 05:24:04 2003 +++ kconf_update/Makefile.in @@@@ -393,16 +393,20 @@@@ x_libraries = @@x_libraries@@ INCLUDES = $(all_includes) -lib_LTLIBRARIES = kconf_update.la +lib_LTLIBRARIES = libkconf_update_main.la kconf_update.la bin_PROGRAMS = kconf_update -kconf_update_SOURCES = dummy.cpp -kconf_update_LDADD = kconf_update.la +kconf_update_SOURCES = kconf_update_main.cpp +kconf_update_LDADD = libkconf_update_main.la kconf_update_LDFLAGS = $(KDE_RPATH) $(all_libraries) -kconf_update_la_SOURCES = kconf_update.cpp -kconf_update_la_LIBADD = ../kdecore/libkdecore.la +libkconf_update_main_la_SOURCES = kconf_update.cpp +libkconf_update_main_la_LIBADD = ../kdecore/libkdecore.la +libkconf_update_main_la_LDFLAGS = $(all_libraries) d26 2 a27 25 +kconf_update_la_SOURCES = kconf_update_main.cpp kconf_update_la_LDFLAGS = $(all_libraries) -module -avoid-version +kconf_update_la_LIBADD = libkconf_update_main.la #>- METASOURCES = AUTO subdir = kconf_update @@@@ -411,28 +415,35 @@@@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -kconf_update_la_DEPENDENCIES = ../kdecore/libkdecore.la -am_kconf_update_la_OBJECTS = kconf_update.lo +kconf_update_la_DEPENDENCIES = libkconf_update_main.la +am_kconf_update_la_OBJECTS = kconf_update_main.lo #>- kconf_update_la_OBJECTS = $(am_kconf_update_la_OBJECTS) #>+ 1 -kconf_update_la_OBJECTS = kconf_update.lo +kconf_update_la_OBJECTS = kconf_update_main.lo +libkconf_update_main_la_DEPENDENCIES = ../kdecore/libkdecore.la +am_libkconf_update_main_la_OBJECTS = kconf_update.lo +#>- libkconf_update_main_la_OBJECTS = $(am_libkconf_update_main_la_OBJECTS) +#>+ 1 +libkconf_update_main_la_OBJECTS = kconf_update.lo bin_PROGRAMS = kconf_update$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) d29 15 a43 70 -am_kconf_update_OBJECTS = dummy.$(OBJEXT) +am_kconf_update_OBJECTS = kconf_update_main.$(OBJEXT) #>- kconf_update_OBJECTS = $(am_kconf_update_OBJECTS) #>+ 1 -kconf_update_OBJECTS = dummy.$(OBJEXT) -kconf_update_DEPENDENCIES = kconf_update.la +kconf_update_OBJECTS = kconf_update_main.$(OBJEXT) +kconf_update_DEPENDENCIES = libkconf_update_main.la DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles -#>- @@AMDEP_TRUE@@DEP_FILES = ./$(DEPDIR)/dummy.Po \ -#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kconf_update.Plo -#>+ 3 -@@AMDEP_TRUE@@DEP_FILES = ./$(DEPDIR)/dummy.Po \ -@@AMDEP_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kconf_update.Plo +#>- @@AMDEP_TRUE@@DEP_FILES = ./$(DEPDIR)/kconf_update.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kconf_update_main.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kconf_update_main.Po +#>+ 4 +@@AMDEP_TRUE@@DEP_FILES = ./$(DEPDIR)/kconf_update.Plo \ +@@AMDEP_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kconf_update_main.Plo \ +@@AMDEP_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kconf_update_main.Po #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@@@ -452,9 +463,10 @@@@ CXXLD = $(CXX) #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@@ -DIST_SOURCES = $(kconf_update_la_SOURCES) $(kconf_update_SOURCES) +DIST_SOURCES = $(kconf_update_la_SOURCES) \ + $(libkconf_update_main_la_SOURCES) $(kconf_update_SOURCES) DIST_COMMON = Makefile.am Makefile.in -SOURCES = $(kconf_update_la_SOURCES) $(kconf_update_SOURCES) +SOURCES = $(kconf_update_la_SOURCES) $(libkconf_update_main_la_SOURCES) $(kconf_update_SOURCES) #>- all: all-am #>+ 1 @@@@ -501,6 +513,8 @@@@ clean-libLTLIBRARIES: done kconf_update.la: $(kconf_update_la_OBJECTS) $(kconf_update_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kconf_update_la_LDFLAGS) $(kconf_update_la_OBJECTS) $(kconf_update_la_LIBADD) $(LIBS) +libkconf_update_main.la: $(libkconf_update_main_la_OBJECTS) $(libkconf_update_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkconf_update_main_la_LDFLAGS) $(libkconf_update_main_la_OBJECTS) $(libkconf_update_main_la_LIBADD) $(LIBS) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @@$(NORMAL_INSTALL) @@@@ -540,8 +554,9 @@@@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/dummy.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kconf_update.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kconf_update_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kconf_update_main.Po@@am__quote@@ distclean-depend: -rm -rf ./$(DEPDIR) @@@@ -779,9 +794,6 @@@@ uninstall-am: uninstall-binPROGRAMS unin # Internal # noinst_HEADERS = kconf_update.h - -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: @ 1.5 log @Update KDE to 3.1.2. Changes: kdelibs: * https authentication through proxy fixed. * KZip failed for some .zip archives. * Fixed a bug in socket code that made KDEPrint crash. * kspell: Support for Hebrew spell checking using hspell (requires hspell 0.5). kdebase: * kwin: Alt+Tab works while drag'n'drop (unless the application also grabs keyboard). * kio_smtp: Doesn't eat 100% CPU when connection breaks and fixed a confusing error message when AUTH failed ("Unknown Command" vs. "Authorization failed") * kscreensaver: Fixed issue where kdesktop_lock would stay running indefinitely in the background if it could not grab the keyboard/mouse, preventing the screen from being locked manually. * kscreensaver: Screensavers are now stopped when asking for the password [#56803] * kio_smb: Several bugfixes for the smbro-ioslave. * kdesktop: fixed minicli layout problem with Qt 3.1.2 * kdm: fixed incorrect user window width with Qt 3.1.2 * Konqueror: Create DCOP interface for mainwindow when object begins to exist. * Konqueror: Fixed tab open delays when it can't reach website. * Konsole: Don't flicker when selecting entire lines. * Konsole: Crash, selection and sort fixes in schema and session editors. * Konsole: Fixed mouse-wheel in mouse mode. * Konsole: Allow programs to resize windows if enabled. * Konsole: Keep output steady when triple-click selecting. * Konsole: Added "Print" menu command. * kicker: Fixed kasbar only drawing last icon from a group. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Update KDE to 3.1. Many bugfixes and functionality enhancements including: General New default widget style: Keramik New default icon theme: Crystal Created and enhanced framework to effectively disable certain features of the GUI, like for example shell access, disallowing to select custom wall papers. "Kiosk mode" Usability improvements: Kicker: Context menu, applet menus, wording and panel feature consistency improved Kicker: Redesigned control module. KCalc: Usability Improvements. KSnapshot: Usability Improvements. KsCD: User Interface Improvements in configuration and information dialogs kdelibs Extended the DCOP commandline client to enable nonGUI applications (such as shell scripts) to use DCOP send DCOP messages to multiple users and/or sessions concurrently Added to notification dialog to allow applications to configure their notifications with a common GUI. Added "Open File", "Open Destination" and "Keep window open" to download progress dialog. KDatePicker has now week number display and selection. Added KLocale support for setting/retrieving the first day of a week Support for "Multimedia keys" on your keyboard. Added on-demand icon loading support to improve startup performance of applications. KHTML: Improvements to printing support. Page Info and Frame info dialog. Auto-Scroll support of webpages using Shift combined with arrow keys. Many, many Bugfixes and improvements. Small codebase merges with Safari. The main merge is planned for a future release however, as it requires more testing. KIO: Modified thumbnail ioslave that can extract a thumbnail from the file directly if it contains one, rather than generating one itself. Added fish:// protocol slave, which can access remote filesystems via SSH and SCP Cleanups and Corrections in smtp:// protocol slave. Activated rtsp:// protocol slave. Added support for Public Key Authentication and interopability with newer versions of OpenSSH to sftp:// protocol slave. KSSL: SSL certificate policies can now be configured based on the host name @ text @d3 1 a3 1 --- kconf_update/Makefile.in.orig Thu Jan 23 12:30:34 2003 d5 1 a5 1 @@@@ -302,16 +302,20 @@@@ d31 1 a31 1 @@@@ -320,19 +324,24 @@@@ a59 1 DEFS = @@DEFS@@ a60 2 @@@@ -341,11 +350,13 @@@@ LIBS = @@LIBS@@ d78 2 a79 1 @@@@ -366,9 +377,10 @@@@ a81 1 CXXFLAGS = @@CXXFLAGS@@ d91 1 a91 1 @@@@ -415,6 +427,8 @@@@ d100 1 a100 1 @@@@ -454,8 +468,9 @@@@ d111 1 a111 1 @@@@ -646,9 +661,6 @@@@ @ 1.3 log @Update KDE to the 3.0.5a distribution. Packages are numbered 3.0.5.1 or 1.0.5.1 accordingly. Fixes and changes are: Multiple vulnerabilities. kdelibs KHTML : Fixed several crashes and misrenderings. rlogin.protocol: fixed command execution in specially crafted urls. kdebase KAddressbook: Don't squeeze columns on startup/properly restore column width settings. kdenetwork lisa, reslisa: Fixed several security vulnerabilities. kdesdk Cervisia: Show long lines in diff view always completely. @ text @d3 1 a3 1 --- kconf_update/Makefile.in.orig Tue Nov 26 08:57:39 2002 d5 1 a5 1 @@@@ -282,16 +282,20 @@@@ x_libraries = @@x_libraries@@ d31 1 a31 1 @@@@ -300,19 +304,24 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d62 1 a62 2 @@@@ -320,9 +329,13 @@@@ CPPFLAGS = @@CPPFLAGS@@ LDFLAGS = @@LDFLAGS@@ d65 9 a73 6 -#>- @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kconf_update.Plo -#>+ 2 -@@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kconf_update.Plo +#>- @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/kconf_update.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/kconf_update_main.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/kconf_update_main.Po d75 3 a77 3 +@@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/kconf_update.Plo \ +@@AMDEP_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kconf_update_main.Plo \ +@@AMDEP_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kconf_update_main.Po d81 1 a81 1 @@@@ -343,9 +356,10 @@@@ CXXLD = $(CXX) d94 2 a95 2 @@@@ -394,6 +408,8 @@@@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) d100 1 d103 1 a103 2 $(mkinstalldirs) $(DESTDIR)$(bindir) @@@@ -428,8 +444,9 @@@@ mostlyclean-compile: d107 4 a110 4 -@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dummy.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kconf_update.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kconf_update_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kconf_update_main.Po@@am__quote@@ d113 2 a114 2 -rm -rf $(DEPDIR) @@@@ -602,9 +619,6 @@@@ uninstall-am: uninstall-binPROGRAMS unin @ 1.2 log @Merge changes in packages from the buildlink2 branch that have buildlink2.mk files back into the main trunk. @ text @d1 1 a1 1 $NetBSD: patch-ak,v 1.1.2.1 2002/06/23 19:06:16 jlam Exp $ d3 1 a3 1 --- kconf_update/Makefile.in.orig Tue May 21 15:42:05 2002 d5 1 a5 1 @@@@ -282,16 +282,20 @@@@ d31 1 a31 1 @@@@ -300,19 +304,24 @@@@ d62 1 a62 1 @@@@ -320,7 +329,9 @@@@ d66 11 a76 4 -@@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kconf_update.Plo +@@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/kconf_update.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kconf_update_main.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kconf_update_main.Po d78 2 a79 3 #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) #>+ 2 @@@@ -340,9 +351,10 @@@@ d92 1 a92 1 @@@@ -391,6 +403,8 @@@@ d101 1 a101 1 @@@@ -425,8 +439,9 @@@@ d112 1 a112 1 @@@@ -602,9 +617,6 @@@@ a121 49 @@@@ -620,11 +632,11 @@@@ #>+ 11 -kconf_update_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kconf_update.cpp +kconf_update_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kconf_update_main.cpp @@echo 'creating kconf_update_la.all_cpp.cpp ...'; \ rm -f kconf_update_la.all_cpp.files kconf_update_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kconf_update_la.all_cpp.final; \ - for file in kconf_update.cpp ; do \ + for file in kconf_update_main.cpp ; do \ echo "#include \"$$file\"" >> kconf_update_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kconf_update_la.all_cpp.final; \ done; \ @@@@ -632,11 +644,23 @@@@ rm -f kconf_update_la.all_cpp.final kconf_update_la.all_cpp.files #>+ 11 -kconf_update.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +libkconf_update_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kconf_update.cpp + @@echo 'creating libkconf_update_main_la.all_cpp.cpp ...'; \ + rm -f libkconf_update_main_la.all_cpp.files libkconf_update_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkconf_update_main_la.all_cpp.final; \ + for file in kconf_update.cpp ; do \ + echo "#include \"$$file\"" >> libkconf_update_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkconf_update_main_la.all_cpp.final; \ + done; \ + cat libkconf_update_main_la.all_cpp.final libkconf_update_main_la.all_cpp.files > libkconf_update_main_la.all_cpp.cpp; \ + rm -f libkconf_update_main_la.all_cpp.final libkconf_update_main_la.all_cpp.files + +#>+ 11 +kconf_update.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kconf_update_main.cpp @@echo 'creating kconf_update.all_cpp.cpp ...'; \ rm -f kconf_update.all_cpp.files kconf_update.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kconf_update.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kconf_update_main.cpp ; do \ echo "#include \"$$file\"" >> kconf_update.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kconf_update.all_cpp.final; \ done; \ @@@@ -645,7 +669,7 @@@@ #>+ 3 clean-final: - -rm -f kconf_update_la.all_cpp.cpp kconf_update.all_cpp.cpp + -rm -f kconf_update_la.all_cpp.cpp libkconf_update_main_la.all_cpp.cpp kconf_update.all_cpp.cpp #>+ 2 final: @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @Initial import of a kdelibs3 pkg. @ text @@ 1.1.1.1.2.1 log @file patch-ak was added on branch buildlink2 on 2002-06-23 19:06:16 +0000 @ text @d1 164 @ 1.1.1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 164 $NetBSD: patch-ak,v 1.1.1.1.2.1 2002/06/23 19:06:16 jlam Exp $ --- kconf_update/Makefile.in.orig Tue May 21 15:42:05 2002 +++ kconf_update/Makefile.in @@@@ -282,16 +282,20 @@@@ INCLUDES = $(all_includes) -lib_LTLIBRARIES = kconf_update.la +lib_LTLIBRARIES = libkconf_update_main.la kconf_update.la bin_PROGRAMS = kconf_update -kconf_update_SOURCES = dummy.cpp -kconf_update_LDADD = kconf_update.la +kconf_update_SOURCES = kconf_update_main.cpp +kconf_update_LDADD = libkconf_update_main.la kconf_update_LDFLAGS = $(KDE_RPATH) $(all_libraries) -kconf_update_la_SOURCES = kconf_update.cpp -kconf_update_la_LIBADD = ../kdecore/libkdecore.la +libkconf_update_main_la_SOURCES = kconf_update.cpp +libkconf_update_main_la_LIBADD = ../kdecore/libkdecore.la +libkconf_update_main_la_LDFLAGS = $(all_libraries) + +kconf_update_la_SOURCES = kconf_update_main.cpp kconf_update_la_LDFLAGS = $(all_libraries) -module -avoid-version +kconf_update_la_LIBADD = libkconf_update_main.la #>- METASOURCES = AUTO subdir = kconf_update @@@@ -300,19 +304,24 @@@@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -kconf_update_la_DEPENDENCIES = ../kdecore/libkdecore.la -am_kconf_update_la_OBJECTS = kconf_update.lo +kconf_update_la_DEPENDENCIES = libkconf_update_main.la +am_kconf_update_la_OBJECTS = kconf_update_main.lo #>- kconf_update_la_OBJECTS = $(am_kconf_update_la_OBJECTS) #>+ 1 -kconf_update_la_OBJECTS = kconf_update.lo +kconf_update_la_OBJECTS = kconf_update_main.lo +libkconf_update_main_la_DEPENDENCIES = ../kdecore/libkdecore.la +am_libkconf_update_main_la_OBJECTS = kconf_update.lo +#>- libkconf_update_main_la_OBJECTS = $(am_libkconf_update_main_la_OBJECTS) +#>+ 1 +libkconf_update_main_la_OBJECTS = kconf_update.lo bin_PROGRAMS = kconf_update$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -am_kconf_update_OBJECTS = dummy.$(OBJEXT) +am_kconf_update_OBJECTS = kconf_update_main.$(OBJEXT) #>- kconf_update_OBJECTS = $(am_kconf_update_OBJECTS) #>+ 1 -kconf_update_OBJECTS = dummy.$(OBJEXT) -kconf_update_DEPENDENCIES = kconf_update.la +kconf_update_OBJECTS = kconf_update_main.$(OBJEXT) +kconf_update_DEPENDENCIES = libkconf_update_main.la DEFS = @@DEFS@@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) @@@@ -320,7 +329,9 @@@@ LDFLAGS = @@LDFLAGS@@ LIBS = @@LIBS@@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp -@@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kconf_update.Plo +@@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/kconf_update.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kconf_update_main.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kconf_update_main.Po #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) #>+ 2 @@@@ -340,9 +351,10 @@@@ CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@@ CXXFLAGS = @@CXXFLAGS@@ -DIST_SOURCES = $(kconf_update_la_SOURCES) $(kconf_update_SOURCES) +DIST_SOURCES = $(kconf_update_la_SOURCES) \ + $(libkconf_update_main_la_SOURCES) $(kconf_update_SOURCES) DIST_COMMON = Makefile.am Makefile.in -SOURCES = $(kconf_update_la_SOURCES) $(kconf_update_SOURCES) +SOURCES = $(kconf_update_la_SOURCES) $(libkconf_update_main_la_SOURCES) $(kconf_update_SOURCES) #>- all: all-am #>+ 1 @@@@ -391,6 +403,8 @@@@ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) kconf_update.la: $(kconf_update_la_OBJECTS) $(kconf_update_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kconf_update_la_LDFLAGS) $(kconf_update_la_OBJECTS) $(kconf_update_la_LIBADD) $(LIBS) +libkconf_update_main.la: $(libkconf_update_main_la_OBJECTS) $(libkconf_update_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkconf_update_main_la_LDFLAGS) $(libkconf_update_main_la_OBJECTS) $(libkconf_update_main_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @@$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @@@@ -425,8 +439,9 @@@@ distclean-compile: -rm -f *.tab.c -@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dummy.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kconf_update.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kconf_update_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kconf_update_main.Po@@am__quote@@ distclean-depend: -rm -rf $(DEPDIR) @@@@ -602,9 +617,6 @@@@ # Internal # noinst_HEADERS = kconf_update.h - -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: @@@@ -620,11 +632,11 @@@@ #>+ 11 -kconf_update_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kconf_update.cpp +kconf_update_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kconf_update_main.cpp @@echo 'creating kconf_update_la.all_cpp.cpp ...'; \ rm -f kconf_update_la.all_cpp.files kconf_update_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kconf_update_la.all_cpp.final; \ - for file in kconf_update.cpp ; do \ + for file in kconf_update_main.cpp ; do \ echo "#include \"$$file\"" >> kconf_update_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kconf_update_la.all_cpp.final; \ done; \ @@@@ -632,11 +644,23 @@@@ rm -f kconf_update_la.all_cpp.final kconf_update_la.all_cpp.files #>+ 11 -kconf_update.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +libkconf_update_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kconf_update.cpp + @@echo 'creating libkconf_update_main_la.all_cpp.cpp ...'; \ + rm -f libkconf_update_main_la.all_cpp.files libkconf_update_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkconf_update_main_la.all_cpp.final; \ + for file in kconf_update.cpp ; do \ + echo "#include \"$$file\"" >> libkconf_update_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkconf_update_main_la.all_cpp.final; \ + done; \ + cat libkconf_update_main_la.all_cpp.final libkconf_update_main_la.all_cpp.files > libkconf_update_main_la.all_cpp.cpp; \ + rm -f libkconf_update_main_la.all_cpp.final libkconf_update_main_la.all_cpp.files + +#>+ 11 +kconf_update.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kconf_update_main.cpp @@echo 'creating kconf_update.all_cpp.cpp ...'; \ rm -f kconf_update.all_cpp.files kconf_update.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kconf_update.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kconf_update_main.cpp ; do \ echo "#include \"$$file\"" >> kconf_update.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kconf_update.all_cpp.final; \ done; \ @@@@ -645,7 +669,7 @@@@ #>+ 3 clean-final: - -rm -f kconf_update_la.all_cpp.cpp kconf_update.all_cpp.cpp + -rm -f kconf_update_la.all_cpp.cpp libkconf_update_main_la.all_cpp.cpp kconf_update.all_cpp.cpp #>+ 2 final: @