Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv24805
Modified Files:
emacs22.patch emacs22.info
Log Message:
New version.
Index: emacs22.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/emacs22.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- emacs22.patch 26 Jun 2006 16:19:18 -0000 1.2
+++ emacs22.patch 12 Feb 2007 01:02:11 -0000 1.3
@@ -1,7 +1,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 @@
+diff -ruN -x '*~' emacs-22.0.93/Makefile.in emacs-22.0.93.patched/Makefile.in
+--- emacs-22.0.93/Makefile.in 2007-01-21 13:34:14.000000000 -0500
++++ emacs-22.0.93.patched/Makefile.in 2007-01-24 12:03:45.000000000 -0500
+@@ -432,7 +432,7 @@
(cd $${dir}; tar -chf - . ) \
| (cd $${dest}; umask 022; \
tar -xvf - && cat > /dev/null) || exit 1; \
@@ -10,7 +10,7 @@
for subdir in `find $${dest} -type d ! -name RCS ! -name CVS
-print` ; do \
chmod a+rx $${subdir} ; \
rm -rf $${subdir}/RCS ; \
-@@ -468,7 +468,7 @@
+@@ -472,7 +472,7 @@
echo "Copying etc/DOC-* to $(DESTDIR)${docdir} ..." ; \
(cd ./etc; tar -chf - DOC*) \
|(cd $(DESTDIR)${docdir}; umask 022; tar -xvf - && cat >
/dev/null) || exit 1; \
@@ -19,7 +19,7 @@
if test "`echo DOC-*`" != "DOC-*"; then rm DOC; fi); \
else true; fi
-unset CDPATH; \
-@@ -480,7 +480,7 @@
+@@ -484,7 +484,7 @@
echo "Copying lisp/*.el and lisp/*.elc to $(DESTDIR)${lispdir} ..."
; \
(cd lisp; tar -chf - *.el *.elc) \
|(cd $(DESTDIR)${lispdir}; umask 022; tar -xvf - && cat >
/dev/null) || exit 1; \
@@ -28,10 +28,10 @@
else true; fi
-unset CDPATH; \
if [ -n "${GZIP_PROG}" ]; \
-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 @@
+diff -ruN -x '*~' emacs-22.0.93/configure emacs-22.0.93.patched/configure
+--- emacs-22.0.93/configure 2007-01-22 19:37:53.000000000 -0500
++++ emacs-22.0.93.patched/configure 2007-01-24 12:03:45.000000000 -0500
+@@ -1806,7 +1806,7 @@
etcdir='${datadir}/emacs/${version}/etc'
archlibdir='${libexecdir}/emacs/${version}/${configuration}'
docdir='${datadir}/emacs/${version}/etc'
@@ -40,10 +40,10 @@
gameuser=games
-@@ -13006,9 +13006,9 @@
+@@ -13567,9 +13567,9 @@
fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5
- echo "${ECHO_T}$ac_cv_lib_ungif_EGifPutExtensionLast" >&6
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5
+ echo "${ECHO_T}$ac_cv_lib_ungif_EGifPutExtensionLast" >&6; }
-if test $ac_cv_lib_ungif_EGifPutExtensionLast = yes; then
+#if test $ac_cv_lib_ungif_EGifPutExtensionLast = yes; then
HAVE_GIF=yes
@@ -52,9 +52,9 @@
fi
-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 2006-06-26 11:07:22.000000000 -0400
+diff -ruN -x '*~' emacs-22.0.93/fix-info emacs-22.0.93.patched/fix-info
+--- emacs-22.0.93/fix-info 1969-12-31 19:00:00.000000000 -0500
++++ emacs-22.0.93.patched/fix-info 2007-01-24 12:03:45.000000000 -0500
@@ -0,0 +1,12 @@
+#!/bin/sh
+
@@ -69,10 +69,10 @@
+ ./mangle-info ${THE_INFO_PREFIX}/${file}
+done
\ 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 @@
+diff -ruN -x '*~' emacs-22.0.93/lisp/startup.el
emacs-22.0.93.patched/lisp/startup.el
+--- emacs-22.0.93/lisp/startup.el 2007-01-21 13:34:20.000000000 -0500
++++ emacs-22.0.93.patched/lisp/startup.el 2007-01-24 12:03:45.000000000
-0500
+@@ -288,6 +288,10 @@
(defvar normal-top-level-add-subdirs-inode-list nil)
@@ -83,7 +83,7 @@
(defvar no-blinking-cursor nil)
(defvar default-frame-background-mode)
-@@ -805,9 +809,19 @@
+@@ -809,9 +813,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.
@@ -106,9 +106,9 @@
;; Sites should not disable this. Only individuals should disable
;; the startup message.
(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 2006-06-26 11:09:36.000000000 -0400
+diff -ruN -x '*~' emacs-22.0.93/mangle-info emacs-22.0.93.patched/mangle-info
+--- emacs-22.0.93/mangle-info 1969-12-31 19:00:00.000000000 -0500
++++ emacs-22.0.93.patched/mangle-info 2007-01-24 12:03:45.000000000 -0500
@@ -0,0 +1,18 @@
+#!/usr/bin/perl -w -i
+
@@ -128,10 +128,10 @@
+print "$1($prefix/$2)";
+print ${POSTMATCH};
+
-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 @@
+diff -ruN -x '*~' emacs-22.0.93/src/Makefile.in
emacs-22.0.93.patched/src/Makefile.in
+--- emacs-22.0.93/src/Makefile.in 2007-01-21 13:34:41.000000000 -0500
++++ emacs-22.0.93.patched/src/Makefile.in 2007-01-24 12:03:45.000000000
-0500
+@@ -436,7 +436,7 @@
#if HAVE_GIF
#ifndef LIBGIF
Index: emacs22.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/emacs22.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- emacs22.info 10 Feb 2007 18:07:04 -0000 1.4
+++ emacs22.info 12 Feb 2007 01:02:11 -0000 1.5
@@ -1,7 +1,7 @@
Info2: <<
Package: emacs22%type_pkg[uitype]
-Version: 22.0.50-20060624
-Revision: 1001
+Version: 22.0.93
+Revision: 1000
Type: uitype (. -nox -gtk)
Description: Flexible real-time text editor
License: GPL
@@ -47,9 +47,8 @@
<<
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-22.0.50-20060624.tar.gz
-SourceDirectory: emacs
-Source-MD5: 6437e52890ef53c73183d98f415577e1
+Source: ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-%v.tar.gz
+Source-MD5: 4e768a1489e514fbb78d1a5f9c512846
Patch: emacs22.patch
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
@@ -61,9 +60,9 @@
elif [ "%type_raw[uitype]" == "-gtk" ]; then
./configure %c --without-carbon --with-x --with-x-toolkit=gtk
else
- ./configure %c --without-carbon --with-x --with-x-toolkit=no
+ ./configure %c --without-carbon --with-x --with-x-toolkit=lucid
fi
- make bootstrap
+ make
<<
InstallScript: <<
make install prefix=%i
@@ -129,10 +128,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 \
- 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
+ eintr elisp emacs emacs-mime erc eshell eudc flymake \
+ forms gnus idlwave info message mh-e newsticker org pcl-cvs \
+ pgg rcirc reftex sc ses sieve smtpmail speedbar tramp url \
+ vip viper widget woman
do
install-info --infodir=%p/share/info --section Emacs Emacs
%p/share/info/emacs-22/${file}
done
@@ -140,10 +139,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 \
- elisp eintr emacs emacs-mime eshell eudc flymake \
+ eintr elisp emacs emacs-mime erc 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
+ pgg rcirc reftex sc ses sieve smtpmail speedbar tramp url vip \
+ viper widget woman
do
install-info --infodir=%p/share/info --remove-exactly emacs-22/${file}
done
@@ -176,9 +175,6 @@
Its info files are installed into the emacs22 subdirectory of
%p/share/info for the same reason.
- Since this package comes from the CVS repository none of the elisp files
- are byte-compiled by default. So instead of 'make' we do `make bootstrap'.
-
Original packages by Christoph Pfister and Christian Swinehart
<<
ConfFiles: %p/var/games/emacs22/tetris-scores %p/var/games/emacs22/snake-scores
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
