head 1.10; access; symbols pkgsrc-2023Q3:1.9.0.134 pkgsrc-2023Q3-base:1.9 pkgsrc-2023Q2:1.9.0.132 pkgsrc-2023Q2-base:1.9 pkgsrc-2023Q1:1.9.0.130 pkgsrc-2023Q1-base:1.9 pkgsrc-2022Q4:1.9.0.128 pkgsrc-2022Q4-base:1.9 pkgsrc-2022Q3:1.9.0.126 pkgsrc-2022Q3-base:1.9 pkgsrc-2022Q2:1.9.0.124 pkgsrc-2022Q2-base:1.9 pkgsrc-2022Q1:1.9.0.122 pkgsrc-2022Q1-base:1.9 pkgsrc-2021Q4:1.9.0.120 pkgsrc-2021Q4-base:1.9 pkgsrc-2021Q3:1.9.0.118 pkgsrc-2021Q3-base:1.9 pkgsrc-2021Q2:1.9.0.116 pkgsrc-2021Q2-base:1.9 pkgsrc-2021Q1:1.9.0.114 pkgsrc-2021Q1-base:1.9 pkgsrc-2020Q4:1.9.0.112 pkgsrc-2020Q4-base:1.9 pkgsrc-2020Q3:1.9.0.110 pkgsrc-2020Q3-base:1.9 pkgsrc-2020Q2:1.9.0.106 pkgsrc-2020Q2-base:1.9 pkgsrc-2020Q1:1.9.0.86 pkgsrc-2020Q1-base:1.9 pkgsrc-2019Q4:1.9.0.108 pkgsrc-2019Q4-base:1.9 pkgsrc-2019Q3:1.9.0.104 pkgsrc-2019Q3-base:1.9 pkgsrc-2019Q2:1.9.0.102 pkgsrc-2019Q2-base:1.9 pkgsrc-2019Q1:1.9.0.100 pkgsrc-2019Q1-base:1.9 pkgsrc-2018Q4:1.9.0.98 pkgsrc-2018Q4-base:1.9 pkgsrc-2018Q3:1.9.0.96 pkgsrc-2018Q3-base:1.9 pkgsrc-2018Q2:1.9.0.94 pkgsrc-2018Q2-base:1.9 pkgsrc-2018Q1:1.9.0.92 pkgsrc-2018Q1-base:1.9 pkgsrc-2017Q4:1.9.0.90 pkgsrc-2017Q4-base:1.9 pkgsrc-2017Q3:1.9.0.88 pkgsrc-2017Q3-base:1.9 pkgsrc-2017Q2:1.9.0.84 pkgsrc-2017Q2-base:1.9 pkgsrc-2017Q1:1.9.0.82 pkgsrc-2017Q1-base:1.9 pkgsrc-2016Q4:1.9.0.80 pkgsrc-2016Q4-base:1.9 pkgsrc-2016Q3:1.9.0.78 pkgsrc-2016Q3-base:1.9 pkgsrc-2016Q2:1.9.0.76 pkgsrc-2016Q2-base:1.9 pkgsrc-2016Q1:1.9.0.74 pkgsrc-2016Q1-base:1.9 pkgsrc-2015Q4:1.9.0.72 pkgsrc-2015Q4-base:1.9 pkgsrc-2015Q3:1.9.0.70 pkgsrc-2015Q3-base:1.9 pkgsrc-2015Q2:1.9.0.68 pkgsrc-2015Q2-base:1.9 pkgsrc-2015Q1:1.9.0.66 pkgsrc-2015Q1-base:1.9 pkgsrc-2014Q4:1.9.0.64 pkgsrc-2014Q4-base:1.9 pkgsrc-2014Q3:1.9.0.62 pkgsrc-2014Q3-base:1.9 pkgsrc-2014Q2:1.9.0.60 pkgsrc-2014Q2-base:1.9 pkgsrc-2014Q1:1.9.0.58 pkgsrc-2014Q1-base:1.9 pkgsrc-2013Q4:1.9.0.56 pkgsrc-2013Q4-base:1.9 pkgsrc-2013Q3:1.9.0.54 pkgsrc-2013Q3-base:1.9 pkgsrc-2013Q2:1.9.0.52 pkgsrc-2013Q2-base:1.9 pkgsrc-2013Q1:1.9.0.50 pkgsrc-2013Q1-base:1.9 pkgsrc-2012Q4:1.9.0.48 pkgsrc-2012Q4-base:1.9 pkgsrc-2012Q3:1.9.0.46 pkgsrc-2012Q3-base:1.9 pkgsrc-2012Q2:1.9.0.44 pkgsrc-2012Q2-base:1.9 pkgsrc-2012Q1:1.9.0.42 pkgsrc-2012Q1-base:1.9 pkgsrc-2011Q4:1.9.0.40 pkgsrc-2011Q4-base:1.9 pkgsrc-2011Q3:1.9.0.38 pkgsrc-2011Q3-base:1.9 pkgsrc-2011Q2:1.9.0.36 pkgsrc-2011Q2-base:1.9 pkgsrc-2011Q1:1.9.0.34 pkgsrc-2011Q1-base:1.9 pkgsrc-2010Q4:1.9.0.32 pkgsrc-2010Q4-base:1.9 pkgsrc-2010Q3:1.9.0.30 pkgsrc-2010Q3-base:1.9 pkgsrc-2010Q2:1.9.0.28 pkgsrc-2010Q2-base:1.9 pkgsrc-2010Q1:1.9.0.26 pkgsrc-2010Q1-base:1.9 pkgsrc-2009Q4:1.9.0.24 pkgsrc-2009Q4-base:1.9 pkgsrc-2009Q3:1.9.0.22 pkgsrc-2009Q3-base:1.9 pkgsrc-2009Q2:1.9.0.20 pkgsrc-2009Q2-base:1.9 pkgsrc-2009Q1:1.9.0.18 pkgsrc-2009Q1-base:1.9 pkgsrc-2008Q4:1.9.0.16 pkgsrc-2008Q4-base:1.9 pkgsrc-2008Q3:1.9.0.14 pkgsrc-2008Q3-base:1.9 cube-native-xorg:1.9.0.12 cube-native-xorg-base:1.9 pkgsrc-2008Q2:1.9.0.10 pkgsrc-2008Q2-base:1.9 cwrapper:1.9.0.8 pkgsrc-2008Q1:1.9.0.6 pkgsrc-2008Q1-base:1.9 pkgsrc-2007Q4:1.9.0.4 pkgsrc-2007Q4-base:1.9 pkgsrc-2007Q3:1.9.0.2 pkgsrc-2007Q3-base:1.9 pkgsrc-2007Q2:1.8.0.2 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.7.0.16 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.14 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.12 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.10 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.7.0.8 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.6 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.7.0.4 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.7.0.2 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.6.0.12 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.10 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.8 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.6 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.6.0.4 pkgsrc-2004Q1-base:1.6 pkgsrc-2003Q4:1.6.0.2 pkgsrc-2003Q4-base:1.6 netbsd-1-6:1.5.0.8 netbsd-1-6-RELEASE-base:1.5 pkgviews:1.5.0.4 pkgviews-base:1.5 buildlink2:1.5.0.2 buildlink2-base:1.5 netbsd-1-5-PATCH003:1.5 netbsd-1-5-PATCH001:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.10 date 2023.11.13.20.04.50; author wiz; state dead; branches; next 1.9; commitid 2vcQHv1YWdqXguME; 1.9 date 2007.09.19.22.22.37; author wiz; state Exp; branches; next 1.8; 1.8 date 2007.05.20.15.48.24; author wiz; state dead; branches; next 1.7; 1.7 date 2005.04.15.02.09.27; author rh; state Exp; branches; next 1.6; 1.6 date 2003.01.09.09.47.31; author rh; state dead; branches 1.6.12.1; next 1.5; 1.5 date 2002.03.24.19.59.38; author rh; state Exp; branches; next 1.4; 1.4 date 2001.10.05.06.56.46; author rh; state Exp; branches; next 1.3; 1.3 date 2001.08.27.20.10.16; author tron; state Exp; branches; next 1.2; 1.2 date 2000.11.30.04.07.18; author mycroft; state Exp; branches; next 1.1; 1.1 date 2000.11.25.13.57.10; author rh; state Exp; branches 1.1.1.1; next ; 1.6.12.1 date 2005.04.16.19.32.17; author snj; state Exp; branches; next ; 1.1.1.1 date 2000.11.25.13.57.10; author rh; state Exp; branches; next ; desc @@ 1.10 log @gnome-vfs*: remove Old Gnome 2 support package, now unused in pkgsrc. @ text @$NetBSD: patch-aa,v 1.9 2007/09/19 22:22:37 wiz Exp $ --- libgnomevfs/xdgmime.c.orig 2004-07-24 16:39:43.000000000 +0200 +++ libgnomevfs/xdgmime.c @@@@ -189,7 +189,7 @@@@ xdg_run_command_on_dirs (XdgDirectoryFun xdg_data_dirs = getenv ("XDG_DATA_DIRS"); if (xdg_data_dirs == NULL) - xdg_data_dirs = "/usr/local/share/:/usr/share/"; + xdg_data_dirs = PREFIX "/share/"; ptr = xdg_data_dirs; @ 1.9 log @Readd gnome-vfs2 as gnome-vfs, to match its upstream name. ok jmmv, drochner @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.11 2005/01/11 12:32:53 jmmv Exp $ @ 1.8 log @Remove remaining gnome1-libs dependencies from pkgsrc. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.7 2005/04/15 02:09:27 rh Exp $ d3 10 a12 5 --- modules/cdda-cddb.c.orig 2001-03-16 12:44:25.000000000 +1000 +++ modules/cdda-cddb.c @@@@ -339,7 +339,7 @@@@ CDDBDoQuery (cdrom_drive *cd_desc, CDDBS query->query_match=MATCH_INEXACT; query->query_matches=0; a13 5 - while(!CDDBReadLine(socket,inbuffer,256)) { + while(query->query_matches < MAX_INEXACT_MATCHES && !CDDBReadLine(socket,inbuffer,256)) { query->query_list[query->query_matches].list_genre= CDDBGenreValue(ChopWhite(strtok(inbuffer," "))); @ 1.7 log @Patch remote code execution security hole pointed out in advisory at http://secunia.com/advisories/14877/ Bump PKGREVISION Set BUILDLINK_RECOMMENDED to gnome-vfs>=1.0.5nb8 @ text @d1 1 a1 1 $NetBSD$ @ 1.6 log @Update gnome-vfs to 1.0.5. Changes include: New features: * UTF-8 gnome-mime-data support * NNTP module * Share MIME data with GnomeVFS2 using gnome-mime-data, no NetBSD-specific patch necessary any longer Bug fixes: * NNTP fixes * Large file (64bit) support * Build fixes * C++ style comments corrected * Miscelaneous fixes * Fix memory leak for nested symlinks, avoid infite loop * Detect OpenSSL libraries better * Don't include to remove namespace clashes @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2002/03/24 19:59:38 rh Exp $ d3 11 a13 67 --- aclocal.m4.orig Fri Oct 12 18:35:42 2001 +++ aclocal.m4 @@@@ -148,46 +148,37 @@@@ dnl AC_SUBST itself to avoid automake putting dnl XML_I18N_MERGE_OAF_RULE = @@XML_I18N_MERGE_OAF_RULE@@ dnl in all the Makefile.in's, because that will blow up when substituted. -XML_I18N_MERGE_OAF_RULE='\%.oaf : \%.oaf.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\ - $(top_builddir)/xml-i18n-merge -o -p $(top_srcdir)/po $< [$]*.oaf' +XML_I18N_MERGE_OAF_RULE='\%.oaf : \%.oaf.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -o -p $(top_srcdir)/po $< [$]*.oaf' HACK_SUBST(XML_I18N_MERGE_OAF_RULE) -XML_I18N_MERGE_SERVER_RULE='\%.server : \%.server.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\ - $(top_builddir)/xml-i18n-merge -o -u $(top_srcdir)/po $< [$]*.server' +XML_I18N_MERGE_SERVER_RULE='\%.server : \%.server.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -o -u $(top_srcdir)/po $< [$]*.server' HACK_SUBST(XML_I18N_MERGE_SERVER_RULE) dnl same deal -XML_I18N_MERGE_KEYS_RULE='\%.keys : \%.keys.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\ - $(top_builddir)/xml-i18n-merge -k X18T_KEYS_KIND $(top_srcdir)/po $< [$]*.keys' +XML_I18N_MERGE_KEYS_RULE='\%.keys : \%.keys.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -k X18T_KEYS_KIND $(top_srcdir)/po $< [$]*.keys' HACK_SUBST(XML_I18N_MERGE_KEYS_RULE) dnl same deal -XML_I18N_MERGE_DESKTOP_RULE='\%.desktop : \%.desktop.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\ - $(top_builddir)/xml-i18n-merge -d X18T_PFORG1 $(top_srcdir)/po $< [$]*.desktop' +XML_I18N_MERGE_DESKTOP_RULE='\%.desktop : \%.desktop.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -d X18T_PFORG1 $(top_srcdir)/po $< [$]*.desktop' HACK_SUBST(XML_I18N_MERGE_DESKTOP_RULE) dnl same deal -XML_I18N_MERGE_DIRECTORY_RULE='\%.directory : \%.directory.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\ - $(top_builddir)/xml-i18n-merge -d X18T_PFORG1 $(top_srcdir)/po $< [$]*.directory' +XML_I18N_MERGE_DIRECTORY_RULE='\%.directory : \%.directory.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -d X18T_PFORG1 $(top_srcdir)/po $< [$]*.directory' HACK_SUBST(XML_I18N_MERGE_DIRECTORY_RULE) dnl same deal -XML_I18N_MERGE_SOUNDLIST_RULE='\%.soundlist : \%.soundlist.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\ - $(top_builddir)/xml-i18n-merge -d X18T_PFORG1 $(top_srcdir)/po $< [$]*.soundlist' +XML_I18N_MERGE_SOUNDLIST_RULE='\%.soundlist : \%.soundlist.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -d X18T_PFORG1 $(top_srcdir)/po $< [$]*.soundlist' HACK_SUBST(XML_I18N_MERGE_SOUNDLIST_RULE) dnl same deal -XML_I18N_MERGE_PONG_RULE='\%.pong : \%.pong.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\ - $(top_builddir)/xml-i18n-merge -x X18T_PFORG1 $(top_srcdir)/po $< [$]*.pong' +XML_I18N_MERGE_PONG_RULE='\%.pong : \%.pong.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -x X18T_PFORG1 $(top_srcdir)/po $< [$]*.pong' HACK_SUBST(XML_I18N_MERGE_PONG_RULE) dnl same deal -XML_I18N_MERGE_XML_RULE='\%.xml : \%.xml.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\ - $(top_builddir)/xml-i18n-merge -x X18T_XML_KIND $(top_srcdir)/po $< [$]*.xml' +XML_I18N_MERGE_XML_RULE='\%.xml : \%.xml.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -x X18T_XML_KIND $(top_srcdir)/po $< [$]*.xml' HACK_SUBST(XML_I18N_MERGE_XML_RULE) dnl same deal -XML_I18N_MERGE_SHEET_RULE='\%.sheet : \%.sheet.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\ - $(top_builddir)/xml-i18n-merge -x -u $(top_srcdir)/po $< [$]*.sheet' +XML_I18N_MERGE_SHEET_RULE='\%.sheet : \%.sheet.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -x -u $(top_srcdir)/po $< [$]*.sheet' HACK_SUBST(XML_I18N_MERGE_SHEET_RULE) @@@@ -4447,7 +4438,7 @@@@ [CATOBJEXT=.gmo DATADIRNAME=share], [CATOBJEXT=.mo - DATADIRNAME=lib]) + DATADIRNAME=share]) INSTOBJEXT=.mo fi fi @ 1.6.12.1 log @Pullup ticket 448 - requested by Lubomir Sedlacik security fix for gnome-vfs Revisions pulled up: - pkgsrc/sysutils/gnome-vfs/Makefile 1.47 - pkgsrc/sysutils/gnome-vfs/buildlink3.mk 1.8 - pkgsrc/sysutils/gnome-vfs/distinfo 1.16 - pkgsrc/sysutils/gnome-vfs/patches/patch-aa 1.7 Module Name: pkgsrc Committed By: rh Date: Fri Apr 15 02:09:27 UTC 2005 Modified Files: pkgsrc/sysutils/gnome-vfs: Makefile buildlink3.mk distinfo Added Files: pkgsrc/sysutils/gnome-vfs/patches: patch-aa Log Message: Patch remote code execution security hole pointed out in advisory at http://secunia.com/advisories/14877/ Bump PKGREVISION Set BUILDLINK_RECOMMENDED to gnome-vfs>=1.0.5nb8 @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.7 2005/04/15 02:09:27 rh Exp $ d3 67 a69 11 --- modules/cdda-cddb.c.orig 2001-03-16 12:44:25.000000000 +1000 +++ modules/cdda-cddb.c @@@@ -339,7 +339,7 @@@@ CDDBDoQuery (cdrom_drive *cd_desc, CDDBS query->query_match=MATCH_INEXACT; query->query_matches=0; - while(!CDDBReadLine(socket,inbuffer,256)) { + while(query->query_matches < MAX_INEXACT_MATCHES && !CDDBReadLine(socket,inbuffer,256)) { query->query_list[query->query_matches].list_genre= CDDBGenreValue(ChopWhite(strtok(inbuffer," "))); @ 1.5 log @Update gnome-vfs to 1.0.3. Changes are mainly bugfixes, most notably this now compiles with control-center-1.4.0.4. This version also adds support for start-here:, preferences:, system-settings:, server-settings:, start-here:, and programs: URI schemes. While at it, fix localstatedir to avoid installing scrollkeeper files where they don't belong (PR pkg/13057). @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Update gnome-vfs to 1.0.2 and while at it, buildlinkify. Changes include: New APIs: * New gnome_vfs_uri_resolve_relative call (Ian) * New module callback API (Mike, Maciej) * Authentication and proxy authentication callbacks (Mike) New features: * Start on an SSH module, disabled by default for now (Ian) * Handle the IceCast/ShoutCast non-standard variant of the HTTP protocol (Maciej) * SSL and https support (Ian, Seth, Maciej) * Extensive API docs (Seth, Sri, Ian, Jonathan, Maciej, Glynn) * New translation (Abel Cheung) Bug fixes: * Move headers for future parallel-install compatibility (Maciej) * FTP directory loading fixes (Jacob) * Fix detection of KOffice file mime types (Frederic) * Ensure all headers are standalone-includable (Darin) * Assorted code cleanup (Darin, Anders) * Split type declarations in gnome-vfs-types.h into individual headers; gnome-vfs-types.h is stull around for compat (Seth, Darin) * Header fixes (Darin) * Random crash and leak fixes (Havoc, Anders, Maciej) * Build fixes (Darin, Maciej, Ian, Robin, Carlos, Ramiro, Jonas) Portability fixes: * Fix module configuration files and parsing code to work on systems that don't use .so as the extension for shared libraries (Jacob) * Add recorsive mutex wrappers for use on systems that don't provide recursive mutexes natively (Dan) * Misc portability fixes (Laca, Frank Belew) @ text @d3 1 a3 1 --- aclocal.m4.orig Tue Sep 11 09:27:38 2001 d5 1 a5 1 @@@@ -221,46 +221,37 @@@@ d61 1 a61 19 @@@@ -4556,17 +4547,6 @@@@ dnl From Jim Meyering. Use this if you use the GNU error.[ch]. dnl FIXME: Migrate into libit -AC_DEFUN(AM_FUNC_ERROR_AT_LINE, -[AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line, - [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");], - am_cv_lib_error_at_line=yes, - am_cv_lib_error_at_line=no)]) - if test $am_cv_lib_error_at_line = no; then - LIBOBJS="$LIBOBJS error.o" - fi - AC_SUBST(LIBOBJS)dnl -]) - dnl See whether we need a declaration for a function. dnl GCC_NEED_DECLARATION(FUNCTION [, EXTRA-HEADER-FILES]) AC_DEFUN([GCC_NEED_DECLARATION], @@@@ -4706,7 +4686,7 @@@@ @ 1.3 log @Heavily patch auto configure stuff to make this work with the new "autoconf" package. @ text @d3 3 a5 3 --- aclocal.m4.orig Tue May 8 01:12:25 2001 +++ aclocal.m4 Mon Aug 27 21:59:51 2001 @@@@ -210,25 +210,16 @@@@ d8 1 a8 1 dnl in all the Makefile.in's d10 8 a17 6 - $(top_builddir)/xml-i18n-merge -o $(top_srcdir)/po $< [$]*.oaf' -AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl -s%@@XML_I18N_MERGE_OAF_RULE@@%[$]XML_I18N_MERGE_OAF_RULE%g -AC_DIVERT_POP()dnl +XML_I18N_MERGE_OAF_RULE='\%.oaf : \%.oaf.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -o $(top_srcdir)/po $< [$]*.oaf' +AC_SUBST(XML_I18N_MERGE_OAF_RULE) d21 20 a40 6 - $(top_builddir)/xml-i18n-merge -k $(top_srcdir)/po $< [$]*.keys' -AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl -s%@@XML_I18N_MERGE_KEYS_RULE@@%[$]XML_I18N_MERGE_KEYS_RULE%g -AC_DIVERT_POP()dnl +XML_I18N_MERGE_KEYS_RULE='\%.keys : \%.keys.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -k $(top_srcdir)/po $< [$]*.keys' +AC_SUBST(XML_I18N_MERGE_KEYS_RULE)@@%[$]XML_I18N_MERGE_KEYS_RULE%g d43 19 a61 11 -XML_I18N_MERGE_DESKTOP_RULE='\%.desktop : \%.desktop.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\ - $(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< [$]*.desktop' -AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl -s%@@XML_I18N_MERGE_DESKTOP_RULE@@%[$]XML_I18N_MERGE_DESKTOP_RULE%g -AC_DIVERT_POP()dnl +XML_I18N_MERGE_DESKTOP_RULE='\%.desktop : \%.desktop.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< [$]*.desktop' +AC_SUBST(XML_I18N_MERGE_DESKTOP_RULE) # Always use our own xml-i18n-tools. XML_I18N_EXTRACT='$(top_builddir)/xml-i18n-extract' @@@@ -1460,17 +1451,6 @@@@ d79 1 a79 1 @@@@ -1607,7 +1587,7 @@@@ @ 1.2 log @Arrange to rerun automake at build time, to pick up the Makefile change... @ text @d3 53 a55 3 --- aclocal.m4.orig Fri Nov 3 19:45:45 2000 +++ aclocal.m4 Thu Nov 30 04:01:25 2000 @@@@ -1532,7 +1532,7 @@@@ @ 1.1 log @Initial revision @ text @d3 8 a10 10 --- configure.orig Wed Aug 30 09:22:17 2000 +++ configure @@@@ -4817,7 +4817,7 @@@@ cat conftest.$ac_ext >&5 rm -rf conftest* CATOBJEXT=.mo - DATADIRNAME=lib + DATADIRNAME=share fi rm -f conftest* d12 2 @ 1.1.1.1 log @Initial import of gnome-vfs-0.4.1, the GNOME virtual file system. @ text @@