>>>> "drv" == Didier Verna
<didier(a)xemacs.org> writes:
drv> Stephen J. Turnbull wrote:
> I'm getting a broken build because Gnus can't find its
own
> files (nndiary.el, presumably that's new in oort).
drv> Correct. I can't answer your question though, because
drv> I don't install the Gnus that's in xemacs-packages.
OK. Figured out how to hack this. Patch below. This one isn't for
xemacs-patches yet, though.
drv> BTW: something boring with the packages is that when you
drv> don't want to install one, it seems that compiling it is
drv> still required.
I don't understand. If you build from the top, yes, but if you build
in the package directory (which unfortunately can fail), it should
work OK whether other packages are compiled or not.
Here's the patch. My oort lives in site-packages/oort-gnus, but
otherwise is a standard XEmacs Gnus hierarchy. The variable
SITEPACKAGEDIRECTORYMAP needs to be set to a list of conses of package
name (as a string) and hierarchy root (as a string), eg in bash
$ export SITEPACKAGEDIRECTORYMAP='(("oort-gnus" .
"site-packages"))'
I suppose there should be a way to do this in the Makefile but the
obvious try (commented out) didn't work right. You also need to hack
package-compile.el (besides the part that gets this environment
variable) to map oort-gnus's lisp directory to gnu/lisp.
There are a few miscellaneous ickinesses that need changed too (like
the disappearance and appearance of a few texi files).
Index: package-compile.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/package-compile.el,v
retrieving revision 1.51
diff -u -r1.51 package-compile.el
--- package-compile.el 4 Oct 2002 22:04:18 -0000 1.51
+++ package-compile.el 22 Oct 2002 10:21:34 -0000
@@ -61,6 +61,7 @@
(require 'bytecomp)
(defconst package-directory-map
+ (append (read (getenv "SITEPACKAGEDIRECTORYMAP"))
'(
;; xemacs-packages
("Sun" . "xemacs-packages")
@@ -176,8 +177,9 @@
("lookup" . "mule-packages")
("mule-base" . "mule-packages")
("mule-ucs" . "mule-packages")
- ("skk" . "mule-packages")))
-
+ ("skk" . "mule-packages"))
+ ) ; (append ...
+ )
(defun package-name-to-directory (package)
"Map `package' to a source directory."
@@ -187,6 +189,8 @@
package-directory-map))
"../.."))))
(cond ((equal package "gnus")
+ (expand-file-name "gnus/lisp" (file-name-as-directory dir)))
+ ((equal package "oort-gnus")
(expand-file-name "gnus/lisp" (file-name-as-directory dir)))
((or (equal package "w3")
(equal package "bbdb")
--- xemacs-packages/gnus/Makefile 2002-10-18 07:22:56.000000000 +0900
+++ site-packages/oort-gnus/Makefile 2002-10-22 19:25:21.000000000 +0900
@@ -17,19 +17,21 @@
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-VERSION = 1.64
-AUTHOR_VERSION = 5.8.8
-MAINTAINER = XEmacs Development Team <xemacs-beta(a)xemacs.org>
-PACKAGE = gnus
+VERSION = 0.10
+AUTHOR_VERSION = 0.07
+
+#special stuff
+MAINTAINER = Stephen J. Turnbull <stephen(a)xemacs.org>
+PACKAGE = oort-gnus
+#SITEPACKAGEDIRECTORYMAP = (("oort-gnus" . "site-packages"))
+REQUIRES = $(PACKAGE) w3 mh-e mailcrypt rmail eterm sh-script dired \
+ mail-lib xemacs-base fsf-compat
+
PKG_TYPE = regular
-REQUIRES = gnus w3 mh-e mailcrypt rmail eterm mail-lib xemacs-base fsf-compat \
- ecrypto
CATEGORY = standard
LISPFILES = $(wildcard gnus/lisp/*.el)
ELCS = $(LISPFILES:.el=.elc)
-EXTRA_SOURCES = gnus/lisp/md5.el.upstream
-
DATA_FILES = $(wildcard etc/sounds/*.au) $(wildcard etc/sounds/*.wav)
DATA_DEST = sounds
DATA_1_FILES = $(wildcard etc/message/*.x?m)
@@ -45,9 +47,8 @@
INFO_FILES = gnus/texi/message.info* gnus/texi/gnus.info* \
gnus/texi/emacs-mime.info*
-TEXI_FILES = gnus/texi/message.texi gnus/texi/gnus.texi \
- gnus/texi/gnus-faq.texi gnus/texi/gnusmail.texi \
- gnus/texi/emacs-mime.texi
+TEXI_FILES = gnus/texi/*.texi
+MANUALS = gnus message emacs-mime
MAKEINFO_FLAGS = -Ignus/texi
@@ -65,6 +66,9 @@
html:
cd gnus/texi && $(MAKE) html
-.PHONY: binkit
+.PHONY: srckit binkit
+
+srckit:
+ @echo "You can't build a source kit for Gnus this way"
binkit: binkit-common
--
Institute of Policy and Planning Sciences
http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
My nostalgia for Icon makes me forget about any of the bad things. I don't
have much nostalgia for Perl, so its faults I remember. Scott Gilbert c.l.py