update editors/xemacs to 21.4.12; from MAINTAINER; reviewed by me and sturm@
This commit is contained in:
lebel
parent
81c32878c5
commit
2505e76847
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.17 2003/03/01 03:19:15 pvalchev Exp $
|
||||
# $OpenBSD: Makefile,v 1.18 2003/04/24 18:15:39 lebel Exp $
|
||||
|
||||
COMMENT= "heavily customizable and extensible editor"
|
||||
|
||||
VERSION= 21.1.14
|
||||
VERSION= 21.4.12
|
||||
DISTNAME= xemacs-${VERSION}
|
||||
CATEGORIES= editors
|
||||
|
||||
@ -17,14 +17,14 @@ PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
# where the source files and patches can be fetched
|
||||
MASTER_SITES= ftp://ftp.xemacs.org/pub/xemacs/xemacs-21.1/ \
|
||||
ftp://ftp.oleane.net/pub/xemacs/xemacs-21.1/ \
|
||||
ftp://ftp.pasteur.fr/pub/computing/xemacs/xemacs-21.1/ \
|
||||
ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/xemacs-21.1/ \
|
||||
ftp://ftp.usyd.edu.au/pub/Xemacs/xemacs-21.1/ \
|
||||
ftp://ftp.lab.kdd.co.jp/xemacs/xemacs-21.1/ \
|
||||
ftp://ftp.th-darmstadt.de/pub/editors/xemacs/xemacs-21.1/ \
|
||||
ftp://ftp.funet.fi/pub/mirrors/ftp.xemacs.org/pub/tux/xemacs/xemacs-21.1/
|
||||
MASTER_SITES= ftp://ftp.xemacs.org/pub/xemacs/xemacs-21.4/ \
|
||||
ftp://ftp.oleane.net/pub/xemacs/xemacs-21.4/ \
|
||||
ftp://ftp.pasteur.fr/pub/computing/xemacs/xemacs-21.4/ \
|
||||
ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/xemacs-21.4/ \
|
||||
ftp://ftp.usyd.edu.au/pub/Xemacs/xemacs-21.4/ \
|
||||
ftp://ftp.lab.kdd.co.jp/xemacs/xemacs-21.4/ \
|
||||
ftp://ftp.th-darmstadt.de/pub/editors/xemacs/xemacs-21.4/ \
|
||||
ftp://ftp.funet.fi/pub/mirrors/ftp.xemacs.org/pub/tux/xemacs/xemacs-21.4/
|
||||
|
||||
# Dependencies are very flavors-specific, you have
|
||||
# to select a flavor set to know them
|
||||
@ -47,34 +47,35 @@ MODULES= gettext
|
||||
# Therefore, this is commented out for now:
|
||||
# SEPARATE_BUILD= simple
|
||||
|
||||
USE_GMAKE= Yes
|
||||
|
||||
.include <bsd.own.mk>
|
||||
#USE_GMAKE= Yes
|
||||
|
||||
# 'configure.in' modified to generate a 'configure'
|
||||
# that knows about curses really being ncurses
|
||||
|
||||
CONFIGURE_STYLE= autoconf old dest
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/libpng"
|
||||
.if (${ELF_TOOLCHAIN} == "yes")
|
||||
CONFIGURE_ENV+= LDFLAGS="-Z"
|
||||
.endif
|
||||
CONFIGURE_ARGS+= --with-gnu-make \
|
||||
--gung-ho \
|
||||
--infodir='$${DESTDIR}${PREFIX}/info/${DISTNAME}' \
|
||||
CONFIGURE_STYLE= gnu old dest
|
||||
CONFIGURE_ARGS+= --infodir='$${DESTDIR}${PREFIX}/info/${DISTNAME}' \
|
||||
--infopath='${LOCALBASE}/info/${DISTNAME}:${LOCALBASE}/info:usr/share/info' \
|
||||
--site-prefixes='${LOCALBASE}:/usr' \
|
||||
--without-ldap \
|
||||
--without-postgresql \
|
||||
--without-cde \
|
||||
--without-offix \
|
||||
--without-dragndrop \
|
||||
--without-gpm \
|
||||
--with-msw=no \
|
||||
--without-tooltalk \
|
||||
--with-sound=no \
|
||||
--without-wnn6
|
||||
--without-wnn6 \
|
||||
--without-gtk \
|
||||
--without-gnome \
|
||||
--with-database=berkdb \
|
||||
--with-file-coding=yes \
|
||||
--with-system-malloc \
|
||||
--pdump
|
||||
|
||||
# there is not (yet) bsd sound support in XEmacs
|
||||
# XEmacs does not work with OpenLDAP 2.0.7 (linking problem)
|
||||
# XEmacs does not work with OpenLDAP (linking problem,
|
||||
# will try to fix if somebody asks)
|
||||
|
||||
FAKE_FLAGS= prefix='$${WRKINST}$${DESTDIR}${PREFIX}' \
|
||||
infodir='$${WRKINST}$${DESTDIR}${PREFIX}/info/${DISTNAME}'
|
||||
@ -92,10 +93,10 @@ SUBST_VARS= GCCARCH
|
||||
#### Flavors
|
||||
|
||||
# generic flavors
|
||||
FLAVORS= mule clashdetect gdbm canna wnn
|
||||
FLAVORS= mule canna wnn
|
||||
|
||||
# X11 Related
|
||||
FLAVORS+= no_x11 tiff no_png jpeg motif compface
|
||||
FLAVORS+= no_x11 compface
|
||||
|
||||
FLAVOR?=
|
||||
|
||||
@ -107,11 +108,7 @@ FLAVOR?=
|
||||
|
||||
CONFIGURE_ARGS+=--without-x11
|
||||
|
||||
. if ${FLAVOR:L:Mno_png} || \
|
||||
${FLAVOR:L:Mjpeg} || \
|
||||
${FLAVOR:L:Mmotif} || \
|
||||
${FLAVOR:L:Mtiff} || \
|
||||
${FLAVOR:L:Mcompface}
|
||||
. if ${FLAVOR:L:Mcompface}
|
||||
ERRORS+= "Fatal: You cannot use X11-related flavors with a non-X11 flavor"
|
||||
. endif
|
||||
|
||||
@ -122,42 +119,25 @@ USE_X11= Yes
|
||||
|
||||
CONFIGURE_ARGS+= --with-menubars=lucid
|
||||
|
||||
. if ${FLAVOR:L:Mmotif}
|
||||
USE_MOTIF= any
|
||||
CONFIGURE_ARGS+=--with-scrollbars=motif \
|
||||
--with-dialogs=motif
|
||||
. else
|
||||
CONFIGURE_ARGS+=--with-scrollbars=lucid \
|
||||
--with-dialogs=athena3d
|
||||
. endif
|
||||
--with-dialogs=athena \
|
||||
--with-widgets=athena
|
||||
|
||||
. if ${FLAVOR:L:Mjpeg}
|
||||
LIB_DEPENDS+= jpeg.62::graphics/jpeg
|
||||
CONFIGURE_ARGS+=--with-jpeg
|
||||
. else
|
||||
CONFIGURE_ARGS+=--without-jpeg
|
||||
. endif
|
||||
|
||||
. if !${FLAVOR:L:Mno_png}
|
||||
LIB_DEPENDS+= png.2.::graphics/png
|
||||
CONFIGURE_ARGS+=--with-png
|
||||
. else
|
||||
CONFIGURE_ARGS+=--without-png
|
||||
. endif
|
||||
CONFIGURE_ARGS+=--with-png \
|
||||
--site-includes="${LOCALBASE}/include/libpng"
|
||||
|
||||
. if ${FLAVOR:L:Mtiff}
|
||||
LIB_DEPENDS+= tiff.35::graphics/tiff
|
||||
CONFIGURE_ARGS+=--with-tiff
|
||||
. else
|
||||
CONFIGURE_ARGS+=--without-tiff
|
||||
. endif
|
||||
|
||||
. if ${FLAVOR:L:Mcompface}
|
||||
|
||||
# compface statically linked -> license issues
|
||||
PERMIT_PACKAGE_CDROM= "No Fee"
|
||||
PERMIT_DISTFILES_CDROM= "No Fee"
|
||||
BUILD_DEPENDS+= ${LOCALBASE}/lib/libcompface.a::graphics/compface
|
||||
BUILD_DEPENDS+= ::graphics/compface
|
||||
CONFIGURE_ARGS+=--with-xface
|
||||
. else
|
||||
CONFIGURE_ARGS+=--with-xface=no
|
||||
@ -171,17 +151,6 @@ CONFIGURE_ARGS+= --with-xim=xlib
|
||||
### end of X11 dependant flavors
|
||||
.endif
|
||||
|
||||
#
|
||||
# GENERAL FLAVORS
|
||||
#
|
||||
|
||||
.if ${FLAVOR:L:Mgdbm}
|
||||
LIB_DEPENDS+= gdbm.2::databases/gdbm
|
||||
CONFIGURE_ARGS+=--with-database=berkdb,gnudbm
|
||||
.else
|
||||
CONFIGURE_ARGS+=--with-database=berkdb
|
||||
.endif
|
||||
|
||||
#
|
||||
# MULE (MUlti Lingual Emacs) RELATED
|
||||
# I18N
|
||||
@ -198,7 +167,7 @@ CONFIGURE_ARGS+=--with-canna=no
|
||||
. endif
|
||||
|
||||
. if ${FLAVOR:L:Mwnn}
|
||||
BUILD_DEPENDS+= ${LOCALBASE}/lib/libwnn.a::japanese/Wnn
|
||||
BUILD_DEPENDS+= ::japanese/Wnn
|
||||
CONFIGURE_ARGS+=--with-wnn
|
||||
. else
|
||||
CONFIGURE_ARGS+=--with-wnn=no
|
||||
@ -215,22 +184,6 @@ CONFIGURE_ARGS+=--with-mule=no \
|
||||
--with-wnn=no
|
||||
.endif
|
||||
|
||||
# Clash-detection flavor needs LOCKDIR to be set to the path
|
||||
# of the directory where clash detection lockfiles will be put.
|
||||
# Some people dislikes this feature because anybody able to read
|
||||
# this directory can see what other people are working on.
|
||||
# W/o this feature, clash-detection still occur using lockfiles present
|
||||
# in the same directory as the file being edited (.#files#) but, in
|
||||
# this case, clash detection won't work well with symlinked files.
|
||||
|
||||
.if ${FLAVOR:L:Mclashdetect}
|
||||
. if defined(LOCKDIR)
|
||||
CONFIGURE_ARGS+=--with-clash-detection --lockdir='$${LOCKDIR}'
|
||||
. else
|
||||
ERRORS+= "Fatal: You need to set LOCKDIR to use clashdetect"
|
||||
. endif
|
||||
.endif
|
||||
|
||||
#
|
||||
# license-related
|
||||
#
|
||||
@ -244,12 +197,10 @@ PERMIT_DISTFILES_CDROM= Yes
|
||||
.endif
|
||||
|
||||
#######
|
||||
.if (${MACHINE_ARCH} != "alpha")
|
||||
STRIP_PROGS+= ${DISTNAME}
|
||||
.endif
|
||||
STRIP_EXECS= cvtmail digest-doc fakemail gnuserv hexl make-docfile \
|
||||
make-path mmencode movemail profile sorted-doc wakeup yow
|
||||
STRIP_PROGS= gnuclient xemacs-b2m xemacs-ctags xemacs-etags ootags
|
||||
mmencode movemail profile sorted-doc wakeup yow
|
||||
STRIP_PROGS= ${DISTNAME} gnuclient xemacs-b2m xemacs-ctags \
|
||||
xemacs-etags ootags
|
||||
|
||||
post-install:
|
||||
# Stripping
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (xemacs-21.1.14.tar.gz) = 20ae73d62dea72bed48740eaa2134d87
|
||||
RMD160 (xemacs-21.1.14.tar.gz) = e841ac98e3d664f0b89b38e66d1df792a5d734e6
|
||||
SHA1 (xemacs-21.1.14.tar.gz) = af7feb3389dfe015732bcaac08b8604c631bf50d
|
||||
MD5 (xemacs-21.4.12.tar.gz) = 699f4e9c05181d3d71cbd733cd5b16fc
|
||||
RMD160 (xemacs-21.4.12.tar.gz) = aa0edcfaa4d3dfeb1be6d5b498615aa23b1667b3
|
||||
SHA1 (xemacs-21.4.12.tar.gz) = 6e66f5290c0e1690d9ec7097101a549e35f05107
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.1 2002/03/22 07:18:44 jasoni Exp $
|
||||
--- Makefile.in.orig Sun Dec 17 19:03:32 2000
|
||||
+++ Makefile.in Mon Mar 18 00:50:00 2002
|
||||
@@ -444,9 +444,14 @@ install-arch-indep: mkdir info
|
||||
fi
|
||||
## Note it's `xemacs' not ${PROGNAME}
|
||||
cd ${srcdir}/etc && \
|
||||
- for page in xemacs etags ctags gnuserv gnuclient gnuattach gnudoit; do \
|
||||
+ for page in xemacs gnuserv gnuclient gnuattach gnudoit; do \
|
||||
${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \
|
||||
chmod 0644 ${mandir}/$${page}${manext} ; \
|
||||
+ done
|
||||
+ cd ${srcdir}/etc && \
|
||||
+ for page in etags ctags; do \
|
||||
+ ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/xemacs-$${page}${manext} ; \
|
||||
+ chmod 0644 ${mandir}/xemacs-$${page}${manext} ; \
|
||||
done
|
||||
@echo "If you would like to save approximately 2M of disk space, do"
|
||||
@echo "make gzip-el"
|
||||
28
editors/xemacs21/patches/patch-Makefile_in_in
Normal file
28
editors/xemacs21/patches/patch-Makefile_in_in
Normal file
@ -0,0 +1,28 @@
|
||||
$OpenBSD: patch-Makefile_in_in,v 1.1 2003/04/24 18:15:39 lebel Exp $
|
||||
--- Makefile.in.in.orig Fri Nov 1 04:51:47 2002
|
||||
+++ Makefile.in.in Mon Feb 24 10:35:03 2003
|
||||
@@ -425,7 +425,7 @@ install-arch-dep: mkdir
|
||||
do (cd $${subdir} && $(RM) -r RCS CVS SCCS \#* *~) ; done ; \
|
||||
else true; fi
|
||||
#ifdef PDUMP
|
||||
- ${INSTALL_DATA} src/${PROGNAME}.dmp ${bindir}/${PROGNAME}-${version}-`src/${PROGNAME} -sd`.dmp
|
||||
+ ${INSTALL_DATA} src/${PROGNAME}-${version}.dmp ${bindir}/${PROGNAME}-${version}.dmp
|
||||
#endif
|
||||
#ifdef WIN32_NATIVE
|
||||
${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}
|
||||
@@ -488,9 +488,14 @@ install-arch-indep: mkdir info
|
||||
done ; \
|
||||
fi
|
||||
cd ${srcdir}/etc && \
|
||||
- for page in xemacs etags ctags gnuserv gnuclient gnuattach gnudoit; do \
|
||||
+ for page in xemacs gnuserv gnuclient gnuattach gnudoit; do \
|
||||
${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \
|
||||
chmod 0644 ${mandir}/$${page}${manext} ; \
|
||||
+ done
|
||||
+ cd ${srcdir}/etc && \
|
||||
+ for page in etags ctags; do \
|
||||
+ ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/xemacs-$${page}${manext} ; \
|
||||
+ chmod 0644 ${mandir}/xemacs-$${page}${manext} ; \
|
||||
done
|
||||
@echo "If you would like to save approximately 2M of disk space, do"
|
||||
@echo "make gzip-el"
|
||||
@ -1,23 +0,0 @@
|
||||
$OpenBSD: patch-configure_in,v 1.1 2001/03/01 21:20:16 naddy Exp $
|
||||
--- configure.in.orig Sat Jan 13 04:07:32 2001
|
||||
+++ configure.in Sat Feb 24 14:03:36 2001
|
||||
@@ -3514,14 +3514,18 @@ if test "$with_tty" = "yes" ; then
|
||||
done
|
||||
fi
|
||||
else dnl "$have_terminfo" = "no" && "with_ncurses" = "no"
|
||||
- XE_ADD_OBJS(tparam.o)
|
||||
dnl The HP-UX curses library seems to have a badly broken version of select(2)
|
||||
dnl that makes "poll: interrupted system call" messages to appear and
|
||||
dnl Emacs suprocesses to hang (e.g. TeX compilation w/ AUCTeX) */
|
||||
case "$opsys" in *-hp-hpux* ) libs_termcap="-ltermcap" ;; esac
|
||||
if test -n "$libs_termcap"; then
|
||||
+ dnl We need to check if tgoto does not exist in termcap yet
|
||||
+ dnl because on OpenBSD libtermcap is another name for libcurses
|
||||
+ dnl which provide he same tgoto as ncurses
|
||||
+ AC_CHECK_LIB(termcap, tgoto, , XE_ADD_OBJS(tparam.o))
|
||||
XE_PREPEND($libs_termcap, LIBS)
|
||||
else
|
||||
+ XE_ADD_OBJS(tparam.o)
|
||||
AC_CHECK_LIB(curses, tgetent, XE_PREPEND(-lcurses, LIBS),
|
||||
AC_CHECK_LIB(termcap, tgetent, XE_PREPEND(-ltermcap, LIBS),
|
||||
XE_ADD_OBJS(termcap.o)))
|
||||
@ -1,10 +1,10 @@
|
||||
$OpenBSD: patch-lib-src_Makefile_in_in,v 1.1 2002/03/22 07:18:44 jasoni Exp $
|
||||
--- lib-src/Makefile.in.in.orig Mon Mar 18 00:35:44 2002
|
||||
+++ lib-src/Makefile.in.in Mon Mar 18 00:41:01 2002
|
||||
@@ -212,10 +212,18 @@ ${archlibdir}: all
|
||||
$OpenBSD: patch-lib-src_Makefile_in_in,v 1.2 2003/04/24 18:15:39 lebel Exp $
|
||||
--- lib-src/Makefile.in.in.orig Tue Aug 20 13:34:16 2002
|
||||
+++ lib-src/Makefile.in.in Mon Feb 17 21:55:55 2003
|
||||
@@ -255,10 +255,18 @@ ${archlibdir}: all
|
||||
install: ${archlibdir}
|
||||
@echo; echo "Installing utilities for users to run."
|
||||
for file in ${INSTALLABLES} ; do \
|
||||
for file in ${PUBLIC_INSTALLABLE_EXES} ; do \
|
||||
- (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} ${bindir}/$${file}) ; \
|
||||
+ if [ $${file} = etags -o $${file} = ctags -o $${file} = b2m ]; then \
|
||||
+ (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} ${bindir}/xemacs-$${file}) ; \
|
||||
@ -12,7 +12,7 @@ $OpenBSD: patch-lib-src_Makefile_in_in,v 1.1 2002/03/22 07:18:44 jasoni Exp $
|
||||
+ (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} ${bindir}/$${file}) ; \
|
||||
+ fi \
|
||||
done
|
||||
for file in ${INSTALLABLE_SCRIPTS} ; do \
|
||||
for file in ${PUBLIC_INSTALLABLE_SCRIPTS} ; do \
|
||||
- (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file}) ; \
|
||||
+ if [ $${file} = rcs-checkin ]; then \
|
||||
+ (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/xemacs-$${file}) ; \
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-lisp_find-paths_el,v 1.1 2001/03/01 21:20:16 naddy Exp $
|
||||
--- lisp/find-paths.el.orig Fri Nov 17 04:21:24 2000
|
||||
+++ lisp/find-paths.el Tue Feb 6 17:03:08 2001
|
||||
$OpenBSD: patch-lisp_find-paths_el,v 1.2 2003/04/24 18:15:39 lebel Exp $
|
||||
--- lisp/find-paths.el.orig Wed Jul 25 09:44:25 2001
|
||||
+++ lisp/find-paths.el Mon Mar 25 22:29:54 2002
|
||||
@@ -105,6 +105,12 @@ from the search."
|
||||
(paths-file-readable-directory-p (paths-construct-path (list directory
|
||||
"lib"
|
||||
@ -12,5 +12,5 @@ $OpenBSD: patch-lisp_find-paths_el,v 1.1 2001/03/01 21:20:16 naddy Exp $
|
||||
+ (concat
|
||||
+ emacs-program-name "-" emacs-program-version))))
|
||||
;; in-place or windows-nt
|
||||
(and
|
||||
(and
|
||||
(paths-file-readable-directory-p (paths-construct-path (list directory "lisp")))
|
||||
|
||||
@ -1,12 +1,23 @@
|
||||
$OpenBSD: patch-src_Makefile_in_in,v 1.1 2001/03/01 21:20:17 naddy Exp $
|
||||
--- src/Makefile.in.in.orig Sun Nov 19 23:08:18 2000
|
||||
+++ src/Makefile.in.in Mon Feb 5 14:58:19 2001
|
||||
@@ -304,7 +304,7 @@ mo_file = ${mo_dir}emacs.mo
|
||||
#endif
|
||||
$OpenBSD: patch-src_Makefile_in_in,v 1.2 2003/04/24 18:15:39 lebel Exp $
|
||||
--- src/Makefile.in.in.orig Wed Jan 15 13:18:00 2003
|
||||
+++ src/Makefile.in.in Mon Feb 24 10:39:21 2003
|
||||
@@ -28,8 +28,10 @@ PROGNAME=@PROGNAME@
|
||||
#define NOT_C_CODE
|
||||
#include "config.h"
|
||||
|
||||
LOADPATH = EMACSBOOTSTRAPLOADPATH="${lispdir}:${blddir}"
|
||||
-DUMPENV = $(LOADPATH)
|
||||
+DUMPENV = $(LOADPATH) EMACSPACKAGEPATH="${lispdir}:${blddir}"
|
||||
|
||||
release: temacs ${libsrc}DOC $(mo_file) ${other_files}
|
||||
#ifdef CANNOT_DUMP
|
||||
+version=@version@
|
||||
+
|
||||
#ifdef PDUMP
|
||||
-DUMP_TARGET = ${PROGNAME}.dmp
|
||||
+DUMP_TARGET = ${PROGNAME}-${version}.dmp
|
||||
EXE_TARGET = ${PROGNAME}
|
||||
DUMP_ID = dump-id.o
|
||||
#else
|
||||
@@ -64,7 +66,6 @@ etcdir = ../etc/
|
||||
prefix=@prefix@
|
||||
srcdir=@srcdir@
|
||||
blddir=@blddir@
|
||||
-version=@version@
|
||||
CC=@XEMACS_CC@
|
||||
CPP=@CPP@
|
||||
CFLAGS=@CFLAGS@
|
||||
|
||||
37
editors/xemacs21/patches/patch-src_dumper_c
Normal file
37
editors/xemacs21/patches/patch-src_dumper_c
Normal file
@ -0,0 +1,37 @@
|
||||
$OpenBSD: patch-src_dumper_c,v 1.1 2003/04/24 18:15:39 lebel Exp $
|
||||
--- src/dumper.c.orig Fri Jan 3 10:59:44 2003
|
||||
+++ src/dumper.c Mon Feb 24 10:52:09 2003
|
||||
@@ -1050,7 +1050,7 @@ pdump (void)
|
||||
pdump_buf = xmalloc (max_size);
|
||||
/* Avoid use of the `open' macro. We want the real function. */
|
||||
#undef open
|
||||
- pdump_fd = open (EMACS_PROGNAME ".dmp",
|
||||
+ pdump_fd = open (EMACS_PROGNAME "-" EMACS_VERSION ".dmp",
|
||||
O_WRONLY | O_CREAT | O_TRUNC | OPEN_BINARY, 0666);
|
||||
pdump_out = fdopen (pdump_fd, "w");
|
||||
|
||||
@@ -1330,23 +1330,7 @@ pdump_file_try (char *exe_path)
|
||||
|
||||
do
|
||||
{
|
||||
- sprintf (w, "-%s-%08x.dmp", EMACS_VERSION, dump_id);
|
||||
- if (pdump_file_get (exe_path))
|
||||
- {
|
||||
- if (pdump_load_check ())
|
||||
- return 1;
|
||||
- pdump_free ();
|
||||
- }
|
||||
-
|
||||
- sprintf (w, "-%08x.dmp", dump_id);
|
||||
- if (pdump_file_get (exe_path))
|
||||
- {
|
||||
- if (pdump_load_check ())
|
||||
- return 1;
|
||||
- pdump_free ();
|
||||
- }
|
||||
-
|
||||
- sprintf (w, ".dmp");
|
||||
+ sprintf (w, "-%s.dmp", EMACS_VERSION);
|
||||
if (pdump_file_get (exe_path))
|
||||
{
|
||||
if (pdump_load_check ())
|
||||
@ -1,33 +1,33 @@
|
||||
$OpenBSD: patch-src_editfns_c,v 1.1 2001/03/01 21:20:17 naddy Exp $
|
||||
--- src/editfns.c.orig Mon Feb 5 17:11:04 2001
|
||||
+++ src/editfns.c Mon Feb 5 17:36:51 2001
|
||||
@@ -871,6 +871,7 @@ char *
|
||||
get_home_directory (void)
|
||||
{
|
||||
$OpenBSD: patch-src_editfns_c,v 1.2 2003/04/24 18:15:39 lebel Exp $
|
||||
--- src/editfns.c.orig Mon Mar 25 22:38:26 2002
|
||||
+++ src/editfns.c Mon Mar 25 22:41:42 2002
|
||||
@@ -873,6 +873,7 @@ get_home_directory (void)
|
||||
between XEmacs and the outside world, the very moment we first get
|
||||
the data. --ben */
|
||||
int output_home_warning = 0;
|
||||
+ struct passwd *pw = NULL;
|
||||
|
||||
if (cached_home_directory == NULL)
|
||||
{
|
||||
@@ -912,6 +913,13 @@ get_home_directory (void)
|
||||
@@ -919,6 +920,13 @@ get_home_directory (void)
|
||||
# endif
|
||||
}
|
||||
#else /* !WINDOWSNT */
|
||||
+ if ((pw = getpwuid(getuid())) != NULL)
|
||||
+ {
|
||||
+ cached_home_directory = pw->pw_dir;
|
||||
+ output_home_warning = 0;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
#else /* !WIN32_NATIVE */
|
||||
+ if ((pw = getpwuid(getuid())) != NULL)
|
||||
+ {
|
||||
+ cached_home_directory = pw->pw_dir;
|
||||
+ output_home_warning = 0;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
/*
|
||||
* Unix, typically.
|
||||
* Using "/" isn't quite right, but what should we do?
|
||||
@@ -920,6 +928,7 @@ get_home_directory (void)
|
||||
@@ -927,6 +935,7 @@ get_home_directory (void)
|
||||
*/
|
||||
cached_home_directory = "/";
|
||||
cached_home_directory = (Extbyte *) "/";
|
||||
output_home_warning = 1;
|
||||
+ }
|
||||
#endif /* !WINDOWSNT */
|
||||
+ }
|
||||
#endif /* !WIN32_NATIVE */
|
||||
}
|
||||
if (initialized && output_home_warning)
|
||||
|
||||
@ -10,27 +10,17 @@ The XEmacs web page can be browsed, using any WWW browser at
|
||||
|
||||
NOTE:
|
||||
This package contains the XEmacs engine.
|
||||
Every major functionality of XEmacs is a separate module.
|
||||
Every major functionnality of XEmacs is a separate module.
|
||||
A complete set of theses modules is bundled in the
|
||||
"xemacs21-sumo" package.
|
||||
|
||||
Flavors:
|
||||
mule - MUlti-Lingual Emacs
|
||||
wnn - input method (needs mule) [4]
|
||||
canna - another input method (needs mule) [4]
|
||||
compface - support for XFaces (needs X11)
|
||||
jpeg - support for JPEGs (needs X11)
|
||||
no_png - disable support for PNGs [1] (needs X11)
|
||||
tiff - support for TIFFs (needs X11)
|
||||
motif - make use of Motif [2] (needs X11)
|
||||
wnn - input method (needs mule) [1]
|
||||
canna - another input method (needs mule) [1]
|
||||
compface - support for XFaces (needs X11),
|
||||
useful only for Gnus users.
|
||||
no_x11 - disable X11 support
|
||||
clashdetect - prevents multiple editing of the same file [3]
|
||||
gdbm - support for GNU dbm
|
||||
|
||||
[1] NOT RECOMMENDED - XEmacs makes use of PNG files quite a lot.
|
||||
[2] Works with LessTif and OpenMotif.
|
||||
[3] Even if you don't use this flavor, XEmacs' uses a lesser efficient way
|
||||
to prevent this. The method this flavor implements involves a world-
|
||||
writeable directory.
|
||||
[4] XEmacs coredumps if the {canna,wnn} server is killed before it closes
|
||||
[1] XEmacs coredumps if the {canna,wnn} server is killed before it closes
|
||||
connection.
|
||||
|
||||
@ -1,18 +1,19 @@
|
||||
+----------------------
|
||||
|
|
||||
| XEmacs is pretty useless as-is. It is just an engine.
|
||||
| You need to install (XE)packages to provide your users full functionality.
|
||||
| You need to install modules to provide your users full functionnality.
|
||||
| There is two methods to achieve this :
|
||||
| 1 - install the xemacs21-sumo (O)package. It contains all the
|
||||
| (XE)packages currently supported by the XEmacs team.
|
||||
| 1 - install the xemacs21-sumo package. It contains all the
|
||||
| modules currently supported by the XEmacs team.
|
||||
| It's fast, easy and your users won't ever bother you again about this.
|
||||
| On the other hand the (O)package is quite huge.
|
||||
| 2 - you have to install by hand every XEmacs' (XE)packages as described
|
||||
| On the other hand the package is quite huge.
|
||||
| 2 - you have to install by hand every XEmacs' modules as described
|
||||
| in the XEmacs documentation. (Search for "packages" in the info tree.)
|
||||
| There are a lot of interdependencies between XEmacs' (XE)packages
|
||||
| There are a lot of interdependencies between XEmacs' modules
|
||||
| and you may end up with everything installed just as method 1 would
|
||||
| have (without the hassle).
|
||||
|
|
||||
| Note: XEmacs (XE)packages are orthogonal to OpenBSD (O)packages.
|
||||
| (Yes, it's confusing. XE are XEmacs' and (O) are OpenBSD ones)
|
||||
| Note: XEmacs modules are named "packages" by the XEmacs team, the term
|
||||
| "module" is used here just to limit possible confusion with
|
||||
| OpenBSD packages.
|
||||
+----------------------
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user