10:03 p.m.
Hi,
finally I found time to take a closer look at how to keep
the xemacs package of VM up to date with upstream.
Upstream has a different directory layout than the current
vm package which seems to have the one of VM 7.19, i.e. all
sources in the base directory of the package except for the
pixmaps which are in "etc/".
But taking a look at the package of gnus I started to modify
it to match the layout of upstream which simplifies syncing
a lot.
Are such changes o.k.?
Also I have added a line to "package-compile.el" in order to
make pre-loading of vm-macros.el etc. work.
The Makefile introduces a lot of new dependencies, which are
not required by the core of vm but by addons, I hope this is
o.k.
The list of provides in "package-info.in" has to be updated
by hand if I am correct?
Also I bundle a newer version of vcard.el with vm, than the
one provided by the gnus package. How are such duplicates
handled? IMHO it would be better to have vcard.el in another
package required by the packages which need it.
A incomplete diff is below ...
Bye,
Robert.
Index: MAINTAINERS
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/MAINTAINERS,v
retrieving revision 1.24
diff -u -r1.24 MAINTAINERS
--- MAINTAINERS 2007/10/15 11:51:13 1.24
+++ MAINTAINERS 2008/02/16 22:02:05
＠＠ -116,7 +116,7 ＠＠
vhdl XEmacs Development Team <xemacs-beta(a)xemacs.org>
view-process XEmacs Development Team <xemacs-beta(a)xemacs.org>
viper Michael Kifer <kifer(a)cs.sunysb.edu>
-vm Kyle Jones <kyle_jones(a)wonderworks.com>
+vm Robert Widhopf-Fenk <hack(a)robf.de>
w3 XEmacs Development Team <xemacs-beta(a)xemacs.org>
x-symbol Uwe Brauer <oub(a)xemacs.org>
xemacs-base XEmacs Development Team <xemacs-beta(a)xemacs.org>
Index: package-compile.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/package-compile.el,v
retrieving revision 1.73
diff -u -r1.73 package-compile.el
--- package-compile.el 2007/11/26 15:25:49 1.73
+++ package-compile.el 2008/02/16 22:02:05
＠＠ -239,6 +239,7 ＠＠
package (expand-file-name area package-source-root))))
(cond ((or (equal package "bbdb")
(equal package "gnus")
+ (equal package "vm")
(equal package "jde")
(equal package "lookup")
(equal package "mule-ucs")
Index: xemacs-packages/vm/Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/vm/Makefile,v
retrieving revision 1.74
diff -u -r1.74 Makefile
--- xemacs-packages/vm/Makefile 2007/10/13 21:40:37 1.74
+++ xemacs-packages/vm/Makefile 2008/02/16 22:02:10
＠＠ -18,53 +18,30 ＠＠
# Boston, MA 02111-1307, USA.
VERSION = 7.26
-AUTHOR_VERSION = 7.19
-MAINTAINER = Kyle Jones <kyle_jones(a)wonderworks.com>
+AUTHOR_VERSION = 8.0.8
+MAINTAINER = Robert Widhopf-Fenk <hack(a)robf.de>
PACKAGE = vm
PKG_TYPE = regular
-REQUIRES = mail-lib xemacs-base
+REQUIRES = vm xemacs-base mail-lib gnus pgg ecrypto eterm sh-script net-utils ps-print
os-utils bbdb fsf-compat
CATEGORY = standard
# vm-version.elc needs to be first in this list, because load time
# code needs the Emacs/XEmacs MULE/no-MULE feature stuff.
-ELCS = vm-version.elc vm-message.elc vm-misc.elc tapestry.elc \
- vm-delete.elc vm-digest.elc vm-easymenu.elc vm-edit.elc \
- vm-folder.elc vm-imap.elc vm-license.elc vm-macro.elc \
- vm-mark.elc vm-menu.elc vm-mime.elc vm-minibuf.elc \
- vm-motion.elc vm-mouse.elc vm-page.elc vm-pop.elc vm-reply.elc \
- vm-save.elc vm-search.elc vm-sort.elc vm-startup.elc \
- vm-summary.elc vm-thread.elc vm-toolbar.elc vm-undo.elc \
- vm-user.elc vm-vars.elc vm-virtual.elc vm-window.elc \
- vm-crypto.elc
-
-EXTRA_SOURCES = vm.el vm.elc vm-autoload.el vm-autoload.elc Makefile-kj \
- README.bytecompile
-
-PRELOADS =-l vm-byteopts.el -l vm-version.el -l vm-message.el \
- -l vm-macro.el -l vm-vars.el
+DONTCOMPILE = lisp/vm-build.el \
+ lisp/_pkg.el lisp/auto-autoloads.el lisp/custom-load.el
-DOCS_TEXINFO_EXTENSION = t
-STANDARD_DOCS = t
+ELCS = $(patsubst %.el,%.elc,$(filter-out $(DONTCOMPILE),$(wildcard lisp/*.el)))
-DATA_FILES = $(shell echo etc/*.x??)
-DATA_DEST = $(PACKAGE)
+EXTRA_SOURCES = NEWS $(DONTCOMPILE)
-EARLY_GENERATED_LISP += vm.el vm-autoload.el
+EXPLICIT_DOCS = $(wildcard info/*.texi)
-include ../../XEmacs.rules
+DATA_FILES = $(shell echo pixmaps/*.xpm) $(shell echo pixmaps/mime/*.xpm)
+DATA_DEST = pixmaps
+
+AUTOLOAD_PATH = lisp
-vm.el:
- ＠echo "building vm.elc (with all modules set to autoload)..."
- ＠echo "(defun vm-its-such-a-cruel-world ()" > vm.el
- ＠echo " (require 'vm-version)" >> vm.el
- ＠echo " (require 'vm-startup)" >> vm.el
- ＠echo " (require 'vm-vars)" >> vm.el
- ＠echo " (require 'vm-autoload))" >> vm.el
- ＠echo "(vm-its-such-a-cruel-world)" >> vm.el
- ＠echo "(fmakunbound 'vm-its-such-a-cruel-world)" >> vm.el
-
-vm-autoload.el: $(ELCS:.elc=.el)
- ＠echo scanning sources to build autoload definitions...
- $(BOOT_XEMACS) -l ./make-autoloads -f print-autoloads \
- $(ELCS:.elc=.el) >> vm-autoload.el
- ＠echo "(provide 'vm-autoload)" >> vm-autoload.el
+PRELOADS = -l vm-build.el -l vm-version.el -l vm-message.el \
+ -l vm-macro.el -l vm-vars.el -l vm-misc.el
+
+include ../../XEmacs.rules
Index: xemacs-packages/vm/package-info.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/vm/package-info.in,v
retrieving revision 1.5
diff -u -r1.5 package-info.in
--- xemacs-packages/vm/package-info.in 2002/01/01 14:38:59 1.5
+++ xemacs-packages/vm/package-info.in 2008/02/16 22:02:10
＠＠ -13,7 +13,17 ＠＠
filename FILENAME
md5sum MD5SUM
size SIZE
- provides (tapestry vm-byteopts vm-delete vm-digest vm-easymenu vm-edit vm-folder
vm-imap vm-license vm-macro vm-mark vm-menu vm-message vm-mime vm-minibuf vm-misc
vm-motion vm-mouse vm-page vm-pop vm-reply vm-save vm-search vm-sort vm-startup vm-summary
vm-thread vm-toolbar vm-undo vm-user vm-vars vm vm-version vm-virtual vm-window)
+ provides (tapestry vm-autoload vm-avirtual vm-biff vm-build vm-crypto
+ vm-delete vm-digest vm-edit vm vm-folder vm-grepmail
+ vm-imap vm-license vm-macro vm-mark vm-menu vm-message
+ vm-message-history vm-mime vm-minibuf vm-misc vm-motion
+ vm-mouse vm-page vm-pcrisis vm-pgg vm-pine vm-pop
+ vm-ps-print vm-reply vm-rfaddons vm-save vm-search
+ vm-serial vm-sort vm-startup vm-summary vm-summary-faces
+ vm-thread vm-toolbar vm-undo vm-user vm-vars vm-vcard
+ vm-version vm-virtual vm-window)
requires (REQUIRES)
type regular
))
+
+
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta