pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/editors/xemacs-current Make this package build again:
details: https://anonhg.NetBSD.org/pkgsrc/rev/f2432a3fe73c
branches: trunk
changeset: 487943:f2432a3fe73c
user: magick <magick%pkgsrc.org@localhost>
date: Sat Jan 22 13:03:06 2005 +0000
description:
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.
diffstat:
editors/xemacs-current/Makefile | 4 ++--
editors/xemacs-current/distinfo | 3 ++-
editors/xemacs-current/options.mk | 22 +++++++++++-----------
editors/xemacs-current/patches/patch-ah | 14 ++++++++++++++
4 files changed, 29 insertions(+), 14 deletions(-)
diffs (94 lines):
diff -r feac3cfab803 -r f2432a3fe73c editors/xemacs-current/Makefile
--- a/editors/xemacs-current/Makefile Sat Jan 22 12:35:26 2005 +0000
+++ b/editors/xemacs-current/Makefile Sat Jan 22 13:03:06 2005 +0000
@@ -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 -r feac3cfab803 -r f2432a3fe73c editors/xemacs-current/distinfo
--- a/editors/xemacs-current/distinfo Sat Jan 22 12:35:26 2005 +0000
+++ b/editors/xemacs-current/distinfo Sat Jan 22 13:03:06 2005 +0000
@@ -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-ae) = 902a375f974e06eb5d67b69deadead98c625d97a
SHA1 (patch-af) = e32b873bfba31e84b162cac4f1a4e9cee7c47c9e
SHA1 (patch-ag) = cd4e13ebaa9ff13c3987eddc427998a3765da259
+SHA1 (patch-ah) = ff4490952e304d075a24d89b685f46702044d8e1
diff -r feac3cfab803 -r f2432a3fe73c editors/xemacs-current/options.mk
--- a/editors/xemacs-current/options.mk Sat Jan 22 12:35:26 2005 +0000
+++ b/editors/xemacs-current/options.mk Sat Jan 22 13:03:06 2005 +0000
@@ -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 @@
.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 -r feac3cfab803 -r f2432a3fe73c editors/xemacs-current/patches/patch-ah
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/xemacs-current/patches/patch-ah Sat Jan 22 13:03:06 2005 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index