Update to 21.5.8.

The patches patch-emacs.c and patch-mem-limits.h are no longer needed
because lim_data has been changed from an unsigned int to an unsigned
long, which should be big enough on all architectures which we support.

Make Andrey Slusar <anray AT inet DOT ua> the maintainer, since he kindly
offered to take over this port from me.

5 files changed, 11 insertions, 26 deletions

diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile
index f1c43e15c12f..9bde31e852de 100644
--- a/editors/xemacs-devel/Makefile
+++ b/editors/xemacs-devel/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	xemacs-${XEMACS_VER:S/-b/./}
 #DISTFILES=	${DISTNAME}.11${EXTRACT_SUFX}
 DIST_SUBDIR=	xemacs
 
-MAINTAINER=	gj@FreeBSD.org
+MAINTAINER=	anray@inet.ua
 COMMENT=	This port tracks the development (GAMMA) version of the XEmacs text editor
 
 NOT_FOR_ARCHS=	sparc64
@@ -31,7 +31,7 @@ USE_XPM=	yes
 
 XEMACS_MAJOR_VER?=	21
 XEMACS_REL=		${XEMACS_MAJOR_VER}.5
-XEMACS_VER=		${XEMACS_MAJOR_VER}.5-b17
+XEMACS_VER=		${XEMACS_MAJOR_VER}.5-b18
 XEMACS_ARCH=		${CONFIGURE_TARGET}
 
 WRKSRC=		${WRKDIR}/xemacs-${XEMACS_VER:S/-b/./}
diff --git a/editors/xemacs-devel/distinfo b/editors/xemacs-devel/distinfo
index 150ebe4510b7..5ea02dd2f48e 100644
--- a/editors/xemacs-devel/distinfo
+++ b/editors/xemacs-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (xemacs/xemacs-21.5.17.tar.gz) = 45f619328fa8ce0e7f38ade44601e3df
-SIZE (xemacs/xemacs-21.5.17.tar.gz) = 13818839
+MD5 (xemacs/xemacs-21.5.18.tar.gz) = 979c2db1b6851e2496e837a14b805373
+SIZE (xemacs/xemacs-21.5.18.tar.gz) = 14985234
diff --git a/editors/xemacs-devel/files/patch-emacs.c b/editors/xemacs-devel/files/patch-emacs.c
deleted file mode 100644
index ce4f8fd5b0fb..000000000000
--- a/editors/xemacs-devel/files/patch-emacs.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/emacs.c.orig	Sun Mar  9 03:37:54 2003
-+++ src/emacs.c	Tue Jul 20 21:59:42 2004
-@@ -398,7 +398,7 @@
- 
- /* Number of bytes of writable memory we can expect to be able to get:
-    Leave this as an unsigned int because it could potentially be 4G */
--unsigned int lim_data;
-+rlim_t lim_data;
- 
- /* WARNING!
- 
diff --git a/editors/xemacs-devel/files/patch-mem-limits.h b/editors/xemacs-devel/files/patch-mem-limits.h
deleted file mode 100644
index a5ce6cb35839..000000000000
--- a/editors/xemacs-devel/files/patch-mem-limits.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mem-limits.h.bak	Thu Mar 18 13:08:19 2004
-+++ src/mem-limits.h	Thu Mar 18 13:08:42 2004
-@@ -108,7 +108,7 @@
- static POINTER data_space_start;
- 
- /* Number of bytes of writable memory we can expect to be able to get */
--extern unsigned int lim_data;
-+extern rlim_t lim_data;
- 
- #if defined (HEAP_IN_DATA) && !defined(PDUMP)
- extern unsigned long static_heap_size;
diff --git a/editors/xemacs-devel/pkg-plist b/editors/xemacs-devel/pkg-plist
index 16356ed4fc56..48d85014bcbf 100644
--- a/editors/xemacs-devel/pkg-plist
+++ b/editors/xemacs-devel/pkg-plist
@@ -18,6 +18,7 @@ lib/xemacs-%%XEMACS_VER%%/etc/COPYING.LIB
 lib/xemacs-%%XEMACS_VER%%/etc/ChangeLog
 lib/xemacs-%%XEMACS_VER%%/etc/DEBUG
 lib/xemacs-%%XEMACS_VER%%/etc/DISTRIB
+lib/xemacs-%%XEMACS_VER%%/etc/ETAGS.EBNF
 lib/xemacs-%%XEMACS_VER%%/etc/Emacs.ad
 lib/xemacs-%%XEMACS_VER%%/etc/FTP
 lib/xemacs-%%XEMACS_VER%%/etc/GNU
@@ -77,6 +78,7 @@ lib/xemacs-%%XEMACS_VER%%/etc/gnudoit.1
 lib/xemacs-%%XEMACS_VER%%/etc/gnuserv.1
 lib/xemacs-%%XEMACS_VER%%/etc/gnuserv.README
 lib/xemacs-%%XEMACS_VER%%/etc/gray1.xbm
+lib/xemacs-%%XEMACS_VER%%/etc/gtkrc
 lib/xemacs-%%XEMACS_VER%%/etc/ms-kermit
 lib/xemacs-%%XEMACS_VER%%/etc/ms-kermit-7bit
 lib/xemacs-%%XEMACS_VER%%/etc/package-index.LATEST.gpg
@@ -1297,6 +1299,7 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/device.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/device-impl.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/devslots.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/dragdrop.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/dump-data.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/dumper.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/elhash.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/emodules.h
@@ -1344,6 +1347,9 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/miscplay.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/mule-ccl.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/ndir.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/nt.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/number-gmp.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/number-mp.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/number.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/objects-gtk-impl.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/objects-gtk.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/objects-impl.h
@@ -1428,6 +1434,7 @@ lib/xemacs-%%XEMACS_VER%%/info/lispref.info-6
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info-7
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info-8
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info-9
+lib/xemacs-%%XEMACS_VER%%/info/lispref.info-10
 lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info
 lib/xemacs-%%XEMACS_VER%%/info/standards.info
 lib/xemacs-%%XEMACS_VER%%/info/widget.info