diff options
author | tron <tron> | 2001-08-27 20:10:16 +0000 |
---|---|---|
committer | tron <tron> | 2001-08-27 20:10:16 +0000 |
commit | 272ad3a20be1c482a1579ed884dd813b4cb9d117 (patch) | |
tree | ab435fa9dfc6bbd5a57885e7a72715c9a0a86f8c /sysutils/gnome-vfs/patches | |
parent | 74a00e50c5497e7ac4ca1e60b7d9d3febcf3cd6b (diff) | |
download | pkgsrc-272ad3a20be1c482a1579ed884dd813b4cb9d117.tar.gz |
Heavily patch auto configure stuff to make this work with the new
"autoconf" package.
Diffstat (limited to 'sysutils/gnome-vfs/patches')
-rw-r--r-- | sysutils/gnome-vfs/patches/patch-aa | 58 | ||||
-rw-r--r-- | sysutils/gnome-vfs/patches/patch-ag | 23 |
2 files changed, 77 insertions, 4 deletions
diff --git a/sysutils/gnome-vfs/patches/patch-aa b/sysutils/gnome-vfs/patches/patch-aa index 2d66f164dc2..7649503b733 100644 --- a/sysutils/gnome-vfs/patches/patch-aa +++ b/sysutils/gnome-vfs/patches/patch-aa @@ -1,8 +1,58 @@ -$NetBSD: patch-aa,v 1.2 2000/11/30 04:07:18 mycroft Exp $ +$NetBSD: patch-aa,v 1.3 2001/08/27 20:10:16 tron Exp $ ---- aclocal.m4.orig Fri Nov 3 19:45:45 2000 -+++ aclocal.m4 Thu Nov 30 04:01:25 2000 -@@ -1532,7 +1532,7 @@ +--- aclocal.m4.orig Tue May 8 01:12:25 2001 ++++ aclocal.m4 Mon Aug 27 21:59:51 2001 +@@ -210,25 +210,16 @@ + 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 +-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_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) + + 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 $(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 + + 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 $(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 @@ + 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], +@@ -1607,7 +1587,7 @@ [CATOBJEXT=.gmo DATADIRNAME=share], [CATOBJEXT=.mo diff --git a/sysutils/gnome-vfs/patches/patch-ag b/sysutils/gnome-vfs/patches/patch-ag new file mode 100644 index 00000000000..ddb24613f03 --- /dev/null +++ b/sysutils/gnome-vfs/patches/patch-ag @@ -0,0 +1,23 @@ +$NetBSD: patch-ag,v 1.1 2001/08/27 20:10:17 tron Exp $ + +--- configure.in.orig Fri May 4 03:35:41 2001 ++++ configure.in Mon Aug 27 21:56:10 2001 +@@ -483,7 +483,6 @@ + data/Makefile + data/mime/Makefile + idl/Makefile +-intl/Makefile + libgnomevfs-pthread/Makefile + libgnomevfs/Makefile + modules/Makefile +@@ -503,7 +502,9 @@ + po/Makefile.in + test/Makefile + test/vfs-run +-macros/Makefile ++xml-i18n-extract ++xml-i18n-merge ++xml-i18n-update + ]) + + chmod u+x test/vfs-run |