ports/77236: [MAINTAINER] editors/xemacs21-mule: update to 21.4.17
Andrey Slusar
anrays at gmail.com
Mon Feb 7 20:30:32 UTC 2005
>Number: 77236
>Category: ports
>Synopsis: [MAINTAINER] editors/xemacs21-mule: update to 21.4.17
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Feb 07 20:30:31 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Andrey Slusar
>Release: FreeBSD 5.3-STABLE i386
>Organization:
Santinel
>Environment:
System: FreeBSD santinel.home.ua 5.3-STABLE FreeBSD 5.3-STABLE #0: Wed Feb 2 00:58:56 EET 2005 anray at santinel.home.ua:/usr/obj/usr/src/sys/ANRAY i386
>Description:
Removed files:
files/patch-ai
files/patch-ak
files/patch-etags.c
files/patch-freebsd.h
files/patch-regex.c
Update to 21.4.17 "Jumbo Shrimp".
>How-To-Repeat:
>Fix:
--- xemacs21-mule.diff begins here ---
diff -ruN /usr/ports/editors/xemacs21-mule/Makefile xemacs21-mule/Makefile
--- /usr/ports/editors/xemacs21-mule/Makefile Sat Jan 29 15:55:03 2005
+++ xemacs21-mule/Makefile Mon Feb 7 20:34:24 2005
@@ -7,7 +7,6 @@
PORTNAME= xemacs-mule
PORTVERSION= ${XEMACS_VER}
-PORTREVISION= 2
CATEGORIES+= editors
MASTER_SITES= ${MASTER_SITE_XEMACS}
MASTER_SITE_SUBDIR= xemacs-${XEMACS_REL}
@@ -41,7 +40,7 @@
compface.1:${PORTSDIR}/mail/faces
XEMACS_REL= 21.4
-XEMACS_VER= ${XEMACS_REL}.16
+XEMACS_VER= ${XEMACS_REL}.17
XEMACS_ARCH= ${CONFIGURE_TARGET}
USE_GETTEXT= yes
diff -ruN /usr/ports/editors/xemacs21-mule/distinfo xemacs21-mule/distinfo
--- /usr/ports/editors/xemacs21-mule/distinfo Fri Dec 24 21:01:19 2004
+++ xemacs21-mule/distinfo Mon Feb 7 22:02:29 2005
@@ -1,6 +1,6 @@
-MD5 (xemacs/xemacs-21.4.16-src.tar.gz) = 547f0dacceacfe013a1cee21bc0e859e
-SIZE (xemacs/xemacs-21.4.16-src.tar.gz) = 8315419
-MD5 (xemacs/xemacs-21.4.16-elc.tar.gz) = daa608da30d3b75dbcb59befe8c1a3c6
-SIZE (xemacs/xemacs-21.4.16-elc.tar.gz) = 931295
-MD5 (xemacs/xemacs-21.4.16-info.tar.gz) = 2af10831789ab70ba866f2660263ff08
-SIZE (xemacs/xemacs-21.4.16-info.tar.gz) = 1632145
+MD5 (xemacs/xemacs-21.4.17-src.tar.gz) = 3a05a0fab0dd9bed9df4a3dceb4da97f
+SIZE (xemacs/xemacs-21.4.17-src.tar.gz) = 8324899
+MD5 (xemacs/xemacs-21.4.17-elc.tar.gz) = 8f678003cc78cd0faecc5ab9e3b8818f
+SIZE (xemacs/xemacs-21.4.17-elc.tar.gz) = 931709
+MD5 (xemacs/xemacs-21.4.17-info.tar.gz) = f34b6dcfaedbf832692b1c5dcb84cd0a
+SIZE (xemacs/xemacs-21.4.17-info.tar.gz) = 1634004
diff -ruN /usr/ports/editors/xemacs21-mule/files/patch-ai xemacs21-mule/files/patch-ai
--- /usr/ports/editors/xemacs21-mule/files/patch-ai Tue Dec 14 00:41:58 2004
+++ xemacs21-mule/files/patch-ai Thu Jan 1 03:00:00 1970
@@ -1,20 +0,0 @@
---- lib-src/fakemail.c.orig Tue Mar 23 22:09:58 1999
-+++ lib-src/fakemail.c Tue Mar 23 22:12:20 1999
-@@ -157,9 +157,17 @@
- extern char *malloc (), *realloc ();
- #endif
-
-+#if defined(__FreeBSD_version) && __FreeBSD_version >= 400000
-+#define CURRENT_USER
-+#endif
-+
- #ifdef CURRENT_USER
- extern struct passwd *getpwuid ();
-+#if defined(__FreeBSD_version) && __FreeBSD_version >= 400000
-+extern uid_t geteuid ();
-+#else
- extern unsigned short geteuid ();
-+#endif
- static struct passwd *my_entry;
- #define cuserid(s) \
- (my_entry = getpwuid (((int) geteuid ())), \
diff -ruN /usr/ports/editors/xemacs21-mule/files/patch-ak xemacs21-mule/files/patch-ak
--- /usr/ports/editors/xemacs21-mule/files/patch-ak Tue Dec 14 00:41:58 2004
+++ xemacs21-mule/files/patch-ak Thu Jan 1 03:00:00 1970
@@ -1,17 +0,0 @@
---- ./src/unexelf.c~ Sun Aug 15 03:29:56 1999
-+++ ./src/unexelf.c Tue Nov 2 10:24:55 1999
-@@ -515,6 +515,14 @@
- # include <sys/exec_elf.h>
- #endif
-
-+#if defined(__FreeBSD__) && (defined(__alpha__) || defined(__amd64__))
-+# ifdef __STDC__
-+# define ElfW(type) Elf64_##type
-+# else
-+# define ElfW(type) Elf64_/**/type
-+# endif
-+#endif
-+
- #if __GNU_LIBRARY__ - 0 >= 6
- # include <link.h> /* get ElfW etc */
- #endif
diff -ruN /usr/ports/editors/xemacs21-mule/files/patch-etags.c xemacs21-mule/files/patch-etags.c
--- /usr/ports/editors/xemacs21-mule/files/patch-etags.c Fri Dec 24 14:39:56 2004
+++ xemacs21-mule/files/patch-etags.c Thu Jan 1 03:00:00 1970
@@ -1,29 +0,0 @@
-Index: lib-src/etags.c
-===================================================================
-RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/etags.c,v
-retrieving revision 1.24.2.2
-retrieving revision 1.24.2.3
-diff -u -r1.24.2.2 -r1.24.2.3
---- lib-src/etags.c 2004/06/24 04:02:29 1.24.2.2
-+++ lib-src/etags.c 2004/12/17 23:03:25 1.24.2.3
-@@ -5146,6 +5146,7 @@
- bool ignore_case;
- language *lang;
- {
-+ static struct re_pattern_buffer zeropattern;
- char *name;
- const char *err;
- struct re_pattern_buffer *patbuf;
-@@ -5166,11 +5167,9 @@
- (void) scan_separators (name);
-
- patbuf = xnew (1, struct re_pattern_buffer);
-+ *patbuf = zeropattern;
- /* Translation table to fold case if appropriate. */
- patbuf->translate = (ignore_case) ? lc_trans : NULL;
-- patbuf->fastmap = NULL;
-- patbuf->buffer = NULL;
-- patbuf->allocated = 0;
-
- err = re_compile_pattern (regexp_pattern, strlen (regexp_pattern), patbuf);
- if (err != NULL)
diff -ruN /usr/ports/editors/xemacs21-mule/files/patch-freebsd.h xemacs21-mule/files/patch-freebsd.h
--- /usr/ports/editors/xemacs21-mule/files/patch-freebsd.h Sat Dec 25 23:43:02 2004
+++ xemacs21-mule/files/patch-freebsd.h Thu Jan 1 03:00:00 1970
@@ -1,11 +0,0 @@
---- src/s/freebsd.h.old Sat Dec 25 16:06:34 2004
-+++ src/s/freebsd.h Sat Dec 25 16:07:10 2004
-@@ -29,7 +29,7 @@
- #ifndef __FreeBSD_version
- #include <osreldate.h>
- #endif
--#if __FreeBSD_version >= 199701
-+#if __FreeBSD_version >= 199701 && __FreeBSD_version < 600006
- #define LIBS_SYSTEM "-lutil -lxpg4"
- #else
- #define LIBS_SYSTEM "-lutil"
diff -ruN /usr/ports/editors/xemacs21-mule/files/patch-regex.c xemacs21-mule/files/patch-regex.c
--- /usr/ports/editors/xemacs21-mule/files/patch-regex.c Sat Jan 29 15:55:04 2005
+++ xemacs21-mule/files/patch-regex.c Thu Jan 1 03:00:00 1970
@@ -1,217 +0,0 @@
-Index: src/regex.c
-===================================================================
-RCS file: /pack/xemacscvs/XEmacs/xemacs/src/regex.c,v
-retrieving revision 1.25.2.10
-retrieving revision 1.25.2.12
-diff -u -r1.25.2.10 -r1.25.2.12
---- src/regex.c 2004/10/08 00:40:33 1.25.2.10
-+++ src/regex.c 2005/01/29 01:33:11 1.25.2.12
-@@ -1994,6 +1994,7 @@
- bufp->re_nsub = 0;
- bufp->re_ngroups = 0;
-
-+ /* Allocate index translation array if needed. */
- if (bufp->external_to_internal_register == 0)
- {
- bufp->external_to_internal_register_size = INIT_REG_TRANSLATE_SIZE;
-@@ -2002,6 +2003,7 @@
- int);
- }
-
-+ /* Initialize translations to impossible value to aid debugging. */
- {
- int i;
-
-@@ -2614,6 +2616,8 @@
- r = ++regnum;
- bufp->re_ngroups++;
- if (!shy)
-+ /* Record the translation from capturing group index to
-+ register number, reallocating table as needed. */
- {
- bufp->re_nsub++;
- while (bufp->external_to_internal_register_size <=
-@@ -3053,23 +3057,23 @@
- case '6': case '7': case '8': case '9':
- {
- int reg;
-+
- if (syntax & RE_NO_BK_REFS)
- goto normal_char;
-
-+ /* External register indexing. */
- reg = c - '0';
-
- if (reg > bufp->re_nsub)
- FREE_STACK_RETURN (REG_ESUBREG);
-
-- {
-- int regint = bufp->external_to_internal_register[reg];
-- /* Can't back reference to a subexpression if inside it. */
-- if (group_in_compile_stack (compile_stack, regint))
-- {
-- goto normal_char;
-- }
-- }
-+ /* Convert external to internal as soon as possible. */
-+ reg = bufp->external_to_internal_register[reg];
-
-+ /* Can't back reference to a subexpression if inside it. */
-+ if (group_in_compile_stack (compile_stack, reg))
-+ goto normal_char;
-+
- laststart = buf_end;
- BUF_PUSH_2 (duplicate, reg);
- }
-@@ -4710,8 +4714,8 @@
- succeed_label:
- DEBUG_PRINT1 ("Accepting match.\n");
-
-- /* If caller wants register contents data back, do it. */
- {
-+ /* If caller wants register contents data back, fill REGS. */
- int num_nonshy_regs = bufp->re_nsub + 1;
- if (regs && !bufp->no_sub)
- {
-@@ -4764,8 +4768,9 @@
- : ((regoff_t) (d - string2 + size1)));
- }
-
-- /* Go through the first `min (num_regs, regs->num_regs)'
-- registers, since that is all we initialized. */
-+ /* Map over the NUM_NONSHY_REGS non-shy internal registers.
-+ Copy each into the corresponding external register.
-+ N.B. MCNT indexes external registers. */
- for (mcnt = 1;
- mcnt < MIN (num_nonshy_regs, regs->num_regs);
- mcnt++)
-@@ -4783,23 +4788,23 @@
- }
- }
- } /* regs && !bufp->no_sub */
-- }
-
-- /* If we have regs and the regs structure has more elements than
-- were in the pattern, set the extra elements to -1. If we
-- (re)allocated the registers, this is the case, because we
-- always allocate enough to have at least one -1 at the end.
--
-- We do this even when no_sub is set because some applications
-- (XEmacs) reuse register structures which may contain stale
-- information, and permit attempts to access those registers.
--
-- It would be possible to require the caller to do this, but we'd
-- have to change the API for this function to reflect that, and
-- audit all callers. */
-- if (regs && regs->num_regs > 0)
-- for (mcnt = num_regs; mcnt < regs->num_regs; mcnt++)
-- regs->start[mcnt] = regs->end[mcnt] = -1;
-+ /* If we have regs and the regs structure has more elements than
-+ were in the pattern, set the extra elements to -1. If we
-+ (re)allocated the registers, this is the case, because we
-+ always allocate enough to have at least one -1 at the end.
-+
-+ We do this even when no_sub is set because some applications
-+ (XEmacs) reuse register structures which may contain stale
-+ information, and permit attempts to access those registers.
-+
-+ It would be possible to require the caller to do this, but we'd
-+ have to change the API for this function to reflect that, and
-+ audit all callers. */
-+ if (regs && regs->num_regs > 0)
-+ for (mcnt = num_nonshy_regs; mcnt < regs->num_regs; mcnt++)
-+ regs->start[mcnt] = regs->end[mcnt] = -1;
-+ }
-
- DEBUG_PRINT4 ("%u failure points pushed, %u popped (%u remain).\n",
- nfailure_points_pushed, nfailure_points_popped,
-@@ -5958,7 +5963,7 @@
-
- static re_bool
- group_match_null_string_p (unsigned char **p, unsigned char *end,
-- register_info_type *reg_info)
-+ register_info_type *register_info)
- {
- int mcnt;
- /* Point to after the args to the start_memory. */
-@@ -6007,7 +6012,7 @@
- its number. */
-
- if (!alt_match_null_string_p (p1, p1 + mcnt - 3,
-- reg_info))
-+ register_info))
- return false;
-
- /* Move to right after this alternative, including the
-@@ -6036,7 +6041,7 @@
- the length of the alternative. */
- EXTRACT_NUMBER (mcnt, p1 - 2);
-
-- if (!alt_match_null_string_p (p1, p1 + mcnt, reg_info))
-+ if (!alt_match_null_string_p (p1, p1 + mcnt, register_info))
- return false;
-
- p1 += mcnt; /* Get past the n-th alternative. */
-@@ -6051,7 +6056,7 @@
-
-
- default:
-- if (!common_op_match_null_string_p (&p1, end, reg_info))
-+ if (!common_op_match_null_string_p (&p1, end, register_info))
- return false;
- }
- } /* while p1 < end */
-@@ -6066,7 +6071,7 @@
-
- static re_bool
- alt_match_null_string_p (unsigned char *p, unsigned char *end,
-- register_info_type *reg_info)
-+ register_info_type *register_info)
- {
- int mcnt;
- unsigned char *p1 = p;
-@@ -6086,7 +6091,7 @@
- break;
-
- default:
-- if (!common_op_match_null_string_p (&p1, end, reg_info))
-+ if (!common_op_match_null_string_p (&p1, end, register_info))
- return false;
- }
- } /* while p1 < end */
-@@ -6102,7 +6107,7 @@
-
- static re_bool
- common_op_match_null_string_p (unsigned char **p, unsigned char *end,
-- register_info_type *reg_info)
-+ register_info_type *register_info)
- {
- int mcnt;
- re_bool ret;
-@@ -6130,13 +6135,14 @@
- case start_memory:
- reg_no = *p1;
- assert (reg_no > 0 && reg_no <= MAX_REGNUM);
-- ret = group_match_null_string_p (&p1, end, reg_info);
-+ ret = group_match_null_string_p (&p1, end, register_info);
-
- /* Have to set this here in case we're checking a group which
- contains a group and a back reference to it. */
-
-- if (REG_MATCH_NULL_STRING_P (reg_info[reg_no]) == MATCH_NULL_UNSET_VALUE)
-- REG_MATCH_NULL_STRING_P (reg_info[reg_no]) = ret;
-+ if (REG_MATCH_NULL_STRING_P (register_info[reg_no]) ==
-+ MATCH_NULL_UNSET_VALUE)
-+ REG_MATCH_NULL_STRING_P (register_info[reg_no]) = ret;
-
- if (!ret)
- return false;
-@@ -6167,7 +6173,7 @@
- break;
-
- case duplicate:
-- if (!REG_MATCH_NULL_STRING_P (reg_info[*p1]))
-+ if (!REG_MATCH_NULL_STRING_P (register_info[*p1]))
- return false;
- break;
-
--- xemacs21-mule.diff ends here ---
--- bsd.emacs.mk.diff begins here ---
--- Mk/bsd.emacs.mk Mon Jan 10 07:23:27 2005
+++ Mk/bsd.emacs.mk.new Mon Feb 7 22:12:20 2005
@@ -149,7 +149,7 @@
# XEmacs-21.x with Mule
.elif (${EMACS_PORT_NAME} == "xemacs21-mule")
EMACS_NAME= xemacs
-EMACS_VER= 21.4.16
+EMACS_VER= 21.4.17
EMACS_MAJOR_VER= 21
EMACS_LIBDIR?= lib/${EMACS_NAME}
EMACS_LIBDIR_WITH_VER?= lib/${EMACS_NAME}-${EMACS_VER}
--- bsd.emacs.mk.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list