Update xemacs to 21.4.17.

Fix the movemail.c format string vulnerability.  Other changes are
mostly build & documentation fixes.

In pkgsrc, pass ${LOCALBASE} and ${X11BASE} as the --site-includes
/ --sith-libraries / --site-runtime-libraries to configure more
correctly.  No visible change.

5 files changed, 20 insertions, 22 deletions

diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index 7fc61c512f3..c8f277ae61e 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2005/01/31 00:10:12 minskim Exp $
-
-PKGREVISION=	3
+# $NetBSD: Makefile,v 1.75 2005/02/28 16:20:09 uebayasi Exp $
 
 .include "../../editors/xemacs/Makefile.common"
 
diff --git a/editors/xemacs/Makefile.common b/editors/xemacs/Makefile.common
index 28db1db1af5..b01fe352b0c 100644
--- a/editors/xemacs/Makefile.common
+++ b/editors/xemacs/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.6 2005/01/31 00:10:12 minskim Exp $
+# $NetBSD: Makefile.common,v 1.7 2005/02/28 16:20:09 uebayasi Exp $
 
-DISTNAME=	xemacs-21.4.15
+DISTNAME=	xemacs-21.4.17
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS:=xemacs-21.4/}
 DISTFILES=	${EXTRACT_ONLY} ${EXTRA_FILES}
@@ -92,9 +92,9 @@ CONFIGURE_ARGS+=	--with-ncurses=no
 CONFIGURE_ARGS+=	--with-msw=no
 CONFIGURE_ARGS+=	${WITH_DIALOGS}
 CONFIGURE_ARGS+=	--infopath="${INFOPATH}"
-CONFIGURE_ARGS+=	--site-includes=${BUILDLINK_DIR}/include:${WRKDIR}
-CONFIGURE_ARGS+=	--site-libraries=${BUILDLINK_DIR}/lib
-CONFIGURE_ARGS+=	--site-runtime-libraries=${PREFIX}/lib
+CONFIGURE_ARGS+=	--site-includes=${BUILDLINK_DIR}/include:${BUILDLINK_X11_DIR}/include:${WRKDIR}
+CONFIGURE_ARGS+=	--site-libraries=${BUILDLINK_DIR}/lib:${BUILDLINK_X11_DIR}
+CONFIGURE_ARGS+=	--site-runtime-libraries=${LOCALBASE}/lib:${X11BASE}/lib
 
 CFLAGS+=		-Dunix
 
diff --git a/editors/xemacs/PLIST b/editors/xemacs/PLIST
index 417a2f50308..6038ae46b34 100644
--- a/editors/xemacs/PLIST
+++ b/editors/xemacs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2004/02/09 07:54:58 minskim Exp $
+@comment $NetBSD: PLIST,v 1.10 2005/02/28 16:20:09 uebayasi Exp $
 bin/${DISTNAME}
 bin/ellcc
 bin/gnuattach
@@ -489,6 +489,7 @@ lib/${DISTNAME}/etc/gnudoit.1
 lib/${DISTNAME}/etc/gnuserv.1
 lib/${DISTNAME}/etc/gnuserv.README
 lib/${DISTNAME}/etc/gray1.xbm
+lib/${DISTNAME}/etc/gtkrc
 lib/${DISTNAME}/etc/idd/drop
 lib/${DISTNAME}/etc/idd/dropmsk
 lib/${DISTNAME}/etc/ms-kermit
@@ -1060,7 +1061,7 @@ lib/${DISTNAME}/lisp/mule/canna-leim.elc
 lib/${DISTNAME}/lisp/mule/chinese.el${ELSUFX}
 lib/${DISTNAME}/lisp/mule/chinese.elc
 lib/${DISTNAME}/lisp/mule/custom-load.el${ELSUFX}
-lib/${DISTNAME}/lisp/mule/custom-load.elc
+@comment XXX 21.4.17 excludes this! - lib/${DISTNAME}/lisp/mule/custom-load.elc
 lib/${DISTNAME}/lisp/mule/cyrillic.el${ELSUFX}
 lib/${DISTNAME}/lisp/mule/cyrillic.elc
 lib/${DISTNAME}/lisp/mule/english.el${ELSUFX}
diff --git a/editors/xemacs/distinfo b/editors/xemacs/distinfo
index 72e6a833938..19eb9589832 100644
--- a/editors/xemacs/distinfo
+++ b/editors/xemacs/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.9 2005/02/23 17:15:13 agc Exp $
+$NetBSD: distinfo,v 1.10 2005/02/28 16:20:10 uebayasi Exp $
 
-SHA1 (xemacs/xemacs-21.4.15.tar.gz) = 6ee2583c71b46ef1edb78bd170c9adbef97ae5db
-RMD160 (xemacs/xemacs-21.4.15.tar.gz) = 9c2d4d1d8c84486ed63b07c3983ec3c648c2a6c7
-Size (xemacs/xemacs-21.4.15.tar.gz) = 10652161 bytes
-SHA1 (xemacs/xemacs-21.4.15-elc.tar.gz) = 7162d6e6b0ddee893f890ec65aec63edc3482919
-RMD160 (xemacs/xemacs-21.4.15-elc.tar.gz) = 3b838d897c9018c02c55d27d7aca1d6e288af9fb
-Size (xemacs/xemacs-21.4.15-elc.tar.gz) = 927962 bytes
-SHA1 (xemacs/xemacs-21.4.15-info.tar.gz) = 7d509aeecbee0bc879e6d412370969768e7422ab
-RMD160 (xemacs/xemacs-21.4.15-info.tar.gz) = 474d3a14ac3275c097875998eda12c82114edf52
-Size (xemacs/xemacs-21.4.15-info.tar.gz) = 1603029 bytes
+SHA1 (xemacs/xemacs-21.4.17.tar.gz) = 274812bee5f8010ca3d56b517026270d94415f33
+RMD160 (xemacs/xemacs-21.4.17.tar.gz) = d42ca370ba916f0147b368bd7db2cc6c523646ae
+Size (xemacs/xemacs-21.4.17.tar.gz) = 10626826 bytes
+SHA1 (xemacs/xemacs-21.4.17-elc.tar.gz) = 5e13cb3d2087d0ef56746b661da6b762533b3e58
+RMD160 (xemacs/xemacs-21.4.17-elc.tar.gz) = 37785dc82bbbbc7eba656c9edc099b425a885eae
+Size (xemacs/xemacs-21.4.17-elc.tar.gz) = 931709 bytes
+SHA1 (xemacs/xemacs-21.4.17-info.tar.gz) = 6a0319d8a5e29c6725d3973ee5f39360503ef681
+RMD160 (xemacs/xemacs-21.4.17-info.tar.gz) = 5894750e99d225e53e79bf2c6fa786b3fd13d7a5
+Size (xemacs/xemacs-21.4.17-info.tar.gz) = 1634004 bytes
 SHA1 (patch-aa) = f625428b9fb782d452a01e82a9d5d716fba4c4ed
 SHA1 (patch-ab) = 1487edf8addea7971f4fcbcf57818090f32edef5
 SHA1 (patch-ac) = effbc40595b0c3b6e443588528113d907a6056c1
diff --git a/editors/xemacs/options.mk b/editors/xemacs/options.mk
index 22456d4a2d2..6b3e16c2587 100644
--- a/editors/xemacs/options.mk
+++ b/editors/xemacs/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2004/12/22 21:46:25 jlam Exp $
+# $NetBSD: options.mk,v 1.3 2005/02/28 16:20:10 uebayasi Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.xemacs
 PKG_SUPPORTED_OPTIONS=	ldap xface canna
@@ -25,4 +25,3 @@ CONFIGURE_ARGS=	--with-canna
 .else
 CONFIGURE_ARGS=	--without-canna
 .endif
-