Sébastien Maret <[EMAIL PROTECTED]> writes:

> On Dec 15, 2005, at 15:57, Brendan Cully wrote:
>
>> On Thursday, 15 December 2005 at 15:52, Sebastien Maret wrote:
>>> The following message is a courtesy copy of an article
>>> that has been posted to gmane.os.apple.fink.devel as well.
>>>
>>> Brendan Cully <[EMAIL PROTECTED]> writes:
>>>
>>>> Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/
>>>> finkinfo/net
>>>> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27005
>>>>
>>>> Added Files:
>>>>    erc.info erc.patch
>>>> Log Message:
>>>> New package from tracker #1236469
>>>
>>> Doesn't work for me. Emacs says that it can't open erc-compat.el.
>>> It's
>>> probably not byte-compiled and removed by:
>>>
>>> rm -f @PREFIX@/share/${FLAVOR}/site-lisp/erc/*.el;
>>>
>>> in the PostInstScript. Copying it from /sw/share/emacs/site-lisp/
>>> erc to
>>> /sw/share/emacs22/site-lisp/erc solves the problem.
>>
>> Bah. I spent a while arguing that the .el files should be removed, and
>> now this :)
>
> I think that removing the .el files is indeed a good idea (provided
> that they are byte-compiled of course), since emacs will use the .elc
> files anyway.
>
>> So, I guess either keep symlinks of all the *.el in the $FLAVOR
>> directories, or maybe just keep symlinks of *.el files that don't have
>> corresponding *.elc.
>
> I'd rather patch the Makefile so the erc-compat.el got byte-compiled.

I've implemented Sebastien's proposal; new info and patch file
attached.  It seems to work just fine with emacs21, emacs22, and
Brendan's system-emacs.

Jesse

Attachment: erc.info
Description: Binary data

diff -Naur --exclude='*~' erc-5.0.4/Makefile erc-5.0.4.fink/Makefile
--- erc-5.0.4/Makefile	2005-07-12 16:09:00.000000000 -0700
+++ erc-5.0.4.fink/Makefile	2005-12-15 19:24:49.000000000 -0800
@@ -2,8 +2,7 @@
 SNAPDIR=erc-$(VERSION)
 
 SPECIAL = erc-auto.el
-UNCOMPILED = erc-chess.el erc-bbdb.el erc-ibuffer.el erc-speak.el \
-		erc-speedbar.el erc-compat.el
+UNCOMPILED = erc-bbdb.el erc-chess.el erc-speak.el
 TESTING = erc-members.el erc-macs.el
 ALLSOURCE = $(wildcard *.el)
 SOURCE	= $(filter-out $(SPECIAL) $(UNCOMPILED) $(TESTING),$(ALLSOURCE))
diff -Naur --exclude='*~' erc-5.0.4/fink/README.fink erc-5.0.4.fink/fink/README.fink
--- erc-5.0.4/fink/README.fink	1969-12-31 16:00:00.000000000 -0800
+++ erc-5.0.4.fink/fink/README.fink	2005-12-14 14:16:59.000000000 -0800
@@ -0,0 +1,11 @@
+To use erc, add the form
+
+(require 'erc)
+
+to your emacs initialization file.  The main entry point into the
+system is the function `erc-select'.
+
+ERC is currently not compiled for XEmacs, since xemacs does not
+register itself with emacsen-common via emacs-install (as of December
+14, 2005).  However, ERC for XEmacs can be obtained using the XEmacs
+package system.
diff -Naur --exclude='*~' erc-5.0.4/fink/emacsen-install erc-5.0.4.fink/fink/emacsen-install
--- erc-5.0.4/fink/emacsen-install	1969-12-31 16:00:00.000000000 -0800
+++ erc-5.0.4.fink/fink/emacsen-install	2005-12-15 19:35:46.000000000 -0800
@@ -0,0 +1,41 @@
+#!/bin/bash -e
+#
+# install file for the fink erc emacs package.
+
+set -o posix
+
+FLAVOR=${1}
+
+echo >&2 "install/erc: Handling install of emacsen flavor ${FLAVOR}"
+
+if [ ${FLAVOR} == emacs20 ]
+then
+    echo "install/erc: Skipping unsupported flavor ${FLAVOR}"
+    exit 0
+fi
+
+if [ ${FLAVOR} == emacs ]
+then
+    echo "install/erc: Done."
+    exit 0
+fi
+
+echo >&2 -n "install/erc: Byte-compiling for ${FLAVOR}..."
+mkdir -p @PREFIX@/share/${FLAVOR}/site-lisp/erc;
+for i in erc-auto.el erc-autoaway.el erc-autojoin.el erc-backend.el erc-bbdb.el erc-button.el erc-chess.el erc-compat.el erc-complete.el erc-dcc.el erc-ezbounce.el erc-fill.el erc-goodies.el erc-ibuffer.el erc-identd.el erc-imenu.el erc-lang.el erc-list.el erc-log.el erc-maint.el erc-match.el erc-menu.el erc-nets.el erc-netsplit.el erc-nicklist.el erc-nickserv.el erc-notify.el erc-page.el erc-pcomplete.el erc-replace.el erc-ring.el erc-sound.el erc-speak.el erc-speedbar.el erc-stamp.el erc-track.el erc-truncate.el erc-xdcc.el erc.el erc-auto.in Makefile; do 
+    cp @PREFIX@/share/emacs/site-lisp/erc/${i} @PREFIX@/share/${FLAVOR}/site-lisp/erc/${i};
+done
+
+cd @PREFIX@/share/${FLAVOR}/site-lisp/erc;
+
+(make EMACS=${FLAVOR} --keep-going 2>&1) | gzip -9qf > @PREFIX@/share/doc/erc/CompilationLog-${FLAVOR}.gz
+
+rm -f @PREFIX@/share/${FLAVOR}/site-lisp/erc/Makefile;
+rm -f @PREFIX@/share/${FLAVOR}/site-lisp/erc/erc-auto.in
+rm -f @PREFIX@/share/${FLAVOR}/site-lisp/erc/erc-auto.el~;
+rm -f @PREFIX@/share/${FLAVOR}/site-lisp/erc/*.el;
+
+echo >&2 "done."
+echo >&2 "install/erc: Compilation log saved in @PREFIX@/share/doc/erc/CompilationLog-${FLAVOR}.gz."
+
+exit 0
diff -Naur --exclude='*~' erc-5.0.4/fink/emacsen-remove erc-5.0.4.fink/fink/emacsen-remove
--- erc-5.0.4/fink/emacsen-remove	1969-12-31 16:00:00.000000000 -0800
+++ erc-5.0.4.fink/fink/emacsen-remove	2005-12-14 16:42:34.000000000 -0800
@@ -0,0 +1,21 @@
+#!/bin/bash -e
+#
+# This is the Fink version of the erc emacs package.
+set -o posix
+
+FLAVOR=${1}
+
+echo "remove/erc: Handling removal for emacsen flavor ${FLAVOR}"
+
+if [ ${FLAVOR} == emacs20 ]
+then
+    echo "remove/erc: Skipping unsupported flavor ${FLAVOR}"
+    exit 0
+fi
+
+echo >&2 -n "remove/erc: Purging compilation log and byte-compiled files for ${FLAVOR}..."
+rm -f @PREFIX@/share/doc/erc/CompilationLog-${FLAVOR}.gz
+rm -Rf @PREFIX@/share/${FLAVOR}/site-lisp/erc
+echo >&2 "done."
+    
+exit 0

-- 
Jesse Alama ([EMAIL PROTECTED])

Reply via email to