Make this package build again:

Remove esound-support from options.mk until i find the reason why
libossaudio is not used.
Fix canna-support with a patch from Thomas Klausner. Thanks.

4 files changed, 29 insertions, 14 deletions

diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile
index 5c6b8a05b2f..74a5c83f5d7 100644
--- a/editors/xemacs-current/Makefile
+++ b/editors/xemacs-current/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2004/12/28 23:18:19 reed Exp $
+# $NetBSD: Makefile,v 1.44 2005/01/22 13:03:06 magick Exp $
 
 DISTNAME=	xemacs-21.5.18
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS:=xemacs-21.5/}
 
diff --git a/editors/xemacs-current/distinfo b/editors/xemacs-current/distinfo
index 3b3e8751f0d..4d77c964882 100644
--- a/editors/xemacs-current/distinfo
+++ b/editors/xemacs-current/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2004/11/25 18:09:06 magick Exp $
+$NetBSD: distinfo,v 1.14 2005/01/22 13:03:06 magick Exp $
 
 SHA1 (xemacs-21.5.18.tar.gz) = b149d1854d71fe1a04a40a9734689876d0140f22
 Size (xemacs-21.5.18.tar.gz) = 14985234 bytes
@@ -9,3 +9,4 @@ SHA1 (patch-ad) = 14c5e0f31801648fbdb7f96e5d26cb505a59b741
 SHA1 (patch-ae) = 902a375f974e06eb5d67b69deadead98c625d97a
 SHA1 (patch-af) = e32b873bfba31e84b162cac4f1a4e9cee7c47c9e
 SHA1 (patch-ag) = cd4e13ebaa9ff13c3987eddc427998a3765da259
+SHA1 (patch-ah) = ff4490952e304d075a24d89b685f46702044d8e1
diff --git a/editors/xemacs-current/options.mk b/editors/xemacs-current/options.mk
index 4abbec504a1..fb50cf48028 100644
--- a/editors/xemacs-current/options.mk
+++ b/editors/xemacs-current/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2004/12/28 15:45:12 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2005/01/22 13:03:06 magick Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.xemacs
 PKG_SUPPORTED_OPTIONS=	esound ldap xface canna
@@ -6,29 +6,29 @@ PKG_SUPPORTED_OPTIONS=	esound ldap xface canna
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mldap)
-CONFIGURE_ARGS=	--with-ldap
+CONFIGURE_ARGS+=	--with-ldap
 .  include "../../databases/openldap/buildlink3.mk"
 .else
-CONFIGURE_ARGS=	--without-ldap
+CONFIGURE_ARGS+=	--without-ldap
 .endif
 
 .if !empty(PKG_OPTIONS:Mxface)
-CONFIGURE_ARGS=	--with-xface
+CONFIGURE_ARGS+=	--with-xface
 .  include "../../mail/faces/buildlink3.mk"
 .else
-CONFIGURE_ARGS=	--without-xface
+CONFIGURE_ARGS+=	--without-xface
 .endif
 
 .if !empty(PKG_OPTIONS:Mcanna)
 .  include "../../inputmethod/canna-lib/buildlink3.mk"
-CONFIGURE_ARGS=	--with-canna
+CONFIGURE_ARGS+=	--with-canna
 .else
-CONFIGURE_ARGS=	--without-canna
+CONFIGURE_ARGS+=	--without-canna
 .endif
 
-.if !empty(PKG_OPTIONS:Mesound)
-.  include "../../audio/esound/buildlink3.mk"
-.else
+#.if !empty(PKG_OPTIONS:Mesound)
+#.  include "../../audio/esound/buildlink3.mk"
+#.else
 CONFIGURE_ARGS+=	--with-sound=none
-.endif
+#.endif
 
diff --git a/editors/xemacs-current/patches/patch-ah b/editors/xemacs-current/patches/patch-ah
new file mode 100644
index 00000000000..9db91c7b63b
--- /dev/null
+++ b/editors/xemacs-current/patches/patch-ah
@@ -0,0 +1,14 @@
+$NetBSD: patch-ah,v 1.1 2005/01/22 13:03:06 magick Exp $
+
+--- src/mule-canna.c.orig	2004-09-20 21:19:52.000000000 +0200
++++ src/mule-canna.c
+@@ -438,7 +438,9 @@ If nil is specified for each arg, the de
+     }
+   else
+     {
++#ifndef CANNA2
+       jrBeepFunc = call_Fding;
++#endif
+ 
+ #ifdef KC_SETAPPNAME
+ #ifndef CANNA_MULE