leim/hebrew.el from the pre-release leim package causes build problems

for the xemacs{,-current}, so we use the stable package instead.

3 files changed, 14 insertions, 10 deletions

diff --git a/editors/xemacs-packages/Makefile b/editors/xemacs-packages/Makefile
index a6d38f86ec7..be6387138e6 100644
--- a/editors/xemacs-packages/Makefile
+++ b/editors/xemacs-packages/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.68 2016/12/15 13:25:42 hauke Exp $
+# $NetBSD: Makefile,v 1.69 2017/08/10 12:02:08 hauke Exp $
 
 DISTNAME=	xemacs-packages
 PKGNAME=	xemacs-packages-1.18
-#PKGREVISION=	1
+PKGREVISION=	1
 
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS:=${XEMACSPKG_PATH}/}
@@ -68,7 +68,6 @@ DISTFILES=	\
 		jde-1.54-pkg.tar.gz \
 		latin-euro-standards-1.11-pkg.tar.gz \
 		latin-unity-1.23-pkg.tar.gz \
-		leim-1.38-pkg.tar.gz \
 		locale-1.30-pkg.tar.gz \
 		lookup-1.17-pkg.tar.gz \
 		mail-lib-1.83-pkg.tar.gz \
@@ -139,6 +138,12 @@ DISTFILES=	\
 		zenirc-1.18-pkg.tar.gz
 ### DISTFILES
 
+# leim/hebrew.el causes build problems, we use stable package instead
+#		leim-1.38-pkg.tar.gz \
+
+DISTFILES+=	leim-1.31-pkg.tar.gz
+SITES.leim-1.31-pkg.tar.gz = ${MASTER_SITE_XEMACS:="packages/"}	
+
 MAINTAINER=	hauke@NetBSD.org
 HOMEPAGE=	http://www.xemacs.org/
 COMMENT=	Common elisp packages for xemacs 21
diff --git a/editors/xemacs-packages/PLIST b/editors/xemacs-packages/PLIST
index d1f88ab6b8a..28bec824c56 100644
--- a/editors/xemacs-packages/PLIST
+++ b/editors/xemacs-packages/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2016/12/15 13:25:42 hauke Exp $
+@comment $NetBSD: PLIST,v 1.17 2017/08/10 12:02:08 hauke Exp $
 lib/xemacs/xemacs-packages/etc/BABYL
 lib/xemacs/xemacs-packages/etc/app-defaults/de/Emacs
 lib/xemacs/xemacs-packages/etc/app-defaults/fr/Emacs
@@ -4700,7 +4700,6 @@ lib/xemacs/xemacs-packages/lisp/leim/custom-load.el${ELSUFX}
 lib/xemacs/xemacs-packages/lisp/leim/custom-load.elc
 lib/xemacs/xemacs-packages/lisp/leim/cyrillic-tajik.el${ELSUFX}
 lib/xemacs/xemacs-packages/lisp/leim/georgian.el${ELSUFX}
-lib/xemacs/xemacs-packages/lisp/leim/hebrew.el${ELSUFX}
 lib/xemacs/xemacs-packages/lisp/leim/ipa-21.5.el${ELSUFX}
 lib/xemacs/xemacs-packages/lisp/leim/latin-ltx.el${ELSUFX}
 lib/xemacs/xemacs-packages/lisp/leim/leim-list.el${ELSUFX}
diff --git a/editors/xemacs-packages/distinfo b/editors/xemacs-packages/distinfo
index 71a8bc92333..5d721579b14 100644
--- a/editors/xemacs-packages/distinfo
+++ b/editors/xemacs-packages/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2016/12/15 13:25:42 hauke Exp $
+$NetBSD: distinfo,v 1.25 2017/08/10 12:02:08 hauke Exp $
 
 SHA1 (xemacs-packages/Sun-1.19-pkg.tar.gz) = de24d0bf78e753e733138c6a2bec0ecf414511e0
 RMD160 (xemacs-packages/Sun-1.19-pkg.tar.gz) = 5f6bec6276f8b5a59ea6532f12c06a474571a274
@@ -240,10 +240,10 @@ SHA1 (xemacs-packages/latin-unity-1.23-pkg.tar.gz) = 9bf28839fcedbc7011fb33595b7
 RMD160 (xemacs-packages/latin-unity-1.23-pkg.tar.gz) = 630410e0ca80de8bd57dce27259ef3b42b177371
 SHA512 (xemacs-packages/latin-unity-1.23-pkg.tar.gz) = fa31cb7c392edb0ae8d481f4a0ac47acb375f4d2da79e0d8eedddf37094b6a425d4ffda32abbc485e4c0711b71d4480378c6dcc17ebe1727df676d313d79f2ab
 Size (xemacs-packages/latin-unity-1.23-pkg.tar.gz) = 108216 bytes
-SHA1 (xemacs-packages/leim-1.38-pkg.tar.gz) = 836f27b488c9a66cdcd0f4ea7b3d0ada6cc68b22
-RMD160 (xemacs-packages/leim-1.38-pkg.tar.gz) = 8a3e072fb4738907655f41d6192e3465b460295f
-SHA512 (xemacs-packages/leim-1.38-pkg.tar.gz) = 308eba0e66d52bc2cc76a2a4b4acd3735537f3f792af7a1c8402f8b1cfbe0b0230a635597ff6465a0bb8f04d0e590ea612bd8b88f59129a29ffda4f50a159f3c
-Size (xemacs-packages/leim-1.38-pkg.tar.gz) = 1817494 bytes
+SHA1 (xemacs-packages/leim-1.31-pkg.tar.gz) = 392c46cf615a520bd2cea8f6822bbf5357b21125
+RMD160 (xemacs-packages/leim-1.31-pkg.tar.gz) = ccf5b8b6d0c8a6565080c82cf39a64541646a35b
+SHA512 (xemacs-packages/leim-1.31-pkg.tar.gz) = 1179480967e12a7a9701cba24e40f6bdeb51e57fe32e7f4ead4196e652029fa04e0470dfdbc5aecd4a0caf0b53893a815559c5c550d9dacf7e724c898ce6f26f
+Size (xemacs-packages/leim-1.31-pkg.tar.gz) = 1804784 bytes
 SHA1 (xemacs-packages/locale-1.30-pkg.tar.gz) = d26176705ec32d0a58fc81a48ca645acc28e0293
 RMD160 (xemacs-packages/locale-1.30-pkg.tar.gz) = 525175892b9dd119dde3755cdd85e25fa17adf34
 SHA512 (xemacs-packages/locale-1.30-pkg.tar.gz) = 81842412baf4bca27bac502e79d77bb9ef02ed12f1df6523fcd0c136a6c950afd8b2bf7fc0e4589e7c298141ab8a9a4cc8d125f727675f35c5b8d1bc008176d3