diff options
Diffstat (limited to 'editors/xemacs-devel-mule/files')
-rw-r--r-- | editors/xemacs-devel-mule/files/patch-ai | 20 | ||||
-rw-r--r-- | editors/xemacs-devel-mule/files/patch-ak | 17 | ||||
-rw-r--r-- | editors/xemacs-devel-mule/files/patch-alloc.c | 16 | ||||
-rw-r--r-- | editors/xemacs-devel-mule/files/patch-configure.ac | 63 | ||||
-rw-r--r-- | editors/xemacs-devel-mule/files/patch-regex.c | 11 |
5 files changed, 11 insertions, 116 deletions
diff --git a/editors/xemacs-devel-mule/files/patch-ai b/editors/xemacs-devel-mule/files/patch-ai deleted file mode 100644 index c91881639c5..00000000000 --- a/editors/xemacs-devel-mule/files/patch-ai +++ /dev/null @@ -1,20 +0,0 @@ ---- lib-src/fakemail.c.orig Tue Mar 23 22:09:58 1999 -+++ lib-src/fakemail.c Tue Mar 23 22:12:20 1999 -@@ -157,9 +157,17 @@ - extern char *malloc (), *realloc (); - #endif - -+#if defined(__FreeBSD_version) && __FreeBSD_version >= 400000 -+#define CURRENT_USER -+#endif -+ - #ifdef CURRENT_USER - extern struct passwd *getpwuid (); -+#if defined(__FreeBSD_version) && __FreeBSD_version >= 400000 -+extern uid_t geteuid (); -+#else - extern unsigned short geteuid (); -+#endif - static struct passwd *my_entry; - #define cuserid(s) \ - (my_entry = getpwuid (((int) geteuid ())), \ diff --git a/editors/xemacs-devel-mule/files/patch-ak b/editors/xemacs-devel-mule/files/patch-ak deleted file mode 100644 index 1284f826cc7..00000000000 --- a/editors/xemacs-devel-mule/files/patch-ak +++ /dev/null @@ -1,17 +0,0 @@ ---- ./src/unexelf.c~ Sun Aug 15 03:29:56 1999 -+++ ./src/unexelf.c Tue Nov 2 10:24:55 1999 -@@ -515,6 +515,14 @@ - # include <sys/exec_elf.h> - #endif - -+#if defined(__FreeBSD__) && (defined(__alpha__) || defined(__amd64__)) -+# ifdef __STDC__ -+# define ElfW(type) Elf64_##type -+# else -+# define ElfW(type) Elf64_/**/type -+# endif -+#endif -+ - #if __GNU_LIBRARY__ - 0 >= 6 - # include <link.h> /* get ElfW etc */ - #endif diff --git a/editors/xemacs-devel-mule/files/patch-alloc.c b/editors/xemacs-devel-mule/files/patch-alloc.c deleted file mode 100644 index 5041461ccc6..00000000000 --- a/editors/xemacs-devel-mule/files/patch-alloc.c +++ /dev/null @@ -1,16 +0,0 @@ -Index: src/alloc.c -=================================================================== -RCS file: /pack/xemacscvs/XEmacs/xemacs/src/alloc.c,v -retrieving revision 1.106 -diff -u -r1.106 alloc.c ---- src/alloc.c 2005/02/03 16:14:04 1.106 -+++ src/alloc.c 2005/02/23 00:01:18 -@@ -349,7 +349,7 @@ - - #else /* ERROR_CHECK_MALLOC */ - --#define MALLOC_BEGIN(block) -+#define MALLOC_BEGIN() - #define FREE_OR_REALLOC_BEGIN(block) - #define MALLOC_END() - diff --git a/editors/xemacs-devel-mule/files/patch-configure.ac b/editors/xemacs-devel-mule/files/patch-configure.ac index e27c99fdbaa..a716503ed86 100644 --- a/editors/xemacs-devel-mule/files/patch-configure.ac +++ b/editors/xemacs-devel-mule/files/patch-configure.ac @@ -1,19 +1,5 @@ -Index: configure.ac -=================================================================== -RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v -retrieving revision 1.2 -diff -u -r1.2 configure.ac --- configure.ac 2005/03/11 11:19:01 1.2 +++ configure.ac 2005/03/17 20:16:50 -@@ -11,7 +11,7 @@ - xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run' - xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard' - ac_cpp='$CPP '"$xe_cppflags" --ac_compile='$CC -c $CFLAGS'"$xe_cppflags"' conftest.$ac_ext >&AS_MESSAGE_LOG_FD' -+ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext >&AS_MESSAGE_LOG_FD' - ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&AS_MESSAGE_LOG_FD' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - ]) @@ -1148,6 +1148,7 @@ dnl Straightforward OS determination case "$ac_cv_build" in @@ -22,55 +8,6 @@ diff -u -r1.2 configure.ac *-*-netbsd* ) opsys=netbsd ;; *-*-openbsd* ) opsys=openbsd ;; *-*-nextstep* ) opsys=nextstep ;; -@@ -1706,12 +1707,12 @@ - else cflags_warning_specified=no; - fi - --if test "${cflags_optimization-unset}" != unset -+if test "${with_cflags_optimization-unset}" != unset - then cflags_optimization_specified=yes; - else cflags_optimization_specified=no; - fi - --if test "${cflags_debugging-unset}" != unset -+if test "${with_cflags_debugging-unset}" != unset - then cflags_debugging_specified=yes; - else cflags_debugging_specified=no; - fi -@@ -2048,11 +2049,11 @@ - dnl Calculate optimization flags. These will be off by default in beta - dnl versions and on in release versions. - --if test -z "$with_optimization" ; then -- if test -n "$emacs_is_beta" ; then -- with_optimization=no -- else -+if test -z "$with_optimization"; then -+ if test -z "$emacs_is_beta" -o "$cflags_optimization_specified" = "yes"; then - with_optimization=yes -+ else -+ with_optimization=no - fi - fi - -@@ -3811,7 +3812,7 @@ - png_problem="" - test -z "$with_png" && { AC_CHECK_FUNC(pow, ,with_png=no) } - test -z "$with_png" && { AC_CHECK_HEADER(png.h, ,with_png=no) } -- test -z "$with_png" && { AC_CHECK_LIB(png, png_read_image,[:],with_png=no) } -+ test -z "$with_png" && { AC_CHECK_LIB(png, png_read_image,[:],with_png=no,[-lz]) } - if test -z "$with_png"; then - AC_MSG_CHECKING(for workable png version information) - xe_check_libs="-lpng -lz" -@@ -3847,7 +3848,7 @@ - - dnl autodetect TIFF - test -z "$with_tiff" && { AC_CHECK_HEADER(tiffio.h, ,with_tiff=no) } -- test -z "$with_tiff" && { AC_CHECK_LIB(tiff, TIFFClientOpen,[:],with_tiff=no) } -+ test -z "$with_tiff" && { AC_CHECK_LIB(tiff, TIFFClientOpen,[:],with_tiff=no,[-lz]) } - test -z "$with_tiff" && with_tiff=yes - if test "$with_tiff" = "yes"; then - AC_DEFINE(HAVE_TIFF) @@ -4943,7 +4950,7 @@ dnl Check for Berkeley DB. if test "$enable_database_berkdb" != "no"; then diff --git a/editors/xemacs-devel-mule/files/patch-regex.c b/editors/xemacs-devel-mule/files/patch-regex.c new file mode 100644 index 00000000000..b546281d555 --- /dev/null +++ b/editors/xemacs-devel-mule/files/patch-regex.c @@ -0,0 +1,11 @@ +--- src/regex.c.orig Sun Apr 18 22:19:13 2004 ++++ src/regex.c Sun Apr 18 22:18:40 2004 +@@ -1322,7 +1322,7 @@ + exactly that if always used MAX_FAILURE_SPACE each time we failed. + This is a variable only so users of regex can assign to it; we never + change it ourselves. */ +-#if defined (MATCH_MAY_ALLOCATE) ++#if defined (MATCH_MAY_ALLOCATE) || defined (REGEX_MALLOC) + /* 4400 was enough to cause a crash on Alpha OSF/1, + whose default stack limit is 2mb. */ + int re_max_failures = 20000; |