Menu
▾
▴
[cvs] experimental/todai/ecc-10.4/main/finkinfo/editors emacs22.info, 1.1.1.1, 1.2 emacs22.patch, 1.1.1.1, 1.2
|
From: AIDA S. <ai...@us...> - 2006-06-30 16:40:27
|
Update of /cvsroot/fink/experimental/todai/ecc-10.4/main/finkinfo/editors In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30374/ecc-10.4/main/finkinfo/editors Modified Files: emacs22.info emacs22.patch Log Message: New emacs22 Index: emacs22.patch =================================================================== RCS file: /cvsroot/fink/experimental/todai/ecc-10.4/main/finkinfo/editors/emacs22.patch,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- emacs22.patch 16 Mar 2006 07:14:25 -0000 1.1.1.1 +++ emacs22.patch 30 Jun 2006 16:40:23 -0000 1.2 @@ -1,7 +1,7 @@ -diff -ruN -x '*~' -x '*CVS*' emacs/Makefile.in emacs.patched/Makefile.in ---- emacs/Makefile.in 2005-11-03 12:00:25.000000000 -0500 -+++ emacs.patched/Makefile.in 2005-11-13 18:47:48.000000000 -0500 -@@ -423,7 +423,7 @@ +diff -ruN -x '*~' emacs/Makefile.in emacs.patched/Makefile.in +--- emacs/Makefile.in 2006-05-06 09:18:44.000000000 -0400 ++++ emacs.patched/Makefile.in 2006-06-24 13:43:08.000000000 -0400 +@@ -428,7 +428,7 @@ (cd $${dir}; tar -chf - . ) \ | (cd $${dest}; umask 022; \ tar -xvf - && cat > /dev/null) || exit 1; \ @@ -10,27 +10,27 @@ for subdir in `find $${dest} -type d ! -name RCS ! -name CVS -print` ; do \ chmod a+rx $${subdir} ; \ rm -rf $${subdir}/RCS ; \ -@@ -463,7 +463,7 @@ - echo "Copying etc/DOC-* to ${docdir} ..." ; \ +@@ -468,7 +468,7 @@ + echo "Copying etc/DOC-* to $(DESTDIR)${docdir} ..." ; \ (cd ./etc; tar -chf - DOC*) \ - |(cd ${docdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 1; \ -- (cd $(docdir); chown $${LOGNAME:-$$USERNAME} DOC*; chmod a+r DOC*; \ -+ (cd $(docdir); chown root:admin DOC*; chmod a+r DOC*; \ + |(cd $(DESTDIR)${docdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 1; \ +- (cd $(DESTDIR)$(docdir); chown $${LOGNAME:-$$USERNAME} DOC*; chmod a+r DOC*; \ ++ (cd $(DESTDIR)$(docdir); chown root:admin DOC*; chmod a+r DOC*; \ if test "`echo DOC-*`" != "DOC-*"; then rm DOC; fi); \ else true; fi -unset CDPATH; \ -@@ -475,7 +475,7 @@ - echo "Copying lisp/*.el and lisp/*.elc to ${lispdir} ..." ; \ +@@ -480,7 +480,7 @@ + echo "Copying lisp/*.el and lisp/*.elc to $(DESTDIR)${lispdir} ..." ; \ (cd lisp; tar -chf - *.el *.elc) \ - |(cd ${lispdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 1; \ -- (cd ${lispdir}; find . -exec chown $${LOGNAME:-$$USERNAME} {} ';') ; \ -+ (cd ${lispdir}; find . -exec chown root:admin {} ';') ; \ + |(cd $(DESTDIR)${lispdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 1; \ +- (cd $(DESTDIR)${lispdir}; find . -exec chown $${LOGNAME:-$$USERNAME} {} ';') ; \ ++ (cd $(DESTDIR)${lispdir}; find . -exec chown root:admin {} ';') ; \ else true; fi -unset CDPATH; \ if [ -n "${GZIP_PROG}" ]; \ -diff -ruN -x '*~' -x '*CVS*' emacs/configure emacs.patched/configure ---- emacs/configure 2005-11-03 12:00:04.000000000 -0500 -+++ emacs.patched/configure 2005-11-17 18:50:04.000000000 -0500 +diff -ruN -x '*~' emacs/configure emacs.patched/configure +--- emacs/configure 2006-05-18 12:58:44.000000000 -0400 ++++ emacs.patched/configure 2006-06-24 13:43:08.000000000 -0400 @@ -1359,7 +1359,7 @@ etcdir='${datadir}/emacs/${version}/etc' archlibdir='${libexecdir}/emacs/${version}/${configuration}' @@ -40,7 +40,7 @@ gameuser=games -@@ -12503,9 +12503,9 @@ +@@ -13006,9 +13006,9 @@ fi echo "$as_me:$LINENO: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5 echo "${ECHO_T}$ac_cv_lib_ungif_EGifPutExtensionLast" >&6 @@ -52,27 +52,27 @@ fi -diff -ruN -x '*~' -x '*CVS*' emacs/fix-info emacs.patched/fix-info +diff -ruN -x '*~' emacs/fix-info emacs.patched/fix-info --- emacs/fix-info 1969-12-31 19:00:00.000000000 -0500 -+++ emacs.patched/fix-info 2005-11-13 18:27:36.000000000 -0500 -@@ -0,0 +1,13 @@ ++++ emacs.patched/fix-info 2006-06-26 11:07:22.000000000 -0400 +@@ -0,0 +1,12 @@ +#!/bin/sh + +THE_INFO_PREFIX=$1 + +for file in ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq \ -+ eintr elisp emacs emacs-mime emacs-xtra eshell eudc flymake forms \ -+ gnus idlwave info message mh-e pcl-cvs pgg reftex sc ses sieve \ -+ smtpmail speedbar tramp vip viper widget woman ++ elisp eintr emacs emacs-mime eshell eudc flymake \ ++ forms gnus idlwave info message mh-e newsticker org pcl-cvs \ ++ pgg reftex sc ses sieve speedbar tramp vip viper widget \ ++ woman smtpmail url rcirc erc +do + ./mangle-info ${THE_INFO_PREFIX}/${file} +done -+ -+ -diff -ruN -x '*~' -x '*CVS*' emacs/lisp/startup.el emacs.patched/lisp/startup.el ---- emacs/lisp/startup.el 2005-11-05 18:11:38.000000000 -0500 -+++ emacs.patched/lisp/startup.el 2005-11-13 18:33:31.000000000 -0500 -@@ -284,6 +284,10 @@ +\ No newline at end of file +diff -ruN -x '*~' emacs/lisp/startup.el emacs.patched/lisp/startup.el +--- emacs/lisp/startup.el 2006-05-24 09:22:12.000000000 -0400 ++++ emacs.patched/lisp/startup.el 2006-06-24 13:43:08.000000000 -0400 +@@ -285,6 +285,10 @@ (defvar normal-top-level-add-subdirs-inode-list nil) @@ -83,31 +83,33 @@ (defvar no-blinking-cursor nil) (defvar default-frame-background-mode) -@@ -796,8 +800,18 @@ +@@ -805,9 +809,19 @@ ;; Run the site-start library if it exists. The point of this file is ;; that it is run before .emacs. There is no point in doing this after ;; .emacs; that is useless. - (if site-run-file - (load site-run-file t t)) -+ ;; (if site-run-file -+ ;; (load site-run-file t t)) -+ +- ++ ;; (if site-run-file ++ ;; (load site-run-file t t)) ++ + ;; Fink version of site-start. + (if site-run-file -+ (progn -+ ;; Load all the fink package snippets. -+ ;; It's in here because we want -q to kill it too. -+ (if (load "fink-startup" t t nil) -+ (fink-startup fink-emacs-flavor)) -+ ;; Now the normal site file... -+ (load site-run-file t t nil))) - ++ (progn ++ ;; Load all the fink package snippets. ++ ;; It's in here because we want -q to kill it too. ++ (if (load "fink-startup" t t nil) ++ (fink-startup fink-emacs-flavor)) ++ ;; Now the normal site file... ++ (load site-run-file t t nil))) ++ ;; Sites should not disable this. Only individuals should disable ;; the startup message. -diff -ruN -x '*~' -x '*CVS*' emacs/mangle-info emacs.patched/mangle-info + (setq inhibit-startup-message nil) +diff -ruN -x '*~' emacs/mangle-info emacs.patched/mangle-info --- emacs/mangle-info 1969-12-31 19:00:00.000000000 -0500 -+++ emacs.patched/mangle-info 2005-11-13 18:44:17.000000000 -0500 -@@ -0,0 +1,17 @@ ++++ emacs.patched/mangle-info 2006-06-26 11:09:36.000000000 -0400 +@@ -0,0 +1,18 @@ +#!/usr/bin/perl -w -i + +use English; @@ -125,9 +127,10 @@ +print ${PREMATCH}; +print "$1($prefix/$2)"; +print ${POSTMATCH}; -diff -ruN -x '*~' -x '*CVS*' emacs/src/Makefile.in emacs.patched/src/Makefile.in ---- emacs/src/Makefile.in 2005-11-03 17:39:37.000000000 -0500 -+++ emacs.patched/src/Makefile.in 2005-11-17 18:50:36.000000000 -0500 ++ +diff -ruN -x '*~' emacs/src/Makefile.in emacs.patched/src/Makefile.in +--- emacs/src/Makefile.in 2006-05-18 13:05:36.000000000 -0400 ++++ emacs.patched/src/Makefile.in 2006-06-24 13:43:08.000000000 -0400 @@ -435,7 +435,7 @@ #if HAVE_GIF Index: emacs22.info =================================================================== RCS file: /cvsroot/fink/experimental/todai/ecc-10.4/main/finkinfo/editors/emacs22.info,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- emacs22.info 16 Mar 2006 07:14:25 -0000 1.1.1.1 +++ emacs22.info 30 Jun 2006 16:40:23 -0000 1.2 @@ -1,7 +1,7 @@ Info2: << Package: emacs22%type_pkg[uitype] Version: 22.0.50 -Revision: 20051113-1002 +Revision: 20060624-1000ecc1 Type: uitype (. -nox -gtk) Description: Flexible real-time text editor License: GPL @@ -48,9 +48,9 @@ << Conflicts: emacs22,emacs22-nox,emacs22-gtk, emacs22-carbon (<< 22.0.50.cvs20060118-1) Replaces: emacs22,emacs22-nox,emacs22-gtk, emacs22-carbon (<< 22.0.50.cvs20060118-1) -Source: http://www-personal.umich.edu/~smaret/download/fink/emacs-%v-20051113.tar.gz +Source: http://www-personal.umich.edu/~smaret/download/fink/emacs-%v-20060624.tar.gz SourceDirectory: emacs -Source-MD5: 46eb867aaa4b77d6c0316777fe49c6ce +Source-MD5: 6437e52890ef53c73183d98f415577e1 Patch: emacs22.patch NoSetMAKEFLAGS: true SetMAKEFLAGS: -j1 @@ -135,9 +135,10 @@ # Since we're placing our info files in a subdirectory of %p/share/info # we need to manually add each doc to the info dir-file for file in ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq \ - eintr elisp emacs emacs-mime emacs-xtra eshell eudc flymake forms \ - gnus idlwave info message mh-e pcl-cvs pgg reftex sc ses sieve \ - smtpmail speedbar tramp vip viper widget woman + elisp eintr emacs emacs-mime eshell eudc flymake \ + forms gnus idlwave info message mh-e newsticker org pcl-cvs \ + pgg reftex sc ses sieve speedbar tramp vip viper widget \ + woman smtpmail url rcirc erc do install-info --infodir=%p/share/info --section Emacs Emacs %p/share/info/emacs-22/${file} done @@ -145,9 +146,10 @@ PreRmScript: << # Manually remove all of our info docs from the dir-file for file in ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq \ - eintr elisp emacs emacs-mime emacs-xtra eshell eudc flymake forms \ - gnus idlwave info message mh-e pcl-cvs pgg reftex sc ses sieve \ - smtpmail speedbar tramp vip viper widget woman + elisp eintr emacs emacs-mime eshell eudc flymake \ + forms gnus idlwave info message mh-e newsticker org pcl-cvs \ + pgg reftex sc ses sieve speedbar tramp vip viper widget \ + woman smtpmail url rcirc erc do install-info --infodir=%p/share/info --remove-exactly emacs-22/${file} done |