ports/75492: [PATCH] editors/xemacs: update to new version

[Pawel Worach]

>Number:         75492
>Category:       ports
>Synopsis:       [PATCH] editors/xemacs: update to new version
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 25 13:50:25 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Pawel Worach
>Release:        6.0-CURRENT
>Organization:
>Environment:
FreeBSD zero 6.0-CURRENT FreeBSD 6.0-CURRENT
>Description:
      Update port to 21.4.16
      Fix build on current where libxpg4 is gone

      One thing I did not know how to fix is, after patching freebsd.h
      patch leaves the .orig file with is then installed by 'make install'.
      How do I fix that, change install: makefile target? remove the file post-install?
>How-To-Repeat:
      
>Fix:
diff -urN --exclude CVS editors/xemacs/Makefile editors/xemacs.new/Makefile
--- editors/xemacs/Makefile	Sat Dec 25 14:44:10 2004
+++ editors/xemacs.new/Makefile	Sat Dec 25 14:28:24 2004
@@ -30,7 +30,7 @@
 USE_BZIP2=	yes
 
 XEMACS_REL=	21.4
-XEMACS_VER=	21.4.15
+XEMACS_VER=	21.4.16
 XEMACS_ARCH=	${CONFIGURE_TARGET}
 
 STRIP=
diff -urN --exclude CVS editors/xemacs/distinfo editors/xemacs.new/distinfo
--- editors/xemacs/distinfo	Sat Dec 25 14:44:10 2004
+++ editors/xemacs.new/distinfo	Thu Dec 23 07:01:44 2004
@@ -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 -urN --exclude CVS editors/xemacs/files/patch-emacs.c editors/xemacs.new/files/patch-emacs.c
--- editors/xemacs/files/patch-emacs.c	Sat Dec 25 14:44:10 2004
+++ editors/xemacs.new/files/patch-emacs.c	Thu Jan  1 01:00:00 1970
@@ -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 -urN --exclude CVS editors/xemacs/files/patch-freebsd.h editors/xemacs.new/files/patch-freebsd.h
--- editors/xemacs/files/patch-freebsd.h	Thu Jan  1 01:00:00 1970
+++ editors/xemacs.new/files/patch-freebsd.h	Sun Nov 21 16:16:02 2004
@@ -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 <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 -urN --exclude CVS editors/xemacs/files/patch-mem-limits.h editors/xemacs.new/files/patch-mem-limits.h
--- editors/xemacs/files/patch-mem-limits.h	Sat Dec 25 14:44:10 2004
+++ editors/xemacs.new/files/patch-mem-limits.h	Thu Jan  1 01:00:00 1970
@@ -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 -urN --exclude CVS editors/xemacs/pkg-plist editors/xemacs.new/pkg-plist
--- editors/xemacs/pkg-plist	Sat Dec 25 14:44:10 2004
+++ editors/xemacs.new/pkg-plist	Sat Dec 25 13:44:11 2004
@@ -125,6 +125,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
@@ -1057,11 +1058,9 @@
 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-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

>Release-Note:
>Audit-Trail:
>Unformatted: