From owner-freebsd-ports Fri Jul 23 11:41:34 1999 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 815C614F6D for ; Fri, 23 Jul 1999 11:41:24 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id LAA84616; Fri, 23 Jul 1999 11:40:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from mta4.odn.ne.jp (mta4.odn.ne.jp [143.90.131.71]) by hub.freebsd.org (Postfix) with ESMTP id F0DC414F6D; Fri, 23 Jul 1999 11:32:13 -0700 (PDT) (envelope-from shigeisp@pop02.odn.ne.jp) Received: from athena.shige.org (KUNcc-01p66.ppp.odn.ad.jp [143.90.235.66]) by mta4.odn.ne.jp (8.8.8+2.7Wbeta7/3.6W/9808281156) with ESMTP id DAA19532; Sat, 24 Jul 1999 03:31:42 +0900 (JST) Received: (from shige@localhost) by aphrodite.shige.org (8.9.3/3.7Wpl1-artemis) id DAA52338; Sat, 24 Jul 1999 03:31:38 +0900 (JST) Message-Id: <199907231831.DAA19532@mta4.odn.ne.jp> Date: Sat, 24 Jul 1999 03:31:38 +0900 (JST) From: shige@FreeBSD.org Reply-To: shige@FreeBSD.org To: FreeBSD-gnats-submit@freebsd.org Cc: shige@FreeBSD.org X-Send-Pr-Version: 3.2 Subject: ports/12779: Update port: editors/emacs20 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 12779 >Category: ports >Synopsis: Update port: editors/emacs20 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jul 23 11:40:00 PDT 1999 >Closed-Date: >Last-Modified: >Originator: Shigeyuki FUKUSHIMA >Release: FreeBSD 4.0-CURRENT i386 >Organization: FreeBSD Ports Term >Environment: FreeBSD 4.0-CURRENT i386 XFree86-3.3.4 >Description: Update port: editors/emacs20 Update to 20.4. Emacs-20.4 is a bug-fix release version for emacs-20.3. Therefore upgrade is recommended. The following fixes are in this port patch: . Update to 20.4. . Change variables: USE_XPGLIB => USE_XPG4. . Split patches/patch-* applied for *.texi Because a patch-* includes some patches for *.texi. When you commit, don't forget this: $ cd editors/emacs20/patches $ cvs remove patch-ab patch-ba $ cvs add patch-al patch-am patch-an patch-ao patch-ap patch-aq $ cvs add patch-ar patch-as patch-at patch-au patch-av patch-aw After you commit this, I will update editors/leim20 port. --- shige >How-To-Repeat: >Fix: diff -urN /usr/ports/editors/emacs20/Makefile emacs20/Makefile --- /usr/ports/editors/emacs20/Makefile Thu Jul 1 22:46:52 1999 +++ emacs20/Makefile Sat Jul 24 02:11:06 1999 @@ -1,12 +1,12 @@ # New ports collection makefile for: GNU emacs -# Version required: 20.3 +# Version required: 20.4 # Date created: 29 October 1994 # Whom: jkh # # $Id: Makefile,v 1.41 1999/06/25 22:05:58 jseger Exp $ # -DISTNAME= emacs-20.3 +DISTNAME= emacs-20.4 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= emacs @@ -27,12 +27,18 @@ MAKE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" MAN1= emacs.1 etags.1 ctags.1 -PLIST_SUB= EMACS_VER=20.3 EMACS_ARCH=${CONFIGURE_TARGET} +PLIST_SUB= EMACS_VER=20.4 EMACS_ARCH=${CONFIGURE_TARGET} -.if defined(USE_XPGLIB) -.if (${USE_XPGLIB} == "YES") +.if defined(USE_XPG4) +.if (${USE_XPG4} == "YES" || ${USE_XPG4} == "yes") CONFIGURE_ARGS+= --with-xpg4 .endif +.endif + +pre-fetch: +.if !defined(USE_XPG4) + @${ECHO_MSG} "NOTE: You can have international locale library support " + @${ECHO_MSG} "by adding \"USE_XPG4=YES\" to argument of make." .endif pre-build: diff -urN /usr/ports/editors/emacs20/files/md5 emacs20/files/md5 --- /usr/ports/editors/emacs20/files/md5 Tue Sep 1 11:29:50 1998 +++ emacs20/files/md5 Sat Jul 24 00:52:48 1999 @@ -1 +1 @@ -MD5 (emacs-20.3.tar.gz) = 5aee43bb7c7267cc24b78011d280ecdc +MD5 (emacs-20.4.tar.gz) = 695614f204d918db617ba3ae849b273d diff -urN /usr/ports/editors/emacs20/patches/patch-aa emacs20/patches/patch-aa --- /usr/ports/editors/emacs20/patches/patch-aa Thu Sep 24 01:13:20 1998 +++ emacs20/patches/patch-aa Sat Jul 24 01:13:11 1999 @@ -1,183 +1,5 @@ ---- man/vip.texi.orig Sun May 17 02:48:50 1998 -+++ man/vip.texi Sat Sep 19 10:53:58 1998 -@@ -2,10 +2,9 @@ - - @setfilename ../info/vip - @settitle VIP -- --@dircategory Editors -+@dircategory The Emacs editor and associated tools - @direntry --* VIP: (vip). An older VI-emulation for Emacs. -+* VIP: (vip). A VI-emulation for Emacs. - @end direntry - - @iftex ---- man/emacs.texi.orig Tue Aug 18 16:45:18 1998 -+++ man/emacs.texi Sat Sep 19 10:54:30 1998 -@@ -6,15 +6,14 @@ - @synindex pg cp - - @ifinfo -+@dircategory The Emacs editor and associated tools -+@direntry -+* Emacs: (emacs). The extensible self-documenting text editor. -+@end direntry - @c The edition number appears in several places in this file - This is the thirteenth edition of the @cite{GNU Emacs Manual}, - updated for Emacs version 20.3 - @c Please REMEMBER to update edition number in *three* places in this file. -- --@dircategory Editors --@direntry --* Emacs: (emacs). The extensible self-documenting text editor. --@end direntry - - Published by the Free Software Foundation - 59 Temple Place, Suite 330 ---- man/viper.texi.orig Tue Jun 9 11:19:18 1998 -+++ man/viper.texi Sat Sep 19 10:55:07 1998 -@@ -5,12 +5,9 @@ - @comment @setfilename viper - @comment @setfilename viper.info - @setfilename ../info/viper -- --@dircategory Editors -+@dircategory The Emacs editor and associated tools - @direntry --* VIPER: (viper). The newest Emacs VI-emulation mode. -- (also, A VI Plan for Emacs Rescue -- or the VI PERil.) -+* VIPER: (viper). The new VI-emulation mode in Emacs-19.29. - @end direntry - - @iftex ---- man/forms.texi.orig Sun May 17 02:49:28 1998 -+++ man/forms.texi Sat Sep 19 10:55:26 1998 -@@ -8,18 +8,17 @@ - @syncodeindex vr cp - @syncodeindex fn cp - @syncodeindex ky cp -+@dircategory The Emacs editor and associated tools -+@direntry -+* Forms: (forms). Emacs package for editing data bases -+ by filling in forms. -+@end direntry - @iftex - @finalout - @setchapternewpage odd - @end iftex - @c @smallbook - @comment %**end of header (This is for running Texinfo on a region.) -- --@dircategory Editors --@direntry --* Forms: (forms). Emacs package for editing data bases -- by filling in forms. --@end direntry - - @ifinfo - This file documents Forms mode, a form-editing major mode for GNU Emacs. ---- man/gnus.texi.orig Sun May 17 02:50:27 1998 -+++ man/gnus.texi Sat Sep 19 10:55:40 1998 -@@ -5,15 +5,15 @@ - @synindex fn cp - @synindex vr cp - @synindex pg cp -+@dircategory The Emacs editor and associated tools -+@direntry -+* GNUS: (gnus). The news reader GNUS. -+@end direntry -+ - @iftex - @finalout - @end iftex - @setchapternewpage odd -- --@dircategory Editors --@direntry --* Gnus: (gnus). The news reader Gnus. --@end direntry - - @ifinfo - ---- man/mh-e.texi.orig Sun May 17 02:51:15 1998 -+++ man/mh-e.texi Sat Sep 19 10:55:53 1998 -@@ -4,13 +4,12 @@ - @setfilename ../info/mh-e - @settitle mh-e - @c %**end of header -- --@setchapternewpage odd -- --@dircategory Editors -+@dircategory The Emacs editor and associated tools - @direntry --* MH-E: (mh-e). Emacs interface to the MH mail system. -+* MH-E: (mh-e). Emacs interface to the MH mail system. - @end direntry -+ -+@setchapternewpage odd - - @c Version variables. - @set EDITION 1.2 ---- man/cl.texi.orig Sun May 17 02:51:46 1998 -+++ man/cl.texi Sat Sep 19 10:56:14 1998 -@@ -2,9 +2,9 @@ - @setfilename ../info/cl - @settitle Common Lisp Extensions - --@dircategory Editors -+@dircategory The Emacs editor and associated tools - @direntry --* CL: (cl). Partial Common Lisp support for Emacs Lisp. -+* CL: (cl). Partial Common Lisp support for Emacs Lisp. - @end direntry - - @iftex ---- man/sc.texi.orig Fri Jul 3 02:48:27 1998 -+++ man/sc.texi Sat Sep 19 10:56:49 1998 -@@ -3,15 +3,15 @@ - @comment %**start of header (This is for running Texinfo on a region.) - @setfilename ../info/sc - @settitle Supercite Version 3.1 User's Manual -+@dircategory The Emacs editor and associated tools -+@direntry -+* SC: (sc). Supercite lets you cite parts of messages -+ you're replying to, in flexible ways. -+@end direntry -+ - @iftex - @finalout - @end iftex -- --@dircategory Editors --@direntry --* SC: (sc). Supercite lets you cite parts of messages you're -- replying to, in flexible ways. --@end direntry - - @c @setchapternewpage odd % For book style double sided manual. - @comment %**end of header (This is for running Texinfo on a region.) ---- man/cc-mode.texi.orig Sun May 17 02:55:23 1998 -+++ man/cc-mode.texi Sat Sep 19 10:57:01 1998 -@@ -8,10 +8,10 @@ - @settitle CC MODE Version 5 Documentation - @footnotestyle end - --@dircategory Editors --@direntry --* CC mode: (ccmode). The GNU Emacs mode for editing C, C++, Objective-C -- and Java code. -+@dircategory The Emacs editor and associated tools -+@direntry -+* CC mode: (ccmode). The GNU Emacs mode for editing C, C++, -+ Objective-C and Java code. - @end direntry - - @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ---- Makefile.in.orig Sun Aug 2 08:21:22 1998 -+++ Makefile.in Sat Sep 19 10:53:17 1998 +--- Makefile.in.orig Sat Apr 10 04:16:24 1999 ++++ Makefile.in Sat Jul 24 01:03:43 1999 @@ -188,7 +188,7 @@ # Subdirectories to make recursively. `lisp' is not included # because the compiled lisp files are part of the distribution diff -urN /usr/ports/editors/emacs20/patches/patch-ab emacs20/patches/patch-ab --- /usr/ports/editors/emacs20/patches/patch-ab Sun Dec 14 23:52:00 1997 +++ emacs20/patches/patch-ab Thu Jan 1 09:00:00 1970 @@ -1,12 +0,0 @@ ---- man/customize.texi.orig Mon Oct 13 17:08:32 1997 -+++ man/customize.texi Mon Oct 13 17:10:06 1997 -@@ -1,5 +1,9 @@ - \input texinfo - @setfilename ../info/customize -+@dircategory The Emacs editor and associated tools -+@direntry -+* Customization: (customize). Customization Declarations -+@end direntry - - @titlepage - @title Writing Customization Definitions diff -urN /usr/ports/editors/emacs20/patches/patch-ad emacs20/patches/patch-ad --- /usr/ports/editors/emacs20/patches/patch-ad Thu Sep 24 01:13:20 1998 +++ emacs20/patches/patch-ad Sat Jul 24 01:21:05 1999 @@ -1,23 +1,5 @@ ---- man/message.texi.orig Sun May 17 02:50:48 1998 -+++ man/message.texi Sat Sep 19 11:00:29 1998 -@@ -10,12 +10,11 @@ - @end iftex - @setchapternewpage odd - --@dircategory Editors -+@ifinfo -+@dircategory The Emacs editor and associated tools - @direntry --* Message: (message). Mail and news composition mode that goes with Gnus. -+* Message: (message). Message, the Emacs message composition mode. - @end direntry -- --@ifinfo - - This file documents Message, the Emacs message composition mode. - ---- man/dired-x.texi.orig Sat Sep 19 11:19:06 1998 -+++ man/dired-x.texi Sat Sep 19 11:20:22 1998 +--- man/dired-x.texi.orig Sun May 17 03:52:28 1998 ++++ man/dired-x.texi Sat Jul 24 01:19:47 1999 @@ -19,9 +19,9 @@ @c dired-x.el REVISION NUMBER @settitle Dired Extra Version 2 User's Manual @@ -27,20 +9,6 @@ @direntry -* Dired-X: (dired-x). Dired Extra Features. +* Dired-X: (dired-x). Dired Extra Features. - @end direntry - - @iftex ---- man/ediff.texi.orig Sat Sep 19 11:20:38 1998 -+++ man/ediff.texi Sat Sep 19 11:21:14 1998 -@@ -14,9 +14,9 @@ - @synindex fn cp - @synindex pg cp - --@dircategory Editors -+@dircategory The Emacs editor and associated tools - @direntry --* Ediff: (ediff). A visual interface for comparing and merging programs. -+* Ediff: (ediff). A visual interface for comparing and merging programs. @end direntry @iftex diff -urN /usr/ports/editors/emacs20/patches/patch-ag emacs20/patches/patch-ag --- /usr/ports/editors/emacs20/patches/patch-ag Tue Sep 1 11:29:51 1998 +++ emacs20/patches/patch-ag Sat Jul 24 01:25:32 1999 @@ -1,12 +1,12 @@ ---- man/Makefile.in.orig Sat May 16 15:00:22 1998 -+++ man/Makefile.in Sun Aug 23 00:27:15 1998 +--- man/Makefile.in.orig Sat Dec 5 08:33:16 1998 ++++ man/Makefile.in Sat Jul 24 01:25:06 1999 @@ -11,7 +11,7 @@ # The makeinfo program is part of the Texinfo distribution. -MAKEINFO = makeinfo +MAKEINFO = makeinfo --no-split - INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl ../info/customize \ + INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \ ../info/dired-x ../info/ediff ../info/forms ../info/gnus \ ../info/info ../info/message ../info/mh-e ../info/reftex \ @@ -70,6 +70,7 @@ diff -urN /usr/ports/editors/emacs20/patches/patch-al emacs20/patches/patch-al --- /usr/ports/editors/emacs20/patches/patch-al Thu Jan 1 09:00:00 1970 +++ emacs20/patches/patch-al Sat Jul 24 01:14:20 1999 @@ -0,0 +1,17 @@ +--- man/cc-mode.texi.orig Sun May 17 03:55:23 1998 ++++ man/cc-mode.texi Sat Jul 24 01:03:42 1999 +@@ -8,10 +8,10 @@ + @settitle CC MODE Version 5 Documentation + @footnotestyle end + +-@dircategory Editors +-@direntry +-* CC mode: (ccmode). The GNU Emacs mode for editing C, C++, Objective-C +- and Java code. ++@dircategory The Emacs editor and associated tools ++@direntry ++* CC mode: (ccmode). The GNU Emacs mode for editing C, C++, ++ Objective-C and Java code. + @end direntry + + @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff -urN /usr/ports/editors/emacs20/patches/patch-am emacs20/patches/patch-am --- /usr/ports/editors/emacs20/patches/patch-am Thu Jan 1 09:00:00 1970 +++ emacs20/patches/patch-am Sat Jul 24 01:14:37 1999 @@ -0,0 +1,14 @@ +--- man/cl.texi.orig Wed Apr 7 03:12:55 1999 ++++ man/cl.texi Sat Jul 24 01:03:42 1999 +@@ -2,9 +2,9 @@ + @setfilename ../info/cl + @settitle Common Lisp Extensions + +-@dircategory Editors ++@dircategory The Emacs editor and associated tools + @direntry +-* CL: (cl). Partial Common Lisp support for Emacs Lisp. ++* CL: (cl). Partial Common Lisp support for Emacs Lisp. + @end direntry + + @iftex diff -urN /usr/ports/editors/emacs20/patches/patch-an emacs20/patches/patch-an --- /usr/ports/editors/emacs20/patches/patch-an Thu Jan 1 09:00:00 1970 +++ emacs20/patches/patch-an Sat Jul 24 01:14:51 1999 @@ -0,0 +1,14 @@ +--- man/emacs.texi.orig Fri Jun 25 02:53:58 1999 ++++ man/emacs.texi Sat Jul 24 01:09:24 1999 +@@ -11,9 +11,9 @@ + updated for Emacs version 20.4 + @c Please REMEMBER to update edition number in *three* places in this file. + +-@dircategory Editors ++@dircategory The Emacs editor and associated tools + @direntry +-* Emacs: (emacs). The extensible self-documenting text editor. ++* Emacs: (emacs). The extensible self-documenting text editor. + @end direntry + + Published by the Free Software Foundation diff -urN /usr/ports/editors/emacs20/patches/patch-ao emacs20/patches/patch-ao --- /usr/ports/editors/emacs20/patches/patch-ao Thu Jan 1 09:00:00 1970 +++ emacs20/patches/patch-ao Sat Jul 24 01:15:07 1999 @@ -0,0 +1,26 @@ +--- man/forms.texi.orig Mon Aug 24 18:43:18 1998 ++++ man/forms.texi Sat Jul 24 01:03:41 1999 +@@ -8,18 +8,17 @@ + @syncodeindex vr cp + @syncodeindex fn cp + @syncodeindex ky cp ++@dircategory The Emacs editor and associated tools ++@direntry ++* Forms: (forms). Emacs package for editing data bases ++ by filling in forms. ++@end direntry + @iftex + @finalout + @setchapternewpage odd + @end iftex + @c @smallbook + @comment %**end of header (This is for running Texinfo on a region.) +- +-@dircategory Editors +-@direntry +-* Forms: (forms). Emacs package for editing data bases +- by filling in forms. +-@end direntry + + @ifinfo + This file documents Forms mode, a form-editing major mode for GNU Emacs. diff -urN /usr/ports/editors/emacs20/patches/patch-ap emacs20/patches/patch-ap --- /usr/ports/editors/emacs20/patches/patch-ap Thu Jan 1 09:00:00 1970 +++ emacs20/patches/patch-ap Sat Jul 24 01:15:24 1999 @@ -0,0 +1,13 @@ +--- man/gnus.texi.orig Wed Apr 7 07:46:41 1999 ++++ man/gnus.texi Sat Jul 24 01:09:33 1999 +@@ -5,8 +5,9 @@ + @synindex fn cp + @synindex vr cp + @synindex pg cp ++@dircategory The Emacs editor and associated tools + @direntry +-* Gnus: (gnus). The newsreader Gnus. ++* Gnus: (gnus). The newsreader Gnus. + @end direntry + @iftex + @finalout diff -urN /usr/ports/editors/emacs20/patches/patch-aq emacs20/patches/patch-aq --- /usr/ports/editors/emacs20/patches/patch-aq Thu Jan 1 09:00:00 1970 +++ emacs20/patches/patch-aq Sat Jul 24 01:15:38 1999 @@ -0,0 +1,20 @@ +--- man/mh-e.texi.orig Sun May 17 03:51:15 1998 ++++ man/mh-e.texi Sat Jul 24 01:03:41 1999 +@@ -4,13 +4,12 @@ + @setfilename ../info/mh-e + @settitle mh-e + @c %**end of header +- +-@setchapternewpage odd +- +-@dircategory Editors ++@dircategory The Emacs editor and associated tools + @direntry +-* MH-E: (mh-e). Emacs interface to the MH mail system. ++* MH-E: (mh-e). Emacs interface to the MH mail system. + @end direntry ++ ++@setchapternewpage odd + + @c Version variables. + @set EDITION 1.2 diff -urN /usr/ports/editors/emacs20/patches/patch-ar emacs20/patches/patch-ar --- /usr/ports/editors/emacs20/patches/patch-ar Thu Jan 1 09:00:00 1970 +++ emacs20/patches/patch-ar Sat Jul 24 01:15:50 1999 @@ -0,0 +1,24 @@ +--- man/sc.texi.orig Fri Jul 3 03:48:27 1998 ++++ man/sc.texi Sat Jul 24 01:03:42 1999 +@@ -3,15 +3,15 @@ + @comment %**start of header (This is for running Texinfo on a region.) + @setfilename ../info/sc + @settitle Supercite Version 3.1 User's Manual ++@dircategory The Emacs editor and associated tools ++@direntry ++* SC: (sc). Supercite lets you cite parts of messages ++ you're replying to, in flexible ways. ++@end direntry ++ + @iftex + @finalout + @end iftex +- +-@dircategory Editors +-@direntry +-* SC: (sc). Supercite lets you cite parts of messages you're +- replying to, in flexible ways. +-@end direntry + + @c @setchapternewpage odd % For book style double sided manual. + @comment %**end of header (This is for running Texinfo on a region.) diff -urN /usr/ports/editors/emacs20/patches/patch-as emacs20/patches/patch-as --- /usr/ports/editors/emacs20/patches/patch-as Thu Jan 1 09:00:00 1970 +++ emacs20/patches/patch-as Sat Jul 24 01:16:02 1999 @@ -0,0 +1,15 @@ +--- man/vip.texi.orig Sun May 17 03:48:50 1998 ++++ man/vip.texi Sat Jul 24 01:03:40 1999 +@@ -2,10 +2,9 @@ + + @setfilename ../info/vip + @settitle VIP +- +-@dircategory Editors ++@dircategory The Emacs editor and associated tools + @direntry +-* VIP: (vip). An older VI-emulation for Emacs. ++* VIP: (vip). A VI-emulation for Emacs. + @end direntry + + @iftex diff -urN /usr/ports/editors/emacs20/patches/patch-at emacs20/patches/patch-at --- /usr/ports/editors/emacs20/patches/patch-at Thu Jan 1 09:00:00 1970 +++ emacs20/patches/patch-at Sat Jul 24 01:16:15 1999 @@ -0,0 +1,17 @@ +--- man/viper.texi.orig Mon Nov 9 02:13:07 1998 ++++ man/viper.texi Sat Jul 24 01:03:41 1999 +@@ -5,12 +5,9 @@ + @comment @setfilename viper + @comment @setfilename viper.info + @setfilename ../info/viper +- +-@dircategory Editors ++@dircategory The Emacs editor and associated tools + @direntry +-* VIPER: (viper). The newest Emacs VI-emulation mode. +- (also, A VI Plan for Emacs Rescue +- or the VI PERil.) ++* VIPER: (viper). The new VI-emulation mode in Emacs-19.29. + @end direntry + + @iftex diff -urN /usr/ports/editors/emacs20/patches/patch-au emacs20/patches/patch-au --- /usr/ports/editors/emacs20/patches/patch-au Thu Jan 1 09:00:00 1970 +++ emacs20/patches/patch-au Sat Jul 24 01:21:40 1999 @@ -0,0 +1,14 @@ +--- man/ediff.texi.orig Tue Jun 9 12:29:49 1998 ++++ man/ediff.texi Sat Jul 24 01:19:48 1999 +@@ -14,9 +14,9 @@ + @synindex fn cp + @synindex pg cp + +-@dircategory Editors ++@dircategory The Emacs editor and associated tools + @direntry +-* Ediff: (ediff). A visual interface for comparing and merging programs. ++* Ediff: (ediff). A visual interface for comparing and merging programs. + @end direntry + + @iftex diff -urN /usr/ports/editors/emacs20/patches/patch-av emacs20/patches/patch-av --- /usr/ports/editors/emacs20/patches/patch-av Thu Jan 1 09:00:00 1970 +++ emacs20/patches/patch-av Sat Jul 24 01:23:51 1999 @@ -0,0 +1,21 @@ +--- man/message.texi.orig Wed Apr 7 07:48:28 1999 ++++ man/message.texi Sat Jul 24 01:23:30 1999 +@@ -5,15 +5,15 @@ + @synindex fn cp + @synindex vr cp + @synindex pg cp ++@ifinfo ++@dircategory The Emacs editor and associated tools + @direntry +-* Message: (message). Mail and news composition mode that goes with Gnus. ++* Message: (message). Message, the Emacs message composition mode. + @end direntry + @iftex + @finalout + @end iftex + @setchapternewpage odd +- +-@ifinfo + + This file documents Message, the Emacs message composition mode. + diff -urN /usr/ports/editors/emacs20/patches/patch-aw emacs20/patches/patch-aw --- /usr/ports/editors/emacs20/patches/patch-aw Thu Jan 1 09:00:00 1970 +++ emacs20/patches/patch-aw Sat Jul 24 02:33:58 1999 @@ -0,0 +1,16 @@ +--- man/reftex.texi.orig Sat Jul 24 02:31:43 1999 ++++ man/reftex.texi Sat Jul 24 02:33:26 1999 +@@ -2,10 +2,10 @@ + @c %**start of header + @setfilename ../info/reftex + @settitle RefTeX User Manual +-@dircategory Editors ++@dircategory The Emacs editor and associated tools + @direntry +-* reftex: (reftex). Support for LaTeX labels, references, and citations +- with Emacs. ++* reftex: (reftex). Support for LaTeX labels, references, ++ and citations with Emacs. + @end direntry + @synindex ky cp + @syncodeindex vr cp diff -urN /usr/ports/editors/emacs20/patches/patch-ba emacs20/patches/patch-ba --- /usr/ports/editors/emacs20/patches/patch-ba Fri Oct 9 23:51:07 1998 +++ emacs20/patches/patch-ba Thu Jan 1 09:00:00 1970 @@ -1,22 +0,0 @@ ---- lib-src/emacsclient.c.orig Thu Apr 9 02:29:18 1998 -+++ lib-src/emacsclient.c Fri Oct 9 23:31:23 1998 -@@ -225,6 +225,8 @@ - struct stat statbfr; - - gethostname (system_name, sizeof (system_name)); -+ system_name[sizeof (system_name) - 1] = '\0'; -+ /* system_name must be null-terminated string */ - sprintf (server.sun_path, "/tmp/esrv%d-%s", geteuid (), system_name); - - if (stat (server.sun_path, &statbfr) == -1) ---- lib-src/emacsserver.c.orig Mon Apr 6 19:18:22 1998 -+++ lib-src/emacsserver.c Fri Oct 9 23:31:23 1998 -@@ -251,6 +251,8 @@ - server.sun_family = AF_UNIX; - #ifndef SERVER_HOME_DIR - gethostname (system_name, sizeof (system_name)); -+ system_name[sizeof (system_name) - 1] = '\0'; -+ /* system_name must be null-terminated string */ - sprintf (server.sun_path, "/tmp/esrv%d-%s", geteuid (), system_name); - - if (unlink (server.sun_path) == -1 && errno != ENOENT) diff -urN /usr/ports/editors/emacs20/patches/patch-cb emacs20/patches/patch-cb --- /usr/ports/editors/emacs20/patches/patch-cb Thu May 13 22:56:52 1999 +++ emacs20/patches/patch-cb Sat Jul 24 01:31:37 1999 @@ -1,5 +1,5 @@ ---- src/s/freebsd.h.orig Wed Aug 19 02:25:36 1998 -+++ src/s/freebsd.h Fri Apr 9 18:19:53 1999 +--- src/s/freebsd.h.orig Tue Apr 13 03:22:12 1999 ++++ src/s/freebsd.h Sat Jul 24 01:30:10 1999 @@ -45,6 +45,13 @@ #define LIBS_SYSTEM -lutil #define LIBS_TERMCAP -ltermcap @@ -31,13 +31,4 @@ +#define UNEXEC unexelf.o #undef LIB_GCC #define LIB_GCC - -@@ -107,7 +121,7 @@ - #define BSD_SYSTEM 199103 - #elif __FreeBSD__ == 2 - #define BSD_SYSTEM 199306 --#elif __FreeBSD__ == 3 -+#elif __FreeBSD__ >= 3 - #define BSD_SYSTEM 199506 - #endif diff -urN /usr/ports/editors/emacs20/patches/patch-cc emacs20/patches/patch-cc --- /usr/ports/editors/emacs20/patches/patch-cc Sat Jan 23 23:28:22 1999 +++ emacs20/patches/patch-cc Sat Jul 24 01:33:45 1999 @@ -1,16 +1,16 @@ ---- configure.in.orig Wed Jul 1 07:15:05 1998 -+++ configure.in Sun Jan 3 21:44:02 1999 -@@ -57,6 +57,9 @@ - AC_ARG_WITH(gssapi, - [ --with-gssapi support GSSAPI-authenticated POP], - [AC_DEFINE(GSSAPI)]) +--- configure.in.orig Sun May 30 04:26:03 1999 ++++ configure.in Sat Jul 24 01:33:18 1999 +@@ -42,6 +42,9 @@ + AC_ARG_WITH(hesiod, + [ --with-hesiod support Hesiod to get the POP server host], + [AC_DEFINE(HESIOD)]) +AC_ARG_WITH(xpg4, +[ --with-xpg4 support XPG4 library on FreeBSD system], +[AC_DEFINE(USE_XPG)]) dnl This should be the last --with option, because --with-x is dnl added later on when we find the path of X, and it's best to dnl keep them together visually. -@@ -162,6 +165,15 @@ +@@ -147,6 +150,15 @@ machine='' opsys='' unported=no case "${canonical}" in @@ -26,7 +26,7 @@ ## NetBSD ports *-*-netbsd* ) opsys=netbsd -@@ -939,7 +951,6 @@ +@@ -943,7 +955,6 @@ ;; *-sysv4.2uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;; *-386bsd* ) opsys=386bsd ;; diff -urN /usr/ports/editors/emacs20/pkg/PLIST emacs20/pkg/PLIST --- /usr/ports/editors/emacs20/pkg/PLIST Mon Jun 14 00:25:22 1999 +++ emacs20/pkg/PLIST Sat Jul 24 02:34:54 1999 @@ -7,7 +7,6 @@ bin/rcs-checkin @unexec install-info --delete %D/info/ccmode %D/info/dir @unexec install-info --delete %D/info/cl %D/info/dir -@unexec install-info --delete %D/info/customize %D/info/dir @unexec install-info --delete %D/info/dired-x %D/info/dir @unexec install-info --delete %D/info/ediff %D/info/dir @unexec install-info --delete %D/info/emacs %D/info/dir @@ -16,13 +15,13 @@ @unexec install-info --delete %D/info/info %D/info/dir @unexec install-info --delete %D/info/message %D/info/dir @unexec install-info --delete %D/info/mh-e %D/info/dir +@unexec install-info --delete %D/info/reftex %D/info/dir @unexec install-info --delete %D/info/sc %D/info/dir @unexec install-info --delete %D/info/vip %D/info/dir @unexec install-info --delete %D/info/viper %D/info/dir @unexec install-info --delete %D/info/widget %D/info/dir info/ccmode info/cl -info/customize info/dired-x info/ediff info/emacs @@ -31,13 +30,13 @@ info/info info/message info/mh-e +info/reftex info/sc info/vip info/viper info/widget @exec install-info %D/info/ccmode %D/info/dir @exec install-info %D/info/cl %D/info/dir -@exec install-info %D/info/customize %D/info/dir @exec install-info %D/info/dired-x %D/info/dir @exec install-info %D/info/ediff %D/info/dir @exec install-info %D/info/emacs %D/info/dir @@ -46,6 +45,7 @@ @exec install-info %D/info/info %D/info/dir @exec install-info %D/info/message %D/info/dir @exec install-info %D/info/mh-e %D/info/dir +@exec install-info %D/info/reftex %D/info/dir @exec install-info %D/info/sc %D/info/dir @exec install-info %D/info/vip %D/info/dir @exec install-info %D/info/viper %D/info/dir @@ -54,6 +54,7 @@ libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/digest-doc libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/emacsserver libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/fakemail +libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/fns-%%EMACS_VER%%.1.el libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/hexl libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/movemail libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/profile @@ -71,7 +72,7 @@ share/emacs/%%EMACS_VER%%/etc/COPYING share/emacs/%%EMACS_VER%%/etc/DEBUG share/emacs/%%EMACS_VER%%/etc/DISTRIB -share/emacs/%%EMACS_VER%%/etc/DOC-20.3.1 +share/emacs/%%EMACS_VER%%/etc/DOC-%%EMACS_VER%%.1 share/emacs/%%EMACS_VER%%/etc/FAQ share/emacs/%%EMACS_VER%%/etc/FTP share/emacs/%%EMACS_VER%%/etc/GNU @@ -132,7 +133,6 @@ share/emacs/%%EMACS_VER%%/etc/emacstool.1 share/emacs/%%EMACS_VER%%/etc/enriched.doc share/emacs/%%EMACS_VER%%/etc/etags.1 -share/emacs/%%EMACS_VER%%/etc/foo.el share/emacs/%%EMACS_VER%%/etc/future-bug share/emacs/%%EMACS_VER%%/etc/gnu.xpm share/emacs/%%EMACS_VER%%/etc/gnus-tut.txt @@ -508,6 +508,8 @@ share/emacs/%%EMACS_VER%%/lisp/generic.elc share/emacs/%%EMACS_VER%%/lisp/gnus/earcon.el share/emacs/%%EMACS_VER%%/lisp/gnus/earcon.elc +share/emacs/%%EMACS_VER%%/lisp/gnus/gnus-agent.el +share/emacs/%%EMACS_VER%%/lisp/gnus/gnus-agent.elc share/emacs/%%EMACS_VER%%/lisp/gnus/gnus-art.el share/emacs/%%EMACS_VER%%/lisp/gnus/gnus-art.elc share/emacs/%%EMACS_VER%%/lisp/gnus/gnus-async.el @@ -524,6 +526,8 @@ share/emacs/%%EMACS_VER%%/lisp/gnus/gnus-cus.elc share/emacs/%%EMACS_VER%%/lisp/gnus/gnus-demon.el share/emacs/%%EMACS_VER%%/lisp/gnus/gnus-demon.elc +share/emacs/%%EMACS_VER%%/lisp/gnus/gnus-draft.el +share/emacs/%%EMACS_VER%%/lisp/gnus/gnus-draft.elc share/emacs/%%EMACS_VER%%/lisp/gnus/gnus-dup.el share/emacs/%%EMACS_VER%%/lisp/gnus/gnus-dup.elc share/emacs/%%EMACS_VER%%/lisp/gnus/gnus-eform.el @@ -588,6 +592,8 @@ share/emacs/%%EMACS_VER%%/lisp/gnus/message.elc share/emacs/%%EMACS_VER%%/lisp/gnus/messcompat.el share/emacs/%%EMACS_VER%%/lisp/gnus/messcompat.elc +share/emacs/%%EMACS_VER%%/lisp/gnus/nnagent.el +share/emacs/%%EMACS_VER%%/lisp/gnus/nnagent.elc share/emacs/%%EMACS_VER%%/lisp/gnus/nnbabyl.el share/emacs/%%EMACS_VER%%/lisp/gnus/nnbabyl.elc share/emacs/%%EMACS_VER%%/lisp/gnus/nndir.el @@ -606,6 +612,7 @@ share/emacs/%%EMACS_VER%%/lisp/gnus/nnheader.elc share/emacs/%%EMACS_VER%%/lisp/gnus/nnkiboze.el share/emacs/%%EMACS_VER%%/lisp/gnus/nnkiboze.elc +share/emacs/%%EMACS_VER%%/lisp/gnus/nnlistserv.el share/emacs/%%EMACS_VER%%/lisp/gnus/nnmail.el share/emacs/%%EMACS_VER%%/lisp/gnus/nnmail.elc share/emacs/%%EMACS_VER%%/lisp/gnus/nnmbox.el @@ -670,6 +677,8 @@ share/emacs/%%EMACS_VER%%/lisp/international/ccl.elc share/emacs/%%EMACS_VER%%/lisp/international/characters.el share/emacs/%%EMACS_VER%%/lisp/international/characters.elc +share/emacs/%%EMACS_VER%%/lisp/international/codepage.el +share/emacs/%%EMACS_VER%%/lisp/international/codepage.elc share/emacs/%%EMACS_VER%%/lisp/international/encoded-kb.el share/emacs/%%EMACS_VER%%/lisp/international/encoded-kb.elc share/emacs/%%EMACS_VER%%/lisp/international/fontset.el @@ -722,8 +731,6 @@ share/emacs/%%EMACS_VER%%/lisp/isearch.elc share/emacs/%%EMACS_VER%%/lisp/ispell.el share/emacs/%%EMACS_VER%%/lisp/ispell.elc -share/emacs/%%EMACS_VER%%/lisp/ispell4.el -share/emacs/%%EMACS_VER%%/lisp/ispell4.elc share/emacs/%%EMACS_VER%%/lisp/iswitchb.el share/emacs/%%EMACS_VER%%/lisp/iswitchb.elc share/emacs/%%EMACS_VER%%/lisp/jka-compr.el @@ -983,6 +990,8 @@ share/emacs/%%EMACS_VER%%/lisp/progmodes/cc-langs.elc share/emacs/%%EMACS_VER%%/lisp/progmodes/cc-menus.el share/emacs/%%EMACS_VER%%/lisp/progmodes/cc-menus.elc +share/emacs/%%EMACS_VER%%/lisp/progmodes/cc-make.el +share/emacs/%%EMACS_VER%%/lisp/progmodes/cc-make.elc share/emacs/%%EMACS_VER%%/lisp/progmodes/cc-mode.el share/emacs/%%EMACS_VER%%/lisp/progmodes/cc-mode.elc share/emacs/%%EMACS_VER%%/lisp/progmodes/cc-styles.el @@ -1043,10 +1052,16 @@ share/emacs/%%EMACS_VER%%/lisp/progmodes/sh-script.elc share/emacs/%%EMACS_VER%%/lisp/progmodes/simula.el share/emacs/%%EMACS_VER%%/lisp/progmodes/simula.elc +share/emacs/%%EMACS_VER%%/lisp/progmodes/sql.el +share/emacs/%%EMACS_VER%%/lisp/progmodes/sql.elc share/emacs/%%EMACS_VER%%/lisp/progmodes/tcl-mode.el share/emacs/%%EMACS_VER%%/lisp/progmodes/tcl-mode.elc share/emacs/%%EMACS_VER%%/lisp/progmodes/vhdl-mode.el share/emacs/%%EMACS_VER%%/lisp/progmodes/vhdl-mode.elc +share/emacs/%%EMACS_VER%%/lisp/ps-bdf.el +share/emacs/%%EMACS_VER%%/lisp/ps-bdf.elc +share/emacs/%%EMACS_VER%%/lisp/ps-mule.el +share/emacs/%%EMACS_VER%%/lisp/ps-mule.elc share/emacs/%%EMACS_VER%%/lisp/ps-print.el share/emacs/%%EMACS_VER%%/lisp/ps-print.elc share/emacs/%%EMACS_VER%%/lisp/rcompile.el @@ -1091,6 +1106,8 @@ share/emacs/%%EMACS_VER%%/lisp/simple.elc share/emacs/%%EMACS_VER%%/lisp/skeleton.el share/emacs/%%EMACS_VER%%/lisp/skeleton.elc +share/emacs/%%EMACS_VER%%/lisp/snmp-mode.el +share/emacs/%%EMACS_VER%%/lisp/snmp-mode.elc share/emacs/%%EMACS_VER%%/lisp/sort.el share/emacs/%%EMACS_VER%%/lisp/sort.elc share/emacs/%%EMACS_VER%%/lisp/soundex.el >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message