Update to 2.4.15.

Comment out the GTK support since either bsd.gnome.mk is broken or I'm
too stupid to figure it out.

4 files changed, 28 insertions, 134 deletions

diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index fb71c587f2bd..2bdcbd84caee 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -30,7 +30,7 @@ USE_XPM=	yes
 .endif
 
 XEMACS_REL=	21.4
-XEMACS_VER=	21.4.14
+XEMACS_VER=	21.4.15
 XEMACS_ARCH=	${CONFIGURE_TARGET}
 
 STRIP=
@@ -65,10 +65,10 @@ HAVE_MOTIF=	yes
 .endif
 
 pre-fetch:
-.if !defined(WANT_GTK)
-	@${ECHO_MSG} "If you want to use GTK, please set the environment variable WANT_GTK "
-	@${ECHO_MSG} "and recompile."
-.endif
+#.if !defined(WANT_GTK)
+#	@${ECHO_MSG} "If you want to use GTK, please set the environment variable WANT_GTK "
+#	@${ECHO_MSG} "and recompile."
+#.endif
 .if defined(HAVE_MOTIF)
 .if !defined(MOTIF_STATIC)
 	@${ECHO_MSG} ""
@@ -96,12 +96,13 @@ WITH_DIALOGS=	--with-dialogs=athena
 LIB_DEPENDS+=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
 .endif
 
-.if defined(WANT_GTK)
-WITH_GTK=	--with-gtk=yes \
-		--with-xpm=no
-USE_GNOME=	gtk12
-USE_XPM=	no
-.endif
+#.if defined(WANT_GTK)
+#USE_GNOME=	gtk20
+#MAKE_ARGS+=	X_LIBS="$(X_LIBS) -lXt"
+#WITH_GTK=	--with-gtk=yes \
+#		--with-xpm=no
+#USE_XPM=	no
+#.endif
 
 # Drop faces (libcompface) and offix (libDnd) if building package,
 # autodetect otherwise
@@ -127,11 +128,11 @@ post-install::
 	${MKDIR} ${PREFIX}/lib/xemacs/site-lisp
 	${CHMOD} 755 ${PREFIX}/lib/xemacs/site-lisp
 	${RM} -f ${PREFIX}/bin/send-pr
-.if defined(WANT_GTK)
-	@${ECHO_MSG} "Please be aware that GTK support is buggy. Do not report bugs to"
-	@${ECHO_MSG} "the maintainer."
-	@${ECHO_MSG} "Please also be aware that the package's name was automagically changed"
-	@${ECHO_MSG} "to ${PORTNAME}${PKGNAMESUFFIX}-${XEMACS_VER}."
-.endif
+#.if defined(WANT_GTK)
+#	@${ECHO_MSG} "Please be aware that GTK support is buggy. Do not report bugs to"
+#	@${ECHO_MSG} "the maintainer."
+#	@${ECHO_MSG} "Please also be aware that the package's name was automagically changed"
+#	@${ECHO_MSG} "to ${PORTNAME}${PKGNAMESUFFIX}-${XEMACS_VER}."
+#.endif
 
 .include <bsd.port.post.mk>
diff --git a/editors/xemacs/distinfo b/editors/xemacs/distinfo
index 46ecac3f0101..3a98dba443a6 100644
--- a/editors/xemacs/distinfo
+++ b/editors/xemacs/distinfo
@@ -1,6 +1,6 @@
-MD5 (xemacs/xemacs-21.4.14-src.tar.gz) = 6034fbaf3934361b4d1c5ff9ee1979da
-SIZE (xemacs/xemacs-21.4.14-src.tar.gz) = 8092804
-MD5 (xemacs/xemacs-21.4.14-elc.tar.gz) = 05408e9bb2c0a199528fa463c766a890
-SIZE (xemacs/xemacs-21.4.14-elc.tar.gz) = 925908
-MD5 (xemacs/xemacs-21.4.14-info.tar.gz) = 421d51e90577c71c453c42a201afe64f
-SIZE (xemacs/xemacs-21.4.14-info.tar.gz) = 1663979
+MD5 (xemacs/xemacs-21.4.15-src.tar.gz) = 840d061aad9c4ae0782fc94a4184625a
+SIZE (xemacs/xemacs-21.4.15-src.tar.gz) = 8118264
+MD5 (xemacs/xemacs-21.4.15-elc.tar.gz) = 0fcacb62b115dd34d2d59fbe8be36166
+SIZE (xemacs/xemacs-21.4.15-elc.tar.gz) = 927962
+MD5 (xemacs/xemacs-21.4.15-info.tar.gz) = 64e6cbd780a39e001d3a2a832717ce31
+SIZE (xemacs/xemacs-21.4.15-info.tar.gz) = 1603029
diff --git a/editors/xemacs/files/patch-regex.c b/editors/xemacs/files/patch-regex.c
deleted file mode 100644
index 33c75b5894a0..000000000000
--- a/editors/xemacs/files/patch-regex.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/regex.c.orig	Sun Apr 18 22:13:51 2004
-+++ src/regex.c	Sun Apr 18 22:14:57 2004
-@@ -1135,7 +1135,7 @@
-    exactly that if always used MAX_FAILURE_SPACE each time we failed.
-    This is a variable only so users of regex can assign to it; we never
-    change it ourselves.  */
--#if defined (MATCH_MAY_ALLOCATE)
-+#if defined (MATCH_MAY_ALLOCATE) || defined (REGEX_MALLOC)
- /* 4400 was enough to cause a crash on Alpha OSF/1,
-    whose default stack limit is 2mb.  */
- int re_max_failures = 20000;
diff --git a/editors/xemacs/pkg-plist b/editors/xemacs/pkg-plist
index 9c82bdd41a16..2b7c40423091 100644
--- a/editors/xemacs/pkg-plist
+++ b/editors/xemacs/pkg-plist
@@ -129,7 +129,7 @@ lib/xemacs-%%XEMACS_VER%%/etc/idd/drop
 lib/xemacs-%%XEMACS_VER%%/etc/idd/dropmsk
 lib/xemacs-%%XEMACS_VER%%/etc/ms-kermit
 lib/xemacs-%%XEMACS_VER%%/etc/ms-kermit-7bit
-lib/xemacs-%%XEMACS_VER%%/etc/package-index.LATEST.pgp
+lib/xemacs-%%XEMACS_VER%%/etc/package-index.LATEST.gpg
 lib/xemacs-%%XEMACS_VER%%/etc/photos/adrian.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/adrianm.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/ajc.png
@@ -754,12 +754,6 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/vcdiff
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/wakeup
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/yow
 lib/xemacs-%%XEMACS_VER%%/info/cl.info
-lib/xemacs-%%XEMACS_VER%%/info/cl.info-1
-lib/xemacs-%%XEMACS_VER%%/info/cl.info-2
-lib/xemacs-%%XEMACS_VER%%/info/cl.info-3
-lib/xemacs-%%XEMACS_VER%%/info/cl.info-4
-lib/xemacs-%%XEMACS_VER%%/info/cl.info-5
-lib/xemacs-%%XEMACS_VER%%/info/cl.info-6
 lib/xemacs-%%XEMACS_VER%%/info/custom.info
 lib/xemacs-%%XEMACS_VER%%/info/dir
 lib/xemacs-%%XEMACS_VER%%/info/emodules.info
@@ -768,123 +762,30 @@ lib/xemacs-%%XEMACS_VER%%/info/info.info
 lib/xemacs-%%XEMACS_VER%%/info/internals.info
 lib/xemacs-%%XEMACS_VER%%/info/internals.info-1
 lib/xemacs-%%XEMACS_VER%%/info/internals.info-2
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-3
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-4
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-5
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-6
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-7
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-8
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-9
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info-1
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-10
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-11
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-12
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-13
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-14
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-15
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-16
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-17
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-18
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-19
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info-2
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-20
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-21
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-22
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-23
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-24
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-25
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-26
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-27
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-28
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-29
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info-3
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-30
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-31
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-32
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-33
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-34
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-35
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-36
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-37
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-38
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-39
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info-4
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-40
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-41
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-42
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-43
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-44
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-45
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-46
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-47
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-48
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-49
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info-5
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-50
 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/new-users-guide.info
-lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info-1
-lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info-2
-lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info-3
 lib/xemacs-%%XEMACS_VER%%/info/standards.info
-lib/xemacs-%%XEMACS_VER%%/info/standards.info-1
-lib/xemacs-%%XEMACS_VER%%/info/standards.info-2
-lib/xemacs-%%XEMACS_VER%%/info/standards.info-3
-lib/xemacs-%%XEMACS_VER%%/info/standards.info-4
 lib/xemacs-%%XEMACS_VER%%/info/term.info
 lib/xemacs-%%XEMACS_VER%%/info/termcap.info
-lib/xemacs-%%XEMACS_VER%%/info/termcap.info-1
-lib/xemacs-%%XEMACS_VER%%/info/termcap.info-2
-lib/xemacs-%%XEMACS_VER%%/info/termcap.info-3
 lib/xemacs-%%XEMACS_VER%%/info/texinfo.info
 lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-1
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-10
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-11
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-12
 lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-2
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-3
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-4
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-5
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-6
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-7
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-8
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-9
 lib/xemacs-%%XEMACS_VER%%/info/widget.info
 lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info
-lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-1
-lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-2
-lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-3
-lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-4
-lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-5
-lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-6
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-1
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-10
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-11
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-12
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-13
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-14
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-15
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-16
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-17
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-18
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-19
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-2
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-20
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-21
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-22
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-23
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-3
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-4
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-5
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-6
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-7
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-8
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-9
 lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog
 lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog.1
 lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog.GTK
@@ -1160,6 +1061,7 @@ lib/xemacs-%%XEMACS_VER%%/lisp/mule/canna-leim.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/chinese.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/chinese.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/custom-load.el
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/custom-load.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/cyrillic.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/cyrillic.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/english.el
@@ -1235,6 +1137,7 @@ lib/xemacs-%%XEMACS_VER%%/lisp/page.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/paragraphs.el
 lib/xemacs-%%XEMACS_VER%%/lisp/paragraphs.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/paths.el
+lib/xemacs-%%XEMACS_VER%%/lisp/paths.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/picture.el
 lib/xemacs-%%XEMACS_VER%%/lisp/picture.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/printer.el
@@ -1321,6 +1224,7 @@ lib/xemacs-%%XEMACS_VER%%/lisp/update-elc-2.el
 lib/xemacs-%%XEMACS_VER%%/lisp/userlock.el
 lib/xemacs-%%XEMACS_VER%%/lisp/userlock.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/version.el
+lib/xemacs-%%XEMACS_VER%%/lisp/version.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/very-early-lisp.el
 lib/xemacs-%%XEMACS_VER%%/lisp/view-less.el
 lib/xemacs-%%XEMACS_VER%%/lisp/view-less.elc