From vasallia@ukr.net  Sat Apr  3 07:51:31 2004
Return-Path: <vasallia@ukr.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 8284A16A4CE; Sat,  3 Apr 2004 07:51:31 -0800 (PST)
Received: from mail-kv.alkar.net (mail-kv.alkar.net [195.248.176.165])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 6415443D5D; Sat,  3 Apr 2004 07:51:29 -0800 (PST)
	(envelope-from vasallia@ukr.net)
Received: from 238-59.dialup.alkar.net ([212.86.238.59] helo=santinel.home.ua)
	by mail-kv.alkar.net with esmtp
	id 1B9nQC-00046z-8K; Sat, 03 Apr 2004 18:51:01 +0300
Received: from anray by santinel.home.ua with local (Exim)
	id 1B9nQB-00095B-Mx; Sat, 03 Apr 2004 18:50:59 +0300
Message-Id: <E1B9nQB-00095B-Mx@santinel.home.ua>
Date: Sat, 03 Apr 2004 18:50:59 +0300
From: Andrey Slusar <vasallia@ukr.net>
Reply-To: Andrey Slusar <vasallia@ukr.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: kiri@FreeBSD.org
Subject: [PATCH] editors/xemacs21-mule: xemacs-mule update to current stable version
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         65129
>Category:       ports
>Synopsis:       [PATCH] editors/xemacs21-mule: xemacs-mule update to current stable version
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Apr 03 08:00:41 PST 2004
>Closed-Date:    Thu Dec 23 21:55:51 GMT 2004
>Last-Modified:  Thu Dec 23 21:55:51 GMT 2004
>Originator:     Andrey Slusar
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
Santinel
>Environment:
System: FreeBSD santinel.home.ua 5.2-CURRENT FreeBSD 5.2-CURRENT #2: Sat Apr 3 01:27:44 EEST 2004 root@santinel.home.ua:/usr/obj/usr/src/sys/ANRAY i386


	
>Description:
	XEmacs update to version 21.4.15
>How-To-Repeat:
	
>Fix:

	

--- xemacs.diff begins here ---
diff -ruN xemacs21-mule.old/Makefile xemacs21-mule/Makefile
--- xemacs21-mule.old/Makefile	Fri Mar 26 07:18:42 2004
+++ xemacs21-mule/Makefile	Sat Apr  3 05:03:35 2004
@@ -37,7 +37,7 @@
 
 XEMACS_MAJOR_VER?=	21
 XEMACS_REL=		${XEMACS_MAJOR_VER}.4
-XEMACS_VER=		${XEMACS_MAJOR_VER}.4.14
+XEMACS_VER=		${XEMACS_MAJOR_VER}.4.15
 XEMACS_ARCH=		${CONFIGURE_TARGET}
 
 USE_GETTEXT=	yes
diff -ruN xemacs21-mule.old/distinfo xemacs21-mule/distinfo
--- xemacs21-mule.old/distinfo	Wed Mar 31 07:20:11 2004
+++ xemacs21-mule/distinfo	Sat Apr  3 16:23:21 2004
@@ -1,6 +1,6 @@
-MD5 (xemacs/xemacs-21.4.14-src.tar.gz) = 6034fbaf3934361b4d1c5ff9ee1979da
-SIZE (xemacs/xemacs-21.4.14-src.tar.gz) = 8092804
-MD5 (xemacs/xemacs-21.4.14-elc.tar.gz) = 05408e9bb2c0a199528fa463c766a890
-SIZE (xemacs/xemacs-21.4.14-elc.tar.gz) = 925908
-MD5 (xemacs/xemacs-21.4.14-info.tar.gz) = 421d51e90577c71c453c42a201afe64f
-SIZE (xemacs/xemacs-21.4.14-info.tar.gz) = 1663979
+MD5 (xemacs/xemacs-21.4.15-src.tar.gz) = 840d061aad9c4ae0782fc94a4184625a
+SIZE (xemacs/xemacs-21.4.15-src.tar.gz) = 8118264
+MD5 (xemacs/xemacs-21.4.15-elc.tar.gz) = 0fcacb62b115dd34d2d59fbe8be36166
+SIZE (xemacs/xemacs-21.4.15-elc.tar.gz) = 927962
+MD5 (xemacs/xemacs-21.4.15-info.tar.gz) = 64e6cbd780a39e001d3a2a832717ce31
+SIZE (xemacs/xemacs-21.4.15-info.tar.gz) = 1603029
diff -ruN xemacs21-mule.old/pkg-plist xemacs21-mule/pkg-plist
--- xemacs21-mule.old/pkg-plist	Wed Sep 10 20:07:03 2003
+++ xemacs21-mule/pkg-plist	Sat Apr  3 18:04:49 2004
@@ -155,7 +155,6 @@
 lib/xemacs-%%XEMACS_VER%%/etc/idd/dropmsk
 lib/xemacs-%%XEMACS_VER%%/etc/ms-kermit
 lib/xemacs-%%XEMACS_VER%%/etc/ms-kermit-7bit
-lib/xemacs-%%XEMACS_VER%%/etc/package-index.LATEST.pgp
 lib/xemacs-%%XEMACS_VER%%/etc/photos/adrian.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/adrianm.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/ajc.png
@@ -780,137 +779,37 @@
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/wakeup
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/yow
 lib/xemacs-%%XEMACS_VER%%/info/cl.info
-lib/xemacs-%%XEMACS_VER%%/info/cl.info-1
-lib/xemacs-%%XEMACS_VER%%/info/cl.info-2
-lib/xemacs-%%XEMACS_VER%%/info/cl.info-3
-lib/xemacs-%%XEMACS_VER%%/info/cl.info-4
-lib/xemacs-%%XEMACS_VER%%/info/cl.info-5
-lib/xemacs-%%XEMACS_VER%%/info/cl.info-6
 lib/xemacs-%%XEMACS_VER%%/info/custom.info
-lib/xemacs-%%XEMACS_VER%%/info/dir
 lib/xemacs-%%XEMACS_VER%%/info/emodules.info
 lib/xemacs-%%XEMACS_VER%%/info/external-widget.info
 lib/xemacs-%%XEMACS_VER%%/info/info.info
 lib/xemacs-%%XEMACS_VER%%/info/internals.info
 lib/xemacs-%%XEMACS_VER%%/info/internals.info-1
 lib/xemacs-%%XEMACS_VER%%/info/internals.info-2
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-3
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-4
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-5
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-6
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-7
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-8
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-9
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info-1
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-10
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-11
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-12
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-13
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-14
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-15
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-16
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-17
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-18
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-19
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info-2
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-20
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-21
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-22
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-23
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-24
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-25
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-26
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-27
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-28
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-29
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info-3
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-30
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-31
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-32
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-33
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-34
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-35
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-36
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-37
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-38
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-39
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info-4
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-40
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-41
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-42
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-43
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-44
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-45
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-46
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-47
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-48
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-49
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info-5
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-50
 lib/xemacs-%%XEMACS_VER%%/info/lispref.info-6
 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/new-users-guide.info
-lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info-1
-lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info-2
-lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info-3
 lib/xemacs-%%XEMACS_VER%%/info/standards.info
-lib/xemacs-%%XEMACS_VER%%/info/standards.info-1
-lib/xemacs-%%XEMACS_VER%%/info/standards.info-2
-lib/xemacs-%%XEMACS_VER%%/info/standards.info-3
-lib/xemacs-%%XEMACS_VER%%/info/standards.info-4
 lib/xemacs-%%XEMACS_VER%%/info/term.info
 lib/xemacs-%%XEMACS_VER%%/info/termcap.info
-lib/xemacs-%%XEMACS_VER%%/info/termcap.info-1
-lib/xemacs-%%XEMACS_VER%%/info/termcap.info-2
-lib/xemacs-%%XEMACS_VER%%/info/termcap.info-3
 lib/xemacs-%%XEMACS_VER%%/info/texinfo.info
 lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-1
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-10
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-11
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-12
 lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-2
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-3
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-4
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-5
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-6
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-7
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-8
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-9
 lib/xemacs-%%XEMACS_VER%%/info/widget.info
 lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info
-lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-1
-lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-2
-lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-3
-lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-4
-lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-5
-lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-6
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-1
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-10
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-11
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-12
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-13
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-14
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-15
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-16
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-17
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-18
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-19
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-2
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-20
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-21
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-22
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-23
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-3
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-4
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-5
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-6
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-7
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-8
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-9
 lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog
 lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog.1
 lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog.GTK
--- xemacs.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->kiri 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Sat Apr 3 13:48:04 PST 2004 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=65129 

From: David Bremner <bremner@unb.ca>
To: freebsd-gnats-submit@FreeBSD.org, vasallia@ukr.net
Cc:  
Subject: Re: ports/65129: [PATCH] editors/xemacs21-mule: xemacs-mule update to
	current stable version
Date: Sun, 09 May 2004 22:40:33 -0300

 1) This is nice for me, because 21.4.14 did not compile for me on 
 5.2.1 (hang during build).  I'm not sure if its worth submitting a PR,
 since it seems to be fixed by 21.4.15
 
 2) In order for this to be integrated into ports, I had to modify
 bsd.emacs.mk to bump the version number.
 
 
 
 --- bsd.emacs.mk	Sun May  9 22:32:40 2004
 +++ bsd.emacs.mk~	Sat May  8 15:04:00 2004
 @@ -149,7 +149,7 @@
  # XEmacs-21.x with Mule
  .elif (${EMACS_PORT_NAME} == "xemacs21-mule")
  EMACS_NAME=		xemacs
 -EMACS_VER=		21.4.15
 +EMACS_VER=		21.4.14
  EMACS_MAJOR_VER=	21
  EMACS_LIBDIR?=		lib/${EMACS_NAME}
  EMACS_LIBDIR_WITH_VER?=	lib/${EMACS_NAME}-${EMACS_VER}
 

From: Andrey Slusar <anray@inet.ua>
To: FreeBSD-gnats-submit@freebsd.org
Cc: kiri@FreeBSD.org
Subject: ports/65129 [PATCH] editors/xemacs21-mule: fixed update to 21.4.15
Date: Sat, 11 Dec 2004 03:23:08 +0200

 >Submitter-Id:	current-users
 >Originator:	Andrey Slusar
 >Organization:	Santinel
 >Confidential:	no 
 >Synopsis:	ports/65129 [PATCH] editors/xemacs21-mule: fixed update to 21.4.15
 >Severity:	non-critical
 >Priority:	low
 >Category:	ports
 >Class:		update
 >Release:	FreeBSD 5.3-STABLE i386
 >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:
 	New files:
 	files/patch-emacs.c
 	files/patch-malloc.c
 
 	Update from 21.4.14 to 21.4.15.
 >How-To-Repeat:
 	
 >Fix:
 
 --- xemacs21-mule.diff begins here ---
 diff -ruN /usr/ports/editors/xemacs21-mule.old/Makefile /usr/ports/editors/xemacs21-mule/Makefile
 --- /usr/ports/editors/xemacs21-mule.old/Makefile	Sat Dec 11 02:08:02 2004
 +++ /usr/ports/editors/xemacs21-mule/Makefile	Sat Dec 11 03:04:04 2004
 @@ -7,7 +7,6 @@
  
  PORTNAME=	xemacs-mule
  PORTVERSION=	${XEMACS_VER}
 -PORTREVISION=	1
  .if defined(WNN6)
  .endif
  CATEGORIES+=	editors
 @@ -21,13 +20,9 @@
  MAINTAINER=	kiri@FreeBSD.org
  COMMENT?=	XEmacs(stable version) text editor with mule(Only the executables)
  
 -USE_GNOME=	#
 -
 -.include <bsd.port.pre.mk>
 -
 -BUILD_DEPENDS=	${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-mule-packages
 -RUN_DEPENDS=	${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages \
 -		${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-mule-packages
 +#BUILD_DEPENDS=	${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-mule-packages
 +#RUN_DEPENDS=	${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages \
 +#		${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-mule-packages
  .if defined(PKGNAMEPREFIX)
  RUN_DEPENDS+=	${LOCALBASE}/lib/xemacs-${XEMACS_VER}/lisp/x-win-xfree86.elc:${PORTSDIR}/editors/xemacs21-mule
  .endif
 @@ -37,9 +32,18 @@
  		compface.1:${PORTSDIR}/mail/faces \
  		${LIB_INPUT_METHOD}
  
 +.include <bsd.port.pre.mk>
 +
 +.if defined(WANT_GTK)
 +WITH_GTK=	--with-gtk=yes
 +WITH_XPM=	--with-xpm=no
 +USE_GNOME=	gtk12
 +USE_XPM=	no
 +.endif
 +
  XEMACS_MAJOR_VER?=	21
  XEMACS_REL=		${XEMACS_MAJOR_VER}.4
 -XEMACS_VER=		${XEMACS_MAJOR_VER}.4.14
 +XEMACS_VER=		${XEMACS_MAJOR_VER}.4.15
  XEMACS_ARCH=		${CONFIGURE_TARGET}
  
  USE_GETTEXT=	yes
 @@ -91,7 +95,7 @@
  
  # Undump and malloc do not behave on amd64 at the moment
  .if ${ARCH} == "amd64"
 -CONFIGURE_ARGS+= --with-system-malloc --pdump 
 +CONFIGURE_ARGS+= --with-system-malloc --pdump
  .endif
  
  pre-fetch:
 @@ -115,13 +119,6 @@
  WITH_DIALOGS=	--with-dialogs=motif
  .endif
  
 -.if defined(WANT_GTK)
 -WITH_GTK=	--with-gtk=yes
 -WITH_XPM=	--with-xpm=no
 -USE_GNOME+=	gtk12
 -USE_XPM=	no
 -.endif
 -
  .if defined(PACKAGE_BUILDING)
  WITH_OFFIX?=	--with-offix=no
  .endif
 @@ -164,10 +161,11 @@
  PKGNAMESUFFIX=		-canna
  WITH_INPUT_METHOD=	--with-canna --with-wnn=no --with-wnn6=no
  LIB_INPUT_METHOD=	canna.1:${PORTSDIR}/japanese/Canna
 -.endif
 +.else
  SITE_INCLUDES+=		${LOCALBASE}/include
  SITE_LIBRARIES+=	${LOCALBASE}/lib
 -WITH_INPUT_METHOD?=	--with-canna=no --with-wnn=no --with-wnn6=no
 +WITH_INPUT_METHOD=	--with-canna=no --with-wnn=no --with-wnn6=no
 +.endif
  
  # fix .so references in a few man pages
  pre-configure::
 @@ -182,8 +180,8 @@
  	@${RM} -f ${WRKSRC}/lib-src/DOC* ${WRKSRC}/src/xemacs
  
  post-install::
 -.for file in b2m ctags ellcc etags gnuclient xemacs-${XEMACS_VER}
 -	${STRIP_CMD} ${PREFIX}/bin/${file}
 +.for f in b2m ctags ellcc etags gnuclient xemacs-${XEMACS_VER}
 +	${STRIP_CMD} ${PREFIX}/bin/${f}
  .endfor
  # For some reason install no longer makes ${PREFIX}/lib/xemacs/site-lisp.
  # Do what PLIST does for pkg_add.
 diff -ruN /usr/ports/editors/xemacs21-mule.old/distinfo /usr/ports/editors/xemacs21-mule/distinfo
 --- /usr/ports/editors/xemacs21-mule.old/distinfo	Sat Dec 11 02:08:02 2004
 +++ /usr/ports/editors/xemacs21-mule/distinfo	Sat Dec 11 01:31:55 2004
 @@ -1,6 +1,6 @@
 -MD5 (xemacs/xemacs-21.4.14-src.tar.gz) = 6034fbaf3934361b4d1c5ff9ee1979da
 -SIZE (xemacs/xemacs-21.4.14-src.tar.gz) = 8092804
 -MD5 (xemacs/xemacs-21.4.14-elc.tar.gz) = 05408e9bb2c0a199528fa463c766a890
 -SIZE (xemacs/xemacs-21.4.14-elc.tar.gz) = 925908
 -MD5 (xemacs/xemacs-21.4.14-info.tar.gz) = 421d51e90577c71c453c42a201afe64f
 -SIZE (xemacs/xemacs-21.4.14-info.tar.gz) = 1663979
 +MD5 (xemacs/xemacs-21.4.15-src.tar.gz) = 840d061aad9c4ae0782fc94a4184625a
 +SIZE (xemacs/xemacs-21.4.15-src.tar.gz) = 8118264
 +MD5 (xemacs/xemacs-21.4.15-elc.tar.gz) = 0fcacb62b115dd34d2d59fbe8be36166
 +SIZE (xemacs/xemacs-21.4.15-elc.tar.gz) = 927962
 +MD5 (xemacs/xemacs-21.4.15-info.tar.gz) = 64e6cbd780a39e001d3a2a832717ce31
 +SIZE (xemacs/xemacs-21.4.15-info.tar.gz) = 1603029
 diff -ruN /usr/ports/editors/xemacs21-mule.old/files/patch-emacs.c /usr/ports/editors/xemacs21-mule/files/patch-emacs.c
 --- /usr/ports/editors/xemacs21-mule.old/files/patch-emacs.c	Thu Jan  1 03:00:00 1970
 +++ /usr/ports/editors/xemacs21-mule/files/patch-emacs.c	Thu Jul 22 00:56:24 2004
 @@ -0,0 +1,11 @@
 +--- 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 -ruN /usr/ports/editors/xemacs21-mule.old/files/patch-malloc.c /usr/ports/editors/xemacs21-mule/files/patch-malloc.c
 --- /usr/ports/editors/xemacs21-mule.old/files/patch-malloc.c	Thu Jan  1 03:00:00 1970
 +++ /usr/ports/editors/xemacs21-mule/files/patch-malloc.c	Sat Dec 11 03:12:00 2004
 @@ -0,0 +1,20 @@
 +--- src/malloc.c.orig	Sat Dec 11 03:11:11 2004
 ++++ src/malloc.c	Sat Dec 11 03:11:36 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 int 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 int siz;
 ++  rlim_t siz;
 +   int oldmask;
 + 
 + #ifdef BSD
 diff -ruN /usr/ports/editors/xemacs21-mule.old/pkg-plist /usr/ports/editors/xemacs21-mule/pkg-plist
 --- /usr/ports/editors/xemacs21-mule.old/pkg-plist	Sat Dec 11 02:08:02 2004
 +++ /usr/ports/editors/xemacs21-mule/pkg-plist	Sat Dec 11 03:05:51 2004
 @@ -780,12 +780,6 @@
  lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/wakeup
  lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/yow
  lib/xemacs-%%XEMACS_VER%%/info/cl.info
 -lib/xemacs-%%XEMACS_VER%%/info/cl.info-1
 -lib/xemacs-%%XEMACS_VER%%/info/cl.info-2
 -lib/xemacs-%%XEMACS_VER%%/info/cl.info-3
 -lib/xemacs-%%XEMACS_VER%%/info/cl.info-4
 -lib/xemacs-%%XEMACS_VER%%/info/cl.info-5
 -lib/xemacs-%%XEMACS_VER%%/info/cl.info-6
  lib/xemacs-%%XEMACS_VER%%/info/custom.info
  lib/xemacs-%%XEMACS_VER%%/info/dir
  lib/xemacs-%%XEMACS_VER%%/info/emodules.info
 @@ -794,123 +788,30 @@
  lib/xemacs-%%XEMACS_VER%%/info/internals.info
  lib/xemacs-%%XEMACS_VER%%/info/internals.info-1
  lib/xemacs-%%XEMACS_VER%%/info/internals.info-2
 -lib/xemacs-%%XEMACS_VER%%/info/internals.info-3
 -lib/xemacs-%%XEMACS_VER%%/info/internals.info-4
 -lib/xemacs-%%XEMACS_VER%%/info/internals.info-5
 -lib/xemacs-%%XEMACS_VER%%/info/internals.info-6
 -lib/xemacs-%%XEMACS_VER%%/info/internals.info-7
 -lib/xemacs-%%XEMACS_VER%%/info/internals.info-8
 -lib/xemacs-%%XEMACS_VER%%/info/internals.info-9
  lib/xemacs-%%XEMACS_VER%%/info/lispref.info
  lib/xemacs-%%XEMACS_VER%%/info/lispref.info-1
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-10
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-11
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-12
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-13
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-14
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-15
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-16
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-17
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-18
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-19
  lib/xemacs-%%XEMACS_VER%%/info/lispref.info-2
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-20
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-21
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-22
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-23
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-24
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-25
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-26
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-27
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-28
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-29
  lib/xemacs-%%XEMACS_VER%%/info/lispref.info-3
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-30
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-31
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-32
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-33
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-34
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-35
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-36
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-37
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-38
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-39
  lib/xemacs-%%XEMACS_VER%%/info/lispref.info-4
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-40
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-41
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-42
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-43
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-44
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-45
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-46
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-47
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-48
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-49
  lib/xemacs-%%XEMACS_VER%%/info/lispref.info-5
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-50
  lib/xemacs-%%XEMACS_VER%%/info/lispref.info-6
  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/new-users-guide.info
 -lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info-1
 -lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info-2
 -lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info-3
  lib/xemacs-%%XEMACS_VER%%/info/standards.info
 -lib/xemacs-%%XEMACS_VER%%/info/standards.info-1
 -lib/xemacs-%%XEMACS_VER%%/info/standards.info-2
 -lib/xemacs-%%XEMACS_VER%%/info/standards.info-3
 -lib/xemacs-%%XEMACS_VER%%/info/standards.info-4
  lib/xemacs-%%XEMACS_VER%%/info/term.info
  lib/xemacs-%%XEMACS_VER%%/info/termcap.info
 -lib/xemacs-%%XEMACS_VER%%/info/termcap.info-1
 -lib/xemacs-%%XEMACS_VER%%/info/termcap.info-2
 -lib/xemacs-%%XEMACS_VER%%/info/termcap.info-3
  lib/xemacs-%%XEMACS_VER%%/info/texinfo.info
  lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-1
 -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-10
 -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-11
 -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-12
  lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-2
 -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-3
 -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-4
 -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-5
 -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-6
 -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-7
 -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-8
 -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-9
  lib/xemacs-%%XEMACS_VER%%/info/widget.info
  lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-1
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-2
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-3
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-4
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-5
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-6
  lib/xemacs-%%XEMACS_VER%%/info/xemacs.info
  lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-1
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-10
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-11
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-12
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-13
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-14
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-15
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-16
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-17
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-18
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-19
  lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-2
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-20
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-21
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-22
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-23
  lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-3
  lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-4
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-5
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-6
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-7
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-8
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-9
  lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog
  lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog.1
  lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog.GTK
 @@ -1186,6 +1087,7 @@
  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
 @@ -1261,6 +1163,7 @@
  lib/xemacs-%%XEMACS_VER%%/lisp/paragraphs.el
  lib/xemacs-%%XEMACS_VER%%/lisp/paragraphs.elc
  lib/xemacs-%%XEMACS_VER%%/lisp/paths.el
 +lib/xemacs-%%XEMACS_VER%%/lisp/paths.elc
  lib/xemacs-%%XEMACS_VER%%/lisp/picture.el
  lib/xemacs-%%XEMACS_VER%%/lisp/picture.elc
  lib/xemacs-%%XEMACS_VER%%/lisp/printer.el
 @@ -1347,6 +1250,7 @@
  lib/xemacs-%%XEMACS_VER%%/lisp/userlock.el
  lib/xemacs-%%XEMACS_VER%%/lisp/userlock.elc
  lib/xemacs-%%XEMACS_VER%%/lisp/version.el
 +lib/xemacs-%%XEMACS_VER%%/lisp/version.elc
  lib/xemacs-%%XEMACS_VER%%/lisp/very-early-lisp.el
  lib/xemacs-%%XEMACS_VER%%/lisp/view-less.el
  lib/xemacs-%%XEMACS_VER%%/lisp/view-less.elc
 --- xemacs21-mule.diff ends here ---
 
 --- bsd.emacs.mk.diff begins here ---
 --- /usr/ports/Mk/bsd.emacs.mk.old	Sat Dec 11 02:55:23 2004
 +++ /usr/ports/Mk/bsd.emacs.mk	Sat Dec 11 02:54:56 2004
 @@ -149,7 +149,7 @@
  # XEmacs-21.x with Mule
  .elif (${EMACS_PORT_NAME} == "xemacs21-mule")
  EMACS_NAME=		xemacs
 -EMACS_VER=		21.4.14
 +EMACS_VER=		21.4.15
  EMACS_MAJOR_VER=	21
  EMACS_LIBDIR?=		lib/${EMACS_NAME}
  EMACS_LIBDIR_WITH_VER?=	lib/${EMACS_NAME}-${EMACS_VER}
 --- bsd.emacs.mk.diff ends here ---
 
 

From: Andrey Slusar <anray@inet.ua>
To: FreeBSD-gnats-submit@freebsd.org
Cc:  
Subject: ports/65129 [PATCH] editors/xemacs21-mule: update to new version
Date: Sun, 12 Dec 2004 20:19:49 +0200

 >Submitter-Id:	current-users
 >Originator:	Andrey Slusar
 >Organization:	Santinel
 >Confidential:	no 
 >Synopsis:	ports/65129 [PATCH] editors/xemacs21-mule: update to new version
 >Severity:	non-critical
 >Priority:	medium
 >Category:	ports
 >Class:		update
 >Release:	FreeBSD 5.3-STABLE i386
 >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:
 	New files:
 	files/patch-regex.c(this patch is fixed xemacs hang)
 	files/patch-malloc.c
 
 	Update from version 21.4.14 to 21.4.16
 
 >How-To-Repeat:
 	
 >Fix:
 
 --- xemacs21-mule.diff begins here ---
 diff -ruN xemacs21-mule/Makefile xemacs21-mule.new/Makefile
 --- xemacs21-mule/Makefile	Sun Dec 12 18:24:15 2004
 +++ xemacs21-mule.new/Makefile	Sun Dec 12 18:06:48 2004
 @@ -7,7 +7,6 @@
  
  PORTNAME=	xemacs-mule
  PORTVERSION=	${XEMACS_VER}
 -PORTREVISION=	1
  .if defined(WNN6)
  .endif
  CATEGORIES+=	editors
 @@ -21,10 +20,6 @@
  MAINTAINER=	kiri@FreeBSD.org
  COMMENT?=	XEmacs(stable version) text editor with mule(Only the executables)
  
 -USE_GNOME=	#
 -
 -.include <bsd.port.pre.mk>
 -
  BUILD_DEPENDS=	${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-mule-packages
  RUN_DEPENDS=	${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages \
  		${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-mule-packages
 @@ -37,9 +32,18 @@
  		compface.1:${PORTSDIR}/mail/faces \
  		${LIB_INPUT_METHOD}
  
 +.include <bsd.port.pre.mk>
 +
 +.if defined(WANT_GTK)
 +WITH_GTK=	--with-gtk=yes
 +WITH_XPM=	--with-xpm=no
 +USE_GNOME=	gtk12
 +USE_XPM=	no
 +.endif
 +
  XEMACS_MAJOR_VER?=	21
  XEMACS_REL=		${XEMACS_MAJOR_VER}.4
 -XEMACS_VER=		${XEMACS_MAJOR_VER}.4.14
 +XEMACS_VER=		${XEMACS_MAJOR_VER}.4.16
  XEMACS_ARCH=		${CONFIGURE_TARGET}
  
  USE_GETTEXT=	yes
 @@ -91,7 +95,7 @@
  
  # Undump and malloc do not behave on amd64 at the moment
  .if ${ARCH} == "amd64"
 -CONFIGURE_ARGS+= --with-system-malloc --pdump 
 +CONFIGURE_ARGS+= --with-system-malloc --pdump
  .endif
  
  pre-fetch:
 @@ -115,13 +119,6 @@
  WITH_DIALOGS=	--with-dialogs=motif
  .endif
  
 -.if defined(WANT_GTK)
 -WITH_GTK=	--with-gtk=yes
 -WITH_XPM=	--with-xpm=no
 -USE_GNOME+=	gtk12
 -USE_XPM=	no
 -.endif
 -
  .if defined(PACKAGE_BUILDING)
  WITH_OFFIX?=	--with-offix=no
  .endif
 @@ -182,8 +179,8 @@
  	@${RM} -f ${WRKSRC}/lib-src/DOC* ${WRKSRC}/src/xemacs
  
  post-install::
 -.for file in b2m ctags ellcc etags gnuclient xemacs-${XEMACS_VER}
 -	${STRIP_CMD} ${PREFIX}/bin/${file}
 +.for f in b2m ctags ellcc etags gnuclient xemacs-${XEMACS_VER}
 +	${STRIP_CMD} ${PREFIX}/bin/${f}
  .endfor
  # For some reason install no longer makes ${PREFIX}/lib/xemacs/site-lisp.
  # Do what PLIST does for pkg_add.
 diff -ruN xemacs21-mule/distinfo xemacs21-mule.new/distinfo
 --- xemacs21-mule/distinfo	Sun Dec 12 18:24:15 2004
 +++ xemacs21-mule.new/distinfo	Sun Dec 12 18:06:39 2004
 @@ -1,6 +1,6 @@
 -MD5 (xemacs/xemacs-21.4.14-src.tar.gz) = 6034fbaf3934361b4d1c5ff9ee1979da
 -SIZE (xemacs/xemacs-21.4.14-src.tar.gz) = 8092804
 -MD5 (xemacs/xemacs-21.4.14-elc.tar.gz) = 05408e9bb2c0a199528fa463c766a890
 -SIZE (xemacs/xemacs-21.4.14-elc.tar.gz) = 925908
 -MD5 (xemacs/xemacs-21.4.14-info.tar.gz) = 421d51e90577c71c453c42a201afe64f
 -SIZE (xemacs/xemacs-21.4.14-info.tar.gz) = 1663979
 +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
 diff -ruN xemacs21-mule/files/patch-emacs.c xemacs21-mule.new/files/patch-emacs.c
 --- xemacs21-mule/files/patch-emacs.c	Thu Jan  1 03:00:00 1970
 +++ xemacs21-mule.new/files/patch-emacs.c	Sun Dec 12 18:06:39 2004
 @@ -0,0 +1,11 @@
 +--- src/emacs.c.orig	Thu Dec  2 13:03:05 2004
 ++++ src/emacs.c	Thu Dec  2 13:03:14 2004
 +@@ -344,7 +344,7 @@
 + #endif
 + 
 + /* Number of bytes of writable memory we can expect to be able to get */
 +-unsigned long lim_data;
 ++rlim_t lim_data;
 + 
 + /* WARNING!
 + 
 diff -ruN xemacs21-mule/files/patch-malloc.c xemacs21-mule.new/files/patch-malloc.c
 --- xemacs21-mule/files/patch-malloc.c	Thu Jan  1 03:00:00 1970
 +++ xemacs21-mule.new/files/patch-malloc.c	Sun Dec 12 18:06:39 2004
 @@ -0,0 +1,20 @@
 +--- src/malloc.c.orig	Thu Dec  2 13:05:28 2004
 ++++ src/malloc.c	Thu Dec  2 13:06:07 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 xemacs21-mule/files/patch-mem-limits.h xemacs21-mule.new/files/patch-mem-limits.h
 --- xemacs21-mule/files/patch-mem-limits.h	Sun Dec 12 18:24:15 2004
 +++ xemacs21-mule.new/files/patch-mem-limits.h	Sun Dec 12 18:06:39 2004
 @@ -1,10 +1,10 @@
 ---- 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	Thu Dec  2 13:04:09 2004
 ++++ src/mem-limits.h	Thu Dec  2 13:04:18 2004
 +@@ -109,7 +109,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)
 diff -ruN xemacs21-mule/files/patch-regex.c xemacs21-mule.new/files/patch-regex.c
 --- xemacs21-mule/files/patch-regex.c	Thu Jan  1 03:00:00 1970
 +++ xemacs21-mule.new/files/patch-regex.c	Sun Dec 12 18:06:39 2004
 @@ -0,0 +1,33 @@
 +Index: regex.c
 +===================================================================
 +RCS file: /pack/xemacscvs/XEmacs/xemacs/src/regex.c,v
 +retrieving revision 1.25.2.10
 +retrieving revision 1.25.2.9
 +diff -u -r1.25.2.10 -r1.25.2.9
 +--- src/regex.c	2004/10/08 00:40:33	1.25.2.10
 ++++ src/regex.c	2004/09/23 03:03:43	1.25.2.9
 +@@ -4766,20 +4766,16 @@
 + 
 + 		/* Go through the first `min (num_regs, regs->num_regs)'
 + 		   registers, since that is all we initialized.  */
 +-		for (mcnt = 1;
 +-		     mcnt < MIN (num_nonshy_regs, regs->num_regs);
 +-		     mcnt++)
 ++		for (mcnt = 1; mcnt < MIN (num_regs, regs->num_regs); mcnt++)
 + 		  {
 +-		    int ireg = bufp->external_to_internal_register[mcnt];
 +-
 +-		    if (REG_UNSET (regstart[ireg]) || REG_UNSET (regend[ireg]))
 ++		    if (REG_UNSET (regstart[mcnt]) || REG_UNSET (regend[mcnt]))
 + 		      regs->start[mcnt] = regs->end[mcnt] = -1;
 + 		    else
 + 		      {
 + 			regs->start[mcnt]
 +-			  = (regoff_t) POINTER_TO_OFFSET (regstart[ireg]);
 ++			  = (regoff_t) POINTER_TO_OFFSET (regstart[mcnt]);
 + 			regs->end[mcnt]
 +-			  = (regoff_t) POINTER_TO_OFFSET (regend[ireg]);
 ++			  = (regoff_t) POINTER_TO_OFFSET (regend[mcnt]);
 + 		      }
 + 		  }
 + 	      } /* regs && !bufp->no_sub */
 diff -ruN xemacs21-mule/pkg-plist xemacs21-mule.new/pkg-plist
 --- xemacs21-mule/pkg-plist	Sun Dec 12 18:24:15 2004
 +++ xemacs21-mule.new/pkg-plist	Sun Dec 12 18:06:39 2004
 @@ -151,11 +151,12 @@
  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
  lib/xemacs-%%XEMACS_VER%%/etc/ms-kermit-7bit
 -lib/xemacs-%%XEMACS_VER%%/etc/package-index.LATEST.pgp
 +lib/xemacs-%%XEMACS_VER%%/etc/package-index.LATEST.gpg
  lib/xemacs-%%XEMACS_VER%%/etc/photos/adrian.png
  lib/xemacs-%%XEMACS_VER%%/etc/photos/adrianm.png
  lib/xemacs-%%XEMACS_VER%%/etc/photos/ajc.png
 @@ -780,12 +781,6 @@
  lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/wakeup
  lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/yow
  lib/xemacs-%%XEMACS_VER%%/info/cl.info
 -lib/xemacs-%%XEMACS_VER%%/info/cl.info-1
 -lib/xemacs-%%XEMACS_VER%%/info/cl.info-2
 -lib/xemacs-%%XEMACS_VER%%/info/cl.info-3
 -lib/xemacs-%%XEMACS_VER%%/info/cl.info-4
 -lib/xemacs-%%XEMACS_VER%%/info/cl.info-5
 -lib/xemacs-%%XEMACS_VER%%/info/cl.info-6
  lib/xemacs-%%XEMACS_VER%%/info/custom.info
  lib/xemacs-%%XEMACS_VER%%/info/dir
  lib/xemacs-%%XEMACS_VER%%/info/emodules.info
 @@ -794,123 +789,30 @@
  lib/xemacs-%%XEMACS_VER%%/info/internals.info
  lib/xemacs-%%XEMACS_VER%%/info/internals.info-1
  lib/xemacs-%%XEMACS_VER%%/info/internals.info-2
 -lib/xemacs-%%XEMACS_VER%%/info/internals.info-3
 -lib/xemacs-%%XEMACS_VER%%/info/internals.info-4
 -lib/xemacs-%%XEMACS_VER%%/info/internals.info-5
 -lib/xemacs-%%XEMACS_VER%%/info/internals.info-6
 -lib/xemacs-%%XEMACS_VER%%/info/internals.info-7
 -lib/xemacs-%%XEMACS_VER%%/info/internals.info-8
 -lib/xemacs-%%XEMACS_VER%%/info/internals.info-9
  lib/xemacs-%%XEMACS_VER%%/info/lispref.info
  lib/xemacs-%%XEMACS_VER%%/info/lispref.info-1
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-10
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-11
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-12
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-13
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-14
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-15
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-16
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-17
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-18
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-19
  lib/xemacs-%%XEMACS_VER%%/info/lispref.info-2
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-20
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-21
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-22
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-23
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-24
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-25
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-26
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-27
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-28
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-29
  lib/xemacs-%%XEMACS_VER%%/info/lispref.info-3
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-30
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-31
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-32
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-33
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-34
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-35
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-36
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-37
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-38
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-39
  lib/xemacs-%%XEMACS_VER%%/info/lispref.info-4
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-40
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-41
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-42
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-43
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-44
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-45
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-46
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-47
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-48
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-49
  lib/xemacs-%%XEMACS_VER%%/info/lispref.info-5
 -lib/xemacs-%%XEMACS_VER%%/info/lispref.info-50
  lib/xemacs-%%XEMACS_VER%%/info/lispref.info-6
  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/new-users-guide.info
 -lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info-1
 -lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info-2
 -lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info-3
  lib/xemacs-%%XEMACS_VER%%/info/standards.info
 -lib/xemacs-%%XEMACS_VER%%/info/standards.info-1
 -lib/xemacs-%%XEMACS_VER%%/info/standards.info-2
 -lib/xemacs-%%XEMACS_VER%%/info/standards.info-3
 -lib/xemacs-%%XEMACS_VER%%/info/standards.info-4
  lib/xemacs-%%XEMACS_VER%%/info/term.info
  lib/xemacs-%%XEMACS_VER%%/info/termcap.info
 -lib/xemacs-%%XEMACS_VER%%/info/termcap.info-1
 -lib/xemacs-%%XEMACS_VER%%/info/termcap.info-2
 -lib/xemacs-%%XEMACS_VER%%/info/termcap.info-3
  lib/xemacs-%%XEMACS_VER%%/info/texinfo.info
  lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-1
 -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-10
 -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-11
 -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-12
  lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-2
 -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-3
 -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-4
 -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-5
 -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-6
 -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-7
 -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-8
 -lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-9
  lib/xemacs-%%XEMACS_VER%%/info/widget.info
  lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-1
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-2
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-3
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-4
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-5
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-6
  lib/xemacs-%%XEMACS_VER%%/info/xemacs.info
  lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-1
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-10
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-11
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-12
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-13
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-14
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-15
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-16
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-17
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-18
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-19
  lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-2
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-20
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-21
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-22
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-23
  lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-3
  lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-4
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-5
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-6
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-7
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-8
 -lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-9
  lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog
  lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog.1
  lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog.GTK
 @@ -1182,7 +1084,6 @@
  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
 @@ -1261,6 +1162,7 @@
  lib/xemacs-%%XEMACS_VER%%/lisp/paragraphs.el
  lib/xemacs-%%XEMACS_VER%%/lisp/paragraphs.elc
  lib/xemacs-%%XEMACS_VER%%/lisp/paths.el
 +lib/xemacs-%%XEMACS_VER%%/lisp/paths.elc
  lib/xemacs-%%XEMACS_VER%%/lisp/picture.el
  lib/xemacs-%%XEMACS_VER%%/lisp/picture.elc
  lib/xemacs-%%XEMACS_VER%%/lisp/printer.el
 @@ -1347,6 +1249,7 @@
  lib/xemacs-%%XEMACS_VER%%/lisp/userlock.el
  lib/xemacs-%%XEMACS_VER%%/lisp/userlock.elc
  lib/xemacs-%%XEMACS_VER%%/lisp/version.el
 +lib/xemacs-%%XEMACS_VER%%/lisp/version.elc
  lib/xemacs-%%XEMACS_VER%%/lisp/very-early-lisp.el
  lib/xemacs-%%XEMACS_VER%%/lisp/view-less.el
  lib/xemacs-%%XEMACS_VER%%/lisp/view-less.elc
 --- xemacs21-mule.diff ends here ---
 
 --- bsd.emacs.mk.diff begins here ---
 --- /usr/ports/Mk/bsd.emacs.mk.old	Sat Dec 11 02:55:23 2004
 +++ /usr/ports/Mk/bsd.emacs.mk	Sun Dec 12 18:30:01 2004
 @@ -149,7 +149,7 @@
  # XEmacs-21.x with Mule
  .elif (${EMACS_PORT_NAME} == "xemacs21-mule")
  EMACS_NAME=		xemacs
 -EMACS_VER=		21.4.14
 +EMACS_VER=		21.4.16
  EMACS_MAJOR_VER=	21
  EMACS_LIBDIR?=		lib/${EMACS_NAME}
  EMACS_LIBDIR_WITH_VER?=	lib/${EMACS_NAME}-${EMACS_VER}
 --- bsd.emacs.mk.diff ends here ---
 
 
Responsible-Changed-From-To: kiri->freebsd-ports-bugs 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Thu Dec 23 18:42:03 GMT 2004 
Responsible-Changed-Why:  
Maintainer was reset. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=65129 
State-Changed-From-To: open->closed 
State-Changed-By: linimon 
State-Changed-When: Thu Dec 23 21:55:22 GMT 2004 
State-Changed-Why:  
Superceeded by ports/75444. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=65129 
>Unformatted:
