Date: Sat, 04 Jun 2005 10:33:21 +0300 From: Andrey Slusar <anrays@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: sem@FreeBSD.org Subject: ports/81886: [MAINTAINER] editors/xemacs-devel-mule: update to 21.5-b21 "corn" Message-ID: <E1DeT9l-0006hm-Mn@santinel.home.ua> Resent-Message-ID: <200506040740.j547e1sv006808@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 81886
>Category: ports
>Synopsis: [MAINTAINER] editors/xemacs-devel-mule: update to 21.5-b21 "corn"
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Jun 04 07:40:01 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Andrey Slusar
>Release: FreeBSD 5.4-STABLE i386
>Organization:
Santinel
>Environment:
System: FreeBSD santinel.home.ua 5.4-STABLE FreeBSD 5.4-STABLE #0: Sun May 29 01:52:37 EEST 2005 anray@santinel.home.ua:/usr/obj/usr/src/sys/ANRAY i386
>Description:
Removed files(already in xemacs upstream):
files/patch-ak, files/patch-ai, files/patch-alloc.c
New files:
files/patch-regex.c
* Update to 21.5-b21
* Unbroke on non-i386 platforms
* Update EMACS_VER on editors/xemacs-devel-mule
* Fix EMACS_VER on editors/xemacs-devel
>How-To-Repeat:
>Fix:
--- xemacs-devel-mule.diff begins here ---
diff -ruN xemacs-devel-mule.old/Makefile xemacs-devel-mule/Makefile
--- xemacs-devel-mule.old/Makefile Sat Jun 4 09:48:20 2005
+++ xemacs-devel-mule/Makefile Sat Jun 4 10:05:35 2005
@@ -48,7 +48,7 @@
.endif
XEMACS_REL= 21.5
-XEMACS_VER= ${XEMACS_REL}-b20
+XEMACS_VER= ${XEMACS_REL}-b21
XEMACS_ARCH= ${MACHINE_ARCH}--freebsd
WRKSRC= ${WRKDIR}/xemacs-${XEMACS_VER:S/-b/./}
@@ -104,15 +104,6 @@
PLIST_SUB= XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH}
.include <bsd.port.pre.mk>
-
-# Undump and malloc do not behave on amd64 and sparc64
-.if (${ARCH} == "amd64") || (${ARCH} == "sparc64")
-CONFIGURE_ARGS+=--with-system-malloc --enable-pdump
-.endif
-
-.if ${ARCH} == "amd64" || ${ARCH} == "sparc64" || ${ARCH} == "ia64"
-BROKEN= "Does not build on amd64, sparc64 or ia64"
-.endif
pre-fetch:
.if defined(WITHOUT_X11)
diff -ruN xemacs-devel-mule.old/distinfo xemacs-devel-mule/distinfo
--- xemacs-devel-mule.old/distinfo Sat Jun 4 09:48:20 2005
+++ xemacs-devel-mule/distinfo Sat Jun 4 09:48:53 2005
@@ -1,2 +1,2 @@
-MD5 (xemacs/xemacs-21.5.20.tar.gz) = 8bf5f1af05588cb59a67bade939c4aeb
-SIZE (xemacs/xemacs-21.5.20.tar.gz) = 11872002
+MD5 (xemacs/xemacs-21.5.21.tar.gz) = 5941238fe8eda3a120bc5735cc50a94d
+SIZE (xemacs/xemacs-21.5.21.tar.gz) = 14963507
diff -ruN xemacs-devel-mule.old/files/patch-ai xemacs-devel-mule/files/patch-ai
--- xemacs-devel-mule.old/files/patch-ai Sat Jun 4 09:48:20 2005
+++ xemacs-devel-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 xemacs-devel-mule.old/files/patch-ak xemacs-devel-mule/files/patch-ak
--- xemacs-devel-mule.old/files/patch-ak Sat Jun 4 09:48:20 2005
+++ xemacs-devel-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 xemacs-devel-mule.old/files/patch-alloc.c xemacs-devel-mule/files/patch-alloc.c
--- xemacs-devel-mule.old/files/patch-alloc.c Sat Jun 4 09:48:20 2005
+++ xemacs-devel-mule/files/patch-alloc.c Thu Jan 1 03:00:00 1970
@@ -1,16 +0,0 @@
-Index: src/alloc.c
-===================================================================
-RCS file: /pack/xemacscvs/XEmacs/xemacs/src/alloc.c,v
-retrieving revision 1.106
-diff -u -r1.106 alloc.c
---- src/alloc.c 2005/02/03 16:14:04 1.106
-+++ src/alloc.c 2005/02/23 00:01:18
-@@ -349,7 +349,7 @@
-
- #else /* ERROR_CHECK_MALLOC */
-
--#define MALLOC_BEGIN(block)
-+#define MALLOC_BEGIN()
- #define FREE_OR_REALLOC_BEGIN(block)
- #define MALLOC_END()
-
diff -ruN xemacs-devel-mule.old/files/patch-configure.ac xemacs-devel-mule/files/patch-configure.ac
--- xemacs-devel-mule.old/files/patch-configure.ac Sat Jun 4 09:48:20 2005
+++ xemacs-devel-mule/files/patch-configure.ac Sat Jun 4 09:48:53 2005
@@ -1,19 +1,5 @@
-Index: configure.ac
-===================================================================
-RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
-retrieving revision 1.2
-diff -u -r1.2 configure.ac
--- configure.ac 2005/03/11 11:19:01 1.2
+++ configure.ac 2005/03/17 20:16:50
-@@ -11,7 +11,7 @@
- xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
- xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
- ac_cpp='$CPP '"$xe_cppflags"
--ac_compile='$CC -c $CFLAGS'"$xe_cppflags"' conftest.$ac_ext >&AS_MESSAGE_LOG_FD'
-+ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext >&AS_MESSAGE_LOG_FD'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&AS_MESSAGE_LOG_FD'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ])
@@ -1148,6 +1148,7 @@
dnl Straightforward OS determination
case "$ac_cv_build" in
@@ -22,55 +8,6 @@
*-*-netbsd* ) opsys=netbsd ;;
*-*-openbsd* ) opsys=openbsd ;;
*-*-nextstep* ) opsys=nextstep ;;
-@@ -1706,12 +1707,12 @@
- else cflags_warning_specified=no;
- fi
-
--if test "${cflags_optimization-unset}" != unset
-+if test "${with_cflags_optimization-unset}" != unset
- then cflags_optimization_specified=yes;
- else cflags_optimization_specified=no;
- fi
-
--if test "${cflags_debugging-unset}" != unset
-+if test "${with_cflags_debugging-unset}" != unset
- then cflags_debugging_specified=yes;
- else cflags_debugging_specified=no;
- fi
-@@ -2048,11 +2049,11 @@
- dnl Calculate optimization flags. These will be off by default in beta
- dnl versions and on in release versions.
-
--if test -z "$with_optimization" ; then
-- if test -n "$emacs_is_beta" ; then
-- with_optimization=no
-- else
-+if test -z "$with_optimization"; then
-+ if test -z "$emacs_is_beta" -o "$cflags_optimization_specified" = "yes"; then
- with_optimization=yes
-+ else
-+ with_optimization=no
- fi
- fi
-
-@@ -3811,7 +3812,7 @@
- png_problem=""
- test -z "$with_png" && { AC_CHECK_FUNC(pow, ,with_png=no) }
- test -z "$with_png" && { AC_CHECK_HEADER(png.h, ,with_png=no) }
-- test -z "$with_png" && { AC_CHECK_LIB(png, png_read_image,[:],with_png=no) }
-+ test -z "$with_png" && { AC_CHECK_LIB(png, png_read_image,[:],with_png=no,[-lz]) }
- if test -z "$with_png"; then
- AC_MSG_CHECKING(for workable png version information)
- xe_check_libs="-lpng -lz"
-@@ -3847,7 +3848,7 @@
-
- dnl autodetect TIFF
- test -z "$with_tiff" && { AC_CHECK_HEADER(tiffio.h, ,with_tiff=no) }
-- test -z "$with_tiff" && { AC_CHECK_LIB(tiff, TIFFClientOpen,[:],with_tiff=no) }
-+ test -z "$with_tiff" && { AC_CHECK_LIB(tiff, TIFFClientOpen,[:],with_tiff=no,[-lz]) }
- test -z "$with_tiff" && with_tiff=yes
- if test "$with_tiff" = "yes"; then
- AC_DEFINE(HAVE_TIFF)
@@ -4943,7 +4950,7 @@
dnl Check for Berkeley DB.
if test "$enable_database_berkdb" != "no"; then
diff -ruN xemacs-devel-mule.old/files/patch-regex.c xemacs-devel-mule/files/patch-regex.c
--- xemacs-devel-mule.old/files/patch-regex.c Thu Jan 1 03:00:00 1970
+++ xemacs-devel-mule/files/patch-regex.c Sun Apr 18 23:28:17 2004
@@ -0,0 +1,11 @@
+--- src/regex.c.orig Sun Apr 18 22:19:13 2004
++++ src/regex.c Sun Apr 18 22:18:40 2004
+@@ -1322,7 +1322,7 @@
+ exactly that if always used MAX_FAILURE_SPACE each time we failed.
+ This is a variable only so users of regex can assign to it; we never
+ change it ourselves. */
+-#if defined (MATCH_MAY_ALLOCATE)
++#if defined (MATCH_MAY_ALLOCATE) || defined (REGEX_MALLOC)
+ /* 4400 was enough to cause a crash on Alpha OSF/1,
+ whose default stack limit is 2mb. */
+ int re_max_failures = 20000;
diff -ruN xemacs-devel-mule.old/pkg-plist xemacs-devel-mule/pkg-plist
--- xemacs-devel-mule.old/pkg-plist Sat Jun 4 09:48:20 2005
+++ xemacs-devel-mule/pkg-plist Sat Jun 4 10:17:26 2005
@@ -583,6 +583,7 @@
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/lisp.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/lrecord.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/lstream.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/mc-alloc.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/7300.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/README
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/acorn.h
@@ -900,6 +901,7 @@
lib/xemacs-%%XEMACS_VER%%/info/lispref.info-7
lib/xemacs-%%XEMACS_VER%%/info/lispref.info-8
lib/xemacs-%%XEMACS_VER%%/info/lispref.info-9
+lib/xemacs-%%XEMACS_VER%%/info/lispref.info-10
lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info
lib/xemacs-%%XEMACS_VER%%/info/standards.info
lib/xemacs-%%XEMACS_VER%%/info/term.info
diff -ruN xemacs-devel-mule.old/pkg-plist.arch-dep xemacs-devel-mule/pkg-plist.arch-dep
--- xemacs-devel-mule.old/pkg-plist.arch-dep Sat Jun 4 09:48:20 2005
+++ xemacs-devel-mule/pkg-plist.arch-dep Sat Jun 4 10:17:57 2005
@@ -105,6 +105,7 @@
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/lisp.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/lrecord.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/lstream.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/mc-alloc.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/7300.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/README
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/acorn.h
--- xemacs-devel-mule.diff ends here ---
--- bsd.emacs.mk.diff begins here ---
--- Mk/bsd.emacs.mk.orig Sat Jun 4 09:47:22 2005
+++ Mk/bsd.emacs.mk Sat Jun 4 09:55:27 2005
@@ -166,7 +166,7 @@
# XEmacs-21 development version
.elif (${EMACS_PORT_NAME} == "xemacs-devel")
EMACS_NAME= xemacs
-EMACS_VER= 21.5-b17
+EMACS_VER= 21.5-b20
EMACS_MAJOR_VER= 21
EMACS_LIBDIR?= lib/${EMACS_NAME}
EMACS_LIBDIR_WITH_VER?= lib/${EMACS_NAME}-${EMACS_VER}
@@ -183,7 +183,7 @@
# XEmacs-21 development version with Mule
.elif (${EMACS_PORT_NAME} == "xemacs-devel-mule")
EMACS_NAME= xemacs
-EMACS_VER= 21.5-b20
+EMACS_VER= 21.5-b21
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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1DeT9l-0006hm-Mn>