- Update to 21.5.b20 "cilantro".

- Fixed option WITH_GTK(bug, reported by Palle Girgensohn <girgen@pingpong.net>)

PR:		ports/78960
Submitted by:	maintainer

7 files changed, 115 insertions, 92 deletions

diff --git a/Mk/bsd.emacs.mk b/Mk/bsd.emacs.mk
index e94dd59c0b54..1aa6d3ab471a 100644
--- a/Mk/bsd.emacs.mk
+++ b/Mk/bsd.emacs.mk
@@ -1,5 +1,5 @@
 #
-#	$FreeBSD: /tmp/pcvs/ports/Mk/bsd.emacs.mk,v 1.39 2005-02-26 06:21:34 sem Exp $
+#	$FreeBSD: /tmp/pcvs/ports/Mk/bsd.emacs.mk,v 1.40 2005-03-18 08:03:53 sem Exp $
 #
 #	bsd.emacs.mk - 19990829 Shigeyuki Fukushima.
 #
@@ -183,7 +183,7 @@ PLIST?=                 ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
 # XEmacs-21 development version with Mule
 .elif (${EMACS_PORT_NAME} == "xemacs-devel-mule")
 EMACS_NAME=		xemacs
-EMACS_VER=		21.5-b19
+EMACS_VER=		21.5-b20
 EMACS_MAJOR_VER=	21
 EMACS_LIBDIR?=		lib/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER?=	lib/${EMACS_NAME}-${EMACS_VER}
diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index 7c14334848d1..365a24a02c24 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -44,27 +44,27 @@ USE_XPM=	yes
 .endif
 
 XEMACS_REL=	21.5
-XEMACS_VER=	${XEMACS_REL}-b19
-XEMACS_ARCH=	${CONFIGURE_TARGET}
+XEMACS_VER=	${XEMACS_REL}-b20
+XEMACS_ARCH=	${MACHINE_ARCH}--freebsd
 
 WRKSRC=		${WRKDIR}/xemacs-${XEMACS_VER:S/-b/./}
 STRIP=
-USE_AUTOCONF_VER=213
-CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
+USE_AUTOCONF_VER=259
+CONFIGURE_TARGET=--build=${XEMACS_ARCH}
 
-CONFIGURE_ARGS=	--with-mule \
+CONFIGURE_ARGS=	--enable-mule \
 		--x-includes=${X11BASE}/include \
 		--x-libraries=${X11BASE}/lib \
-		--site-libraries='${SITE_LIBRARIES}' \
-		--site-includes='${SITE_INCLUDES}' \
-		--with-sound=native \
+		--with-site-libraries='${SITE_LIBRARIES}' \
+		--with-site-includes='${SITE_INCLUDES}' \
+		--enable-sound=native \
 		--with-site-lisp \
 		--with-pop \
 		--with-xfs \
 		--with-ldap=no \
-		--infopath=${LOCALBASE}/lib/xemacs/info:${LOCALBASE}/info:${X11BASE}/info:/usr/info:${LOCALBASE}/lib/texmf/doc/info:/usr/lib/texmf/doc:/usr/share/info \
-		--with-clash-detection \
-		--with-database=berkdb \
+		--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 \
+		--enable-database=berkdb \
 		${WITH_XIM} \
 		${WITH_MENUBARS} ${WITH_SCROLLBARS} \
 		${WITH_DIALOGS} ${WITH_WIDGETS}
@@ -82,11 +82,16 @@ MAN1=		ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \
 .endif
 
 .if !defined(DEBUG)
-CONFIGURE_ARGS+=--debug=no --error-checking=none
+CONFIGURE_ARGS+=--enable-debug=no --enable-error-checking=no
 .endif
 
 .if defined(WITH_GTK)
 CONFIGURE_ARGS+=--with-gtk
+WITH_XIM=
+WITH_MENUBARS=	--enable-menubars=gtk
+WITH_SCROLLBARS=--enable-scrollbars=gtk
+WITH_DIALOGS=	--enable-dialogs=gtk
+WITH_WIDGETS=	--enable-widgets=gtk
 USE_GNOME+=	gtk12
 .endif
 
@@ -98,7 +103,7 @@ PLIST_SUB=	XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH}
 
 # Undump and malloc do not behave on amd64 and sparc64
 .if (${ARCH} == "amd64") || (${ARCH} == "sparc64")
-CONFIGURE_ARGS+=--with-system-malloc --pdump
+CONFIGURE_ARGS+=--with-system-malloc --enable-pdump
 .endif
 
 pre-fetch:
@@ -106,7 +111,7 @@ pre-fetch:
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Set the environment variable WITHOUT_X11 if you "
 	@${ECHO_MSG} "do not want to use X11."
-CONFIGURE_ARGS+=	--without-x11
+CONFIGURE_ARGS+=	--with-x11=no
 .else
 .if !defined(WITH_GTK)
 	@${ECHO_MSG} "If you want to use GTK, please set the environment variable WITH_GTK and recompile."
@@ -124,23 +129,23 @@ USE_MOTIF=	yes
 
 # hack to avoid shipping binaries linked with Motif
 .if defined(MOTIF_STATIC)
-WITH_DIALOGS=	--with-dialogs=athena
+WITH_DIALOGS?=	--enable-dialogs=athena
 .else
-WITH_DIALOGS=	--with-dialogs=motif
+WITH_DIALOGS?=	--enable-dialogs=motif
 .endif
 
 .if defined(PACKAGE_BUILDING)
 CONFIGURE_ARGS+=--with-offix=no
 .endif
-WITH_MENUBARS?=	--with-menubars=lucid
-WITH_SCROLLBARS?=--with-scrollbars=motif
-WITH_WIDGETS?=	--with-widgets=motif
+WITH_MENUBARS?=	--enable-menubars=lucid
+WITH_SCROLLBARS?=--enable-scrollbars=motif
+WITH_WIDGETS?=	--enable-widgets=motif
 .endif
 WITH_XIM?=	--with-xim=xlib
-WITH_MENUBARS?=	--with-menubars=athena
-WITH_SCROLLBARS?=--with-scrollbars=athena
-WITH_DIALOGS?=	--with-dialogs=athena
-WITH_WIDGETS?=	--with-widgets=athena
+WITH_MENUBARS?=	--enable-menubars=athena
+WITH_SCROLLBARS?=--enable-scrollbars=athena
+WITH_DIALOGS?=	--enable-dialogs=athena
+WITH_WIDGETS?=	--enable-widgets=athena
 
 .if defined(WITH_XAW3D)
 CONFIGURE_ARGS+=--with-athena=3d
diff --git a/editors/xemacs-devel-mule/distinfo b/editors/xemacs-devel-mule/distinfo
index 888c2e2a2475..1d8d2eb6c3a5 100644
--- a/editors/xemacs-devel-mule/distinfo
+++ b/editors/xemacs-devel-mule/distinfo
@@ -1,2 +1,2 @@
-MD5 (xemacs/xemacs-21.5.19.tar.gz) = 75ca89c49b4d99ae00113f8cd1b2a287
-SIZE (xemacs/xemacs-21.5.19.tar.gz) = 15564957
+MD5 (xemacs/xemacs-21.5.20.tar.gz) = 8bf5f1af05588cb59a67bade939c4aeb
+SIZE (xemacs/xemacs-21.5.20.tar.gz) = 11872002
diff --git a/editors/xemacs-devel-mule/files/patch-af b/editors/xemacs-devel-mule/files/patch-af
deleted file mode 100644
index 814548dd9365..000000000000
--- a/editors/xemacs-devel-mule/files/patch-af
+++ /dev/null
@@ -1,53 +0,0 @@
---- configure.in.orig	Fri Feb 14 14:31:16 2003
-+++ configure.in	Tue Apr 29 21:52:41 2003
-@@ -1133,6 +1133,7 @@
- dnl Straightforward OS determination
- case "$canonical" in
-   *-*-linux*    ) opsys=linux ;;
-+  *-*-freebsd*   ) opsys=freebsd ;;
-   *-*-netbsd*   ) opsys=netbsd ;;
-   *-*-openbsd*	) opsys=openbsd ;;
-   *-*-nextstep* ) opsys=nextstep ;;
-@@ -3920,20 +3921,24 @@
-     test "$ac_cv_func_crypt" != "yes" && { AC_CHECK_LIB(crypt, crypt) }
-   fi
-   dnl Back to our regularly scheduled wnn hunting
--  if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
--    AC_CHECK_LIB(wnn,jl_dic_list_e,libwnn=wnn,
--      AC_CHECK_LIB(wnn4,jl_dic_list_e,libwnn=wnn4,
--	AC_CHECK_LIB(wnn6,jl_dic_list_e,libwnn=wnn6,
--	  AC_CHECK_LIB(wnn6_fromsrc,dic_list_e,libwnn=wnn6_fromsrc,with_wnn=no))))
-+ if test "$with_wnn6" = "yes"; then
-+   AC_CHECK_LIB(wnn6,jl_fi_dic_list_e,libwnn=wnn6,
-+     AC_CHECK_LIB(wnn6_fromsrc,jl_fi_dic_list_e,libwnn=wnn6_fromsrc,
-+AC_CHECK_LIB(wnn,jl_fi_dic_list_e,libwnn=wnn, [with_wnn6=no; with_wnn=no])))
-+ else
-+   if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
-+     AC_CHECK_LIB(wnn,jl_dic_list_e,libwnn=wnn,
-+AC_CHECK_LIB(wnn4,jl_dic_list_e,libwnn=wnn4,
-+  AC_CHECK_LIB(wnn6,jl_fi_dic_list_e,[libwnn=wnn6; with_wnn6=yes],
-+    AC_CHECK_LIB(wnn6_fromsrc,jl_fi_dic_list_e, [libwnn=wnn6_fromsrc; with_wnn6=yes],with_wnn=no))))
-+   fi
-   fi
-   test -z "$with_wnn" && with_wnn=yes
-   if test "$with_wnn" = "yes"; then
-     AC_DEFINE(HAVE_WNN)
-     XE_PREPEND(-l$libwnn, libs_x)
--    if test "$with_wnn6" != "no"; then
--      AC_CHECK_LIB($libwnn, jl_fi_dic_list, with_wnn6=yes)
--      test "$with_wnn6" = "yes" && AC_DEFINE(WNN6)
--    fi
-+    dnl XE_ADD_OBJS(mule-wnnfns.o) missing here
-+    test "$with_wnn6" = "yes" && AC_DEFINE(WNN6)
-   fi
- 
-   dnl Autodetect canna
-@@ -4526,7 +4531,7 @@
- dnl Check for Berkeley DB.
- if test "$with_database_berkdb" != "no"; then
-   AC_MSG_CHECKING(for Berkeley db.h)
--  for header in "db/db.h" "db.h"; do
-+  for header in "/usr/include/db.h" "db/db.h" "db.h"; do
-     AC_TRY_COMPILE([
- #include <stdlib.h>
- #if !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1)
diff --git a/editors/xemacs-devel-mule/files/patch-configure.ac b/editors/xemacs-devel-mule/files/patch-configure.ac
new file mode 100644
index 000000000000..e27c99fdbaab
--- /dev/null
+++ b/editors/xemacs-devel-mule/files/patch-configure.ac
@@ -0,0 +1,82 @@
+Index: configure.ac
+===================================================================
+RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
+retrieving revision 1.2
+diff -u -r1.2 configure.ac
+--- configure.ac	2005/03/11 11:19:01	1.2
++++ configure.ac	2005/03/17 20:16:50
+@@ -11,7 +11,7 @@
+ xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
+ xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
+ ac_cpp='$CPP '"$xe_cppflags"
+-ac_compile='$CC -c $CFLAGS'"$xe_cppflags"' conftest.$ac_ext >&AS_MESSAGE_LOG_FD'
++ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext >&AS_MESSAGE_LOG_FD'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&AS_MESSAGE_LOG_FD'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ])
+@@ -1148,6 +1148,7 @@
+ dnl Straightforward OS determination
+ case "$ac_cv_build" in
+   *-*-linux*    ) opsys=linux ;;
++  *-*-freebsd*	) opsys=freebsd ;;
+   *-*-netbsd*   ) opsys=netbsd ;;
+   *-*-openbsd*	) opsys=openbsd ;;
+   *-*-nextstep* ) opsys=nextstep ;;
+@@ -1706,12 +1707,12 @@
+   else cflags_warning_specified=no;
+ fi
+ 
+-if test "${cflags_optimization-unset}" != unset
++if test "${with_cflags_optimization-unset}" != unset
+   then cflags_optimization_specified=yes;
+   else cflags_optimization_specified=no;
+ fi
+ 
+-if test "${cflags_debugging-unset}" != unset
++if test "${with_cflags_debugging-unset}" != unset
+   then cflags_debugging_specified=yes;
+   else cflags_debugging_specified=no;
+ fi
+@@ -2048,11 +2049,11 @@
+ dnl Calculate optimization flags.  These will be off by default in beta
+ dnl versions and on in release versions.
+ 
+-if test -z "$with_optimization" ; then
+-  if test -n "$emacs_is_beta" ; then
+-    with_optimization=no
+-  else
++if test -z "$with_optimization"; then
++  if test -z "$emacs_is_beta" -o "$cflags_optimization_specified" = "yes"; then
+     with_optimization=yes
++  else
++    with_optimization=no
+   fi
+ fi
+ 
+@@ -3811,7 +3812,7 @@
+   png_problem=""
+   test -z "$with_png" && { AC_CHECK_FUNC(pow,                  ,with_png=no) }
+   test -z "$with_png" && { AC_CHECK_HEADER(png.h,              ,with_png=no) }
+-  test -z "$with_png" && { AC_CHECK_LIB(png, png_read_image,[:],with_png=no) }
++  test -z "$with_png" && { AC_CHECK_LIB(png, png_read_image,[:],with_png=no,[-lz]) }
+   if test -z "$with_png"; then
+     AC_MSG_CHECKING(for workable png version information)
+     xe_check_libs="-lpng -lz"
+@@ -3847,7 +3848,7 @@
+ 
+   dnl autodetect TIFF
+   test -z "$with_tiff" && { AC_CHECK_HEADER(tiffio.h,            ,with_tiff=no) }
+-  test -z "$with_tiff" && { AC_CHECK_LIB(tiff, TIFFClientOpen,[:],with_tiff=no) }
++  test -z "$with_tiff" && { AC_CHECK_LIB(tiff, TIFFClientOpen,[:],with_tiff=no,[-lz]) }
+   test -z "$with_tiff" && with_tiff=yes
+   if test "$with_tiff" = "yes"; then
+     AC_DEFINE(HAVE_TIFF)
+@@ -4943,7 +4950,7 @@
+ dnl Check for Berkeley DB.
+ if test "$enable_database_berkdb" != "no"; then
+   AC_MSG_CHECKING(for Berkeley db.h)
+-  for header in "db/db.h" "db.h"; do
++  for header in "/usr/include/db.h" "db/db.h" "db.h"; do
+     AC_TRY_COMPILE([
+ #include <stdlib.h>
+ #if !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1)
diff --git a/editors/xemacs-devel-mule/files/patch-freebsd.h b/editors/xemacs-devel-mule/files/patch-freebsd.h
deleted file mode 100644
index 7290249492fa..000000000000
--- a/editors/xemacs-devel-mule/files/patch-freebsd.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/s/freebsd.h.old	Sun Dec 26 00:47:51 2004
-+++ src/s/freebsd.h	Sun Dec 26 00:48:27 2004
-@@ -29,7 +29,7 @@
- #ifndef __FreeBSD_version
- #include <osreldate.h>
- #endif
--#if __FreeBSD_version >= 199701
-+#if __FreeBSD_version >= 199701 && __FreeBSD_version < 600006
- #define LIBS_SYSTEM "-lutil -lxpg4"
- #else
- #define LIBS_SYSTEM "-lutil"
diff --git a/editors/xemacs-devel-mule/pkg-plist b/editors/xemacs-devel-mule/pkg-plist
index e3f015b7f9c2..bc210152e457 100644
--- a/editors/xemacs-devel-mule/pkg-plist
+++ b/editors/xemacs-devel-mule/pkg-plist
@@ -67,6 +67,7 @@ lib/xemacs-%%XEMACS_VER%%/etc/TUTORIAL.th
 lib/xemacs-%%XEMACS_VER%%/etc/VEGETABLES
 lib/xemacs-%%XEMACS_VER%%/etc/XKeysymDB
 lib/xemacs-%%XEMACS_VER%%/etc/cbx.png
+lib/xemacs-%%XEMACS_VER%%/etc/configure-2.13
 lib/xemacs-%%XEMACS_VER%%/etc/ctags.1
 lib/xemacs-%%XEMACS_VER%%/etc/custom/check0.xpm
 lib/xemacs-%%XEMACS_VER%%/etc/custom/check1.xpm
@@ -899,7 +900,6 @@ 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/term.info