Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/editors
In directory sc8-pr-cvs17:/tmp/cvs-serv1255/10.3/unstable/main/finkinfo/editors
Modified Files:
emacs22-carbon.info emacs22-carbon.patch
Log Message:
Emacs 22.1 with newer patches from MacEmacs JP project.
Index: emacs22-carbon.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/editors/emacs22-carbon.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- emacs22-carbon.info 20 Mar 2006 09:48:50 -0000 1.5
+++ emacs22-carbon.info 8 Jun 2007 17:43:28 -0000 1.6
@@ -1,30 +1,32 @@
Package: emacs22-carbon
-Version: 22.0.50.cvs20060316
-Revision: 2
-BuildDepends: libncurses5, fink (>= 0.24.2)
-Depends: emacsen-common, ncurses, libncurses5-shlibs, passwd, macosx
+Version: 22.1
+Revision: 1001
+BuildDepends: libncurses5 (>= 5.4-20041023-1006), fink (>= 0.24.2)
+Depends: emacsen-common, ncurses (>= 5.4-20041023-1006), libncurses5-shlibs
(>= 5.4-20041023-1006), passwd, macosx
Provides: emacsen
-Source: http://www.j10n.org/files/emacs-%v.tar.bz2
-Source-MD5: 064017da151f696b84a00b07c80d888e
-Source2:
http://downloads.sourceforge.jp/macemacsjp/19409/inline_patch-20060319.tar.gz
-Source2-MD5: 420dc2bf2899a1e0a33391ae3ba8a404
-Source3:
http://downloads.sourceforge.jp/macemacsjp/16865/transparency-2.1.1.tar.gz
-Source3-MD5: fcc6c8803c31c1081c5b26bcb90d4c46
-Source4:
http://downloads.sourceforge.jp/macemacsjp/16789/fixed-width-fontset-0.9.0.tar.gz
-Source4-MD5: dabad41eb11f64d5351ff628ca8a11e7
+Source: mirror:gnu:emacs/emacs-%v.tar.gz
+Source-MD5: 6949df37caec2d7a2e0eee3f1b422726
+Source2:
http://downloads.sourceforge.jp/macemacsjp/25700/inline_patch-1.0.0.tar.gz
+Source2-MD5: ebc70f5a148d908b5b5435bad6b966f0
+Source3:
http://downloads.sourceforge.jp/macemacsjp/24136/transparency-3.0.0.tar.gz
+Source3-MD5: 32ec78ce70a85b3fb9cc409ab2a96fbb
+Source4:
http://downloads.sourceforge.jp/macemacsjp/25668/fixed-width-fontset.1.0.0.tar.gz
+Source4-MD5: ef2d0b570d408e256a11ca73a8877d64
Source5: http://downloads.sourceforge.jp/macemacsjp/17718/mac-functions.patch
Source5Rename: mac-functions-20051116.patch
Source5-MD5: 6d122157a8c1c98b2b569e07da545206
-Source6: http://downloads.sourceforge.jp/macemacsjp/17715/utf-8m.el
-Source6Rename: utf-8m-20051124.el
-Source6-MD5: 54197bdbfcca0755be10625bef2d9ea6
+Source6: http://downloads.sourceforge.jp/macemacsjp/23457/utf-8m.el
+Source6Rename: utf-8m-20070105.el
+Source6-MD5: 779d181fa3b5ba5b2b30f1ec8aa995e7
+Source7: http://downloads.sourceforge.jp/macemacsjp/24135/hide_menubar.tar.gz
+Source7Rename: hide_menubar-0.2.0.tar.gz
+Source7-MD5: df47c265c220ed6ea4aaf4f5887772fb
Description: Flexible real-time text editor, Aqua native
DocFiles: <<
AUTHORS COPYING README mac/README:mac.README
- ../transparency2/readme:transparency2.readme
- ../transparency2/readme.ja:transparency2.readme.ja
- ../fixed-width-fontset/readme:fixed-width-fontset.readme
- ../fixed-width-fontset/readme.ja:fixed-width-fontset.readme.ja
+ ../transparency*/readme:transparency.readme
+ ../fixed-width-fontset.*/readme:fixed-width-fontset.readme
+ ../fixed-width-fontset.*/readme.ja:fixed-width-fontset.readme.ja
<<
ConfFiles: %p/var/games/%n/tetris-scores %p/var/games/%n/snake-scores
AppBundles: finktmp/mac/Emacs22.app
@@ -33,18 +35,19 @@
#!/bin/sh -ev
# Remove CVS date from version number (%v) and append '-carbon' suffix
-v=`expr "%v" : '\(.*\)\.cvs'`-carbon
+v=`echo "%v"|sed 's/\.cvs.*$//'`-carbon
sed -e 's|@PREFIX@|%p|g' \
-e 's|@EMACS-FLAVOR@|%n|g' \
-e "s|@EMACS-VERSION@|$v|g" \
%a/%n.patch | patch -p1
-/usr/bin/patch -p0 -i ../inline_patch-*/emacs-inline.patch
-/usr/bin/patch -p0 -i ../transparency2/transparency2.patch
+sed 's/:init-value t/:init-value nil/;s/mac_input_method_mode =
1/mac_input_method_mode = 0/' ../inline_patch-*/emacs-inline.patch | patch -p0
+/usr/bin/patch -p0 -i ../transparency*/transparency*.patch
mkdir finktmp
-cp ../fixed-width-fontset/carbon-font.el
../fixed-width-fontset/fixed-width-fontset.el finktmp
+cp ../fixed-width-fontset.*/carbon-font.el
../fixed-width-fontset.*/fixed-width-fontset.el finktmp
/usr/bin/patch -p0 -i ../mac-functions-*.patch
cp ../utf-8m-*.el finktmp/utf-8m.el
+/usr/bin/patch -p1 -i ../hide_menubar.patch
<<
SetMAKEFLAGS: -j1
@@ -55,8 +58,9 @@
#!/bin/sh -ev
# Remove CVS date from version number (%v) and append '-carbon' suffix
-v=`expr "%v" : '\(.*\)\.cvs'`-carbon
+v=`echo "%v"|sed 's/\.cvs.*$//'`-carbon
+set +v
case `uname -r` in
7.*)
if fgrep -q '7.0.4'
/System/Library/Frameworks/QuickTime.framework/Resources/version.plist; then
@@ -66,6 +70,7 @@
exit 1
fi;;
esac
+set -v
./configure %c
# Sync .elc's with patched .el's
(cd src && make bootstrap) || exit
@@ -83,7 +88,7 @@
#!/bin/sh -ev
# Remove CVS date from version number (%v) and append '-carbon' suffix
-v=`expr "%v" : '\(.*\)\.cvs'`-carbon
+v=`echo "%v"|sed 's/\.cvs.*$//'`-carbon
# Install Everything (except Emacs.app)
make prefix=%i install
@@ -125,7 +130,7 @@
PostInstScript: <<
# Remove CVS date from version number (%v) and append '-carbon' suffix
-v=`expr "%v" : '\(.*\)\.cvs'`-carbon
+v=`echo "%v"|sed 's/\.cvs.*$//'`-carbon
libdir=%p/lib/emacs/$v/%m-apple-darwin`uname -r|sed 's/\\..*//'`
chown games:admin $libdir/update-game-score
@@ -159,10 +164,11 @@
# we need to manually add each doc to the info dir-file
# NOTE: list of info docs also present in prerm script and "fixinfo"
# included in the emacs22-carbon.patch
-for file in ada-mode autotype ccmode cl dired-x ebrowse ediff efaq eintr \
- elisp emacs emacs-mime emacs-xtra eshell eudc forms gnus idlwave \
- info message mh-e newsticker org pcl-cvs pgg reftex sc ses sieve \
- smtpmail speedbar tramp url vip viper widget woman
+for file in ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq \
+ 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 "Carbon Emacs" "Carbon Emacs" %p/share/info/%n/${file}
@@ -171,13 +177,14 @@
PreRmScript: <<
# Remove CVS date from version number (%v) and append '-carbon' suffix
-v=`expr "%v" : '\(.*\)\.cvs'`-carbon
+v=`echo "%v"|sed 's/\.cvs.*$//'`-carbon
# Manually remove all of our info docs from the dir-file
-for file in ada-mode autotype ccmode cl dired-x ebrowse ediff efaq eintr \
- elisp emacs emacs-mime emacs-xtra eshell eudc forms gnus idlwave \
- info message mh-e newsticker org pcl-cvs pgg reftex sc ses sieve \
- smtpmail speedbar tramp url vip viper widget woman
+for file in ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq \
+ 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 --remove-exactly %n/${file}
done
@@ -233,22 +240,6 @@
The patchfile modifies startup.el, and brings in the scripts fix-info and
mangle-info, in order to implement our emacs packaging system.
-
-Since this package comes from the CVS repository none of the elisp files
-are byte-compiled by default. So before making the source tarball used by
-fink the CVS version must first be `make bootstrap'ed then the .elc's
-produced are injected into a fresh copy of the source tree and tarred
-up again. If .el's are patched, .elc's are updated by `make recompile'.
-
-How to make tarball containing .elc's:
-$ cvs -d :pserver:[EMAIL PROTECTED]:/sources/emacs login
-<password is empty>
-$ cvs -d :pserver:[EMAIL PROTECTED]:/sources/emacs co \
- -d emacs-%v -D "dd mm yyyy UTC" emacs
-$ cd emacs-%v
-$ ./configure --without-carbon --without-x
-$ make bootstrap MAKEINFO="LC_ALL=C %p/bin/makeinfo --force"
-$ make distclean
<<
DescUsage: <<
You can launch emacs22-carbon, not just by double-clicking, but also by typing
@@ -260,7 +251,9 @@
If you want to input characters via MacIM in inline style, add your .emacs.el:
(if (eq window-system 'mac)
- (mac-setup-inline-input-method))
+ (mac-input-method-mode t))
+There are some problems around "inline patch"; Japanese people may prefer
+emacs22-carbon-22.0.50.cvs20060319.
<<
License: GPL
Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
Index: emacs22-carbon.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/editors/emacs22-carbon.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- emacs22-carbon.patch 19 Mar 2006 18:41:27 -0000 1.2
+++ emacs22-carbon.patch 8 Jun 2007 17:43:28 -0000 1.3
@@ -1,6 +1,6 @@
-diff -Naur --exclude=*.orig emacs-22.0.50.cvs20060316.orig/01carbon-emacs.el
emacs-22.0.50.cvs20060316/01carbon-emacs.el
---- emacs-22.0.50.cvs20060316.orig/01carbon-emacs.el Thu Jan 1 00:00:00 1970
-+++ emacs-22.0.50.cvs20060316/01carbon-emacs.el Mon Mar 6 15:42:52 2006
+diff -Naur emacs-22.1.orig/01carbon-emacs.el emacs-22.1/01carbon-emacs.el
+--- emacs-22.1.orig/01carbon-emacs.el 1970-01-01 00:00:00.000000000 +0000
++++ emacs-22.1/01carbon-emacs.el 2007-06-08 13:59:50.000000000 +0000
@@ -0,0 +1,13 @@
+(if (eq window-system 'mac)
+ (progn
@@ -15,51 +15,51 @@
+ ;; inline image support
+ (auto-image-file-mode)
+ ))
-diff -Naur --exclude=*.orig emacs-22.0.50.cvs20060316.orig/Emacs.finkwrap
emacs-22.0.50.cvs20060316/Emacs.finkwrap
---- emacs-22.0.50.cvs20060316.orig/Emacs.finkwrap Thu Jan 1 00:00:00 1970
-+++ emacs-22.0.50.cvs20060316/Emacs.finkwrap Mon Mar 6 15:42:52 2006
+diff -Naur emacs-22.1.orig/Emacs.finkwrap emacs-22.1/Emacs.finkwrap
+--- emacs-22.1.orig/Emacs.finkwrap 1970-01-01 00:00:00.000000000 +0000
++++ emacs-22.1/Emacs.finkwrap 2006-03-06 15:42:52.000000000 +0000
@@ -0,0 +1,3 @@
+#!/bin/bash
+. @PREFIX@/bin/init.sh
+exec -a "$0" "$0.bin" "$@"
-diff -Naur --exclude=*.orig emacs-22.0.50.cvs20060316.orig/Makefile.in
emacs-22.0.50.cvs20060316/Makefile.in
---- emacs-22.0.50.cvs20060316.orig/Makefile.in Fri Mar 3 12:00:55 2006
-+++ emacs-22.0.50.cvs20060316/Makefile.in Sun Mar 19 12:43:18 2006
-@@ -422,8 +422,7 @@
+diff -Naur emacs-22.1.orig/Makefile.in emacs-22.1/Makefile.in
+--- emacs-22.1.orig/Makefile.in 2007-05-14 14:56:28.000000000 +0000
++++ emacs-22.1/Makefile.in 2007-06-07 13:14:37.000000000 +0000
+@@ -436,8 +436,7 @@
&& (echo "Copying $${dir} to $${dest}..." ; \
(cd $${dir}; tar -chf - . ) \
| (cd $${dest}; umask 022; \
- tar -xvf - && cat > /dev/null) || exit 1; \
- find $${dest} -exec chown $${LOGNAME:-$$USERNAME} {} ';' ;\
-+ gtar -xvf - --no-same-owner --no-same-permissions && cat >
/dev/null) || exit 1; \
++ tar -xvf - --no-same-owner --no-same-permissions && cat >
/dev/null) || exit 1; \
for subdir in `find $${dest} -type d ! -name RCS ! -name CVS
-print` ; do \
chmod a+rx $${subdir} ; \
rm -rf $${subdir}/RCS ; \
-@@ -462,8 +461,8 @@
+@@ -476,8 +475,8 @@
then \
echo "Copying etc/DOC-* to $(DESTDIR)${docdir} ..." ; \
(cd ./etc; tar -chf - 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}; umask 022; gtar -xvf - --no-same-owner
--no-same-permissions && cat > /dev/null) || exit 1; \
++ |(cd $(DESTDIR)${docdir}; umask 022; tar -xvf - --no-same-owner
--no-same-permissions && cat > /dev/null) || exit 1; \
+ (cd $(DESTDIR)$(docdir); chmod a+r DOC*; \
if test "`echo DOC-*`" != "DOC-*"; then rm DOC; fi); \
else true; fi
-unset CDPATH; \
-@@ -474,8 +473,7 @@
+@@ -488,8 +487,7 @@
then \
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; \
- (cd $(DESTDIR)${lispdir}; find . -exec chown $${LOGNAME:-$$USERNAME}
{} ';') ; \
-+ |(cd $(DESTDIR)${lispdir}; umask 022; gtar -xvf - --no-same-owner
--no-same-permissions && cat > /dev/null) || exit 1; \
++ |(cd $(DESTDIR)${lispdir}; umask 022; tar -xvf - --no-same-owner
--no-same-permissions && cat > /dev/null) || exit 1; \
else true; fi
-unset CDPATH; \
if [ -n "${GZIP_PROG}" ]; \
-diff -Naur --exclude=*.orig emacs-22.0.50.cvs20060316.orig/configure
emacs-22.0.50.cvs20060316/configure
---- emacs-22.0.50.cvs20060316.orig/configure Fri Mar 3 11:32:03 2006
-+++ emacs-22.0.50.cvs20060316/configure Sun Mar 19 12:36:55 2006
-@@ -1359,7 +1359,7 @@
+diff -Naur emacs-22.1.orig/configure emacs-22.1/configure
+--- emacs-22.1.orig/configure 2007-05-25 12:43:29.000000000 +0000
++++ emacs-22.1/configure 2007-06-07 13:14:37.000000000 +0000
+@@ -1807,7 +1807,7 @@
etcdir='${datadir}/emacs/${version}/etc'
archlibdir='${libexecdir}/emacs/${version}/${configuration}'
docdir='${datadir}/emacs/${version}/etc'
@@ -68,7 +68,7 @@
gameuser=games
-@@ -22782,6 +22782,7 @@
+@@ -22935,6 +22935,7 @@
echo "$as_me: error: can't find current emacs version in
\`${srcdir}/lisp/version.el'." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -76,31 +76,33 @@
### Specify what sort of things we'll be editing into Makefile and config.h.
### Use configuration here uncanonicalized to avoid exceeding size limits.
-diff -Naur --exclude=*.orig emacs-22.0.50.cvs20060316.orig/emacs.bash
emacs-22.0.50.cvs20060316/emacs.bash
---- emacs-22.0.50.cvs20060316.orig/emacs.bash Thu Jan 1 00:00:00 1970
-+++ emacs-22.0.50.cvs20060316/emacs.bash Mon Mar 6 15:42:52 2006
+diff -Naur emacs-22.1.orig/emacs.bash emacs-22.1/emacs.bash
+--- emacs-22.1.orig/emacs.bash 1970-01-01 00:00:00.000000000 +0000
++++ emacs-22.1/emacs.bash 2006-03-06 15:42:52.000000000 +0000
@@ -0,0 +1,3 @@
+#!/bin/bash
+exec -a "@PREFIX@/Applications/Emacs22.app/Contents/MacOS/Emacs" \
+ "@PREFIX@/Applications/Emacs22.app/Contents/MacOS/Emacs.bin" "$@"
-diff -Naur --exclude=*.orig emacs-22.0.50.cvs20060316.orig/fix-info
emacs-22.0.50.cvs20060316/fix-info
---- emacs-22.0.50.cvs20060316.orig/fix-info Thu Jan 1 00:00:00 1970
-+++ emacs-22.0.50.cvs20060316/fix-info Mon Mar 6 15:42:52 2006
-@@ -0,0 +1,10 @@
+diff -Naur emacs-22.1.orig/fix-info emacs-22.1/fix-info
+--- emacs-22.1.orig/fix-info 1970-01-01 00:00:00.000000000 +0000
++++ emacs-22.1/fix-info 2007-06-07 13:22:34.000000000 +0000
+@@ -0,0 +1,12 @@
+#!/bin/sh
+
+THE_INFO_PREFIX=$1
+
-+for file in ada-mode autotype ccmode cl dired-x ebrowse ediff efaq \
-+ emacs emacs-mime eshell eudc forms gnus idlwave info message mh-e
\
-+ pcl-cvs reftex sc speedbar vip viper widget woman
++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
+do
+ ./mangle-info ${THE_INFO_PREFIX}/${file}
+done
-diff -Naur --exclude=*.orig emacs-22.0.50.cvs20060316.orig/lisp/startup.el
emacs-22.0.50.cvs20060316/lisp/startup.el
---- emacs-22.0.50.cvs20060316.orig/lisp/startup.el Mon Feb 27 01:56:19 2006
-+++ emacs-22.0.50.cvs20060316/lisp/startup.el Sun Mar 19 12:36:55 2006
-@@ -289,6 +289,10 @@
+diff -Naur emacs-22.1.orig/lisp/startup.el emacs-22.1/lisp/startup.el
+--- emacs-22.1.orig/lisp/startup.el 2007-05-14 14:56:29.000000000 +0000
++++ emacs-22.1/lisp/startup.el 2007-06-07 13:14:37.000000000 +0000
+@@ -292,6 +292,10 @@
(defvar default-frame-background-mode)
@@ -111,7 +113,7 @@
(defvar pure-space-overflow nil
"Non-nil if building Emacs overflowed pure space.")
-@@ -806,8 +810,20 @@
+@@ -815,8 +819,20 @@
;; 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.
@@ -133,9 +135,9 @@
;; Sites should not disable this. Only individuals should disable
;; the startup message.
-diff -Naur --exclude=*.orig emacs-22.0.50.cvs20060316.orig/mangle-info
emacs-22.0.50.cvs20060316/mangle-info
---- emacs-22.0.50.cvs20060316.orig/mangle-info Thu Jan 1 00:00:00 1970
-+++ emacs-22.0.50.cvs20060316/mangle-info Mon Mar 6 15:42:52 2006
+diff -Naur emacs-22.1.orig/mangle-info emacs-22.1/mangle-info
+--- emacs-22.1.orig/mangle-info 1970-01-01 00:00:00.000000000 +0000
++++ emacs-22.1/mangle-info 2006-03-06 15:42:52.000000000 +0000
@@ -0,0 +1,17 @@
+#!/usr/bin/perl -w -i
+
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
