Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27597
Added Files:
emacs23.info emacs23.patch
Log Message:
New version
--- NEW FILE: emacs23.info ---
Info2: <<
Package: emacs23%type_pkg[uitype]
Version: 23.1
Revision: 1
Type: uitype (. -nox)
Description: Flexible real-time text editor
License: GPL
Maintainer: Sebastien Maret <bma...@users.sourceforge.net>
Provides: emacsen
Depends: <<
dbus,
dbus-shlibs,
emacsen-common,
libncurses5-shlibs (>= 5.4-20041023-1006),
ncurses (>= 5.4-20041023-1006),
passwd,
(%type_raw[uitype] = .) giflib-shlibs,
(%type_raw[uitype] = .) gtk+2-shlibs (>= 2.12.0-1),
(%type_raw[uitype] = .) libgettext3-shlibs,
(%type_raw[uitype] = .) libiconv,
(%type_raw[uitype] = .) libjpeg-shlibs,
(%type_raw[uitype] = .) libotf-shlibs,
(%type_raw[uitype] = .) libpng3-shlibs (>= 1:1.2.18-1),
(%type_raw[uitype] = .) librsvg2-shlibs,
(%type_raw[uitype] = .) libtiff-shlibs,
(%type_raw[uitype] = .) pango1-xft2-ft219 (>= 1.18.4-4),
(%type_raw[uitype] = .) x11
<<
BuildDepends: <<
dbus-dev,
fink (>= 0.24.12-1),
libncurses5 (>= 5.4-20041023-1006),
(%type_raw[uitype] = .) atk1 (>= 1.20.0-1),
(%type_raw[uitype] = .) cairo (>= 1.6-1),
(%type_raw[uitype] = .) expat1,
(%type_raw[uitype] = .) fontconfig2-dev (>= 2.4.1-1),
(%type_raw[uitype] = .) freetype219 (>= 2.3.5-1),
(%type_raw[uitype] = .) giflib,
(%type_raw[uitype] = .) glib2-dev (>= 2.14.0-1),
(%type_raw[uitype] = .) glitz,
(%type_raw[uitype] = .) gtk+2-dev (>= 2.12.0-1),
(%type_raw[uitype] = .) libgettext3-dev,
(%type_raw[uitype] = .) libiconv-dev,
(%type_raw[uitype] = .) libotf,
(%type_raw[uitype] = .) libjpeg,
(%type_raw[uitype] = .) libpng3 (>= 1:1.2.18-1),
(%type_raw[uitype] = .) librsvg2,
(%type_raw[uitype] = .) libtiff,
(%type_raw[uitype] = .) pango1-xft2-ft219-dev (>= 1.18.4-4),
(%type_raw[uitype] = .) pixman (>= 0.10.0-1),
(%type_raw[uitype] = .) pkgconfig (>= 0.21-1),
(%type_raw[uitype] = .) x11-dev
<<
Conflicts: emacs23, emacs23-nox
Replaces: emacs23, emacs23-nox
Source: mirror:gnu:emacs/emacs-%v.tar.gz
Source-MD5: a620d4452769d04ad8864d662f34f8dd
PatchFile: emacs23.patch
PatchFile-MD5: e4aa0f4c5511619fcfed690e4a1a8f80
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
SetCPPFLAGS: -I%p/lib/pango-ft219/include/pango-1.0
-I%p/lib/pango-ft219/include -I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I%p/lib/fontconfig2/include
NoSetLDFLAGS: true
SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib
-L%p/lib/fontconfig2/lib
SetLIBS: -L%p/lib
SetCFLAGS: -Os -pipe
ConfigureParams: --disable-dependency-tracking --infodir='${prefix}/share/info'
--mandir='${prefix}/share/man' --libexecdir='${prefix}/lib'
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
CompileScript: <<
#!/bin/bash -ev
if [ $UID -ne 0 ]; then echo "%n cannot be built with --build-as-nobody"; exit
1; fi
if [ "%type_raw[uitype]" == "-nox" ]; then
./configure %c --without-x
else
./configure %c --with-x --with-x-toolkit=gtk
fi
# Sync .elc's with patched .el's
(cd src && make bootstrap-emacs) || exit
(cd lisp && make recompile EMACS=../src/bootstrap-emacs) || exit
# Compile emacs with new *.elc
make
<<
InstallScript: <<
make install prefix=%i
rm %i/bin/emacs
mv %i/share/man/man1/emacs.1 %i/share/man/man1/emacs.1.emacs23
mv %i/bin/ctags %i/bin/ctags.emacs23
mv %i/share/man/man1/ctags.1 %i/share/man/man1/ctags.1.emacs23
mv %i/bin/emacsclient %i/bin/emacsclient.emacs23
mv %i/share/man/man1/emacsclient.1 %i/share/man/man1/emacsclient.1.emacs23
mv %i/bin/etags %i/bin/etags.emacs23
mv %i/share/man/man1/etags.1 %i/share/man/man1/etags.1.emacs23
mv %i/bin/b2m %i/bin/b2m.emacs23
mv %i/bin/rcs-checkin %i/bin/rcs-checkin.emacs23
mv %i/bin/ebrowse %i/bin/ebrowse.emacs23
mv %i/bin/grep-changelog %i/bin/grep-changelog.emacs23
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/emacs23/site-start.d
mkdir -p %i/share/emacs23
mv %i/share/emacs/%v/site-lisp %i/share/emacs23/
(cd %i/share/emacs/%v; ln -s ../../emacs23/site-lisp site-lisp)
(cd %i/bin; chmod 755 emacs-%v; ln -s emacs-%v emacs23)
mv %i/share/info %i/share/emacs-23.info
mkdir -p %i/share/info
mv %i/share/emacs-23.info %i/share/info/emacs-23
rm %i/share/info/emacs-23/dir %i/share/info/emacs-23/dir.old
chmod 755 mangle-info
chmod 755 fix-info
./fix-info %i/share/info/emacs-23
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: <<
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/emacs23 40
--slave %p/share/man/man1/emacs.1 emacs.1 %p/share/man/man1/emacs.1.emacs23
update-alternatives --install %p/bin/ctags ctags %p/bin/ctags.emacs23 40
--slave %p/share/man/man1/ctags.1 ctags.1 %p/share/man/man1/ctags.1.emacs23
update-alternatives --install %p/bin/etags etags %p/bin/etags.emacs23 60
--slave %p/share/man/man1/etags.1 etags.1 %p/share/man/man1/etags.1.emacs23
update-alternatives --install %p/bin/emacsclient emacsclient
%p/bin/emacsclient.emacs23 40
update-alternatives --install %p/bin/b2m b2m %p/bin/b2m.emacs23 40
update-alternatives --install %p/bin/rcs-checkin rcs-checkin
%p/bin/rcs-checkin.emacs23 40
update-alternatives --install %p/bin/ebrowse ebrowse %p/bin/ebrowse.emacs23 40
update-alternatives --install %p/bin/grep-changelog grep-changelog
%p/bin/grep-changelog.emacs23 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 emacs23
# 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 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 newsticker nxml-mode org pcl-cvs pgg rcirc \
reftex remember sasl 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-23/${file}
done
<<
PreRmScript: <<
# Manually remove all of our info docs from the dir-file
for file in 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 newsticker nxml-mode org pcl-cvs pgg rcirc \
reftex remember sasl sc ses sieve smtpmail speedbar tramp \
url vip viper widget woman
do
install-info --infodir=%p/share/info --remove-exactly emacs-23/${file}
done
if [ $1 != "upgrade" ]; then
update-alternatives --remove emacs %p/bin/emacs23
update-alternatives --remove emacsclient %p/bin/emacsclient.emacs23
update-alternatives --remove ctags %p/bin/ctags.emacs23
update-alternatives --remove etags %p/bin/etags.emacs23
update-alternatives --remove b2m %p/bin/b2m.emacs23
update-alternatives --remove rcs-checkin %p/bin/rcs-checkin.emacs23
update-alternatives --remove ebrowse %p/bin/ebrowse.emacs23
update-alternatives --remove grep-changelog %p/bin/grep-changelog.emacs23
%p/lib/emacsen-common/emacs-remove emacs23
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 emacs23 & xemacs.
Its info files are installed into the emacs23 subdirectory of
%p/share/info for the same reason.
Original packages by Christoph Pfister and Christian Swinehart
<<
ConfFiles: %p/var/games/emacs23/tetris-scores %p/var/games/emacs23/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/
<<
--- NEW FILE: emacs23.patch ---
diff --exclude='*~' -ruN emacs-23.1/configure emacs-23.1.patched/configure
--- emacs-23.1/configure 2009-07-29 17:12:00.000000000 +0200
+++ emacs-23.1.patched/configure 2009-08-26 16:55:27.000000000 +0200
@@ -1854,7 +1854,7 @@
etcdir='${datadir}/emacs/${version}/etc'
archlibdir='${libexecdir}/emacs/${version}/${configuration}'
docdir='${datadir}/emacs/${version}/etc'
-gamedir='${localstatedir}/games/emacs'
+gamedir='${localstatedir}/games/emacs23'
gameuser=games
@@ -14610,9 +14610,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
if test "$HAVE_GIF" = yes; then
diff --exclude='*~' -ruN emacs-23.1/fix-info emacs-23.1.patched/fix-info
--- emacs-23.1/fix-info 1970-01-01 01:00:00.000000000 +0100
+++ emacs-23.1.patched/fix-info 2009-08-26 17:44:01.000000000 +0200
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+THE_INFO_PREFIX=$1
+
+for file in 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 newsticker nxml-mode org pcl-cvs pgg rcirc \
+ reftex remember sasl sc ses sieve smtpmail speedbar tramp \
+ url vip viper widget woman
+do
+ ./mangle-info ${THE_INFO_PREFIX}/${file}
+done
\ No newline at end of file
diff --exclude='*~' -ruN emacs-23.1/lisp/startup.el
emacs-23.1.patched/lisp/startup.el
--- emacs-23.1/lisp/startup.el 2009-06-21 06:37:46.000000000 +0200
+++ emacs-23.1.patched/lisp/startup.el 2009-08-26 16:57:34.000000000 +0200
@@ -375,6 +375,10 @@
(defvar normal-top-level-add-subdirs-inode-list nil)
+(defconst fink-emacs-flavor 'emacs23
+ "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)
@@ -977,9 +981,19 @@
;; be loaded from site-run-file and wants to test if -q was given
;; should check init-file-user instead, since that is already set.
;; See cus-edit.el for an example.
- (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 screen.
(setq inhibit-startup-screen nil)
diff --exclude='*~' -ruN emacs-23.1/mangle-info emacs-23.1.patched/mangle-info
--- emacs-23.1/mangle-info 1970-01-01 01:00:00.000000000 +0100
+++ emacs-23.1.patched/mangle-info 2009-08-26 16:56:06.000000000 +0200
@@ -0,0 +1,18 @@
+#!/usr/bin/perl -w -i
+
+use English;
+use strict;
+
+$RS = undef;
+
+my $prefix = "emacs-23";
+
+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};
+
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
