summaryrefslogtreecommitdiff
path: root/editors/xemacs-current
diff options
context:
space:
mode:
Diffstat (limited to 'editors/xemacs-current')
-rw-r--r--editors/xemacs-current/Makefile9
-rw-r--r--editors/xemacs-current/PLIST56
-rw-r--r--editors/xemacs-current/distinfo12
-rw-r--r--editors/xemacs-current/patches/patch-aa6
-rw-r--r--editors/xemacs-current/patches/patch-ab20
-rw-r--r--editors/xemacs-current/patches/patch-ac8
6 files changed, 56 insertions, 55 deletions
diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile
index 36238652823..23c2188019b 100644
--- a/editors/xemacs-current/Makefile
+++ b/editors/xemacs-current/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2002/11/01 16:34:38 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2003/01/18 05:45:42 uebayasi Exp $
-DISTNAME= xemacs-21.5.9
-PKGREVISION= 1
+DISTNAME= xemacs-21.5.10
CATEGORIES= editors
MASTER_SITES= ftp://ftp.xemacs.org/pub/xemacs/xemacs-21.5/ \
ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/xemacs-21.5/ \
@@ -14,8 +13,8 @@ COMMENT= *BETA* XEmacs text editor version 21.5.9
USE_BUILDLINK2= YES
USE_X11= YES
-PLIST_SUBST+= EMACSVER=xemacs-21.5-b9
-MESSAGE_SUBST+= EMACSVER=xemacs-21.5-b9
+PLIST_SUBST+= EMACSVER=xemacs-21.5-b10
+MESSAGE_SUBST+= EMACSVER=xemacs-21.5-b10
.if (${MACHINE_ARCH} == "arm32")
. include "../../lang/gcc/buildlink2.mk"
diff --git a/editors/xemacs-current/PLIST b/editors/xemacs-current/PLIST
index 9856967d1c3..2540d315daf 100644
--- a/editors/xemacs-current/PLIST
+++ b/editors/xemacs-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/10/06 11:40:07 magick Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/01/18 05:45:42 uebayasi Exp $
bin/${EMACSVER}
bin/ellcc
bin/gnuattach
@@ -10,6 +10,9 @@ bin/xemacs-b2m
bin/xemacs-ctags
bin/xemacs-etags
bin/xemacs-rcs-checkin
+@exec ${MKDIR} %D/lib/xemacs
+@exec ${MKDIR} %D/lib/xemacs/site-lisp
+@exec ${MKDIR} %D/lib/xemacs/site-modules
lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/DOC
lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/add-big-package.sh
lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/config.values
@@ -64,7 +67,6 @@ lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/device.h
lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/devslots.h
lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/dragdrop.h
lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/dumper.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/eldap.h
lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/elhash.h
lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/emodules.h
lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/event-gtk.h
@@ -229,7 +231,6 @@ lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/offix-types.h
lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/offix.h
lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/opaque.h
lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/paths.h
-lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/postgresql.h
lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/process.h
lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/procimpl.h
lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/rangetab.h
@@ -387,6 +388,8 @@ lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/xmprimitivep.h
lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/xmu.h
lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/make-docfile
lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/mmencode
+lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/modules/auto-autoloads.el
+lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/modules/auto-autoloads.elc
lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/movemail
lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/profile
lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/rcs2log
@@ -935,6 +938,8 @@ lib/${EMACSVER}/info/lispref.info-47
lib/${EMACSVER}/info/lispref.info-48
lib/${EMACSVER}/info/lispref.info-49
lib/${EMACSVER}/info/lispref.info-5
+lib/${EMACSVER}/info/lispref.info-50
+lib/${EMACSVER}/info/lispref.info-51
lib/${EMACSVER}/info/lispref.info-6
lib/${EMACSVER}/info/lispref.info-7
lib/${EMACSVER}/info/lispref.info-8
@@ -991,6 +996,7 @@ lib/${EMACSVER}/info/xemacs.info-20
lib/${EMACSVER}/info/xemacs.info-21
lib/${EMACSVER}/info/xemacs.info-22
lib/${EMACSVER}/info/xemacs.info-23
+lib/${EMACSVER}/info/xemacs.info-24
lib/${EMACSVER}/info/xemacs.info-3
lib/${EMACSVER}/info/xemacs.info-4
lib/${EMACSVER}/info/xemacs.info-5
@@ -999,7 +1005,6 @@ lib/${EMACSVER}/info/xemacs.info-7
lib/${EMACSVER}/info/xemacs.info-8
lib/${EMACSVER}/info/xemacs.info-9
lib/${EMACSVER}/lisp/ChangeLog
-lib/${EMACSVER}/lisp/ChangeLog.1
lib/${EMACSVER}/lisp/ChangeLog.GTK
lib/${EMACSVER}/lisp/README
lib/${EMACSVER}/lisp/abbrev.el
@@ -1545,35 +1550,32 @@ man/man1/gnuserv.1
man/man1/xemacs-ctags.1
man/man1/xemacs-etags.1
man/man1/xemacs.1
-@dirrm lib/${EMACSVER}/etc/custom/example-themes
-@dirrm lib/${EMACSVER}/etc/custom
-@dirrm lib/${EMACSVER}/etc/eos
-@dirrm lib/${EMACSVER}/etc/idd
-@dirrm lib/${EMACSVER}/etc/photos
-@dirrm lib/${EMACSVER}/etc/sparcworks
-@dirrm lib/${EMACSVER}/etc/tests/external-widget
-@dirrm lib/${EMACSVER}/etc/tests
-@dirrm lib/${EMACSVER}/etc/toolbar
-@dirrm lib/${EMACSVER}/etc/unicode/ibm
-@dirrm lib/${EMACSVER}/etc/unicode/mule-ucs
-@dirrm lib/${EMACSVER}/etc/unicode/other
+@exec ${MKDIR} /var/tmp/xemacs.lock && chmod 1777 /var/tmp/xemacs.lock
+@unexec ${RM} -rf /var/tmp/xemacs.lock
+@dirrm lib/${EMACSVER}/lisp/term
+@dirrm lib/${EMACSVER}/lisp/mule
+@dirrm lib/${EMACSVER}/lisp
+@dirrm lib/${EMACSVER}/info
@dirrm lib/${EMACSVER}/etc/unicode/unicode-consortium
+@dirrm lib/${EMACSVER}/etc/unicode/other
+@dirrm lib/${EMACSVER}/etc/unicode/mule-ucs
+@dirrm lib/${EMACSVER}/etc/unicode/ibm
@dirrm lib/${EMACSVER}/etc/unicode
+@dirrm lib/${EMACSVER}/etc/toolbar
+@dirrm lib/${EMACSVER}/etc/tests/external-widget
+@dirrm lib/${EMACSVER}/etc/tests
+@dirrm lib/${EMACSVER}/etc/sparcworks
+@dirrm lib/${EMACSVER}/etc/photos
+@dirrm lib/${EMACSVER}/etc/idd
+@dirrm lib/${EMACSVER}/etc/eos
+@dirrm lib/${EMACSVER}/etc/custom/example-themes
+@dirrm lib/${EMACSVER}/etc/custom
@dirrm lib/${EMACSVER}/etc
-@dirrm lib/${EMACSVER}/lisp/mule
-@dirrm lib/${EMACSVER}/lisp/term
-@dirrm lib/${EMACSVER}/lisp
@dirrm lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/modules
-@dirrm lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/m
@dirrm lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/s
+@dirrm lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include/m
@dirrm lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}/include
@dirrm lib/${EMACSVER}/${MACHINE_GNU_PLATFORM}
-@dirrm lib/${EMACSVER}/info
-@dirrm lib/${EMACSVER}
-@exec ${MKDIR} /var/tmp/xemacs.lock && chmod 1777 /var/tmp/xemacs.lock
-@unexec rm -rf /var/tmp/xemacs.lock
-@exec ${MKDIR} %D/lib/xemacs/site-lisp
-@exec ${MKDIR} %D/lib/xemacs/site-modules
-@dirrm lib/xemacs/site-lisp
@dirrm lib/xemacs/site-modules
+@dirrm lib/xemacs/site-lisp
@dirrm lib/xemacs
diff --git a/editors/xemacs-current/distinfo b/editors/xemacs-current/distinfo
index 265c9f9b707..a160a14ee9a 100644
--- a/editors/xemacs-current/distinfo
+++ b/editors/xemacs-current/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2002/10/06 11:40:07 magick Exp $
+$NetBSD: distinfo,v 1.3 2003/01/18 05:45:42 uebayasi Exp $
-SHA1 (xemacs-21.5.9.tar.gz) = b1e04ea87e9eea1e0e0806faef3fb211712dcfc2
-Size (xemacs-21.5.9.tar.gz) = 12618231 bytes
-SHA1 (patch-aa) = fd7d092348048db6b47a399a1b651c5d578d37bb
-SHA1 (patch-ab) = 451b3eaa6ba2d33e654daf53442c90d969478dde
-SHA1 (patch-ac) = 0272b0547f25872f7605f846d082817bfcdceead
+SHA1 (xemacs-21.5.10.tar.gz) = 429818840413950366af1552e687db565cb4bb30
+Size (xemacs-21.5.10.tar.gz) = 12748210 bytes
+SHA1 (patch-aa) = 4966a5bda4456976cdc1b05eb5c6bb5cf4f41250
+SHA1 (patch-ab) = 62a968f19d1b2b9efc5f8c3cf3e612f6a1dc7df2
+SHA1 (patch-ac) = 1ffaa2c5c425de6abd8f76d262762d21d8c7d0af
SHA1 (patch-ad) = 14c5e0f31801648fbdb7f96e5d26cb505a59b741
SHA1 (patch-ae) = 902a375f974e06eb5d67b69deadead98c625d97a
diff --git a/editors/xemacs-current/patches/patch-aa b/editors/xemacs-current/patches/patch-aa
index 16d6566bf35..b3101332688 100644
--- a/editors/xemacs-current/patches/patch-aa
+++ b/editors/xemacs-current/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/03/24 19:40:33 magick Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/18 05:45:43 uebayasi Exp $
---- Makefile.in.in.orig Thu Dec 20 07:08:09 2001
+--- Makefile.in.in.orig Sat Jan 18 12:23:29 2003
+++ Makefile.in.in
-@@ -470,8 +470,12 @@
+@@ -477,8 +477,12 @@
fi
cd ${srcdir}/etc && \
for page in xemacs etags ctags gnuserv gnuclient gnuattach gnudoit; do \
diff --git a/editors/xemacs-current/patches/patch-ab b/editors/xemacs-current/patches/patch-ab
index 6f1bcfd24b7..19e18970270 100644
--- a/editors/xemacs-current/patches/patch-ab
+++ b/editors/xemacs-current/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2002/10/06 11:40:07 magick Exp $
+$NetBSD: patch-ab,v 1.3 2003/01/18 05:45:43 uebayasi Exp $
---- configure.orig Fri Aug 16 06:11:45 2002
+--- configure.orig Mon Dec 16 11:33:04 2002
+++ configure
-@@ -1157,6 +1157,7 @@
+@@ -1159,6 +1159,7 @@
machine='' opsys=''
case "$canonical" in
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.2 2002/10/06 11:40:07 magick Exp $
sparc-*-* ) machine=sparc ;;
alpha*-*-* ) machine=alpha ;;
vax-*-* ) machine=vax ;;
-@@ -1229,9 +1230,10 @@
+@@ -1231,9 +1232,10 @@
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-ab,v 1.2 2002/10/06 11:40:07 magick Exp $
esac
;;
-@@ -3145,7 +3147,7 @@
+@@ -3207,7 +3209,7 @@
decosf* | linux* | irix*) dash_r="-rpath " ;;
*)
dash_r=""
@@ -31,7 +31,7 @@ $NetBSD: patch-ab,v 1.2 2002/10/06 11:40:07 magick Exp $
xe_check_libs="${try_dash_r}/no/such/file-or-directory"
if test "$GCC" = "yes"; then
-@@ -13283,6 +13285,43 @@
+@@ -14233,6 +14235,43 @@
fi
fi
@@ -75,11 +75,11 @@ $NetBSD: patch-ab,v 1.2 2002/10/06 11:40:07 magick Exp $
test "$need_miscplay" = "yes" && extra_objs="$extra_objs miscplay.o" && if test "$extra_verbose" = "yes"; then
echo " xemacs will be linked with \"miscplay.o\""
fi
-@@ -15926,6 +15965,7 @@
- s%@dnd_objs@%$dnd_objs%g
+@@ -16072,6 +16111,7 @@
+ s%@postgresql_libs@%$postgresql_libs%g
s%@lwlib_objs@%$lwlib_objs%g
s%@ALLOCA@%$ALLOCA%g
+s%@LIBOSSAUDIO@%$LIBOSSAUDIO%g
s%@have_esd_config@%$have_esd_config%g
- s%@dll_ld@%$dll_ld%g
- s%@dll_cflags@%$dll_cflags%g
+ s%@SRC_SUBDIR_DEPS@%$SRC_SUBDIR_DEPS%g
+ s%@INSTALL_ARCH_DEP_SUBDIR@%$INSTALL_ARCH_DEP_SUBDIR%g
diff --git a/editors/xemacs-current/patches/patch-ac b/editors/xemacs-current/patches/patch-ac
index f1de7ef5ffa..b1f0134faf4 100644
--- a/editors/xemacs-current/patches/patch-ac
+++ b/editors/xemacs-current/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/03/24 19:40:33 magick Exp $
+$NetBSD: patch-ac,v 1.2 2003/01/18 05:45:44 uebayasi Exp $
---- lib-src/Makefile.in.in.orig Thu Dec 20 08:58:19 2001
+--- lib-src/Makefile.in.in.orig Fri Apr 26 03:03:23 2002
+++ lib-src/Makefile.in.in
@@ -66,7 +66,7 @@
INSTALL = @install_pp@ @INSTALL@
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/03/24 19:40:33 magick Exp $
## ========================== Lists of Files ===========================
#define NO_SHORTNAMES
-@@ -234,7 +234,7 @@
+@@ -237,7 +237,7 @@
## Install the internal utilities. Until they are installed, we can
## just run them directly from lib-src.
@@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/03/24 19:40:33 magick Exp $
@echo; echo "Installing utilities run internally by XEmacs."
./make-path ${archlibdir}
if test "`(cd ${archlibdir} && $(pwd))`" != "`$(pwd)`"; then \
-@@ -245,17 +245,27 @@
+@@ -248,17 +248,27 @@
if test "`(cd ${archlibdir} && $(pwd))`" \
!= "`(cd ${srcdir} && $(pwd))`"; then \
for f in ${PRIVATE_INSTALLABLE_SCRIPTS}; do \