From d331134e450d2dc173595a481480520cb2525ba4 Mon Sep 17 00:00:00 2001 From: Sergey Matveychuk Date: Sat, 25 Dec 2004 22:27:59 +0000 Subject: [PATCH] - Update to 21.4.16 - Fix build on -CURRENT PR: ports/75492 Submitted by: Pawel Worach --- editors/xemacs/Makefile | 7 +++++-- editors/xemacs/distinfo | 4 ++-- editors/xemacs/files/patch-emacs.c | 11 ----------- editors/xemacs/files/patch-freebsd.h | 11 +++++++++++ editors/xemacs/files/patch-mem-limits.h | 11 ----------- editors/xemacs/pkg-plist | 4 +--- 6 files changed, 19 insertions(+), 29 deletions(-) delete mode 100644 editors/xemacs/files/patch-emacs.c create mode 100644 editors/xemacs/files/patch-freebsd.h delete mode 100644 editors/xemacs/files/patch-mem-limits.h diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile index 18c1c298a1d0..43a404070a79 100644 --- a/editors/xemacs/Makefile +++ b/editors/xemacs/Makefile @@ -30,7 +30,7 @@ USE_XPM= yes USE_BZIP2= yes XEMACS_REL= 21.4 -XEMACS_VER= 21.4.15 +XEMACS_VER= 21.4.16 XEMACS_ARCH= ${CONFIGURE_TARGET} STRIP= @@ -81,7 +81,7 @@ pre-fetch: @${ECHO_MSG} "" @${ECHO_MSG} "Set the environment variable WITHOUT_X11 if you " @${ECHO_MSG} "do not want to use X11." -CONFIG_ARGS+= --with-png=yes --with-tiff=yes +CONFIG_ARGS+= --with-png=yes --with-tiff=yes .endif .if defined(WITHOUT_X11) CONFIGURE_ARGS+= --without-x11 @@ -112,6 +112,9 @@ WITH_OFFIX?= --with-offix=no .endif .endif +post-patch: + @${RM} ${WRKSRC}/src/s/freebsd.h.orig + # fix .so references in a few man pages pre-configure:: .for file in etc/ctags.1 etc/gnuattach.1 etc/gnuclient.1 etc/gnudoit.1 diff --git a/editors/xemacs/distinfo b/editors/xemacs/distinfo index 56279f494473..cce3595ee40a 100644 --- a/editors/xemacs/distinfo +++ b/editors/xemacs/distinfo @@ -1,2 +1,2 @@ -MD5 (xemacs/xemacs-21.4.15.tar.bz2) = 74f899d38a230d629375f7e3cf656ca5 -SIZE (xemacs/xemacs-21.4.15.tar.bz2) = 8799299 +MD5 (xemacs/xemacs-21.4.16.tar.bz2) = a3a5000db3ada076a117665ea473dab4 +SIZE (xemacs/xemacs-21.4.16.tar.bz2) = 9029850 diff --git a/editors/xemacs/files/patch-emacs.c b/editors/xemacs/files/patch-emacs.c deleted file mode 100644 index 0d633424c209..000000000000 --- a/editors/xemacs/files/patch-emacs.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/emacs.c.orig Wed Jan 15 07:18:00 2003 -+++ src/emacs.c Tue Jul 20 12:02:41 2004 -@@ -344,7 +344,7 @@ - #endif - - /* Number of bytes of writable memory we can expect to be able to get */ --unsigned int lim_data; -+rlim_t lim_data; - - /* WARNING! - diff --git a/editors/xemacs/files/patch-freebsd.h b/editors/xemacs/files/patch-freebsd.h new file mode 100644 index 000000000000..ddd3eed6d8b4 --- /dev/null +++ b/editors/xemacs/files/patch-freebsd.h @@ -0,0 +1,11 @@ +--- src/s/freebsd.h.orig Sun Nov 21 16:14:32 2004 ++++ src/s/freebsd.h Sun Nov 21 16:15:10 2004 +@@ -29,7 +29,7 @@ + #ifndef __FreeBSD_version + #include + #endif +-#if __FreeBSD_version >= 199701 ++#if __FreeBSD_version >= 199701 && __FreeBSD_version < 600006 + #define LIBS_SYSTEM "-lutil -lxpg4" + #else + #define LIBS_SYSTEM "-lutil" diff --git a/editors/xemacs/files/patch-mem-limits.h b/editors/xemacs/files/patch-mem-limits.h deleted file mode 100644 index a5ce6cb35839..000000000000 --- a/editors/xemacs/files/patch-mem-limits.h +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 @@ - 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 rlim_t lim_data; - - #if defined (HEAP_IN_DATA) && !defined(PDUMP) - extern unsigned long static_heap_size; diff --git a/editors/xemacs/pkg-plist b/editors/xemacs/pkg-plist index 2b7c40423091..3caf94839fdf 100644 --- a/editors/xemacs/pkg-plist +++ b/editors/xemacs/pkg-plist @@ -125,6 +125,7 @@ lib/xemacs-%%XEMACS_VER%%/etc/gnudoit.1 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 @@ -1057,11 +1058,9 @@ lib/xemacs-%%XEMACS_VER%%/lisp/mule/arabic.elc lib/xemacs-%%XEMACS_VER%%/lisp/mule/auto-autoloads.el lib/xemacs-%%XEMACS_VER%%/lisp/mule/auto-autoloads.elc lib/xemacs-%%XEMACS_VER%%/lisp/mule/canna-leim.el -lib/xemacs-%%XEMACS_VER%%/lisp/mule/canna-leim.elc lib/xemacs-%%XEMACS_VER%%/lisp/mule/chinese.el lib/xemacs-%%XEMACS_VER%%/lisp/mule/chinese.elc lib/xemacs-%%XEMACS_VER%%/lisp/mule/custom-load.el -lib/xemacs-%%XEMACS_VER%%/lisp/mule/custom-load.elc lib/xemacs-%%XEMACS_VER%%/lisp/mule/cyrillic.el lib/xemacs-%%XEMACS_VER%%/lisp/mule/cyrillic.elc lib/xemacs-%%XEMACS_VER%%/lisp/mule/english.el @@ -1103,7 +1102,6 @@ lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-misc.elc lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-tty-init.el lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-tty-init.elc lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-x-init.el -lib/xemacs-%%XEMACS_VER%%/lisp/mule/mule-x-init.elc lib/xemacs-%%XEMACS_VER%%/lisp/mule/thai-xtis-chars.el lib/xemacs-%%XEMACS_VER%%/lisp/mule/thai-xtis-chars.elc lib/xemacs-%%XEMACS_VER%%/lisp/mule/thai-xtis.el