diff options
| author | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2012-03-12 15:51:15 +0000 |
|---|---|---|
| committer | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2012-03-12 15:51:15 +0000 |
| commit | 4fd524115c0739c5f92c17da8abca13486ab3dc3 (patch) | |
| tree | ed90506f42665e8030a49fdc7770056263f4d2f3 /www/emacs-w3m/files | |
| parent | - Fix format (diff) | |
Update to 1.4.471 CVS snapshot on 2012/03/06.
Set correct INSTALL_TARGET for emacs-devel. [1]
Fix build error with WITHOUT_SHIMBUN=yes. [2]
PR: ports/165611 [2]
Submitted by: John Hein <jhein@symmetricom.com> [1], Seiji Ariga <freebsd@khaotic.net> [2]
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=293171
Diffstat (limited to 'www/emacs-w3m/files')
| -rw-r--r-- | www/emacs-w3m/files/extra-patch-Makefile.in | 17 | ||||
| -rw-r--r-- | www/emacs-w3m/files/extra-patch-aclocal.m4 | 8 | ||||
| -rw-r--r-- | www/emacs-w3m/files/patch-Makefile.in | 22 |
3 files changed, 30 insertions, 17 deletions
diff --git a/www/emacs-w3m/files/extra-patch-Makefile.in b/www/emacs-w3m/files/extra-patch-Makefile.in new file mode 100644 index 000000000000..5b2dd2c6580e --- /dev/null +++ b/www/emacs-w3m/files/extra-patch-Makefile.in @@ -0,0 +1,17 @@ +--- Makefile.in.orig 2012-03-07 00:42:29.000000000 +0900 ++++ Makefile.in 2012-03-07 00:42:39.000000000 +0900 +@@ -92,14 +92,6 @@ + $(INSTALL_DATA) shimbun/$$p "$(DESTDIR)$(lispdir)/s$$p";\ + fi;\ + done;\ +- for p in `cd shimbun && echo *.el`; do\ +- echo "$(INSTALL_DATA) shimbun/$$p \"$(DESTDIR)$(lispdir)/$$p\"";\ +- $(INSTALL_DATA) shimbun/$$p "$(DESTDIR)$(lispdir)/$$p";\ +- done;\ +- for p in `cd shimbun && echo *.elc`; do\ +- echo "$(INSTALL_DATA) shimbun/$$p \"$(DESTDIR)$(lispdir)/$$p\"";\ +- $(INSTALL_DATA) shimbun/$$p "$(DESTDIR)$(lispdir)/$$p";\ +- done;\ + fi + + install-icons: diff --git a/www/emacs-w3m/files/extra-patch-aclocal.m4 b/www/emacs-w3m/files/extra-patch-aclocal.m4 index 5f0937b19e62..789cba752f63 100644 --- a/www/emacs-w3m/files/extra-patch-aclocal.m4 +++ b/www/emacs-w3m/files/extra-patch-aclocal.m4 @@ -1,5 +1,5 @@ ---- aclocal.m4.orig 2008-02-06 11:24:18.000000000 +0900 -+++ aclocal.m4 2010-01-28 00:57:56.000000000 +0900 +--- aclocal.m4.orig 2012-01-06 11:02:58.000000000 +0900 ++++ aclocal.m4 2012-03-11 22:40:26.000000000 +0900 @@ -13,7 +13,7 @@ dnl XEmacs 21.5 starts, in order to suppress warnings for Lisp shadows dnl when XEmacs 21.5 starts. @@ -9,10 +9,10 @@ else XEMACSDEBUG= fi -@@ -296,6 +296,7 @@ +@@ -263,6 +263,7 @@ fi fi]) - retval=`eval ${XEMACSDEBUG}${EMACS}' '${VANILLA_FLAG}' -batch -l w3mhack.el '${ADDITIONAL_LOAD_PATH}' -f w3mhack-print-status'` + retval=`eval ${XEMACSDEBUG}${EMACS}' '${VANILLA_FLAG}' -batch -l w3mhack.el '${ADDITIONAL_LOAD_PATH}' -f w3mhack-print-status 2>/dev/null | $EGREP -v '\''^$'\'` + retval=`echo $retval | tr -d "\n"` if test x"$retval" != xOK; then AC_MSG_ERROR([Process couldn't proceed. See the above messages.]) diff --git a/www/emacs-w3m/files/patch-Makefile.in b/www/emacs-w3m/files/patch-Makefile.in index cf97c31944b6..0e7bc9980b98 100644 --- a/www/emacs-w3m/files/patch-Makefile.in +++ b/www/emacs-w3m/files/patch-Makefile.in @@ -1,24 +1,20 @@ ---- Makefile.in.orig 2008-02-06 11:24:18.000000000 +0900 -+++ Makefile.in 2010-01-25 00:55:21.000000000 +0900 -@@ -63,7 +63,7 @@ +--- Makefile.in.orig 2012-03-07 00:42:29.000000000 +0900 ++++ Makefile.in 2012-03-07 00:45:51.000000000 +0900 +@@ -64,7 +64,7 @@ install-lisp: lisp - @$(SHELL) $(srcdir)/mkinstalldirs "$(lispdir)";\ + @$(SHELL) $(srcdir)/mkinstalldirs "$(DESTDIR)$(lispdir)";\ - for p in ChangeLog ChangeLog.[1-9] ChangeLog.[1-9][0-9] *.el; do\ + for p in *.el; do\ if test -f "$$p"; then\ case "$$p" in\ $(IGNORES)) ;;\ -@@ -85,12 +85,6 @@ +@@ -86,7 +86,7 @@ fi;\ done;\ if test -f shimbun/shimbun.elc; then\ - for p in `cd shimbun && echo ChangeLog ChangeLog.[1-9] ChangeLog.[1-9][0-9]`; do\ -- if test -f "shimbun/$$p"; then\ -- echo "$(INSTALL_DATA) shimbun/$$p \"$(lispdir)/s$$p\"";\ -- $(INSTALL_DATA) shimbun/$$p "$(lispdir)/s$$p";\ -- fi;\ -- done;\ - for p in `cd shimbun && echo *.el`; do\ - echo "$(INSTALL_DATA) shimbun/$$p \"$(lispdir)/$$p\"";\ - $(INSTALL_DATA) shimbun/$$p "$(lispdir)/$$p";\ ++ for p in `cd shimbun`; do\ + if test -f "shimbun/$$p"; then\ + echo "$(INSTALL_DATA) shimbun/$$p \"$(DESTDIR)$(lispdir)/s$$p\"";\ + $(INSTALL_DATA) shimbun/$$p "$(DESTDIR)$(lispdir)/s$$p";\ |