diff options
author | minskim <minskim@pkgsrc.org> | 2009-08-06 04:46:04 +0000 |
---|---|---|
committer | minskim <minskim@pkgsrc.org> | 2009-08-06 04:46:04 +0000 |
commit | 61b8d1931b53939befa0c6b64271f9cd276dc5a1 (patch) | |
tree | e814a849e272e482b1cde10172d4dffbfae7198e /editors/emacs | |
parent | aa9b6aacf843e191effc4f30463fabd701f6766d (diff) | |
download | pkgsrc-61b8d1931b53939befa0c6b64271f9cd276dc5a1.tar.gz |
Update patches for emacs-23.1.
These should have been committed when emacs was updated.
Diffstat (limited to 'editors/emacs')
-rw-r--r-- | editors/emacs/distinfo | 4 | ||||
-rw-r--r-- | editors/emacs/patches/patch-ab | 44 | ||||
-rw-r--r-- | editors/emacs/patches/patch-ae | 49 |
3 files changed, 57 insertions, 40 deletions
diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo index 9ded6bbd626..8ebfe381260 100644 --- a/editors/emacs/distinfo +++ b/editors/emacs/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.40 2009/08/05 22:04:50 minskim Exp $ +$NetBSD: distinfo,v 1.41 2009/08/06 04:46:04 minskim Exp $ SHA1 (emacs-23.1.tar.gz) = e993445d14d2fdedd1418bc32c8c4ea30442bc51 RMD160 (emacs-23.1.tar.gz) = c557149f59916b82f0ae156f87406126b03671b4 Size (emacs-23.1.tar.gz) = 42904117 bytes SHA1 (patch-ab) = 53fd489995efae908827d7a3de4811daf156fd0a -SHA1 (patch-ae) = 5ced08d7818b562ab56910fb4ac5ad7f9779da77 +SHA1 (patch-ae) = 2b016d6b4bb796cf5bddc55f104139e01209adb6 diff --git a/editors/emacs/patches/patch-ab b/editors/emacs/patches/patch-ab index bf7db64de5a..4513eb52b07 100644 --- a/editors/emacs/patches/patch-ab +++ b/editors/emacs/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.26 2008/10/11 09:56:38 uebayasi Exp $ +$NetBSD: patch-ab,v 1.27 2009/08/06 04:46:04 minskim Exp $ ---- configure.orig 2008-10-10 10:35:49.000000000 +0900 -+++ configure -@@ -1809,7 +1809,7 @@ archlibdir='${libexecdir}/emacs/${versio +--- configure.orig 2009-06-04 20:29:50 +0300 ++++ configure 2009-06-07 21:41:16 +0300 +@@ -1979,7 +1979,7 @@ archlibdir='${libexecdir}/emacs/${versio docdir='${datadir}/emacs/${version}/etc' gamedir='${localstatedir}/games/emacs' @@ -10,12 +10,32 @@ $NetBSD: patch-ab,v 1.26 2008/10/11 09:56:38 uebayasi Exp $ +gameuser=${GAMEOWN} - # Check whether --with-gcc was given. -@@ -3142,6 +3142,7 @@ _ACEOF - *-sysv5uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;; - *-sysv5OpenUNIX* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;; - *-386bsd* ) opsys=386bsd ;; -+ *-dragonfly* ) opsys=dragonfly ;; - *-nextstep* ) opsys=nextstep ;; - ## Otherwise, we'll fall through to the generic opsys code at the bottom. + +@@ -2529,6 +2529,15 @@ case "${canonical}" in esac + ;; + ++ ## DragonFly ports ++ *-*-dragonfly*) ++ opsys=dragonfly ++ case "${canonical}" in ++ i[3456]86-*-dragonfly*) machine=intel386 ;; ++ amd64-*-dragonfly*|x86_64-*-dragonfly*) machine=amdx86-64 ;; ++ esac ++ ;; ++ + ## FreeBSD kernel + glibc based userland + *-*-kfreebsd*gnu* ) + opsys=gnu-kfreebsd +@@ -9605,9 +9614,9 @@ if test "${HAVE_NS}" = yes; then + window_system=nextstep + with_xft=no + # set up packaging dirs +- exec_prefix=${ns_appbindir} +- libexecdir=${ns_appbindir}/libexec + if test "${EN_NS_SELF_CONTAINED}" = yes; then ++ exec_prefix=${ns_appbindir} ++ libexecdir=${ns_appbindir}/libexec + prefix=${ns_appresdir} + fi + fi diff --git a/editors/emacs/patches/patch-ae b/editors/emacs/patches/patch-ae index 822d9c64517..cd7dc819fe6 100644 --- a/editors/emacs/patches/patch-ae +++ b/editors/emacs/patches/patch-ae @@ -1,18 +1,27 @@ -$NetBSD: patch-ae,v 1.12 2008/10/11 09:56:38 uebayasi Exp $ +$NetBSD: patch-ae,v 1.13 2009/08/06 04:46:04 minskim Exp $ ---- Makefile.in.orig 2008-10-10 10:35:49.000000000 +0900 +--- Makefile.in.orig 2009-06-20 21:36:54.000000000 -0700 +++ Makefile.in -@@ -141,7 +141,7 @@ man1dir=$(mandir)/man1 +@@ -141,7 +141,7 @@ MAN_PAGES=b2m.1 ctags.1 ebrowse.1 emacs. infodir=@infodir@ - INFO_FILES=ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq \ - elisp eintr emacs emacs-mime eshell eudc flymake \ -- forms gnus idlwave info message mh-e newsticker org pcl-cvs \ -+ forms gnus idlwave message mh-e newsticker org pcl-cvs \ - pgg reftex sc ses sieve speedbar tramp vip viper widget \ - woman smtpmail url rcirc erc + INFO_FILES=ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse \ + ediff efaq eintr elisp emacs emacs-mime epa erc eshell eudc \ +- flymake forms gnus idlwave info mairix-el message mh-e \ ++ flymake forms gnus idlwave mairix-el message mh-e \ + newsticker nxml-mode org pcl-cvs pgg rcirc reftex remember \ + sasl sc ses sieve smtpmail speedbar tramp url vip viper \ + widget woman +@@ -403,7 +403,7 @@ $(srcdir)/src/stamp-h.in: $(AUTOCONF_INP + install: all install-arch-indep install-arch-dep install-leim blessmail + @true -@@ -515,27 +515,23 @@ install-arch-indep: mkdir info - for elt in $(INFO_FILES); do \ +-MV_DIRS = for i in $$dir; do rm -fr `basename "$$i"` ; mv "$$i" . ; done ++MV_DIRS = for i in $$dir; do if test -e $$i ; then rm -fr `basename "$$i"` ; mv "$$i" . ; fi; done + + ### Install the executables that were compiled specifically for this machine. + ### It would be nice to do something for a parallel make +@@ -572,21 +572,11 @@ install-arch-indep: mkdir info install-e + 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; \ @@ -24,6 +33,7 @@ $NetBSD: patch-ae,v 1.12 2008/10/11 09:56:38 uebayasi Exp $ - if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} && /bin/pwd)` ]; \ - then \ - for elt in $(INFO_FILES); do \ +- test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \ - (cd $${thisdir}; \ - ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \ - done; \ @@ -31,18 +41,5 @@ $NetBSD: patch-ae,v 1.12 2008/10/11 09:56:38 uebayasi Exp $ - -chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} $(DESTDIR)${datadir}/emacs/site-lisp ${COPYDESTS} $(DESTDIR)${infodir} + chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} $(DESTDIR)${datadir}/emacs/site-lisp ${COPYDESTS} $(DESTDIR)${infodir} thisdir=`/bin/pwd`; \ - cd ${srcdir}/etc; \ -- for page in emacs emacsclient etags ctags ; do \ -+ for page in emacs emacsclient ; do \ - (cd $${thisdir}; \ - ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 $(DESTDIR)${man1dir}/$${page}${manext}; \ - chmod a+r $(DESTDIR)${man1dir}/$${page}${manext}); \ - done -+ for page in etags ctags ; do \ -+ (cd $${thisdir}; \ -+ ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 $(DESTDIR)${man1dir}/emacs-$${page}${manext}; \ -+ chmod a+r $(DESTDIR)${man1dir}/emacs-$${page}${manext}); \ -+ done - - ### Install LEIM files. Although they are machine-independent, we - ### have separate target here instead of including it in + cd ${mansrcdir}; \ + for page in ${MAN_PAGES}; do \ |