diff options
Diffstat (limited to 'editors/emacs-devel/files')
| -rw-r--r-- | editors/emacs-devel/files/patch-configure | 2 | ||||
| -rw-r--r-- | editors/emacs-devel/files/patch-doc-emacs-Makefile.in | 26 | ||||
| -rw-r--r-- | editors/emacs-devel/files/patch-doc-lispintro-Makefile.in | 30 | ||||
| -rw-r--r-- | editors/emacs-devel/files/patch-doc-lispref-Makefile.in | 21 | ||||
| -rw-r--r-- | editors/emacs-devel/files/patch-doc-misc-Makefile.in | 13 | ||||
| -rw-r--r-- | editors/emacs-devel/files/patch-src_config.in | 14 |
6 files changed, 57 insertions, 49 deletions
diff --git a/editors/emacs-devel/files/patch-configure b/editors/emacs-devel/files/patch-configure index cc5d025d98a5..ba34920b61f0 100644 --- a/editors/emacs-devel/files/patch-configure +++ b/editors/emacs-devel/files/patch-configure @@ -3,7 +3,7 @@ $FreeBSD$ --- configure.orig +++ configure -@@ -6041,170 +6041,6 @@ +@@ -6055,170 +6055,6 @@ LIBSOUND= fi diff --git a/editors/emacs-devel/files/patch-doc-emacs-Makefile.in b/editors/emacs-devel/files/patch-doc-emacs-Makefile.in index da2f5b8506b8..5faf9ad9aa7e 100644 --- a/editors/emacs-devel/files/patch-doc-emacs-Makefile.in +++ b/editors/emacs-devel/files/patch-doc-emacs-Makefile.in @@ -1,20 +1,14 @@ ---- 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 @@ + +$FreeBSD$ + +--- doc/emacs/Makefile.in.orig ++++ doc/emacs/Makefile.in +@@ -39,7 +39,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 +-MAKEINFO = makeinfo --force -I $(srcdir) ++MAKEINFO = makeinfo --force --no-split -I $(srcdir) - 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 + TEXI2DVI = texi2dvi + TEXI2PDF = texi2pdf diff --git a/editors/emacs-devel/files/patch-doc-lispintro-Makefile.in b/editors/emacs-devel/files/patch-doc-lispintro-Makefile.in index a6266c3bef95..86c190ca927a 100644 --- a/editors/emacs-devel/files/patch-doc-lispintro-Makefile.in +++ b/editors/emacs-devel/files/patch-doc-lispintro-Makefile.in @@ -1,20 +1,14 @@ ---- 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 + +$FreeBSD$ + +--- doc/lispintro/Makefile.in.orig ++++ doc/lispintro/Makefile.in +@@ -28,7 +28,7 @@ + # Directory with the (customized) texinfo.tex file. + texinfodir = $(srcdir)/../misc + +-MAKEINFO = makeinfo --force -I $(srcdir) ++MAKEINFO = makeinfo --no-split --force -I $(srcdir) TEXI2DVI = texi2dvi + TEXI2PDF = texi2pdf 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/emacs-devel/files/patch-doc-lispref-Makefile.in b/editors/emacs-devel/files/patch-doc-lispref-Makefile.in index 6d069939164d..9ce0624ce29a 100644 --- a/editors/emacs-devel/files/patch-doc-lispref-Makefile.in +++ b/editors/emacs-devel/files/patch-doc-lispref-Makefile.in @@ -1,11 +1,14 @@ ---- 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 + +$FreeBSD$ + +--- doc/lispref/Makefile.in.orig ++++ doc/lispref/Makefile.in @@ -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: + # Directory with emacsver.texi. + emacsdir = $(srcdir)/../emacs +-MAKEINFO = makeinfo --force -I $(emacsdir) -I $(srcdir) ++MAKEINFO = makeinfo --no-split --force -I $(emacsdir) -I $(srcdir) + TEXI2DVI = texi2dvi + TEXI2PDF = texi2pdf + DVIPS = dvips diff --git a/editors/emacs-devel/files/patch-doc-misc-Makefile.in b/editors/emacs-devel/files/patch-doc-misc-Makefile.in index 8626784b0f4e..02c821e5f3c9 100644 --- a/editors/emacs-devel/files/patch-doc-misc-Makefile.in +++ b/editors/emacs-devel/files/patch-doc-misc-Makefile.in @@ -1,11 +1,14 @@ ---- 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 @@ + +$FreeBSD$ + +--- doc/misc/Makefile.in.orig ++++ doc/misc/Makefile.in +@@ -42,7 +42,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 +-MAKEINFO = makeinfo --force -I$(emacsdir) ++MAKEINFO = makeinfo --force --no-split -I$(emacsdir) # Also add new entries to INFO_FILES in the top-level Makefile.in. INFO_TARGETS = \ diff --git a/editors/emacs-devel/files/patch-src_config.in b/editors/emacs-devel/files/patch-src_config.in new file mode 100644 index 000000000000..b8fee6cc07d1 --- /dev/null +++ b/editors/emacs-devel/files/patch-src_config.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- src/config.in.orig ++++ src/config.in +@@ -1171,6 +1171,8 @@ + + #ifdef HAVE_ALLOCA_H + # include <alloca.h> ++#elif __FreeBSD__ ++#include <stdlib.h> + #elif defined __GNUC__ + # define alloca __builtin_alloca + #elif defined _AIX |