PATCH packages The latin-unity and mule-ucs packages are both unique, in exactly the same way. "You keep using that word. I do not think it means what you think it means." They both fail to byte compile successfully with 21.1. At this point, I do not believe that we care. This patch removes the Makefile bits that deal with 21.1 from those two packages. Speaking of words that don't mean what you think they mean, "support" isn't really the right word, but I'm not sure how else to phrase it. diff -r 0db6a485b423 mule-packages/latin-unity/ChangeLog --- a/mule-packages/latin-unity/ChangeLog Thu May 15 20:53:40 2014 +0200 +++ b/mule-packages/latin-unity/ChangeLog Mon Sep 29 16:19:18 2014 -0600 ＠＠ -1,3 +1,7 ＠＠ +2014-09-29 Jerry James <james(a)xemacs.org&gt; + + * Makefile: Drop XEmacs 21.1 support. + 2014-05-15 Norbert Koch <viteno(a)xemacs.org&gt; * Makefile (VERSION): XEmacs package 1.22 released. diff -r 0db6a485b423 mule-packages/latin-unity/Makefile --- a/mule-packages/latin-unity/Makefile Thu May 15 20:53:40 2014 +0200 +++ b/mule-packages/latin-unity/Makefile Mon Sep 29 16:19:18 2014 -0600 ＠＠ -36,15 +36,6 ＠＠ REQUIRES = mule-base latin-euro-standards mule-ucs leim fsf-compat dired endif -# Latin-Unity is a unique package in that it does not compile or run -# under XEmacsen 21.1, at least not "out of the box". So here's -# some really ugly Makefile voodoo that will allow people using XEmacs -# 21.1 to build the packages without it blowing up in their faces. -# Don't try this at home, kids. SY. -include ../../Local.rules -CHECK_VERSION = $(XEMACS) -batch -no-autoloads -eval '(princ (emacs-version>= 21 4))' - -ifeq ($(shell $(CHECK_VERSION)),t) ELCS = latin-unity.elc latin-unity-vars.elc latin-euro-input.elc \ latin-unity-latin7.elc latin-latin7-input.elc latin-unity-latin9.elc \ latin-unity-latin8.elc latin-unity-latin10.elc \ ＠＠ -86,14 +77,3 ＠＠ # -l latin-unity-vars -l latin-unity \ # -f latin-unity-install -f latin-unity-test \ # -eval "(write-file \"./latintest\" nil 'iso-2022-7)" -else -include ../../Version.rules - -bad-version: autoloads - ＠echo "************************ W A R N I N G *************************" - ＠echo "Building $(PACKAGE) with versions less than 21.4 is unsupported by" - ＠echo "the XEmacs Project." - ＠echo "If you need this feature, contact the package maintainer directly:" - ＠echo "$(MAINTAINER)" - -endif diff -r f7fb28ff013e mule-packages/mule-ucs/ChangeLog --- a/mule-packages/mule-ucs/ChangeLog Wed Jun 04 15:36:18 2014 -0600 +++ b/mule-packages/mule-ucs/ChangeLog Mon Sep 29 16:19:18 2014 -0600 ＠＠ -1,3 +1,7 ＠＠ +2014-09-29 Jerry James <james(a)xemacs.org&gt; + + * Makefile: Drop XEmacs 21.1 support. + 2014-05-15 Norbert Koch <viteno(a)xemacs.org&gt; * Makefile (VERSION): XEmacs package 1.20 released. diff -r f7fb28ff013e mule-packages/mule-ucs/Makefile --- a/mule-packages/mule-ucs/Makefile Wed Jun 04 15:36:18 2014 -0600 +++ b/mule-packages/mule-ucs/Makefile Mon Sep 29 16:19:18 2014 -0600 ＠＠ -25,15 +25,6 ＠＠ REQUIRES = mule-base latin-euro-standards CATEGORY = mule -# Mule-UCS is a unique package in that it does not compile or run -# under XEmacsen 21.1, at least not "out of the box". So here's -# some really ugly Makefile voodoo that will allow people using XEmacs -# 21.1 to build the packages without it blowing up in their faces. -# Don't try this at home, kids. SY. -include ../../Local.rules -CHECK_VERSION = $(XEMACS) -batch -no-autoloads -eval '(princ (emacs-version>= 21 4))' - -ifeq ($(shell $(CHECK_VERSION)),t) EXTRA_SOURCES = \ lisp/un-trbase.el ＠＠ -82,15 +73,3 ＠＠ #compile:: # $(XEMACS) -no-autoloads -batch -l mucs-comp.el - -else -include ../../Version.rules - -bad-version: - ＠echo "************************ W A R N I N G *************************" - ＠echo "Building Mule-UCS with versions less than 21.4 is unsupported by" - ＠echo "the XEmacs Project." - ＠echo "If you need this feature, contact the package maintainer directly:" - ＠echo "$(MAINTAINER)" -endif - -- Jerry James http://www.jamezone.org/ _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches