Here is an update to 21.4.17, which fixes a few problems. An invalid
bound has been found with Wbounded by alek@, and a few cleanings have
been done.
matthieu@ has reported that it was working pretty well.
Please, test.
diff -urN editors/xemacs21/Makefile mystuff/editors/xemacs21/Makefile
--- editors/xemacs21/Makefile Sat Sep 24 22:23:00 2005
+++ mystuff/editors/xemacs21/Makefile Tue Oct 18 21:41:12 2005
@@ -2,9 +2,8 @@
COMMENT= "heavily customizable and extensible editor"
-VERSION= 21.4.15
+VERSION= 21.4.17
DISTNAME= xemacs-${VERSION}
-PKGNAME= ${DISTNAME}p2
CATEGORIES= editors
HOMEPAGE= http://www.xemacs.org/
@@ -16,7 +15,6 @@
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m ncurses util
-# where the source files and patches can be fetched
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/ \
@@ -26,30 +24,11 @@
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
+GCCARCH= ${MACHINE_ARCH}-unknown-openbsd${OSREV}
+SUBST_VARS= GCCARCH VERSION
-# build/configuration variables
-
-# XEmacs symlinks a lot of files in its source tree
-# preventing safe SEPARATE_BUILD
-# (In facts, files modified in the source tree
-# are not platform-specific (elisp bytecode) but
-# you cannot build the package on different systems
-# sharing the same ports tree w/o risking race
-# problems (yes, building over nfs is stupid but...))
-# (there are flavors (mule) issues too)
-# Lots of configure.in changes are needed to restore
-# a more logical behaviour (eech)
-# Therefore, this is commented out for now:
-# SEPARATE_BUILD= simple
-
-#USE_GMAKE= Yes
-
-# 'configure.in' modified to generate a 'configure'
-# that knows about curses really being ncurses
-
CONFIGURE_STYLE= autoconf old dest no-autoheader
+
CONFIGURE_ARGS+= --infodir='$${DESTDIR}${PREFIX}/info/${DISTNAME}' \
--infopath='${LOCALBASE}/info/${DISTNAME}:${LOCALBASE}/info:/usr/share/info' \
--site-prefixes='${LOCALBASE}:/usr' \
@@ -69,77 +48,39 @@
--with-database=no \
--with-file-coding=yes \
--with-system-malloc \
- --pdump
+ --pdump \
+ ${GCCARCH}
-# there is not (yet) bsd sound support in XEmacs
-# 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}'
-####
-
-# Arch string for configure
-# copied from emacs and xemacs20 ports
-
-GCCARCH= ${MACHINE_ARCH}-unknown-openbsd${OSREV}
-
-CONFIGURE_ARGS+= ${GCCARCH}
-SUBST_VARS= GCCARCH VERSION
-
-#### Flavors
-
-# generic flavors
-FLAVORS= mule canna wnn
-
-# X11 Related
-FLAVORS+= no_x11
-
+FLAVORS= mule canna wnn no_x11
FLAVOR?=
-#
-# X11-related
-#
-
.if ${FLAVOR:L:Mno_x11}
-
CONFIGURE_ARGS+=--without-x11
-
.else
-
-### X11-dependent flavors
USE_X11= Yes
WANTLIB+= ICE SM X11 Xaw Xext Xmu Xpm Xt z
-CONFIGURE_ARGS+= --with-menubars=lucid
-
-CONFIGURE_ARGS+=--with-scrollbars=lucid \
+CONFIGURE_ARGS+=--with-menubars=lucid \
+ --with-scrollbars=lucid \
--with-dialogs=athena \
- --with-widgets=athena
-
-LIB_DEPENDS+= jpeg.62::graphics/jpeg
-CONFIGURE_ARGS+=--with-jpeg
-LIB_DEPENDS+= png.2.::graphics/png
-CONFIGURE_ARGS+=--with-png \
+ --with-widgets=athena \
+ --with-jpeg \
+ --with-png \
+ --with-tiff \
--site-includes="${LOCALBASE}/include/libpng"
-LIB_DEPENDS+= tiff.35::graphics/tiff
-CONFIGURE_ARGS+=--with-tiff
+LIB_DEPENDS+= jpeg.62::graphics/jpeg \
+ png.2.::graphics/png \
+ tiff.35::graphics/tiff
. if ${FLAVOR:L:Mmule}
-CONFIGURE_ARGS+= --with-xim=xlib
-# prevents XEmacs from using motif's XIM which coredumps a lot
+CONFIGURE_ARGS+=--with-xim=xlib
. endif
-
-### end of X11 dependant flavors
.endif
-#
-# MULE (MUlti Lingual Emacs) RELATED
-# I18N
-#
-
.if ${FLAVOR:L:Mmule}
MODULES= devel/gettext
CONFIGURE_ARGS+=--with-mule
@@ -147,15 +88,11 @@
. if ${FLAVOR:L:Mcanna}
LIB_DEPENDS+= canna16::japanese/canna
CONFIGURE_ARGS+=--with-canna
-. else
-CONFIGURE_ARGS+=--with-canna=no
. endif
. if ${FLAVOR:L:Mwnn}
BUILD_DEPENDS+= ::japanese/Wnn
CONFIGURE_ARGS+=--with-wnn
-. else
-CONFIGURE_ARGS+=--with-wnn=no
. endif
.else
@@ -169,22 +106,8 @@
--with-wnn=no
.endif
-#######
-STRIP_EXECS= cvtmail digest-doc fakemail gnuserv hexl make-docfile \
- mmencode movemail profile sorted-doc wakeup yow
-STRIP_PROGS= ${DISTNAME} gnuclient xemacs-b2m xemacs-ctags \
- xemacs-etags ootags
-
post-install:
-# Stripping
-.for file in ${STRIP_PROGS}
- @strip ${PREFIX}/bin/${file}
-.endfor
-.for file in ${STRIP_EXECS}
- @strip ${PREFIX}/lib/${DISTNAME}/${GCCARCH}/${file}
-.endfor
-.if !defined(LOCKDIR)
- @rm -rf ${PREFIX}/lib/xemacs
-.endif
+ rm -f ${PREFIX}/lib/xemacs-${VERSION}/lisp/${USER}*
.include <bsd.port.mk>
+
diff -urN editors/xemacs21/distinfo mystuff/editors/xemacs21/distinfo
--- editors/xemacs21/distinfo Wed Jan 5 17:28:22 2005
+++ mystuff/editors/xemacs21/distinfo Sun Sep 25 14:59:33 2005
@@ -1,4 +1,4 @@
-MD5 (xemacs-21.4.15.tar.gz) = b80e040d9cb85c9210999554dc210fa6
-RMD160 (xemacs-21.4.15.tar.gz) = 9c2d4d1d8c84486ed63b07c3983ec3c648c2a6c7
-SHA1 (xemacs-21.4.15.tar.gz) = 6ee2583c71b46ef1edb78bd170c9adbef97ae5db
-SIZE (xemacs-21.4.15.tar.gz) = 10652161
+MD5 (xemacs-21.4.17.tar.gz) = 835d539709fbbe8e30cd5de8b3541aa1
+RMD160 (xemacs-21.4.17.tar.gz) = d42ca370ba916f0147b368bd7db2cc6c523646ae
+SHA1 (xemacs-21.4.17.tar.gz) = 274812bee5f8010ca3d56b517026270d94415f33
+SIZE (xemacs-21.4.17.tar.gz) = 10626826
diff -urN editors/xemacs21/patches/patch-Makefile_in_in
mystuff/editors/xemacs21/patches/patch-Makefile_in_in
--- editors/xemacs21/patches/patch-Makefile_in_in Thu Apr 24 20:15:39 2003
+++ mystuff/editors/xemacs21/patches/patch-Makefile_in_in Mon Oct 10
21:40:40 2005
@@ -1,7 +1,7 @@
$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
+--- Makefile.in.in.orig Mon Jan 31 03:54:47 2005
++++ Makefile.in.in Mon Oct 10 21:36:19 2005
+@@ -429,7 +429,7 @@ install-arch-dep: mkdir
do (cd $${subdir} && $(RM) -r RCS CVS SCCS \#* *~) ; done ; \
else true; fi
#ifdef PDUMP
@@ -10,7 +10,7 @@
#endif
#ifdef WIN32_NATIVE
${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}
-@@ -488,9 +488,14 @@ install-arch-indep: mkdir info
+@@ -494,9 +494,14 @@ install-arch-indep: mkdir info
done ; \
fi
cd ${srcdir}/etc && \
diff -urN editors/xemacs21/patches/patch-configure_in
mystuff/editors/xemacs21/patches/patch-configure_in
--- editors/xemacs21/patches/patch-configure_in Mon Oct 4 18:40:48 2004
+++ mystuff/editors/xemacs21/patches/patch-configure_in Mon Oct 10 21:40:40 2005
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.3 2004/10/04 16:40:48 naddy Exp $
---- configure.in.orig Mon Oct 4 18:25:45 2004
-+++ configure.in Mon Oct 4 18:26:20 2004
-@@ -3761,6 +3761,7 @@ if test "$with_mule" = "yes" ; then
+--- configure.in.orig Mon Jan 31 03:54:47 2005
++++ configure.in Mon Oct 10 21:36:20 2005
+@@ -3768,6 +3768,7 @@ if test "$with_mule" = "yes" ; then
XE_ADD_OBJS(mule.o mule-ccl.o mule-charset.o file-coding.o)
dnl Use -lintl to get internationalized strerror for Mule
diff -urN editors/xemacs21/patches/patch-info_emodules_info
mystuff/editors/xemacs21/patches/patch-info_emodules_info
--- editors/xemacs21/patches/patch-info_emodules_info Thu Jan 1 01:00:00 1970
+++ mystuff/editors/xemacs21/patches/patch-info_emodules_info Tue Oct 18
16:45:50 2005
@@ -0,0 +1,18 @@
+$OpenBSD$
+--- info/emodules.info.orig Thu Sep 8 08:44:25 2005
++++ info/emodules.info Thu Sep 8 08:47:03 2005
+@@ -1,6 +1,14 @@
+ This is ../info/emodules.info, produced by makeinfo version 4.6 from
+ emodules.texi.
+
++INFO-DIR-SECTION XEmacs Editor
++START-INFO-DIR-ENTRY
++* Dynamic loadable modules: (emodules). Dynamic loadable module support.
++END-INFO-DIR-ENTRY
++
++^_
++File: emodules.info, Node: Top, Next: Introduction, Prev: (dir), Up: (dir)
++
+ This file documents the module loading technology of XEmacs.
+
+ Copyright (C) 1998 J. Kean Johnston.
diff -urN editors/xemacs21/patches/patch-lib-src_cvtmail_c
mystuff/editors/xemacs21/patches/patch-lib-src_cvtmail_c
--- editors/xemacs21/patches/patch-lib-src_cvtmail_c Thu Jan 1 01:00:00 1970
+++ mystuff/editors/xemacs21/patches/patch-lib-src_cvtmail_c Mon Oct 10
21:40:40 2005
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- lib-src/cvtmail.c.orig Mon Oct 10 21:40:20 2005
++++ lib-src/cvtmail.c Mon Oct 10 21:40:30 2005
+@@ -60,7 +60,7 @@ main (int argc, char *argv[])
+ FILE *mfilef;
+ FILE *cff;
+ char pre[10];
+- char name[14];
++ char name[15];
+ int c;
+
+ hd = getenv ("HOME");
diff -urN editors/xemacs21/patches/patch-lib-src_movemail_c
mystuff/editors/xemacs21/patches/patch-lib-src_movemail_c
--- editors/xemacs21/patches/patch-lib-src_movemail_c Wed Feb 9 04:48:43 2005
+++ mystuff/editors/xemacs21/patches/patch-lib-src_movemail_c Sun Sep 25
15:12:31 2005
@@ -1,6 +1,6 @@
-$OpenBSD: patch-lib-src_movemail_c,v 1.2 2005/02/09 03:48:43 brad Exp $
---- lib-src/movemail.c.orig Tue Aug 20 07:34:22 2002
-+++ lib-src/movemail.c Tue Feb 8 20:42:15 2005
+$OpenBSD$
+--- lib-src/movemail.c.orig Sun Sep 25 15:10:55 2005
++++ lib-src/movemail.c Sun Sep 25 15:12:18 2005
@@ -588,14 +588,12 @@ lock_dot(char *filename)
p--;
*p = 0;
@@ -17,12 +17,3 @@
if (desc < 0)
{
char *message = (char *) xmalloc (strlen (tempname) + 50);
-@@ -796,7 +794,7 @@ popmail (char *user, char *outfile, char
- mbx_delimit_begin (mbf);
- if (pop_retr (server, i, mbx_write, mbf) != POP_RETRIEVED)
- {
-- error (Errmsg, NULL, NULL);
-+ error ("%s", Errmsg, NULL);
- close (mbfi);
- return (1);
- }
diff -urN editors/xemacs21/pkg/PLIST mystuff/editors/xemacs21/pkg/PLIST
--- editors/xemacs21/pkg/PLIST Sun Nov 7 11:00:48 2004
+++ mystuff/editors/xemacs21/pkg/PLIST Tue Oct 18 21:52:41 2005
@@ -1,4 +1,4 @@
[EMAIL PROTECTED] $OpenBSD: PLIST,v 1.11 2004/11/07 10:00:48 espie Exp $
[EMAIL PROTECTED] $OpenBSD$
bin/ellcc
bin/gnuattach
bin/gnuclient
@@ -11,15 +11,17 @@
bin/xemacs-ctags
bin/xemacs-etags
bin/xemacs-rcs-checkin
[EMAIL PROTECTED] info/xemacs-${VERSION}/
+info/xemacs-${VERSION}/
@info info/xemacs-${VERSION}/cl.info
@info info/xemacs-${VERSION}/custom.info
[EMAIL PROTECTED] info/xemacs-${VERSION}/dir
@info info/xemacs-${VERSION}/emodules.info
-info/xemacs-${VERSION}/external-widget.info
[EMAIL PROTECTED] info/xemacs-${VERSION}/emodules.info.orig
[EMAIL PROTECTED] info/xemacs-${VERSION}/external-widget.info
@info info/xemacs-${VERSION}/info.info
@info info/xemacs-${VERSION}/internals.info
@info info/xemacs-${VERSION}/lispref.info
-info/xemacs-${VERSION}/new-users-guide.info
[EMAIL PROTECTED] info/xemacs-${VERSION}/new-users-guide.info
@info info/xemacs-${VERSION}/standards.info
@info info/xemacs-${VERSION}/term.info
@info info/xemacs-${VERSION}/termcap.info
@@ -27,6 +29,7 @@
@info info/xemacs-${VERSION}/widget.info
@info info/xemacs-${VERSION}/xemacs-faq.info
@info info/xemacs-${VERSION}/xemacs.info
+lib/xemacs/
lib/xemacs-${VERSION}/
lib/xemacs-${VERSION}/etc/
lib/xemacs-${VERSION}/etc/BETA
@@ -146,6 +149,7 @@
lib/xemacs-${VERSION}/etc/gnuserv.1
lib/xemacs-${VERSION}/etc/gnuserv.README
lib/xemacs-${VERSION}/etc/gray1.xbm
+lib/xemacs-${VERSION}/etc/gtkrc
lib/xemacs-${VERSION}/etc/idd/
lib/xemacs-${VERSION}/etc/idd/drop
lib/xemacs-${VERSION}/etc/idd/dropmsk
@@ -1059,11 +1063,9 @@
lib/xemacs-${VERSION}/lisp/mule/auto-autoloads.el
lib/xemacs-${VERSION}/lisp/mule/auto-autoloads.elc
lib/xemacs-${VERSION}/lisp/mule/canna-leim.el
-lib/xemacs-${VERSION}/lisp/mule/canna-leim.elc
lib/xemacs-${VERSION}/lisp/mule/chinese.el
lib/xemacs-${VERSION}/lisp/mule/chinese.elc
lib/xemacs-${VERSION}/lisp/mule/custom-load.el
-lib/xemacs-${VERSION}/lisp/mule/custom-load.elc
lib/xemacs-${VERSION}/lisp/mule/cyrillic.el
lib/xemacs-${VERSION}/lisp/mule/cyrillic.elc
lib/xemacs-${VERSION}/lisp/mule/english.el
@@ -1105,7 +1107,6 @@
lib/xemacs-${VERSION}/lisp/mule/mule-tty-init.el
lib/xemacs-${VERSION}/lisp/mule/mule-tty-init.elc
lib/xemacs-${VERSION}/lisp/mule/mule-x-init.el
-lib/xemacs-${VERSION}/lisp/mule/mule-x-init.elc
lib/xemacs-${VERSION}/lisp/mule/thai-xtis-chars.el
lib/xemacs-${VERSION}/lisp/mule/thai-xtis-chars.elc
lib/xemacs-${VERSION}/lisp/mule/thai-xtis.el
@@ -1267,6 +1268,8 @@
lib/xemacs-${VERSION}/lisp/x-win-sun.elc
lib/xemacs-${VERSION}/lisp/x-win-xfree86.el
lib/xemacs-${VERSION}/lisp/x-win-xfree86.elc
+lib/xemacs/site-lisp/
+lib/xemacs/site-modules/
@man man/man1/gnuattach.1
@man man/man1/gnuclient.1
@man man/man1/gnudoit.1
