From 6d713b3afb32a00b445e05f336b9a25442461231 Mon Sep 17 00:00:00 2001 From: minskim Date: Mon, 9 Feb 2004 07:54:58 +0000 Subject: Update xemacs to 21.4.15. Approved by uebayasi@. Changes in this version: * etc/OXYMORONS: Inserted "Corporate Culture" for 21.4.15. * etc/package-index.LATEST.gpg: New, replaces `package-index.LATEST.pgp'. * etc/package-index.LATEST.pgp: Removed, replaced with `package-index.LATEST.gpg'. * configure.in: The icc compiler pretends to be gcc. It isn't. * etc/PACKAGES (ERC): new. * configure.usage (--with-widgets): widgets now defaults to --with-widgets=no. Patch inspired by Jim Schumacher. * etc/PACKAGES (riece): New package. * etc/PACKAGES (liece): Mark as deprecated. * configure.in: Add Intel C++ compiler detection to compiler version reporting. * configure.in: record additional info about compiler and libc versions, to assist in debugging. * configure.in (line 3573): (Mule input methods): Deprecate Motif for Linux. (Installation): Report when LessTif is used. * configure.in: installexe.sh is under srcdir, not blddir. * aclocal.m4: Add icc (Intel compiler) support. * configure.in: Ditto. * configure.in (OS_RELEASE): Add support for SunOS 5.10. On current OSes produced by Sun, `uname -r' prints "5.9". It seems likely that on future OSes, `uname -r' will print "5.10". We need to accept multi-digit release numbers. * PROBLEMS: Propose bash as an alternative to buggy Solaris /bin/sh. * configure.in: XEmacs failed to build on Solaris9. --- editors/xemacs/Makefile | 5 +- editors/xemacs/PLIST | 109 +++------------------------------------- editors/xemacs/distinfo | 18 +++---- editors/xemacs/patches/patch-aa | 14 +++--- editors/xemacs/patches/patch-af | 18 +++---- 5 files changed, 34 insertions(+), 130 deletions(-) (limited to 'editors') diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile index 349161c0ddd..73211e0f27d 100644 --- a/editors/xemacs/Makefile +++ b/editors/xemacs/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.68 2004/02/09 07:16:13 minskim Exp $ +# $NetBSD: Makefile,v 1.69 2004/02/09 07:54:58 minskim Exp $ -DISTNAME= xemacs-21.4.14 -PKGREVISION= 1 +DISTNAME= xemacs-21.4.15 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_XEMACS:=xemacs-21.4/} DISTFILES= ${EXTRACT_ONLY} ${EXTRA_FILES} diff --git a/editors/xemacs/PLIST b/editors/xemacs/PLIST index 85dd0197724..417a2f50308 100644 --- a/editors/xemacs/PLIST +++ b/editors/xemacs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2003/02/26 10:17:33 tron Exp $ +@comment $NetBSD: PLIST,v 1.9 2004/02/09 07:54:58 minskim Exp $ bin/${DISTNAME} bin/ellcc bin/gnuattach @@ -493,7 +493,7 @@ lib/${DISTNAME}/etc/idd/drop lib/${DISTNAME}/etc/idd/dropmsk lib/${DISTNAME}/etc/ms-kermit lib/${DISTNAME}/etc/ms-kermit-7bit -lib/${DISTNAME}/etc/package-index.LATEST.pgp +lib/${DISTNAME}/etc/package-index.LATEST.gpg lib/${DISTNAME}/etc/photos/adrian.png lib/${DISTNAME}/etc/photos/adrianm.png lib/${DISTNAME}/etc/photos/ajc.png @@ -753,12 +753,6 @@ lib/${DISTNAME}/etc/xemacs.1 lib/${DISTNAME}/etc/xemacs.xbm lib/${DISTNAME}/etc/xemacs.xpm lib/${DISTNAME}/info/cl.info -lib/${DISTNAME}/info/cl.info-1 -lib/${DISTNAME}/info/cl.info-2 -lib/${DISTNAME}/info/cl.info-3 -lib/${DISTNAME}/info/cl.info-4 -lib/${DISTNAME}/info/cl.info-5 -lib/${DISTNAME}/info/cl.info-6 lib/${DISTNAME}/info/custom.info lib/${DISTNAME}/info/dir lib/${DISTNAME}/info/emodules.info @@ -767,123 +761,30 @@ lib/${DISTNAME}/info/info.info lib/${DISTNAME}/info/internals.info lib/${DISTNAME}/info/internals.info-1 lib/${DISTNAME}/info/internals.info-2 -lib/${DISTNAME}/info/internals.info-3 -lib/${DISTNAME}/info/internals.info-4 -lib/${DISTNAME}/info/internals.info-5 -lib/${DISTNAME}/info/internals.info-6 -lib/${DISTNAME}/info/internals.info-7 -lib/${DISTNAME}/info/internals.info-8 -lib/${DISTNAME}/info/internals.info-9 lib/${DISTNAME}/info/lispref.info lib/${DISTNAME}/info/lispref.info-1 -lib/${DISTNAME}/info/lispref.info-10 -lib/${DISTNAME}/info/lispref.info-11 -lib/${DISTNAME}/info/lispref.info-12 -lib/${DISTNAME}/info/lispref.info-13 -lib/${DISTNAME}/info/lispref.info-14 -lib/${DISTNAME}/info/lispref.info-15 -lib/${DISTNAME}/info/lispref.info-16 -lib/${DISTNAME}/info/lispref.info-17 -lib/${DISTNAME}/info/lispref.info-18 -lib/${DISTNAME}/info/lispref.info-19 lib/${DISTNAME}/info/lispref.info-2 -lib/${DISTNAME}/info/lispref.info-20 -lib/${DISTNAME}/info/lispref.info-21 -lib/${DISTNAME}/info/lispref.info-22 -lib/${DISTNAME}/info/lispref.info-23 -lib/${DISTNAME}/info/lispref.info-24 -lib/${DISTNAME}/info/lispref.info-25 -lib/${DISTNAME}/info/lispref.info-26 -lib/${DISTNAME}/info/lispref.info-27 -lib/${DISTNAME}/info/lispref.info-28 -lib/${DISTNAME}/info/lispref.info-29 lib/${DISTNAME}/info/lispref.info-3 -lib/${DISTNAME}/info/lispref.info-30 -lib/${DISTNAME}/info/lispref.info-31 -lib/${DISTNAME}/info/lispref.info-32 -lib/${DISTNAME}/info/lispref.info-33 -lib/${DISTNAME}/info/lispref.info-34 -lib/${DISTNAME}/info/lispref.info-35 -lib/${DISTNAME}/info/lispref.info-36 -lib/${DISTNAME}/info/lispref.info-37 -lib/${DISTNAME}/info/lispref.info-38 -lib/${DISTNAME}/info/lispref.info-39 lib/${DISTNAME}/info/lispref.info-4 -lib/${DISTNAME}/info/lispref.info-40 -lib/${DISTNAME}/info/lispref.info-41 -lib/${DISTNAME}/info/lispref.info-42 -lib/${DISTNAME}/info/lispref.info-43 -lib/${DISTNAME}/info/lispref.info-44 -lib/${DISTNAME}/info/lispref.info-45 -lib/${DISTNAME}/info/lispref.info-46 -lib/${DISTNAME}/info/lispref.info-47 -lib/${DISTNAME}/info/lispref.info-48 -lib/${DISTNAME}/info/lispref.info-49 lib/${DISTNAME}/info/lispref.info-5 -lib/${DISTNAME}/info/lispref.info-50 lib/${DISTNAME}/info/lispref.info-6 lib/${DISTNAME}/info/lispref.info-7 lib/${DISTNAME}/info/lispref.info-8 lib/${DISTNAME}/info/lispref.info-9 lib/${DISTNAME}/info/new-users-guide.info -lib/${DISTNAME}/info/new-users-guide.info-1 -lib/${DISTNAME}/info/new-users-guide.info-2 -lib/${DISTNAME}/info/new-users-guide.info-3 lib/${DISTNAME}/info/standards.info -lib/${DISTNAME}/info/standards.info-1 -lib/${DISTNAME}/info/standards.info-2 -lib/${DISTNAME}/info/standards.info-3 -lib/${DISTNAME}/info/standards.info-4 lib/${DISTNAME}/info/term.info lib/${DISTNAME}/info/termcap.info -lib/${DISTNAME}/info/termcap.info-1 -lib/${DISTNAME}/info/termcap.info-2 -lib/${DISTNAME}/info/termcap.info-3 lib/${DISTNAME}/info/texinfo.info lib/${DISTNAME}/info/texinfo.info-1 -lib/${DISTNAME}/info/texinfo.info-10 -lib/${DISTNAME}/info/texinfo.info-11 -lib/${DISTNAME}/info/texinfo.info-12 lib/${DISTNAME}/info/texinfo.info-2 -lib/${DISTNAME}/info/texinfo.info-3 -lib/${DISTNAME}/info/texinfo.info-4 -lib/${DISTNAME}/info/texinfo.info-5 -lib/${DISTNAME}/info/texinfo.info-6 -lib/${DISTNAME}/info/texinfo.info-7 -lib/${DISTNAME}/info/texinfo.info-8 -lib/${DISTNAME}/info/texinfo.info-9 lib/${DISTNAME}/info/widget.info lib/${DISTNAME}/info/xemacs-faq.info -lib/${DISTNAME}/info/xemacs-faq.info-1 -lib/${DISTNAME}/info/xemacs-faq.info-2 -lib/${DISTNAME}/info/xemacs-faq.info-3 -lib/${DISTNAME}/info/xemacs-faq.info-4 -lib/${DISTNAME}/info/xemacs-faq.info-5 -lib/${DISTNAME}/info/xemacs-faq.info-6 lib/${DISTNAME}/info/xemacs.info lib/${DISTNAME}/info/xemacs.info-1 -lib/${DISTNAME}/info/xemacs.info-10 -lib/${DISTNAME}/info/xemacs.info-11 -lib/${DISTNAME}/info/xemacs.info-12 -lib/${DISTNAME}/info/xemacs.info-13 -lib/${DISTNAME}/info/xemacs.info-14 -lib/${DISTNAME}/info/xemacs.info-15 -lib/${DISTNAME}/info/xemacs.info-16 -lib/${DISTNAME}/info/xemacs.info-17 -lib/${DISTNAME}/info/xemacs.info-18 -lib/${DISTNAME}/info/xemacs.info-19 lib/${DISTNAME}/info/xemacs.info-2 -lib/${DISTNAME}/info/xemacs.info-20 -lib/${DISTNAME}/info/xemacs.info-21 -lib/${DISTNAME}/info/xemacs.info-22 -lib/${DISTNAME}/info/xemacs.info-23 lib/${DISTNAME}/info/xemacs.info-3 lib/${DISTNAME}/info/xemacs.info-4 -lib/${DISTNAME}/info/xemacs.info-5 -lib/${DISTNAME}/info/xemacs.info-6 -lib/${DISTNAME}/info/xemacs.info-7 -lib/${DISTNAME}/info/xemacs.info-8 -lib/${DISTNAME}/info/xemacs.info-9 lib/${DISTNAME}/lisp/ChangeLog lib/${DISTNAME}/lisp/ChangeLog.1 lib/${DISTNAME}/lisp/ChangeLog.GTK @@ -1159,6 +1060,7 @@ lib/${DISTNAME}/lisp/mule/canna-leim.elc lib/${DISTNAME}/lisp/mule/chinese.el${ELSUFX} lib/${DISTNAME}/lisp/mule/chinese.elc lib/${DISTNAME}/lisp/mule/custom-load.el${ELSUFX} +lib/${DISTNAME}/lisp/mule/custom-load.elc lib/${DISTNAME}/lisp/mule/cyrillic.el${ELSUFX} lib/${DISTNAME}/lisp/mule/cyrillic.elc lib/${DISTNAME}/lisp/mule/english.el${ELSUFX} @@ -1234,6 +1136,7 @@ lib/${DISTNAME}/lisp/page.elc lib/${DISTNAME}/lisp/paragraphs.el${ELSUFX} lib/${DISTNAME}/lisp/paragraphs.elc lib/${DISTNAME}/lisp/paths.el${ELSUFX} +lib/${DISTNAME}/lisp/paths.elc lib/${DISTNAME}/lisp/picture.el${ELSUFX} lib/${DISTNAME}/lisp/picture.elc lib/${DISTNAME}/lisp/printer.el${ELSUFX} @@ -1320,6 +1223,7 @@ lib/${DISTNAME}/lisp/update-elc.el${ELSUFX} lib/${DISTNAME}/lisp/userlock.el${ELSUFX} lib/${DISTNAME}/lisp/userlock.elc lib/${DISTNAME}/lisp/version.el${ELSUFX} +lib/${DISTNAME}/lisp/version.elc lib/${DISTNAME}/lisp/very-early-lisp.el${ELSUFX} lib/${DISTNAME}/lisp/view-less.el${ELSUFX} lib/${DISTNAME}/lisp/view-less.elc @@ -1380,14 +1284,15 @@ man/man1/xemacs.1 @dirrm lib/${DISTNAME}/etc/custom/example-themes @dirrm lib/${DISTNAME}/etc/custom @dirrm lib/${DISTNAME}/etc +@exec ${MKDIR} %D/lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/modules @dirrm lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/modules @dirrm lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/s @dirrm lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include/m @dirrm lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/include @dirrm lib/${DISTNAME}/${MACHINE_GNU_PLATFORM} @dirrm lib/${DISTNAME} -@exec ${MKDIR} %D/lib/xemacs/site-lisp @exec ${MKDIR} %D/lib/xemacs/site-modules @dirrm lib/xemacs/site-modules +@exec ${MKDIR} %D/lib/xemacs/site-lisp @dirrm lib/xemacs/site-lisp @dirrm lib/xemacs diff --git a/editors/xemacs/distinfo b/editors/xemacs/distinfo index 83ddc1af059..811aff20fa5 100644 --- a/editors/xemacs/distinfo +++ b/editors/xemacs/distinfo @@ -1,16 +1,16 @@ -$NetBSD: distinfo,v 1.7 2003/12/22 07:08:30 uebayasi Exp $ +$NetBSD: distinfo,v 1.8 2004/02/09 07:54:58 minskim Exp $ -SHA1 (xemacs/xemacs-21.4.14.tar.gz) = dcd79e08ef3587b103f604f67f477c068b567ded -Size (xemacs/xemacs-21.4.14.tar.gz) = 10681946 bytes -SHA1 (xemacs/xemacs-21.4.14-elc.tar.gz) = 78b93496d579486e00c352345a1e8520564dc360 -Size (xemacs/xemacs-21.4.14-elc.tar.gz) = 925908 bytes -SHA1 (xemacs/xemacs-21.4.14-info.tar.gz) = 7db784d419f6b210f66f0bb7f223fc2134607140 -Size (xemacs/xemacs-21.4.14-info.tar.gz) = 1663979 bytes -SHA1 (patch-aa) = 2827e7f28e8553c0375e75fa151a57e0e2b8bebf +SHA1 (xemacs/xemacs-21.4.15.tar.gz) = 6ee2583c71b46ef1edb78bd170c9adbef97ae5db +Size (xemacs/xemacs-21.4.15.tar.gz) = 10652161 bytes +SHA1 (xemacs/xemacs-21.4.15-elc.tar.gz) = 7162d6e6b0ddee893f890ec65aec63edc3482919 +Size (xemacs/xemacs-21.4.15-elc.tar.gz) = 927962 bytes +SHA1 (xemacs/xemacs-21.4.15-info.tar.gz) = 7d509aeecbee0bc879e6d412370969768e7422ab +Size (xemacs/xemacs-21.4.15-info.tar.gz) = 1603029 bytes +SHA1 (patch-aa) = f625428b9fb782d452a01e82a9d5d716fba4c4ed SHA1 (patch-ab) = 1487edf8addea7971f4fcbcf57818090f32edef5 SHA1 (patch-ac) = effbc40595b0c3b6e443588528113d907a6056c1 SHA1 (patch-ad) = e2a70a64f0659ffda6dd27b37512e4dc5bd4ecf4 -SHA1 (patch-af) = 4ab7856f36a93f3e8aa5ca9e35dc4a65da72ddfc +SHA1 (patch-af) = 3e69cbd226c6f6b0f6480d78ffd06b7da8cef2b9 SHA1 (patch-ah) = 9a02b989a6d45cdfead22ea703acceca722cf313 SHA1 (patch-ai) = ea752473a56d20907201763966ecdeaaeffac84a SHA1 (patch-ak) = 240daa4996d51fe754e6fe46f2577f9112febe3c diff --git a/editors/xemacs/patches/patch-aa b/editors/xemacs/patches/patch-aa index aa45eb3ffd9..a1c69a195a1 100644 --- a/editors/xemacs/patches/patch-aa +++ b/editors/xemacs/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.4 2003/02/25 02:14:59 uebayasi Exp $ +$NetBSD: patch-aa,v 1.5 2004/02/09 07:54:58 minskim Exp $ ---- configure.orig Thu Jan 16 01:45:58 2003 +--- configure.orig 2004-01-23 22:34:33.000000000 -0600 +++ configure -@@ -1128,6 +1128,7 @@ +@@ -1130,6 +1130,7 @@ echo "$ac_t""$configuration" 1>&6 machine='' opsys='' case "$canonical" in @@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.4 2003/02/25 02:14:59 uebayasi Exp $ sparc-*-* ) machine=sparc ;; alpha*-*-* ) machine=alpha ;; vax-*-* ) machine=vax ;; -@@ -1200,9 +1201,10 @@ +@@ -1202,9 +1203,10 @@ case "$canonical" in case "$canonical" in i[3-9]86-*-netbsd*) machine=intel386 ;; hp300-*-netbsd* | amiga-*-netbsd* | sun3-*-netbsd* | mac68k-*-netbsd* | da30-*-netbsd* | m68k-*-netbsd* ) @@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.4 2003/02/25 02:14:59 uebayasi Exp $ esac ;; -@@ -3110,7 +3112,7 @@ +@@ -3134,7 +3136,7 @@ echo "configure:3132: checking "for runt decosf* | linux* | irix*) dash_r="-rpath " ;; *) dash_r="" @@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.4 2003/02/25 02:14:59 uebayasi Exp $ xe_check_libs="${try_dash_r}/no/such/file-or-directory" if test "$GCC" = "yes"; then -@@ -13830,6 +13832,41 @@ +@@ -14057,6 +14059,41 @@ else for feature in ncurses gpm; do eval "with_${feature}=no" done fi @@ -73,7 +73,7 @@ $NetBSD: patch-aa,v 1.4 2003/02/25 02:14:59 uebayasi Exp $ test "$with_x11" = "yes" -o "$with_tty" = "yes" -o "$need_event_unixoid" = "yes" && extra_objs="$extra_objs event-unixoid.o" && if test "$extra_verbose" = "yes"; then echo " xemacs will be linked with \"event-unixoid.o\"" fi -@@ -16087,6 +16124,7 @@ +@@ -16477,6 +16514,7 @@ s%@libs_xauth@%$libs_xauth%g s%@dnd_objs@%$dnd_objs%g s%@lwlib_objs@%$lwlib_objs%g s%@ALLOCA@%$ALLOCA%g diff --git a/editors/xemacs/patches/patch-af b/editors/xemacs/patches/patch-af index b0b13ddcd16..8a8d0aa8c74 100644 --- a/editors/xemacs/patches/patch-af +++ b/editors/xemacs/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.4 2003/02/25 02:14:59 uebayasi Exp $ +$NetBSD: patch-af,v 1.5 2004/02/09 07:54:58 minskim Exp $ ---- configure.in.orig Tue Jan 7 12:57:03 2003 +--- configure.in.orig 2004-01-23 22:37:54.000000000 -0600 +++ configure.in -@@ -1079,6 +1079,7 @@ +@@ -1082,6 +1082,7 @@ machine='' opsys='' dnl Straightforward machine determination case "$canonical" in @@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.4 2003/02/25 02:14:59 uebayasi Exp $ sparc-*-* ) machine=sparc ;; alpha*-*-* ) machine=alpha ;; vax-*-* ) machine=vax ;; -@@ -1157,10 +1158,10 @@ +@@ -1160,10 +1161,10 @@ case "$canonical" in case "$canonical" in i[[3-9]]86-*-netbsd*) machine=intel386 ;; hp300-*-netbsd* | amiga-*-netbsd* | sun3-*-netbsd* | mac68k-*-netbsd* | da30-*-netbsd* | m68k-*-netbsd* ) @@ -23,7 +23,7 @@ $NetBSD: patch-af,v 1.4 2003/02/25 02:14:59 uebayasi Exp $ esac ;; -@@ -2224,7 +2225,7 @@ +@@ -2244,7 +2245,7 @@ if test "$add_runtime_path" = "yes"; the decosf* | linux* | irix*) dash_r="-rpath " ;; *) dash_r="" @@ -32,13 +32,13 @@ $NetBSD: patch-af,v 1.4 2003/02/25 02:14:59 uebayasi Exp $ xe_check_libs="${try_dash_r}/no/such/file-or-directory" XE_PROTECT_LINKER_FLAGS(xe_check_libs) AC_TRY_LINK(, , dash_r="$try_dash_r") -@@ -4320,6 +4321,9 @@ - eval "with_${feature}=no" +@@ -4395,6 +4396,9 @@ else dnl "$with_tty" = "no" done fi dnl with_tty -+ + +AC_CHECK_LIB(ossaudio, main, LIBOSSAUDIO=-lossaudio) +AC_SUBST(LIBOSSAUDIO) - ++ dnl Do we need event-unixoid.o ? dnl This is needed for X, or for TTY, or for MSWIN w/Cygwin select() + dnl [but not Mingw MSWIN] -- cgit v1.2.3