10 files changed, 57 insertions, 77 deletions

diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index 6d84165f9240..96a70bcd2e71 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	xemacs-devel-mule
 PORTVERSION=	${XEMACS_VER:S/-/./}
-PORTREVISION=	1
 CATEGORIES+=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS}
 MASTER_SITE_SUBDIR=	xemacs-${XEMACS_REL}
@@ -49,7 +48,7 @@ USE_XPM=	yes
 .endif
 
 XEMACS_REL=	21.5
-XEMACS_VER=	${XEMACS_REL}-b23
+XEMACS_VER=	${XEMACS_REL}-b24
 XEMACS_ARCH=	${MACHINE_ARCH}--freebsd
 
 WRKSRC=		${WRKDIR}/xemacs-${XEMACS_VER:S/-b/./}
@@ -65,7 +64,6 @@ CONFIGURE_ARGS=	--enable-mule \
 		--enable-sound=native \
 		--with-site-lisp \
 		--with-pop \
-		--with-xfs \
 		--with-ldap=no \
 		--with-infopath=${LOCALBASE}/lib/xemacs/info:${LOCALBASE}/info:${X11BASE}/info:/usr/info:${LOCALBASE}/lib/texmf/doc/info:/usr/lib/texmf/doc:/usr/share/info \
 		--enable-clash-detection \
@@ -90,7 +88,10 @@ MAN1=		ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \
 CONFIGURE_ARGS+=--enable-debug=no --enable-error-checking=no
 .endif
 
-.if defined(WITH_GTK)
+.if defined(WITH_XFT)
+LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
+CONFIGURE_ARGS+=--with-xft=all
+.elif defined(WITH_GTK)
 CONFIGURE_ARGS+=--with-gtk
 WITH_XIM=
 WITH_MENUBARS=	--enable-menubars=gtk
@@ -98,6 +99,8 @@ WITH_SCROLLBARS=--enable-scrollbars=gtk
 WITH_DIALOGS=	--enable-dialogs=gtk
 WITH_WIDGETS=	--enable-widgets=gtk
 USE_GNOME+=	gtk12
+.else
+CONFIGURE_ARGS+=--with-xfs
 .endif
 
 PKGDIR=		${.CURDIR}/../../editors/xemacs-devel-mule
diff --git a/editors/xemacs-devel-mule/distinfo b/editors/xemacs-devel-mule/distinfo
index 0900c319f00a..b84291ce0087 100644
--- a/editors/xemacs-devel-mule/distinfo
+++ b/editors/xemacs-devel-mule/distinfo
@@ -1,2 +1,3 @@
-MD5 (xemacs/xemacs-21.5.23.tar.gz) = 3a8111472fa7ae47d74374f85f1d0aae
-SIZE (xemacs/xemacs-21.5.23.tar.gz) = 14832801
+MD5 (xemacs/xemacs-21.5.24.tar.gz) = ac64d1df6583054999044fa3c1363b5f
+SHA256 (xemacs/xemacs-21.5.24.tar.gz) = 88e2a236c6d608d91fbf399f4a1a7823416cf2236d860c9d8b010f4e2cdd8b01
+SIZE (xemacs/xemacs-21.5.24.tar.gz) = 15103874
diff --git a/editors/xemacs-devel-mule/files/patch-aa b/editors/xemacs-devel-mule/files/patch-aa
index 45fbafd60623..54d2e365c1e7 100644
--- a/editors/xemacs-devel-mule/files/patch-aa
+++ b/editors/xemacs-devel-mule/files/patch-aa
@@ -1,11 +1,11 @@
---- lib-src/Makefile.in.in~	Tue Feb  8 11:54:39 2000
-+++ lib-src/Makefile.in.in	Thu Sep 21 22:26:13 2000
-@@ -224,7 +224,7 @@
- 	(cd ${archlibdir} && \
- 	 $(RM) ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS})
+--- lib-src/Makefile.in.in.orig	Tue Nov 22 09:14:42 2005
++++ lib-src/Makefile.in.in	Mon Dec 19 14:01:40 2005
+@@ -270,7 +270,7 @@
+ 	cd ${bindir} && $(RM) ${PUBLIC_INSTALLABLES}
+ 	cd ${archlibdir} && $(RM) ${PRIVATE_INSTALLABLES}
  
 -.PHONY: mostlyclean clean distclean realclean extraclean
 +.PHONY: mostlyclean clean distclean realclean extraclean ${archlibdir}
+ .PHONY: distclean-noconfig realclean-noconfig extraclean-noconfig
  mostlyclean:
- 	$(RM) *.o *.i core
- clean: mostlyclean
+ 	-$(RM) *.o *.i core
diff --git a/editors/xemacs-devel-mule/files/patch-configure.ac b/editors/xemacs-devel-mule/files/patch-configure.ac
index a716503ed86d..1d9758ae1bae 100644
--- a/editors/xemacs-devel-mule/files/patch-configure.ac
+++ b/editors/xemacs-devel-mule/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac	2005/03/11 11:19:01	1.2
-+++ configure.ac	2005/03/17 20:16:50
-@@ -1148,6 +1148,7 @@
+--- configure.ac.orig	Sun Dec 18 19:58:55 2005
++++ configure.ac	Mon Dec 19 16:04:59 2005
+@@ -1257,6 +1257,7 @@
  dnl Straightforward OS determination
  case "$ac_cv_build" in
    *-*-linux*    ) opsys=linux ;;
@@ -8,7 +8,16 @@
    *-*-netbsd*   ) opsys=netbsd ;;
    *-*-openbsd*	) opsys=openbsd ;;
    *-*-nextstep* ) opsys=nextstep ;;
-@@ -4943,7 +4950,7 @@
+@@ -3423,7 +3424,7 @@
+       dnl #### How about /sw/include, and /opt/local/include?
+       dnl these directories need to be the parent of the freetype directory
+       for freetype_include_top in "/usr/X11R6/include/freetype2" \
+-				  "/usr/include/freetype2"
++				  "$with_site_includes/freetype2"
+       do
+ 	if test -d $freetype_include_top; then
+ 	  AC_CHECKING([in ${freetype_include_top}/freetype2])
+@@ -5296,7 +5297,7 @@
  dnl Check for Berkeley DB.
  if test "$enable_database_berkdb" != "no"; then
    AC_MSG_CHECKING(for Berkeley db.h)
diff --git a/editors/xemacs-devel-mule/files/patch-mule-coding.c b/editors/xemacs-devel-mule/files/patch-mule-coding.c
deleted file mode 100644
index 668a870899d9..000000000000
--- a/editors/xemacs-devel-mule/files/patch-mule-coding.c
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: src/mule-coding.c
-===================================================================
-RCS file: /pack/xemacscvs/XEmacs/xemacs/src/mule-coding.c,v
-retrieving revision 1.35
-retrieving revision 1.36
-diff -u -r1.35 -r1.36
---- src/mule-coding.c	2005/06/19 21:08:31	1.35
-+++ src/mule-coding.c	2005/11/22 07:19:32	1.36
-@@ -2643,10 +2643,10 @@
- 	write_c_string (printcharfun, "(force)");
-     }
- 
--#define FROB(prop)					\
--  if (!NILP (iso2022_getprop (cs, prop)))		\
--    {							\
--      write_fmt_string (printcharfun, ", %s", prop);	\
-+#define FROB(prop)					        \
-+  if (!NILP (iso2022_getprop (cs, prop)))		        \
-+    {						                \
-+      write_fmt_string_lisp (printcharfun, ", %s", 1, prop);	\
-     }
-   
-   FROB (Qshort);
diff --git a/editors/xemacs-devel-mule/files/patch-unexelf.c b/editors/xemacs-devel-mule/files/patch-unexelf.c
deleted file mode 100644
index e645d8592ff9..000000000000
--- a/editors/xemacs-devel-mule/files/patch-unexelf.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/unexelf.c.orig	Mon Jul  4 16:11:27 2005
-+++ src/unexelf.c	Thu Sep 22 22:38:19 2005
-@@ -565,8 +565,8 @@
-  *
-  */
- int
--unexec (Extbyte *new_name, Extbyte *old_name, unsigned int UNUSED (data_start),
--	unsigned int UNUSED (bss_start), unsigned int UNUSED (entry_address))
-+unexec (Extbyte *new_name, Extbyte *old_name, uintptr_t UNUSED (data_start),
-+	uintptr_t UNUSED (bss_start), uintptr_t UNUSED (entry_address))
- {
-   int new_file, old_file, new_file_size;
- 
diff --git a/editors/xemacs-devel-mule/files/patch-window.c b/editors/xemacs-devel-mule/files/patch-window.c
deleted file mode 100644
index 24bfc925a5e6..000000000000
--- a/editors/xemacs-devel-mule/files/patch-window.c
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: src/window.c
-===================================================================
-RCS file: /pack/xemacscvs/XEmacs/xemacs/src/window.c,v
-retrieving revision 1.88
-retrieving revision 1.89
-diff -u -r1.88 -r1.89
---- src/window.c	2005/10/25 11:16:30	1.88
-+++ src/window.c	2005/11/18 12:23:57	1.89
-@@ -4314,7 +4314,14 @@
-       if (NILP (parent))
- 	{
- 	  if (widthflag)
--	    invalid_operation ("No other window to side of this one", Qunbound);
-+	    {
-+	      int new_pixsize;
-+	      sizep = &CURSIZE (w);
-+	      dim = CURCHARSIZE (w);
-+	      new_pixsize = inpixels?(*sizep + delta):(dim+delta);
-+	      set_window_pixsize (window, new_pixsize, 0, 0);
-+	      return;
-+	    }
- 	  break;
- 	}
-       if (widthflag
diff --git a/editors/xemacs-devel-mule/files/patch-xlwmenu.c b/editors/xemacs-devel-mule/files/patch-xlwmenu.c
new file mode 100644
index 000000000000..ee91eba795b5
--- /dev/null
+++ b/editors/xemacs-devel-mule/files/patch-xlwmenu.c
@@ -0,0 +1,18 @@
+Index: lwlib/xlwmenu.c
+===================================================================
+RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwmenu.c,v
+retrieving revision 1.38
+diff -u -r1.38 xlwmenu.c
+--- lwlib/xlwmenu.c	2005/11/26 11:45:59	1.38
++++ lwlib/xlwmenu.c	2005/12/20 13:04:56
+@@ -2828,8 +2828,9 @@
+ 	  XColor xcolor;
+ 	  Visual *visual;
+ 	  int ignore;
++	  Colormap cmap;
+ 	  visual_info_from_widget ((Widget) mw, &visual, &ignore);
+-	  Colormap cmap = mw->core.colormap;
++	  cmap = mw->core.colormap;
+ 	  xcolor.pixel = mw->core.background_pixel;
+ 	  XQueryColor (dpy, cmap, &xcolor);
+ 	  xcolor.red   = (xcolor.red   * 17) / 20;
diff --git a/editors/xemacs-devel-mule/pkg-plist b/editors/xemacs-devel-mule/pkg-plist
index f20359dfdae3..c1bba09bb5bc 100644
--- a/editors/xemacs-devel-mule/pkg-plist
+++ b/editors/xemacs-devel-mule/pkg-plist
@@ -46,6 +46,7 @@ lib/xemacs-%%XEMACS_VER%%/etc/InstallGuide
 lib/xemacs-%%XEMACS_VER%%/etc/NEWS
 lib/xemacs-%%XEMACS_VER%%/etc/ONEWS
 lib/xemacs-%%XEMACS_VER%%/etc/OONEWS
+lib/xemacs-%%XEMACS_VER%%/etc/PROBLEMS
 lib/xemacs-%%XEMACS_VER%%/etc/README
 lib/xemacs-%%XEMACS_VER%%/etc/TUTORIAL
 lib/xemacs-%%XEMACS_VER%%/etc/TUTORIAL.cs
@@ -556,6 +557,7 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/file-coding.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/frame-impl.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/frame.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/frameslots.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/gc.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/gccache-gtk.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/general-slots.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/getpagesize.h
@@ -855,9 +857,11 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/toolbar.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/tooltalk.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/ui-gtk.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/universe.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/vdb.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/window-impl.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/window.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/winslots.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xft-fonts.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xgccache.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xintrinsic.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xintrinsicp.h
@@ -1055,6 +1059,8 @@ lib/xemacs-%%XEMACS_VER%%/lisp/font-menu.el
 lib/xemacs-%%XEMACS_VER%%/lisp/font-menu.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/font.el
 lib/xemacs-%%XEMACS_VER%%/lisp/font.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/fontconfig.el
+lib/xemacs-%%XEMACS_VER%%/lisp/fontconfig.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/fontl-hooks.el
 lib/xemacs-%%XEMACS_VER%%/lisp/fontl-hooks.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/format.el
diff --git a/editors/xemacs-devel-mule/pkg-plist.arch-dep b/editors/xemacs-devel-mule/pkg-plist.arch-dep
index 2f2fe9da556e..8817c101eac3 100644
--- a/editors/xemacs-devel-mule/pkg-plist.arch-dep
+++ b/editors/xemacs-devel-mule/pkg-plist.arch-dep
@@ -79,6 +79,7 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/file-coding.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/frame-impl.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/frame.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/frameslots.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/gc.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/gccache-gtk.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/general-slots.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/getpagesize.h
@@ -378,9 +379,11 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/toolbar.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/tooltalk.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/ui-gtk.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/universe.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/vdb.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/window-impl.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/window.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/winslots.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xft-fonts.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xgccache.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xintrinsic.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xintrinsicp.h