Update of /cvsroot/fink/experimental/todai/ecc/main/finkinfo/editors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18146
Modified Files:
emacs22-carbon.info
Added Files:
emacs22.info emacs22.patch
Log Message:
* Enable co-existing of emacs22 and emacs22-carbon
* emacs22 Depend on passwd
* Reduce dependencies of emacs22
* --build-as-nobody
Index: emacs22-carbon.info
===================================================================
RCS file:
/cvsroot/fink/experimental/todai/ecc/main/finkinfo/editors/emacs22-carbon.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- emacs22-carbon.info 7 Mar 2006 09:06:21 -0000 1.2
+++ emacs22-carbon.info 13 Mar 2006 06:14:54 -0000 1.3
@@ -1,6 +1,6 @@
Package: emacs22-carbon
Version: 22.0.50.cvs20060118
-Revision: 2
+Revision: 3
BuildDepends: libncurses5, fink (>= 0.24.2)
Depends: emacsen-common, passwd, macosx
Provides: emacsen
@@ -51,7 +51,7 @@
SetMAKEFLAGS: -j1
SetCPPFLAGS: -DUSE_ATSUI
SetCFLAGS: -fconstant-cfstrings
-ConfigureParams: --build=%m-apple-darwin`uname -r|sed 's/\..*//'`
--infodir='${prefix}/share/info' --mandir='${prefix}/share/man'
--libexecdir='${prefix}/lib' --with-carbon --enable-carbon-appdir= --without-x
--without-gif --without-toolkit-scroll-bars
+ConfigureParams: --build=%m-apple-darwin`uname -r|sed 's/\\..*//'`
--infodir='${prefix}/share/info' --mandir='${prefix}/share/man'
--libexecdir='${prefix}/lib' --with-carbon --enable-carbon-appdir= --without-x
--without-gif --without-toolkit-scroll-bars
CompileScript: <<
#!/bin/sh -ev
@@ -88,7 +88,6 @@
# Install Everything (except Emacs.app)
make prefix=%i install
-case `id -u` in 0) chown games %i/var/games/%n/*;; esac
# Move some files to avoid conflicts with other emacsen
for f in %i/share/man/man1/{emacs.1,ctags.1,emacsclient.1,etags.1} \
@@ -129,7 +128,11 @@
PostInstScript: <<
# Remove CVS date from version number (%v) and append '-carbon' suffix
v=`expr "%v" : '\(.*\)\.cvs'`-carbon
+libdir=%p/lib/emacs/$v/%m-apple-darwin`uname -r|sed 's/\\..*//'`
+chown games:admin $libdir/update-game-score
+chmod 4755 $libdir/update-game-score
+chown -R games:admin %p/var/games/%n
mkdir -p %p/etc/lisp/emacs/$v/site-lisp
mkdir -p %p/etc/lisp/emacs/site-lisp
--- NEW FILE: emacs22.patch ---
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 @@
(cd $${dir}; tar -chf - . ) \
| (cd $${dest}; umask 022; \
tar -xvf - && cat > /dev/null) || exit 1; \
- find $${dest} -exec chown $${LOGNAME:-$$USERNAME} {} ';' ;\
+ find $${dest} -exec chown root:admin {} ';' ;\
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} ..." ; \
(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*; \
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} ..." ; \
(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 {} ';') ; \
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
@@ -1359,7 +1359,7 @@
etcdir='${datadir}/emacs/${version}/etc'
archlibdir='${libexecdir}/emacs/${version}/${configuration}'
docdir='${datadir}/emacs/${version}/etc'
-gamedir='${localstatedir}/games/emacs'
+gamedir='${localstatedir}/games/emacs22'
gameuser=games
@@ -12503,9 +12503,9 @@
fi
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
-fi
+#fi
fi
diff -ruN -x '*~' -x '*CVS*' 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 @@
+#!/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
+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 @@
(defvar normal-top-level-add-subdirs-inode-list nil)
+(defconst fink-emacs-flavor 'emacs22
+ "A symbol representing the particular fink flavor of emacs running.
+Something like 'emacs20, 'xemacs20, etc.")
+
(defvar no-blinking-cursor nil)
(defvar default-frame-background-mode)
@@ -796,8 +800,18 @@
;; 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))
+
+ ;; 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)))
;; Sites should not disable this. Only individuals should disable
;; the startup message.
diff -ruN -x '*~' -x '*CVS*' 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 @@
+#!/usr/bin/perl -w -i
+
+use English;
+use strict;
+
+$RS = undef;
+
+my $prefix = "emacs-22";
+
+my $x = <>;
+if(!($x =~ m/^(\s*START-INFO-DIR-ENTRY\s+\*\s*[^:]+:\s*)\(([^\)]+)\)/mo)) {
+ die "Couldn't find START-INFO-DIR-ENTRY.";
+}
+
+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
@@ -435,7 +435,7 @@
#if HAVE_GIF
#ifndef LIBGIF
-#define LIBGIF -lungif
+#define LIBGIF -lgif
#endif /* not defined LIBGIF */
#else /* not HAVE_GIF */
#define LIBGIF
--- NEW FILE: emacs22.info ---
Info2: <<
Package: emacs22%type_pkg[uitype]
Version: 22.0.50
Revision: 20051113-1
Type: uitype (. -nox -gtk)
Description: Flexible real-time text editor
License: GPL
Maintainer: Sebastien Maret <[EMAIL PROTECTED]>
Provides: emacsen
Depends: <<
emacsen-common,
ncurses,
libncurses5-shlibs,
passwd,
(%type_raw[uitype] = .) x11,
(%type_raw[uitype] = .) libpng3-shlibs (>= 1.2.5-4),
(%type_raw[uitype] = .) libtiff-shlibs,
(%type_raw[uitype] = .) libjpeg-shlibs,
(%type_raw[uitype] = .) giflib-shlibs | (%type_raw[uitype] = .)
libungif-shlibs (>= 4.1.0final),
(%type_raw[uitype] = -gtk) x11,
(%type_raw[uitype] = -gtk) libgettext3-shlibs,
(%type_raw[uitype] = -gtk) libiconv,
(%type_raw[uitype] = -gtk) libpng3-shlibs (>= 1.2.5-4),
(%type_raw[uitype] = -gtk) libtiff-shlibs,
(%type_raw[uitype] = -gtk) libjpeg-shlibs,
(%type_raw[uitype] = -gtk) giflib-shlibs | (%type_raw[uitype] = -gtk)
libungif-shlibs (>= 4.1.0final),
(%type_raw[uitype] = -gtk) gtk+2-shlibs
<<
BuildDepends: <<
libncurses5,
texinfo,
(%type_raw[uitype] = .) x11-dev,
(%type_raw[uitype] = .) libpng3 (>= 1.2.5-4),
(%type_raw[uitype] = .) libtiff,
(%type_raw[uitype] = .) libjpeg,
(%type_raw[uitype] = .) giflib | (%type_raw[uitype] = .) libungif (>=
4.1.0final),
(%type_raw[uitype] = -gtk) libpng3 (>= 1.2.5-4),
(%type_raw[uitype] = -gtk) libtiff,
(%type_raw[uitype] = -gtk) libjpeg,
(%type_raw[uitype] = -gtk) giflib | (%type_raw[uitype] = -gtk) libungif (>=
4.1.0final),
(%type_raw[uitype] = -gtk) x11-dev,
(%type_raw[uitype] = -gtk) libgettext3-dev,
(%type_raw[uitype] = -gtk) libiconv-dev,
(%type_raw[uitype] = -gtk) atk1 (>= 1.6.0-1),
(%type_raw[uitype] = -gtk) glib2-dev (>= 2.6.0-1),
(%type_raw[uitype] = -gtk) gtk+2-dev,
(%type_raw[uitype] = -gtk) pango1-xft2-dev (>= 1.8.0-1)
<<
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
SourceDirectory: emacs
Source-MD5: 46eb867aaa4b77d6c0316777fe49c6ce
Patch: emacs22.patch
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
ConfigureParams: --build=%m-apple-darwin`uname -r|sed 's/\\..*//'`
--infodir='${prefix}/share/info' --mandir='${prefix}/share/man'
--libexecdir='${prefix}/lib'
CompileScript: <<
#!/bin/bash -e
if [ "%type_raw[uitype]" == "-nox" ]; then
./configure %c --without-x
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
fi
make bootstrap MAKEINFO="LC=ALL=C %p/bin/makeinfo --force"
<<
InstallScript: <<
make install prefix=%i
rm %i/bin/emacs
mv %i/share/man/man1/emacs.1 %i/share/man/man1/emacs.1.emacs22
mv %i/bin/ctags %i/bin/ctags.emacs22
mv %i/share/man/man1/ctags.1 %i/share/man/man1/ctags.1.emacs22
mv %i/bin/emacsclient %i/bin/emacsclient.emacs22
mv %i/share/man/man1/emacsclient.1 %i/share/man/man1/emacsclient.1.emacs22
mv %i/bin/etags %i/bin/etags.emacs22
mv %i/share/man/man1/etags.1 %i/share/man/man1/etags.1.emacs22
mv %i/bin/b2m %i/bin/b2m.emacs22
mv %i/bin/rcs-checkin %i/bin/rcs-checkin.emacs22
mv %i/bin/ebrowse %i/bin/ebrowse.emacs22
mv %i/bin/grep-changelog %i/bin/grep-changelog.emacs22
mkdir -p %i/share/doc/%n
install -m 644 README %i/share/doc/%n/
install -m 644 src/COPYING %i/share/doc/%n/COPYING
mkdir -p %i/etc/emacs
mkdir -p %i/etc/emacs22/site-start.d
mkdir -p %i/share/emacs22
mv %i/share/emacs/%v/site-lisp %i/share/emacs22/
(cd %i/share/emacs/%v; ln -s ../../emacs22/site-lisp site-lisp)
(cd %i/bin; chmod 755 emacs-%v; ln -s emacs-%v emacs22)
mv %i/share/info %i/share/emacs-22.info
mkdir -p %i/share/info
mv %i/share/emacs-22.info %i/share/info/emacs-22
rm %i/share/info/emacs-22/dir %i/share/info/emacs-22/dir.old
chmod 755 mangle-info
chmod 755 fix-info
./fix-info %i/share/info/emacs-22
chown -R root:admin %i/share/emacs/%v/etc
chown -R root:admin %i/share/emacs/%v/lisp
chown -R root:admin %i/share/emacs/%v/leim
chmod 755 %i/share/emacs/%v/leim/ja-dic
chmod 755 %i/share/emacs/%v/leim/quail
rm %i/share/emacs/site-lisp/subdirs.el
<<
#
PostInstScript: <<
libdir=%p/lib/emacs/%v/%m-apple-darwin`uname -r|sed 's/\\..*//'`
chown games:admin $libdir/update-game-score
chmod 4755 $libdir/update-game-score
chown -R games:admin %p/var/games/emacs22
mkdir -p %p/etc/lisp/emacs/%v/site-lisp
mkdir -p %p/etc/lisp/emacs/site-lisp
update-alternatives --install %p/bin/emacs emacs %p/bin/emacs22 40
--slave %p/share/man/man1/emacs.1 emacs.1 %p/share/man/man1/emacs.1.emacs22
update-alternatives --install %p/bin/ctags ctags %p/bin/ctags.emacs22 40
--slave %p/share/man/man1/ctags.1 ctags.1 %p/share/man/man1/ctags.1.emacs22
update-alternatives --install %p/bin/etags etags %p/bin/etags.emacs22 60
--slave %p/share/man/man1/etags.1 etags.1 %p/share/man/man1/etags.1.emacs22
update-alternatives --install %p/bin/emacsclient emacsclient
%p/bin/emacsclient.emacs22 40
update-alternatives --install %p/bin/b2m b2m %p/bin/b2m.emacs22 40
update-alternatives --install %p/bin/rcs-checkin rcs-checkin
%p/bin/rcs-checkin.emacs22 40
update-alternatives --install %p/bin/ebrowse ebrowse %p/bin/ebrowse.emacs22 40
update-alternatives --install %p/bin/grep-changelog grep-changelog
%p/bin/grep-changelog.emacs22 40
# redundant but apparently necessary since doing it in the build script
# isn't actually making the change when the .deb is unpacked (why?)
chmod 755 %p/share/emacs/%v/leim/ja-dic
chmod 755 %p/share/emacs/%v/leim/quail
# Register ourselves with emacsen-common
%p/lib/emacsen-common/emacs-install emacs22
# 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
do
install-info --infodir=%p/share/info --section Emacs Emacs
%p/share/info/emacs-22/${file}
done
<<
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
do
install-info --infodir=%p/share/info --remove-exactly emacs-22/${file}
done
if [ $1 != "upgrade" ]; then
update-alternatives --remove emacs %p/bin/emacs22
update-alternatives --remove emacsclient %p/bin/emacsclient.emacs22
update-alternatives --remove ctags %p/bin/ctags.emacs22
update-alternatives --remove etags %p/bin/etags.emacs22
update-alternatives --remove b2m %p/bin/b2m.emacs22
update-alternatives --remove rcs-checkin %p/bin/rcs-checkin.emacs22
update-alternatives --remove ebrowse %p/bin/ebrowse.emacs22
update-alternatives --remove grep-changelog %p/bin/grep-changelog.emacs22
%p/lib/emacsen-common/emacs-remove emacs22
fi
<<
#
DescDetail: <<
GNU Emacs is an extensible, customizable, self-documenting real-time
display editor. Through its extensibility, it is actually much more
than an editor. You can use it as a file manager, mail reader, web
browser, and for many other tasks. Some people even use it to control
their coffee machine.
<<
DescPackaging: <<
update-alternatives is used for emacs, emacsclient, ctags, etags, b2m
rcs-checkin, ebrowse, and grep-changelog to allow parallel installation
of emacs22 & xemacs.
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 before the 'make' we first do
`make bootstrap'.
Original packages by Christoph Pfister and Christian Swinehart
<<
ConfFiles: %p/var/games/emacs22/tetris-scores %p/var/games/emacs22/snake-scores
DescPort: <<
The patchfile modifies startup.el, and brings in the scripts fix-info and
mangle-info, in order to implement our emacs packaging system.
<<
Homepage: http://www.gnu.org/software/emacs/
<<
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
