4 files changed, 109 insertions, 24 deletions

diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index 807a751a3fea..d8dc67377baa 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-DISTNAME=	xemacs-21.1.2
+DISTNAME=	xemacs-21.1.6
 PKGNAME=	xemacs-21.1
 CATEGORIES=	editors
 MASTER_SITES=	\
@@ -24,7 +24,7 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.3:${PORTSDIR}/graphics/png
 
-XEMACS_VER=	21.1-p2
+XEMACS_VER=	21.1.6
 DIST_SUBDIR=	xemacs
 
 USE_GMAKE=	yes
@@ -38,18 +38,16 @@ CONFIGURE_ARGS=	${XEMACS_ARCH} --prefix=${PREFIX} \
 		--site-includes=${PREFIX}/include \
 		--site-libraries=${PREFIX}/lib \
 		--with-session=yes \
-		${WITH_XFACE} ${WITH_MULE} ${WITH_DIALOGS} ${WITH_OFFIX}
+		--with-png=yes \
+		${WITH_XFACE} ${WITH_DIALOGS} ${WITH_OFFIX}
 MAN1=		ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \
 		gnuserv.1 xemacs.1
 ALL_TARGET=	all dist
 
 PLIST_SUB=	XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH}
 
-# Have
 pre-fetch:
-.if !defined(USE_MULE)
-	@${ECHO_MSG} "To compile in the MULE features, set the environment variable USE_MULE"
-.endif
+	@${ECHO_MSG} "If you want the MULE features, please use the xemacs-mule port"
 .if defined(HAVE_MOTIF)
 .if !defined(MOTIF_STATIC)
 	@${ECHO_MSG} ""
@@ -60,12 +58,6 @@ pre-fetch:
 .endif
 .endif
 
-.if defined(USE_MULE)
-WITH_MULE=	--with-mule
-# MULEDISTFILE=	${DISTNAME}-mule.tar.gz
-# PLIST=		${PKGDIR}/PLIST.mule
-.endif
-
 # hack to avoid shipping binaries linked with Motif
 .if defined(MOTIF_STATIC)
 WITH_DIALOGS=	--with-dialogs=athena
@@ -85,7 +77,6 @@ post-install:
 .endfor
 # ``make install'' does not set the permissions like pkg_add does.
 	${CHMOD} 1777 /var/run/emacs/lock
-#	${MKDIR} ${PREFIX}/lib/xemacs
 	${RM} -f ${PREFIX}/bin/send-pr
 # install xemacs21.sh into ${PREFIX}/etc/rc.d
 	@if [ ! -d ${PREFIX}/etc/rc.d ]; then ${MKDIR} ${PREFIX}/etc/rc.d; fi
diff --git a/editors/xemacs/distinfo b/editors/xemacs/distinfo
index a6e377048c46..ca0e9b9fefbb 100644
--- a/editors/xemacs/distinfo
+++ b/editors/xemacs/distinfo
@@ -1,3 +1,3 @@
-MD5 (xemacs/xemacs-21.1.2.tar.gz) = d6c3027d8efb56d265dda522392fa8bb
-MD5 (xemacs/xemacs-21.1.2-elc.tar.gz) = 257d6043e6930004edba05ed74e75650
-MD5 (xemacs/xemacs-21.1.2-info.tar.gz) = cf4c2eba16e1342e6cc235590cfbfdac
+MD5 (xemacs/xemacs-21.1.6.tar.gz) = f216ccf246d10771b65436fd45b50810
+MD5 (xemacs/xemacs-21.1.6-elc.tar.gz) = 5047ea121e8b972725bbeb2a197e4461
+MD5 (xemacs/xemacs-21.1.6-info.tar.gz) = 6d9bf4b1f51b278439fd3fbb7033c9b5
diff --git a/editors/xemacs/files/patch-af b/editors/xemacs/files/patch-af
index dcf71c249c80..8d16648b8671 100644
--- a/editors/xemacs/files/patch-af
+++ b/editors/xemacs/files/patch-af
@@ -1,11 +1,11 @@
---- configure.orig	Wed May 26 06:28:12 1999
-+++ configure	Wed May 26 06:28:08 1999
-@@ -11172,7 +11172,7 @@
+--- configure.orig	Sun Aug 15 01:29:45 1999
++++ configure	Mon Sep  6 16:47:50 1999
+@@ -11104,7 +11104,7 @@
  if test "$with_database_berkdb" != "no"; then
    echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6
- echo "configure:11175: checking for Berkeley db.h" >&5
+ echo "configure:11107: checking for Berkeley db.h" >&5
 -  for path in "db/db.h" "db.h"; do
 +  for path in "/usr/include/db.h" "db/db.h" "db.h"; do
      cat > conftest.$ac_ext <<EOF
- #line 11178 "configure"
+ #line 11110 "configure"
  #include "confdefs.h"
diff --git a/editors/xemacs/pkg-plist b/editors/xemacs/pkg-plist
index beb3ce87c08a..124f05e2637b 100644
--- a/editors/xemacs/pkg-plist
+++ b/editors/xemacs/pkg-plist
@@ -13,7 +13,7 @@ bin/xemacs-%%XEMACS_VER%%
 @unexec rm %B/xemacs
 @unexec rm %B/xemacs21
 etc/rc.d/xemacs21.sh
-@exec mkdir -p /var/run/xemacs/lock ; chmod 1777 /var/run/xemacs/lock
+@exec mkdir -p /var/run/emacs/lock ; chmod 1777 /var/run/emacs/lock
 lib/xemacs-%%XEMACS_VER%%/etc/BETA
 lib/xemacs-%%XEMACS_VER%%/etc/CHARSETS
 lib/xemacs-%%XEMACS_VER%%/etc/CODING-STANDARDS
@@ -541,6 +541,7 @@ lib/xemacs-%%XEMACS_VER%%/lisp/mule/canna-leim.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/chinese.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/cyrillic.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/english.el
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/ethiopic.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/european.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/greek.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/hebrew.el
@@ -559,12 +560,14 @@ lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-init.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-misc.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-x-init.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-tty-init.el
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/thai-xtis-chars.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/viet-chars.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/arabic.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/canna-leim.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/chinese.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/cyrillic.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/english.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/ethiopic.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/european.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/greek.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/hebrew.elc
@@ -583,6 +586,7 @@ lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-init.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-misc.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-tty-init.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-x-init.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/thai-xtis-chars.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/viet-chars.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/term/AT386.el
 lib/xemacs-%%XEMACS_VER%%/lisp/term/README
@@ -936,6 +940,31 @@ lib/xemacs-%%XEMACS_VER%%/i386--freebsd/gzip-el.sh
 lib/xemacs-%%XEMACS_VER%%/i386--freebsd/add-big-package.sh
 lib/xemacs-%%XEMACS_VER%%/i386--freebsd/DOC
 lib/xemacs-%%XEMACS_VER%%/i386--freebsd/config.values
+@dirrm lib/xemacs-%%XEMACS_VER%%/etc/app-defaults/fr
+@dirrm lib/xemacs-%%XEMACS_VER%%/etc/app-defaults/ja
+@dirrm lib/xemacs-%%XEMACS_VER%%/etc/app-defaults
+@dirrm lib/xemacs-%%XEMACS_VER%%/etc/e
+@dirrm lib/xemacs-%%XEMACS_VER%%/etc/auctex/style
+@dirrm lib/xemacs-%%XEMACS_VER%%/etc/auctex
+@dirrm lib/xemacs-%%XEMACS_VER%%/etc/frame-icon
+@dirrm lib/xemacs-%%XEMACS_VER%%/etc/gnats
+@dirrm lib/xemacs-%%XEMACS_VER%%/etc/gnus
+@dirrm lib/xemacs-%%XEMACS_VER%%/etc/gnusrefcard
+@dirrm lib/xemacs-%%XEMACS_VER%%/etc/message
+@dirrm lib/xemacs-%%XEMACS_VER%%/etc/mine
+@dirrm lib/xemacs-%%XEMACS_VER%%/etc/mule
+@dirrm lib/xemacs-%%XEMACS_VER%%/etc/ns
+@dirrm lib/xemacs-%%XEMACS_VER%%/etc/sgml/ISO_8879=1986/entities
+@dirrm lib/xemacs-%%XEMACS_VER%%/etc/sgml/ISO_8879=1986
+@dirrm lib/xemacs-%%XEMACS_VER%%/etc/sgml/cdtd
+@dirrm lib/xemacs-%%XEMACS_VER%%/etc/sgml
+@dirrm lib/xemacs-%%XEMACS_VER%%/etc/skk
+@dirrm lib/xemacs-%%XEMACS_VER%%/etc/smilies
+@dirrm lib/xemacs-%%XEMACS_VER%%/etc/sounds
+@dirrm lib/xemacs-%%XEMACS_VER%%/etc/time
+@dirrm lib/xemacs-%%XEMACS_VER%%/etc/vm
+@dirrm lib/xemacs-%%XEMACS_VER%%/etc/w3
+@dirrm lib/xemacs-%%XEMACS_VER%%/etc/custom/example-themes
 @dirrm lib/xemacs-%%XEMACS_VER%%/etc/custom
 @dirrm lib/xemacs-%%XEMACS_VER%%/etc/eos
 @dirrm lib/xemacs-%%XEMACS_VER%%/etc/idd
@@ -947,9 +976,74 @@ lib/xemacs-%%XEMACS_VER%%/i386--freebsd/config.values
 @dirrm lib/xemacs-%%XEMACS_VER%%/etc
 @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%
 @dirrm lib/xemacs-%%XEMACS_VER%%/info
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/apel
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/cl
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/efs
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/egg
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/auctex/style
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/auctex
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/bytecomp
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/calendar
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/cc-mode
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/comint
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/custom
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/dired
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/edebug
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/ediff
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/electric
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/emulators
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/energize
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/eos
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/epoch
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/eterm
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/games
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/gnats
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/gnus
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/hm--html-menus
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/hyperbole/kotl
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/hyperbole
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/ilisp
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/iso
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/its
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/language
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/leim/quail
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/leim
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/locale/ja
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/locale
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/mailcrypt
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/mel
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/mh-e
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/mu
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/modes
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/ns
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/oobr/tree-nx/English.lproj/InfoPanel.nib
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/oobr/tree-nx/English.lproj/TreeView.nib
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/oobr/tree-nx/English.lproj/DocWindow.nib
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/oobr/tree-nx/English.lproj
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/oobr/tree-nx
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/oobr/tree-x
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/oobr
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/packages
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/pcl-cvs
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/prim
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/psgml
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/quail
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/rmail
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/skk
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/sunpro
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/tl
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/tm
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/tooltalk
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/url
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/utils
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/viper
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/vm
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/vms
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/w3
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/w32
+@dirrm lib/xemacs-%%XEMACS_VER%%/lisp/x11
 @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/mule
 @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/term
 @dirrm lib/xemacs-%%XEMACS_VER%%/lisp
 @dirrm lib/xemacs-%%XEMACS_VER%%
 @dirrm lib/xemacs
-@unexec rm -rf /var/run/xemacs