Date: Tue, 14 Dec 2004 03:49:04 +0200 From: Andrey Slusar <anray@inet.ua> To: FreeBSD-gnats-submit@FreeBSD.org Cc: kiri@FreeBSD.org Subject: ports/75038: [PATCH] editors/xemacs-devel-mule: update to new version Message-ID: <E1Ce1oG-000IFk-Vo@santinel.home.ua> Resent-Message-ID: <200412140150.iBE1oOt2086267@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 75038
>Category: ports
>Synopsis: [PATCH] editors/xemacs-devel-mule: update to new version
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Dec 14 01:50:24 GMT 2004
>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: Tue Nov 30 13:06:39 EET 2004 anray@santinel.home.ua:/usr/obj/usr/src/sys/ANRAY i386
>Description:
Update 21.5.16 to 21.5.18
>How-To-Repeat:
>Fix:
--- xemacs-devel-mule.diff begins here ---
diff -ruN editors/xemacs-devel-mule/Makefile editors/xemacs-devel-mule.new/Makefile
--- editors/xemacs-devel-mule/Makefile Tue Dec 14 00:38:16 2004
+++ editors/xemacs-devel-mule.new/Makefile Tue Dec 14 00:37:30 2004
@@ -7,10 +7,8 @@
PORTNAME= xemacs-devel-mule
PORTVERSION= ${XEMACS_VER:S/-/./}
-PORTREVISION= 1
CATEGORIES+= editors
-MASTER_SITES= ${MASTER_SITE_LOCAL:S|%SUBDIR%|kiri/xemacs|} \
- ${MASTER_SITE_XEMACS:S|%SUBDIR%|xemacs-${XEMACS_REL}|}
+MASTER_SITES= ${MASTER_SITE_XEMACS:S|%SUBDIR%|xemacs-${XEMACS_REL}|}
DISTNAME= xemacs-${XEMACS_VER:S/-b/./}
DIST_SUBDIR= xemacs
@@ -38,7 +36,7 @@
XEMACS_MAJOR_VER?= 21
XEMACS_REL= ${XEMACS_MAJOR_VER}.5
-XEMACS_VER= ${XEMACS_MAJOR_VER}.5-b16
+XEMACS_VER= ${XEMACS_MAJOR_VER}.5-b18
XEMACS_ARCH= ${CONFIGURE_TARGET}
WRKSRC= ${WRKDIR}/xemacs-${XEMACS_VER:S/-b/./}
diff -ruN editors/xemacs-devel-mule/distinfo editors/xemacs-devel-mule.new/distinfo
--- editors/xemacs-devel-mule/distinfo Tue Dec 14 00:38:16 2004
+++ editors/xemacs-devel-mule.new/distinfo Tue Dec 14 00:37:23 2004
@@ -1,2 +1,2 @@
-MD5 (xemacs/xemacs-21.5.16.tar.gz) = 09f532e91cda52d9a4e9239c8909e631
-SIZE (xemacs/xemacs-21.5.16.tar.gz) = 12915530
+MD5 (xemacs/xemacs-21.5.18.tar.gz) = 979c2db1b6851e2496e837a14b805373
+SIZE (xemacs/xemacs-21.5.18.tar.gz) = 14985234
diff -ruN editors/xemacs-devel-mule/files/patch-emacs.c editors/xemacs-devel-mule.new/files/patch-emacs.c
--- editors/xemacs-devel-mule/files/patch-emacs.c Thu Jan 1 03:00:00 1970
+++ editors/xemacs-devel-mule.new/files/patch-emacs.c Tue Dec 14 00:37:23 2004
@@ -0,0 +1,11 @@
+--- src/emacs.c.orig Thu Nov 25 01:38:32 2004
++++ src/emacs.c Thu Nov 25 01:38:54 2004
+@@ -537,7 +537,7 @@
+
+ /* Number of bytes of writable memory we can expect to be able to get:
+ Leave this as an unsigned int because it could potentially be 4G */
+-unsigned long lim_data;
++rlim_t lim_data;
+
+ /* WARNING!
+
diff -ruN editors/xemacs-devel-mule/files/patch-malloc.c editors/xemacs-devel-mule.new/files/patch-malloc.c
--- editors/xemacs-devel-mule/files/patch-malloc.c Thu Jan 1 03:00:00 1970
+++ editors/xemacs-devel-mule.new/files/patch-malloc.c Tue Dec 14 00:37:23 2004
@@ -0,0 +1,20 @@
+--- src/malloc.c.orig Tue Dec 14 00:35:45 2004
++++ src/malloc.c Tue Dec 14 00:36:15 2004
+@@ -285,7 +285,7 @@
+ static char busy[30];
+
+ /* Number of bytes of writable memory we can expect to be able to get */
+-extern unsigned long lim_data;
++extern rlim_t lim_data;
+
+ /* Level number of warnings already issued.
+ 0 -- no warnings issued.
+@@ -339,7 +339,7 @@
+ {
+ char *cp;
+ int nblks;
+- unsigned long siz;
++ rlim_t siz;
+ int oldmask;
+
+ #ifdef BSD
diff -ruN editors/xemacs-devel-mule/files/patch-mem-limits.h editors/xemacs-devel-mule.new/files/patch-mem-limits.h
--- editors/xemacs-devel-mule/files/patch-mem-limits.h Thu Mar 25 12:59:14 2004
+++ editors/xemacs-devel-mule.new/files/patch-mem-limits.h Tue Dec 14 00:37:23 2004
@@ -1,11 +1,11 @@
---- src/mem-limits.h.bak Thu Mar 18 13:08:19 2004
-+++ src/mem-limits.h Thu Mar 18 13:08:42 2004
-@@ -108,7 +108,7 @@
+--- src/mem-limits.h.orig Sat Sep 11 08:28:41 2004
++++ src/mem-limits.h Tue Dec 14 00:12:42 2004
+@@ -80,7 +80,7 @@
static POINTER data_space_start;
/* Number of bytes of writable memory we can expect to be able to get */
--extern unsigned int lim_data;
+-extern unsigned long lim_data;
+extern rlim_t lim_data;
- #if defined (HEAP_IN_DATA) && !defined(PDUMP)
- extern unsigned long static_heap_size;
+ /* The implementation of get_lim_data() is very machine dependent. */
+
diff -ruN editors/xemacs-devel-mule/pkg-plist editors/xemacs-devel-mule.new/pkg-plist
--- editors/xemacs-devel-mule/pkg-plist Tue Dec 14 00:38:16 2004
+++ editors/xemacs-devel-mule.new/pkg-plist Tue Dec 14 00:37:23 2004
@@ -46,6 +46,7 @@
lib/xemacs-%%XEMACS_VER%%/etc/ChangeLog
lib/xemacs-%%XEMACS_VER%%/etc/DEBUG
lib/xemacs-%%XEMACS_VER%%/etc/DISTRIB
+lib/xemacs-%%XEMACS_VER%%/etc/ETAGS.EBNF
lib/xemacs-%%XEMACS_VER%%/etc/Emacs.ad
lib/xemacs-%%XEMACS_VER%%/etc/FTP
lib/xemacs-%%XEMACS_VER%%/etc/GNU
@@ -157,6 +158,7 @@
lib/xemacs-%%XEMACS_VER%%/etc/gnuserv.1
lib/xemacs-%%XEMACS_VER%%/etc/gnuserv.README
lib/xemacs-%%XEMACS_VER%%/etc/gray1.xbm
+lib/xemacs-%%XEMACS_VER%%/etc/gtkrc
lib/xemacs-%%XEMACS_VER%%/etc/idd/drop
lib/xemacs-%%XEMACS_VER%%/etc/idd/dropmsk
lib/xemacs-%%XEMACS_VER%%/etc/ms-kermit
@@ -241,8 +243,6 @@
lib/xemacs-%%XEMACS_VER%%/etc/photos/vladimirm.png
lib/xemacs-%%XEMACS_VER%%/etc/photos/wmperry.png
lib/xemacs-%%XEMACS_VER%%/etc/photos/wmperrym.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/youngs.png
-lib/xemacs-%%XEMACS_VER%%/etc/photos/youngsm.png
lib/xemacs-%%XEMACS_VER%%/etc/recycle.xpm
lib/xemacs-%%XEMACS_VER%%/etc/recycle2.xpm
lib/xemacs-%%XEMACS_VER%%/etc/refcard.ps.gz
@@ -547,6 +547,7 @@
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/cm.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/coding-system-slots.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/commands.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/compiler.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/config.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/conslots.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/console-gtk-impl.h
@@ -567,6 +568,7 @@
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/device.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/devslots.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/dragdrop.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/dump-data.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/dumper.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/elhash.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/emodules.h
@@ -714,6 +716,9 @@
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/mule-ccl.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/ndir.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/nt.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/number-gmp.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/number-mp.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/number.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/objects-gtk-impl.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/objects-gtk.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/objects-impl.h
@@ -918,6 +923,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 editors/xemacs-devel-mule/pkg-plist.arch-dep editors/xemacs-devel-mule.new/pkg-plist.arch-dep
--- editors/xemacs-devel-mule/pkg-plist.arch-dep Tue Dec 14 00:38:16 2004
+++ editors/xemacs-devel-mule.new/pkg-plist.arch-dep Tue Dec 14 00:37:23 2004
@@ -43,6 +43,7 @@
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/cm.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/coding-system-slots.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/commands.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/compiler.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/config.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/conslots.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/console-gtk-impl.h
@@ -63,6 +64,7 @@
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/device.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/devslots.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/dragdrop.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/dump-data.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/dumper.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/elhash.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/emodules.h
@@ -210,6 +212,9 @@
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/mule-ccl.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/ndir.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/nt.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/number-gmp.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/number-mp.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/number.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/objects-gtk-impl.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/objects-gtk.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/objects-impl.h
--- xemacs-devel-mule.diff ends here ---
--- bsd.emacs.mk.diff begins here ---
--- Mk/bsd.emacs.mk.old Sat Dec 11 02:55:23 2004
+++ bsd.emacs.mk Tue Dec 14 03:39:41 2004
@@ -183,7 +183,7 @@
# XEmacs-21 development version with Mule
.elif (${EMACS_PORT_NAME} == "xemacs-devel-mule")
EMACS_NAME= xemacs
-EMACS_VER= 21.5-b16
+EMACS_VER= 21.5-b18
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?E1Ce1oG-000IFk-Vo>