diff options
Diffstat (limited to 'editors/emacs23/files')
-rw-r--r-- | editors/emacs23/files/patch-Makefile.in | 39 | ||||
-rw-r--r-- | editors/emacs23/files/patch-configure | 165 | ||||
-rw-r--r-- | editors/emacs23/files/patch-doc-emacs-Makefile.in | 20 | ||||
-rw-r--r-- | editors/emacs23/files/patch-doc-lispintro-Makefile.in | 20 | ||||
-rw-r--r-- | editors/emacs23/files/patch-doc-lispref-Makefile.in | 11 | ||||
-rw-r--r-- | editors/emacs23/files/patch-doc-misc-Makefile.in | 11 | ||||
-rw-r--r-- | editors/emacs23/files/patch-sources.el | 10 | ||||
-rw-r--r-- | editors/emacs23/files/patch-src_coding.c | 51 | ||||
-rw-r--r-- | editors/emacs23/files/patch-src_config.in | 14 |
9 files changed, 0 insertions, 341 deletions
diff --git a/editors/emacs23/files/patch-Makefile.in b/editors/emacs23/files/patch-Makefile.in deleted file mode 100644 index fd303bd3a231..000000000000 --- a/editors/emacs23/files/patch-Makefile.in +++ /dev/null @@ -1,39 +0,0 @@ ---- Makefile.in.orig Tue Jun 23 07:41:36 2009 +0300 -+++ Makefile.in Tue Jun 23 07:39:33 2009 +0300 -@@ -461,14 +461,6 @@ - - install-arch-indep: mkdir info install-etc - -set ${COPYDESTS} ; \ -- unset CDPATH; \ -- for dir in ${COPYDIR} ; do \ -- if [ `(cd $$1 && /bin/pwd)` != `(cd $${dir} && /bin/pwd)` ] ; then \ -- rm -rf $$1 ; \ -- fi ; \ -- shift ; \ -- done -- -set ${COPYDESTS} ; \ - mkdir ${COPYDESTS} ; \ - chmod ugo+rx ${COPYDESTS} ; \ - unset CDPATH; \ -@@ -570,9 +562,9 @@ - cd ${srcdir}/info ; \ - for elt in $(INFO_FILES); do \ - test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \ -- for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \ -- ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \ -- chmod a+r $(DESTDIR)${infodir}/$$f; \ -+ for f in `ls $$elt 2>/dev/null`; do \ -+ ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f.info; \ -+ chmod a+r $(DESTDIR)${infodir}/$$f.info; \ - done; \ - done); \ - else true; fi -@@ -583,7 +575,7 @@ - for elt in $(INFO_FILES); do \ - test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \ - (cd $${thisdir}; \ -- ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \ -+ ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt.info); \ - done; \ - else true; fi - -chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} $(DESTDIR)${datadir}/emacs/site-lisp ${COPYDESTS} $(DESTDIR)${infodir} diff --git a/editors/emacs23/files/patch-configure b/editors/emacs23/files/patch-configure deleted file mode 100644 index 668668865700..000000000000 --- a/editors/emacs23/files/patch-configure +++ /dev/null @@ -1,165 +0,0 @@ - -$FreeBSD$ - ---- configure.orig -+++ configure -@@ -5806,159 +5806,6 @@ - LIBSOUND= - fi - -- -- -- ALSA_REQUIRED=1.0.0 -- ALSA_MODULES="alsa >= $ALSA_REQUIRED" -- -- succeeded=no -- -- # Extract the first word of "pkg-config", so it can be a program name with args. --set dummy pkg-config; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else -- case $PKG_CONFIG in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done -- done --IFS=$as_save_IFS -- -- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" -- ;; --esac --fi --PKG_CONFIG=$ac_cv_path_PKG_CONFIG --if test -n "$PKG_CONFIG"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 --$as_echo "$PKG_CONFIG" >&6; } --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } --fi -- -- -- -- if test "$PKG_CONFIG" = "no" ; then -- HAVE_ALSA=no -- else -- PKG_CONFIG_MIN_VERSION=0.9.0 -- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ALSA_MODULES" >&5 --$as_echo_n "checking for $ALSA_MODULES... " >&6; } -- -- if $PKG_CONFIG --exists "$ALSA_MODULES" 2>&5; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- succeeded=yes -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking ALSA_CFLAGS" >&5 --$as_echo_n "checking ALSA_CFLAGS... " >&6; } -- ALSA_CFLAGS=`$PKG_CONFIG --cflags "$ALSA_MODULES"|sed -e 's,///*,/,g'` -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ALSA_CFLAGS" >&5 --$as_echo "$ALSA_CFLAGS" >&6; } -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking ALSA_LIBS" >&5 --$as_echo_n "checking ALSA_LIBS... " >&6; } -- ALSA_LIBS=`$PKG_CONFIG --libs "$ALSA_MODULES"|sed -e 's,///*,/,g'` -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ALSA_LIBS" >&5 --$as_echo "$ALSA_LIBS" >&6; } -- else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- ALSA_CFLAGS="" -- ALSA_LIBS="" -- ## If we have a custom action on failure, don't print errors, but -- ## do set a variable so people can do so. -- ALSA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$ALSA_MODULES"` -- -- fi -- -- -- -- else -- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." -- echo "*** See http://www.freedesktop.org/software/pkgconfig" -- fi -- fi -- -- if test $succeeded = yes; then -- HAVE_ALSA=yes -- else -- HAVE_ALSA=no -- fi -- -- if test $HAVE_ALSA = yes; then -- SAVE_CFLAGS="$CFLAGS" -- SAVE_LDFLAGS="$LDFLAGS" -- CFLAGS="$ALSA_CFLAGS $CFLAGS" -- LDFLAGS="$ALSA_LIBS $LDFLAGS" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include <asoundlib.h> --int --main () --{ --snd_lib_error_set_handler (0); -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- emacs_alsa_normal=yes --else -- emacs_alsa_normal=no --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- if test "$emacs_alsa_normal" != yes; then -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include <alsa/asoundlib.h> --int --main () --{ --snd_lib_error_set_handler (0); -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- emacs_alsa_subdir=yes --else -- emacs_alsa_subdir=no --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- if test "$emacs_alsa_subdir" != yes; then -- as_fn_error $? "pkg-config found alsa, but it does not compile. See config.log for error messages." "$LINENO" 5 -- fi -- ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE" -- fi -- -- CFLAGS="$SAVE_CFLAGS" -- LDFLAGS="$SAVE_LDFLAGS" -- LIBSOUND="$LIBSOUND $ALSA_LIBS" -- CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS" -- --$as_echo "#define HAVE_ALSA 1" >>confdefs.h -- -- fi -- - fi - - for ac_header in sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \ diff --git a/editors/emacs23/files/patch-doc-emacs-Makefile.in b/editors/emacs23/files/patch-doc-emacs-Makefile.in deleted file mode 100644 index da2f5b8506b8..000000000000 --- a/editors/emacs23/files/patch-doc-emacs-Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- doc/emacs/Makefile.in.orig 2008-12-09 19:27:59.000000000 +0200 -+++ doc/emacs/Makefile.in 2008-12-09 19:25:19.000000000 +0200 -@@ -34,7 +34,7 @@ - - # The makeinfo program is part of the Texinfo distribution. - # Use --force so that it generates output even if there are errors. --MAKEINFO = makeinfo --force -+MAKEINFO = makeinfo --force --no-split - - INFO_TARGETS = $(infodir)/emacs - DVI_TARGETS = emacs.dvi -@@ -144,7 +144,7 @@ - # rm -f Makefile - - maintainer-clean: distclean -- for file in $(INFO_TARGETS); do rm -f $${file}*; done -+ for file in $(INFO_TARGETS); do rm -f $${file}; done - - - # Formerly this directory had texindex.c and getopt.c in it diff --git a/editors/emacs23/files/patch-doc-lispintro-Makefile.in b/editors/emacs23/files/patch-doc-lispintro-Makefile.in deleted file mode 100644 index a6266c3bef95..000000000000 --- a/editors/emacs23/files/patch-doc-lispintro-Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- doc/lispintro/Makefile.in.orig 2008-12-09 19:27:59.000000000 +0200 -+++ doc/lispintro/Makefile.in 2008-12-09 19:25:20.000000000 +0200 -@@ -33,7 +33,7 @@ - INFO_TARGETS = ${infodir}/eintr - DVI_TARGETS = emacs-lisp-intro.dvi - --MAKEINFO = makeinfo -+MAKEINFO = makeinfo --no-split - TEXI2DVI = texi2dvi - DVIPS = dvips - -@@ -65,7 +65,7 @@ - - maintainer-clean: distclean - rm -f *.aux *.cps *.fns *.kys *.pgs *.vrs *.toc -- cd $(infodir); rm -f eintr eintr-[1-9] -+ cd $(infodir); rm -f eintr - - # 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. diff --git a/editors/emacs23/files/patch-doc-lispref-Makefile.in b/editors/emacs23/files/patch-doc-lispref-Makefile.in deleted file mode 100644 index 6d069939164d..000000000000 --- a/editors/emacs23/files/patch-doc-lispref-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/lispref/Makefile.in.orig 2008-12-09 19:27:59.000000000 +0200 -+++ doc/lispref/Makefile.in 2008-12-09 19:25:20.000000000 +0200 -@@ -32,7 +32,7 @@ - TEXI2DVI = texi2dvi - SHELL = /bin/sh - INSTALL_INFO = install-info --MAKEINFO = makeinfo --force -+MAKEINFO = makeinfo --force --no-split - - # List of all the texinfo files in the manual: - diff --git a/editors/emacs23/files/patch-doc-misc-Makefile.in b/editors/emacs23/files/patch-doc-misc-Makefile.in deleted file mode 100644 index 8626784b0f4e..000000000000 --- a/editors/emacs23/files/patch-doc-misc-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/misc/Makefile.in.orig Tue Jun 23 07:39:39 2009 +0300 -+++ doc/misc/Makefile.in Tue Jun 23 07:39:41 2009 +0300 -@@ -34,7 +34,7 @@ - - # The makeinfo program is part of the Texinfo distribution. - # Use --force so that it generates output even if there are errors. --MAKEINFO = makeinfo --force -+MAKEINFO = makeinfo --force --no-split - - # Also add new entries to INFO_FILES in the top-level Makefile.in. - INFO_TARGETS = \ diff --git a/editors/emacs23/files/patch-sources.el b/editors/emacs23/files/patch-sources.el deleted file mode 100644 index 659786ce208a..000000000000 --- a/editors/emacs23/files/patch-sources.el +++ /dev/null @@ -1,10 +0,0 @@ - -$FreeBSD: /tmp/pcvs/ports/editors/emacs23/files/patch-sources.el,v 1.3 2009-12-20 20:19:17 bsam Exp $ - ---- /dev/null -+++ sources.el -@@ -0,0 +1,4 @@ -+;;; Path to Emacs C Sources. -+(when (string-match (regexp-quote "%%EMACS_VER%%") emacs-version) -+ (setq find-function-C-source-directory -+ "%%DATADIR%%/%%EMACS_VER%%/src")) diff --git a/editors/emacs23/files/patch-src_coding.c b/editors/emacs23/files/patch-src_coding.c deleted file mode 100644 index 9dd1a5e0f45d..000000000000 --- a/editors/emacs23/files/patch-src_coding.c +++ /dev/null @@ -1,51 +0,0 @@ - -$FreeBSD$ - ---- src/coding.c.orig -+++ src/coding.c -@@ -3853,8 +3853,20 @@ - else - charset = CHARSET_FROM_ID (charset_id_2); - ONE_MORE_BYTE (c1); -- if (c1 < 0x20 || (c1 >= 0x80 && c1 < 0xA0)) -- goto invalid_code; -+ /* -+ * <ESC>N sequence is recognized as SS2 in some ISO2022 -+ * encodings. As a workaround, mark invalid only if -+ * <ESC>N + GR in a 7-bit encoding or <ESC>N + GL in an 8-bit -+ * encoding. -+ */ -+ if (CODING_ISO_FLAGS (coding) & CODING_ISO_FLAG_SEVEN_BITS) { -+ if (c1 < 0x20 || c1 >= 0x80) -+ goto invalid_code; -+ } -+ else { -+ if (c1 < 0xA0) -+ goto invalid_code; -+ } - break; - - case 'O': /* invocation of single-shift-3 */ -@@ -3867,8 +3879,20 @@ - else - charset = CHARSET_FROM_ID (charset_id_3); - ONE_MORE_BYTE (c1); -- if (c1 < 0x20 || (c1 >= 0x80 && c1 < 0xA0)) -- goto invalid_code; -+ /* -+ * <ESC>O sequence by arrow keys is recognized as SS3 in -+ * some ISO2022 encodings. As a workaround, mark invalid only if -+ * <ESC>O + GR in a 7-bit encoding or <ESC>O + GL in an 8-bit -+ * encoding. -+ */ -+ if (CODING_ISO_FLAGS (coding) & CODING_ISO_FLAG_SEVEN_BITS) { -+ if (c1 < 0x20 || c1 >= 0x80) -+ goto invalid_code; -+ } -+ else { -+ if (c1 < 0xA0) -+ goto invalid_code; -+ } - break; - - case '0': case '2': case '3': case '4': /* start composition */ diff --git a/editors/emacs23/files/patch-src_config.in b/editors/emacs23/files/patch-src_config.in deleted file mode 100644 index 834b77b8c5c2..000000000000 --- a/editors/emacs23/files/patch-src_config.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- src/config.in.orig -+++ src/config.in -@@ -1183,6 +1183,8 @@ - #endif - #ifdef HAVE_ALLOCA_H - # include <alloca.h> -+#elif defined __FreeBSD__ -+#include <stdlib.h> - #elif defined __GNUC__ - # define alloca __builtin_alloca - #elif defined _AIX |