[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

nedit update

To: ports_(_at_)_openbsd_(_dot_)_org
Subject: nedit update
From: Damien Miller <djm_(_at_)_mindrot_(_dot_)_org>
Date: 14 Jan 2004 20:51:02 +1100
Organization:

Updates nedit to the current released version. Comments? OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/nedit/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- Makefile	26 Oct 2002 00:39:15 -0000	1.27
+++ Makefile	14 Jan 2004 06:59:23 -0000
@@ -3,11 +3,12 @@
 
 COMMENT=		"X11/Motif GUI text editor"
 
-DISTNAME=		nedit-5.3RC1-source
-PKGNAME=		nedit-5.3rc1
+DISTNAME=		nedit-5.4-source
+PKGNAME=		nedit-5.4
+WRKDIST=		${WRKDIR}/${PKGNAME}
 CATEGORIES=		editors x11
 
-MASTER_SITES=		http://nedit.org/ftp/beta/
+MASTER_SITES=		http://nedit.org/ftp/v5_4/
 
 HOMEPAGE=		http://www.nedit.org/
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/editors/nedit/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	13 Jun 2002 05:44:57 -0000	1.3
+++ distinfo	14 Jan 2004 06:59:23 -0000
@@ -1,3 +1,3 @@
-MD5 (nedit-5.3RC1-source.tar.gz) = 4e6b84564e19b63a2511a5afa3c1883c
-RMD160 (nedit-5.3RC1-source.tar.gz) = 4ae87fa5713f2ba32ca20360e1e09a1c75418ab7
-SHA1 (nedit-5.3RC1-source.tar.gz) = f03067d3f5435e875ac8f8783abb63414c63e43e
+MD5 (nedit-5.4-source.tar.gz) = 57acc7c1c5959ad376b243d550f1926a
+RMD160 (nedit-5.4-source.tar.gz) = 32378da6ca0423034c4e1a21a2408b17863be6a6
+SHA1 (nedit-5.4-source.tar.gz) = ef63d6ca803cc7f68ab7d9ba9140857d9cdfa9a2
Index: patches/patch-doc_NEdit_ad
===================================================================
RCS file: /cvs/ports/editors/nedit/patches/patch-doc_NEdit_ad,v
retrieving revision 1.1
diff -u -r1.1 patch-doc_NEdit_ad
--- patches/patch-doc_NEdit_ad	16 Nov 2001 08:44:53 -0000	1.1
+++ patches/patch-doc_NEdit_ad	14 Jan 2004 06:59:23 -0000
@@ -1,35 +1,57 @@
 $OpenBSD: patch-doc_NEdit_ad,v 1.1 2001/11/16 08:44:53 form Exp $
---- doc/NEdit.ad.orig	Fri Sep  7 21:16:30 2001
-+++ doc/NEdit.ad	Fri Nov 16 14:32:37 2001
-@@ -22,150 +22,150 @@
- !       very specific defaults for file selection box fonts */
- !nedit*FileSelect*XmList.fontList:-adobe-courier-medium-r-normal-*-12-*-*-*-*-*-*
- !*XmTextField.fontList:-adobe-courier-medium-r-normal-*-12-*-*-*-*-*-*
+--- doc/NEdit.ad.orig	2003-09-29 01:03:50.000000000 +1000
++++ doc/NEdit.ad	2003-12-04 22:25:59.000000000 +1100
+@@ -8,188 +8,188 @@
+ ! Application defaults for NEdit 5.4
+ !
+ !
+-!*FontList: -*-helvetica-medium-r-normal-*-*-120-*-*-*-iso8859-1
+-!*XmText.FontList: -*-courier-medium-r-normal-*-*-120-*-*-*-iso8859-1
+-!*XmTextField.FontList: -*-courier-medium-r-normal-*-*-120-*-*-*-iso8859-1
+-!*XmList.FontList: -*-courier-medium-r-normal-*-*-120-*-*-*-iso8859-1
+-!*XmFileSelectionBox*XmList.FontList: -*-courier-medium-r-normal-*-*-120-*-*-*-iso8859-1
 -!*background: #b3b3b3
 -!*foreground: black
--!*text.lineNumForeground: #777777
--!*text.background: #e5e5e5
+-!*XmText.foreground: black
+-!*XmText.background: rgb:e5/e5/e5
+-!*XmList.foreground: black
+-!*XmList.background: rgb:e5/e5/e5
+-!*XmTextField.foreground: black
+-!*XmTextField.background: rgb:e5/e5/e5
+-!*XmText.translations: #override\n
+-!    Ctrl~Alt~Meta<KeyPress>v: paste-clipboard()\n
+-!    Ctrl~Alt~Meta<KeyPress>c: copy-clipboard()\n
+-!    Ctrl~Alt~Meta<KeyPress>x: cut-clipboard()\n
+-!    Ctrl~Alt~Meta<KeyPress>u: delete-to-start-of-line()\n
+-!*XmTextField.translations: #override\n
+-!    Ctrl~Alt~Meta<KeyPress>v: paste-clipboard()\n
+-!    Ctrl~Alt~Meta<KeyPress>c: copy-clipboard()\n
+-!    Ctrl~Alt~Meta<KeyPress>x: cut-clipboard()\n
+-!    Ctrl~Alt~Meta<KeyPress>u: delete-to-start-of-line()\n
+-!*XmFileSelectionBox.resizePolicy: XmRESIZE_NONE
+-!*XmFileSelectionBox.textAccelerators:
+-!*text.lineNumForeground: black
+-!*text.background: rgb:e5/e5/e5
 -!*text.foreground: black
+-!*text.highlightForeground: white
 -!*text.highlightBackground: red
--!*text.highlightForeground: black
--!*XmText*foreground: black
--!*XmText*background: #cccccc
--!*helpText.background: #cccccc
+-!*textFrame.shadowThickness: 1
+-!*menuBar.marginHeight: 0
+-!*menuBar.shadowThickness: 1
+-!*pane.sashHeight: 11
+-!*pane.sashWidth: 11
+-!*pane.marginWidth: 0
+-!*pane.marginHeight: 0
+-!*scrolledW*spacing: 0
+-!*text.selectionArrayCount: 3
+-!*helpText.background: rgb:cc/cc/cc
 -!*helpText.foreground: black
 -!*helpText.selectBackground: #b3b3b3
--!*helpText.font: -adobe-courier-medium-r-normal-*-12-*-*-*-*-*-*
--!*XmText.translations: #override \
--!Ctrl~Alt~Meta<KeyPress>v: paste-clipboard()\n\
--!Ctrl~Alt~Meta<KeyPress>c: copy-clipboard()\n\
--!Ctrl~Alt~Meta<KeyPress>x: cut-clipboard()\n
--!*XmTextField.translations: #override \
--!Ctrl~Alt~Meta<KeyPress>v: paste-clipboard()\n\
--!Ctrl~Alt~Meta<KeyPress>c: copy-clipboard()\n\
--!Ctrl~Alt~Meta<KeyPress>x: cut-clipboard()\n
--!*XmList*foreground: black
--!*XmList*background: #cccccc
--!*XmTextField*background: #cccccc
--!*XmTextField*foreground: black
+-!*statsLine.background: #b3b3b3
+-!*statsLine.FontList: -*-helvetica-medium-r-normal-*-*-120-*-*-*-iso8859-1
+-!*helpText.font: -*-courier-medium-r-normal-*-*-120-*-*-*-iso8859-1
+-!*calltip.background: LemonChiffon1
+-!*calltip.foreground: black
 -!*iSearchForm*highlightThickness: 1
 -!*fileMenu.tearOffModel: XmTEAR_OFF_ENABLED
 -!*editMenu.tearOffModel: XmTEAR_OFF_ENABLED
@@ -86,8 +108,8 @@
 -!*editMenu.fillParagraph.acceleratorText: Ctrl+J
 -!*editMenu.insertFormFeed.accelerator: Alt Ctrl<Key>l
 -!*editMenu.insertFormFeed.acceleratorText: Alt+Ctrl+L
--!*editMenu.insControlCode.accelerator: Alt<Key>i
--!*editMenu.insControlCode.acceleratorText: Alt+I
+-!*editMenu.insertCtrlCode.accelerator: Alt Ctrl<Key>i
+-!*editMenu.insertCtrlCode.acceleratorText: Alt+Ctrl+I
 -!*searchMenu.mnemonic: S
 -!*searchMenu.find.accelerator: Ctrl<Key>f
 -!*searchMenu.find.acceleratorText: [Shift]Ctrl+F
@@ -104,9 +126,15 @@
 -!*searchMenu.replace.accelerator: Ctrl<Key>r
 -!*searchMenu.replace.acceleratorText: [Shift]Ctrl+R
 -!*searchMenu.replaceShift.accelerator: Shift Ctrl<Key>r
--!*searchMenu.replaceAgain.accelerator: Ctrl<Key>t
--!*searchMenu.replaceAgain.acceleratorText: [Shift]Ctrl+T
--!*searchMenu.replaceAgainShift.accelerator: Shift Ctrl<Key>t
+-!*searchMenu.findReplace.accelerator: Ctrl<Key>r
+-!*searchMenu.findReplace.acceleratorText: [Shift]Ctrl+R
+-!*searchMenu.findReplaceShift.accelerator: Shift Ctrl<Key>r
+-!*searchMenu.replaceFindAgain.accelerator: Ctrl<Key>t
+-!*searchMenu.replaceFindAgain.acceleratorText: [Shift]Ctrl+T
+-!*searchMenu.replaceFindAgainShift.accelerator: Shift Ctrl<Key>t
+-!*searchMenu.replaceAgain.accelerator: Alt<Key>t
+-!*searchMenu.replaceAgain.acceleratorText: [Shift]Alt+T
+-!*searchMenu.replaceAgainShift.accelerator: Shift Alt<Key>t
 -!*searchMenu.gotoLineNumber.accelerator: Ctrl<Key>l
 -!*searchMenu.gotoLineNumber.acceleratorText: Ctrl+L
 -!*searchMenu.gotoSelected.accelerator: Ctrl<Key>e
@@ -121,18 +149,19 @@
 -!*searchMenu.gotoMatchingShift.accelerator: Shift Ctrl<Key>m
 -!*searchMenu.findDefinition.accelerator: Ctrl<Key>d
 -!*searchMenu.findDefinition.acceleratorText: Ctrl+D
+-!*searchMenu.showCalltip.accelerator: Ctrl<Key>apostrophe
+-!*searchMenu.showCalltip.acceleratorText: Ctrl+'
 -!*preferencesMenu.mnemonic: P
 -!*preferencesMenu.statisticsLine.accelerator: Alt<Key>a
 -!*preferencesMenu.statisticsLine.acceleratorText: Alt+A
--!*preferencesMenu.overtype.accelerator: Ctrl<Key>b
--!*preferencesMenu.overtype.acceleratorText: Ctrl+B
+-!*preferencesMenu.overtype.acceleratorText: Insert
 -!*shellMenu.mnemonic: l
 -!*shellMenu.filterSelection.accelerator: Alt<Key>r
 -!*shellMenu.filterSelection.acceleratorText: Alt+R
 -!*shellMenu.executeCommand.accelerator: Alt<Key>x
 -!*shellMenu.executeCommand.acceleratorText: Alt+X
--!*shellMenu.executeCommandLine.accelerator: <Key>KP_Enter
--!*shellMenu.executeCommandLine.acceleratorText: KP Enter
+-!*shellMenu.executeCommandLine.accelerator: Ctrl<Key>KP_Enter
+-!*shellMenu.executeCommandLine.acceleratorText: Ctrl+KP Enter
 -!*shellMenu.cancelShellCommand.accelerator: Ctrl<Key>period
 -!*shellMenu.cancelShellCommand.acceleratorText: Ctrl+.
 -!*macroMenu.mnemonic: c
@@ -152,31 +181,61 @@
 -!*windowsMenu.closePane.accelerator: Ctrl<Key>1
 -!*windowsMenu.closePane.acceleratorText: Ctrl+1
 -!*helpMenu.mnemonic: H
+-!*helpForm.sw.helpText*translations: #override\
+-!    <Key>Tab: help-focus-buttons()\n\
+-!    <Key>Return: help-button-action("dismiss")\n\
+-!    <KeyPress>osfCancel: help-button-action("dismiss")\n\
+-!    ~Meta~Ctrl~Shift<Btn1Down>: grab-focus() help-hyperlink()\n\
+-!    ~Meta~Ctrl~Shift<Btn1Up>: help-hyperlink("current", "process-cancel", "extend-end")\n\
+-!    ~Meta~Ctrl~Shift<Btn2Down>: process-bdrag() help-hyperlink()\n\
+-!    ~Meta~Ctrl~Shift<Btn2Up>: help-hyperlink(\"new", "process-cancel", "copy-to")
++*FontList: -*-helvetica-medium-r-normal-*-*-120-*-*-*-iso8859-1
++*XmText.FontList: -*-courier-medium-r-normal-*-*-120-*-*-*-iso8859-1
++*XmTextField.FontList: -*-courier-medium-r-normal-*-*-120-*-*-*-iso8859-1
++*XmList.FontList: -*-courier-medium-r-normal-*-*-120-*-*-*-iso8859-1
++*XmFileSelectionBox*XmList.FontList: -*-courier-medium-r-normal-*-*-120-*-*-*-iso8859-1
 +*background: #b3b3b3
 +*foreground: black
-+*text.lineNumForeground: #777777
-+*text.background: #e5e5e5
++*XmText.foreground: black
++*XmText.background: rgb:e5/e5/e5
++*XmList.foreground: black
++*XmList.background: rgb:e5/e5/e5
++*XmTextField.foreground: black
++*XmTextField.background: rgb:e5/e5/e5
++*XmText.translations: #override\n
++    Ctrl~Alt~Meta<KeyPress>v: paste-clipboard()\n
++    Ctrl~Alt~Meta<KeyPress>c: copy-clipboard()\n
++    Ctrl~Alt~Meta<KeyPress>x: cut-clipboard()\n
++    Ctrl~Alt~Meta<KeyPress>u: delete-to-start-of-line()\n
++*XmTextField.translations: #override\n
++    Ctrl~Alt~Meta<KeyPress>v: paste-clipboard()\n
++    Ctrl~Alt~Meta<KeyPress>c: copy-clipboard()\n
++    Ctrl~Alt~Meta<KeyPress>x: cut-clipboard()\n
++    Ctrl~Alt~Meta<KeyPress>u: delete-to-start-of-line()\n
++*XmFileSelectionBox.resizePolicy: XmRESIZE_NONE
++*XmFileSelectionBox.textAccelerators:
++*text.lineNumForeground: black
++*text.background: rgb:e5/e5/e5
 +*text.foreground: black
++*text.highlightForeground: white
 +*text.highlightBackground: red
-+*text.highlightForeground: black
-+*XmText*foreground: black
-+*XmText*background: #cccccc
-+*helpText.background: #cccccc
++*textFrame.shadowThickness: 1
++*menuBar.marginHeight: 0
++*menuBar.shadowThickness: 1
++*pane.sashHeight: 11
++*pane.sashWidth: 11
++*pane.marginWidth: 0
++*pane.marginHeight: 0
++*scrolledW*spacing: 0
++*text.selectionArrayCount: 3
++*helpText.background: rgb:cc/cc/cc
 +*helpText.foreground: black
 +*helpText.selectBackground: #b3b3b3
-+*helpText.font: -adobe-courier-medium-r-normal-*-12-*-*-*-*-*-*
-+*XmText.translations: #override \
-+Ctrl~Alt~Meta<KeyPress>v: paste-clipboard()\n\
-+Ctrl~Alt~Meta<KeyPress>c: copy-clipboard()\n\
-+Ctrl~Alt~Meta<KeyPress>x: cut-clipboard()\n
-+*XmTextField.translations: #override \
-+Ctrl~Alt~Meta<KeyPress>v: paste-clipboard()\n\
-+Ctrl~Alt~Meta<KeyPress>c: copy-clipboard()\n\
-+Ctrl~Alt~Meta<KeyPress>x: cut-clipboard()\n
-+*XmList*foreground: black
-+*XmList*background: #cccccc
-+*XmTextField*background: #cccccc
-+*XmTextField*foreground: black
++*statsLine.background: #b3b3b3
++*statsLine.FontList: -*-helvetica-medium-r-normal-*-*-120-*-*-*-iso8859-1
++*helpText.font: -*-courier-medium-r-normal-*-*-120-*-*-*-iso8859-1
++*calltip.background: LemonChiffon1
++*calltip.foreground: black
 +*iSearchForm*highlightThickness: 1
 +*fileMenu.tearOffModel: XmTEAR_OFF_ENABLED
 +*editMenu.tearOffModel: XmTEAR_OFF_ENABLED
@@ -233,8 +292,8 @@
 +*editMenu.fillParagraph.acceleratorText: Ctrl+J
 +*editMenu.insertFormFeed.accelerator: Alt Ctrl<Key>l
 +*editMenu.insertFormFeed.acceleratorText: Alt+Ctrl+L
-+*editMenu.insControlCode.accelerator: Alt<Key>i
-+*editMenu.insControlCode.acceleratorText: Alt+I
++*editMenu.insertCtrlCode.accelerator: Alt Ctrl<Key>i
++*editMenu.insertCtrlCode.acceleratorText: Alt+Ctrl+I
 +*searchMenu.mnemonic: S
 +*searchMenu.find.accelerator: Ctrl<Key>f
 +*searchMenu.find.acceleratorText: [Shift]Ctrl+F
@@ -251,9 +310,15 @@
 +*searchMenu.replace.accelerator: Ctrl<Key>r
 +*searchMenu.replace.acceleratorText: [Shift]Ctrl+R
 +*searchMenu.replaceShift.accelerator: Shift Ctrl<Key>r
-+*searchMenu.replaceAgain.accelerator: Ctrl<Key>t
-+*searchMenu.replaceAgain.acceleratorText: [Shift]Ctrl+T
-+*searchMenu.replaceAgainShift.accelerator: Shift Ctrl<Key>t
++*searchMenu.findReplace.accelerator: Ctrl<Key>r
++*searchMenu.findReplace.acceleratorText: [Shift]Ctrl+R
++*searchMenu.findReplaceShift.accelerator: Shift Ctrl<Key>r
++*searchMenu.replaceFindAgain.accelerator: Ctrl<Key>t
++*searchMenu.replaceFindAgain.acceleratorText: [Shift]Ctrl+T
++*searchMenu.replaceFindAgainShift.accelerator: Shift Ctrl<Key>t
++*searchMenu.replaceAgain.accelerator: Alt<Key>t
++*searchMenu.replaceAgain.acceleratorText: [Shift]Alt+T
++*searchMenu.replaceAgainShift.accelerator: Shift Alt<Key>t
 +*searchMenu.gotoLineNumber.accelerator: Ctrl<Key>l
 +*searchMenu.gotoLineNumber.acceleratorText: Ctrl+L
 +*searchMenu.gotoSelected.accelerator: Ctrl<Key>e
@@ -268,18 +333,19 @@
 +*searchMenu.gotoMatchingShift.accelerator: Shift Ctrl<Key>m
 +*searchMenu.findDefinition.accelerator: Ctrl<Key>d
 +*searchMenu.findDefinition.acceleratorText: Ctrl+D
++*searchMenu.showCalltip.accelerator: Ctrl<Key>apostrophe
++*searchMenu.showCalltip.acceleratorText: Ctrl+'
 +*preferencesMenu.mnemonic: P
 +*preferencesMenu.statisticsLine.accelerator: Alt<Key>a
 +*preferencesMenu.statisticsLine.acceleratorText: Alt+A
-+*preferencesMenu.overtype.accelerator: Ctrl<Key>b
-+*preferencesMenu.overtype.acceleratorText: Ctrl+B
++*preferencesMenu.overtype.acceleratorText: Insert
 +*shellMenu.mnemonic: l
 +*shellMenu.filterSelection.accelerator: Alt<Key>r
 +*shellMenu.filterSelection.acceleratorText: Alt+R
 +*shellMenu.executeCommand.accelerator: Alt<Key>x
 +*shellMenu.executeCommand.acceleratorText: Alt+X
-+*shellMenu.executeCommandLine.accelerator: <Key>KP_Enter
-+*shellMenu.executeCommandLine.acceleratorText: KP Enter
++*shellMenu.executeCommandLine.accelerator: Ctrl<Key>KP_Enter
++*shellMenu.executeCommandLine.acceleratorText: Ctrl+KP Enter
 +*shellMenu.cancelShellCommand.accelerator: Ctrl<Key>period
 +*shellMenu.cancelShellCommand.acceleratorText: Ctrl+.
 +*macroMenu.mnemonic: c
@@ -299,3 +365,12 @@
 +*windowsMenu.closePane.accelerator: Ctrl<Key>1
 +*windowsMenu.closePane.acceleratorText: Ctrl+1
 +*helpMenu.mnemonic: H
++*helpForm.sw.helpText*translations: #override\
++    <Key>Tab: help-focus-buttons()\n\
++    <Key>Return: help-button-action("dismiss")\n\
++    <KeyPress>osfCancel: help-button-action("dismiss")\n\
++    ~Meta~Ctrl~Shift<Btn1Down>: grab-focus() help-hyperlink()\n\
++    ~Meta~Ctrl~Shift<Btn1Up>: help-hyperlink("current", "process-cancel", "extend-end")\n\
++    ~Meta~Ctrl~Shift<Btn2Down>: process-bdrag() help-hyperlink()\n\
++    ~Meta~Ctrl~Shift<Btn2Up>: help-hyperlink(\"new", "process-cancel", "copy-to")
+ 
Index: patches/patch-doc_nc_man
===================================================================
RCS file: /cvs/ports/editors/nedit/patches/patch-doc_nc_man,v
retrieving revision 1.2
diff -u -r1.2 patch-doc_nc_man
--- patches/patch-doc_nc_man	26 Aug 2002 04:23:24 -0000	1.2
+++ patches/patch-doc_nc_man	14 Jan 2004 06:59:23 -0000
@@ -1,88 +1,104 @@
 $OpenBSD: patch-doc_nc_man,v 1.2 2002/08/26 04:23:24 pvalchev Exp $
---- doc/nc.man.orig	Wed Oct 31 13:27:55 2001
-+++ doc/nc.man	Wed Oct 31 13:29:09 2001
-@@ -137,26 +137,26 @@
- .rm #[ #] #H #V #F C
- .\" ======================================================================
- .\"
--.IX Title "NC 1"
--.TH NC 1 " " "2001-08-12" " "
-+.IX Title "NCL 1"
-+.TH NCL 1 " " "2001-08-12" " "
+--- doc/nc.man.orig	2003-11-21 05:40:13.000000000 +1100
++++ doc/nc.man	2003-12-04 22:27:20.000000000 +1100
+@@ -141,10 +141,10 @@
+ .TH NC 1 "NEdit 5.4" "2003-10-14" "NEdit documentation"
  .UC
  .SH "NAME"
 -nc \- Client program for NEdit text editor
-+ncl \- Client program for NEdit text editor
++nc1 \- Client program for NEdit text editor
  .SH "SYNOPSYS"
  .IX Header "SYNOPSYS"
--\&\fBnc\fR [\fB\-read\fR] [\fB\-create\fR] [\fB\-line\fR \fIn\fR | \fB+\fR\fIn\fR] [\fB\-do\fR \fIcommand\fR]
-+\&\fBncl\fR [\fB\-read\fR] [\fB\-create\fR] [\fB\-line\fR \fIn\fR | \fB+\fR\fIn\fR] [\fB\-do\fR \fIcommand\fR]
- [\fB\-ask\fR] [\fB\-noask\fR] [\fB\-svrname\fR \fIname\fR] [\fB\-svrcmd\fR \fIcommand\fR] [\fB\-lm\fR
- \&\fIlanguagemode\fR] [\fB\-geometry\fR \fIgeometry\fR]  [\fB\-iconic\fR] [\fB\-display\fR
- \&\fI[host]:server[.screen]\fR] [file...]
+-nc [\fB\-read\fR] [\fB\-create\fR] [\fB\-line\fR \fIn\fR | \fB+\fR\fIn\fR] [\fB\-do\fR \fIcommand\fR] 
++nc1 [\fB\-read\fR] [\fB\-create\fR] [\fB\-line\fR \fIn\fR | \fB+\fR\fIn\fR] [\fB\-do\fR \fIcommand\fR] 
+    [\fB\-ask\fR] [\fB\-noask\fR] [\fB\-svrname\fR \fIname\fR] [\fB\-svrcmd\fR \fIcommand\fR] 
+    [\fB\-lm\fR \fIlanguagemode\fR] 
+    [\fB\-geometry\fR \fIgeometry\fR | \fB\-g\fR \fIgeometry\fR] [\fB\-icon\fR | \fB\-iconic\fR] 
+@@ -154,13 +154,13 @@ nc [\fB\-read\fR] [\fB\-create\fR] [\fB\
+    [\fB\--\fR] [file...]
  .SH "DESCRIPTION"
  .IX Header "DESCRIPTION"
 -\&\fBnc\fR is the client interface to the NEdit text editor. A server can be started
-+\&\fBncl\fR is the client interface to the NEdit text editor. A server can be started
++\&\fBnc1\fR is the client interface to the NEdit text editor. A server can be started
  explicitly by running NEdit in server mode:
  .PP
  .Vb 1
- \&  nedit -server
+ \& nedit -server
  .Ve
--If no server is running, \fBnc\fR will start one unless configured otherwize.
-+If no server is running, \fBncl\fR will start one unless configured otherwize.
+-If no server is running, \fBnc\fR will start one unless configured otherwise.
++If no server is running, \fBnc1\fR will start one unless configured otherwise.
  Client/server mode is useful for integrating NEdit with software development
  environments, mailers, and other programs; or just as a quick way to open files
  from the shell command line without starting a new NEdit session.
-@@ -177,17 +177,17 @@ Execute an NEdit macro or action. On eac
- the command line. 
+@@ -181,21 +181,21 @@ Execute an NEdit macro or action on the 
+ command line. Note that other files mentioned in the command line are not
+ affected. 
+ .Sp
+-If you use this command without a filename, \fBnc\fR would randomly choose one
++If you use this command without a filename, \fBnc1\fR would randomly choose one
+ window to focus and execute the macro in.
  .Ip "\fB\-ask\fR, \fB\-noask\fR" 4
  .IX Item "-ask, -noask"
 -Instructs \fBnc\fR whether to automatically start a server if one is not
-+Instructs \fBncl\fR whether to automatically start a server if one is not
- available. This is also settable via the X resource, \f(CW\*(C`nc.autoStart\*(C'\fR.
++Instructs \fBnc1\fR whether to automatically start a server if one is not
+ available. This overrides the X resource `nc.autoStart'.
  .Ip "\fB\-svrname\fR \fIname\fR" 4
  .IX Item "-svrname name"
 -Explicitly instructs \fBnc\fR which server to connect to, an instance of
-+Explicitly instructs \fBncl\fR which server to connect to, an instance of
- \&\fBnedit\fR(1) with a corresponding \fB\-svrname\fR argument.  By naming servers, you
++Explicitly instructs \fBnc1\fR which server to connect to, an instance of
+ \&\fInedit\fR\|(1) with a corresponding \fB\-svrname\fR argument.  By naming servers, you
  can run several simultaneously, and direct files and commands specifically to
  any one.
  .Ip "\fB\-svrcmd\fR \fIcommand\fR" 4
  .IX Item "-svrcmd command"
 -The command which \fBnc\fR uses to start an NEdit server. It is also settable via
-+The command which \fBncl\fR uses to start an NEdit server. It is also settable via
- the X resource \f(CW\*(C`nc.serverCommand\*(C'\fR, by default, \fI\*(L"nedit \-server\*(R"\fR.
++The command which \fBnc1\fR uses to start an NEdit server. It is also settable via
+ the X resource `nc.serverCommand', by default, \fI\*(L"nedit \-server\*(R"\fR.
  .Ip "\fB\-lm\fR \fIlanguagemode\fR" 4
  .IX Item "-lm languagemode"
-@@ -226,11 +226,11 @@ for your display:
+@@ -230,11 +230,11 @@ Under rare conditions (such as a slow co
+ increase the time-out period. In most cases, the default is fine. 
+ .Ip "\fB\-wait\fR" 4
+ .IX Item "-wait"
+-Instructs \fBnc\fR not to return to the shell until all files given
++Instructs \fBnc1\fR not to return to the shell until all files given
+ are closed.
+ .Sp
+-Normally, \fBnc\fR returns once the files given in its command line
+-are opened by the server. When this option is given, nc returns
++Normally, \fBnc1\fR returns once the files given in its command line
++are opened by the server. When this option is given, nc1 returns
+ only after the last file given in this call is closed.
+ Note that this option affects all files, not only the ones
+ following this option in the command line.
+@@ -262,11 +262,11 @@ for your display:
  .Ve
  .SH "NOTES"
  .IX Header "NOTES"
--Communication between \fBnc\fR and \fBnedit\fR(1) is through the X display. So as
+-Communication between \fInc\fR\|(1) and \fInedit\fR\|(1) is through the X display. So as
 -long as X windows is set up and working properly, \fBnc\fR will work properly
--as well. \fBnc\fR uses the \f(CW\*(C`DISPLAY\*(C'\fR environment variable, the machine name and
-+Communication between \fBncl\fR and \fBnedit\fR(1) is through the X display. So as
-+long as X is set up and working properly, \fBncl\fR will work properly
-+as well. \fBncl\fR uses the \f(CW\*(C`DISPLAY\*(C'\fR environment variable, the machine name and
+-as well. \fBnc\fR uses the `\s-1DISPLAY\s0' environment variable, the machine name and
++Communication between \fInc1\fR\|(1) and \fInedit\fR\|(1) is through the X display. So as
++long as X windows is set up and working properly, \fBnc1\fR will work properly
++as well. \fBnc1\fR uses the `\s-1DISPLAY\s0' environment variable, the machine name and
  your user name to find the appropriate server, meaning, if you have several
 -machines sharing a common file system, \fBnc\fR will not be able to find a server
-+machines sharing a common file system, \fBncl\fR will not be able to find a server
++machines sharing a common file system, \fBnc1\fR will not be able to find a server
  that is running on a machine with a different host name, even though it may be
  perfectly appropriate for editing a given file.
  .PP
-@@ -239,12 +239,12 @@ command line, for example:
+@@ -275,12 +275,12 @@ command line, for example:
  .Ip "incorrect:" 4
  .IX Item "incorrect:"
  .Vb 1
 -\&  nc file.c -line 25
-+\&  ncl file.c -line 25
++\&  nc1 file.c -line 25
  .Ve
  .Ip "correct:" 4
  .IX Item "correct:"
  .Vb 1
 -\&  nc -line 25 file.c
-+\&  ncl -line 25 file.c
++\&  nc1 -line 25 file.c
  .Ve
  .PP
  For more information see NEdit's online help, or \fInedit.doc\fR in the NEdit
Index: patches/patch-doc_nedit_doc
===================================================================
RCS file: /cvs/ports/editors/nedit/patches/patch-doc_nedit_doc,v
retrieving revision 1.2
diff -u -r1.2 patch-doc_nedit_doc
--- patches/patch-doc_nedit_doc	13 Jun 2002 05:44:57 -0000	1.2
+++ patches/patch-doc_nedit_doc	14 Jan 2004 06:59:23 -0000
@@ -1,9 +1,9 @@
 $OpenBSD: patch-doc_nedit_doc,v 1.2 2002/06/13 05:44:57 form Exp $
---- doc/nedit.doc.orig	Thu Jun 13 12:24:59 2002
-+++ doc/nedit.doc	Thu Jun 13 12:25:38 2002
+--- doc/nedit.doc.orig	2003-11-21 05:40:11.000000000 +1100
++++ doc/nedit.doc	2003-12-04 22:24:52.000000000 +1100
 @@ -4,6 +4,10 @@
  
- NEdit 5.3RC1                                               March 19, 2002
+ NEdit 5.4                                               November 20, 2003
  
 +  NOTE: Due to conflict with the program nc - Arbitrary tcp and udp
 +  connections and listens - the NEdit Client program, called nc in this
Index: patches/patch-doc_nedit_man
===================================================================
RCS file: /cvs/ports/editors/nedit/patches/patch-doc_nedit_man,v
retrieving revision 1.1
diff -u -r1.1 patch-doc_nedit_man
--- patches/patch-doc_nedit_man	31 Oct 2001 08:03:19 -0000	1.1
+++ patches/patch-doc_nedit_man	14 Jan 2004 06:59:23 -0000
@@ -1,39 +1,39 @@
 $OpenBSD: patch-doc_nedit_man,v 1.1 2001/10/31 08:03:19 form Exp $
---- doc/nedit.man.orig	Wed Oct 31 13:31:16 2001
-+++ doc/nedit.man	Wed Oct 31 13:32:03 2001
-@@ -172,14 +172,14 @@ Go to line number \fIn\fR.
+--- doc/nedit.man.orig	2003-11-21 05:40:12.000000000 +1100
++++ doc/nedit.man	2003-12-04 22:36:29.000000000 +1100
+@@ -177,14 +177,14 @@ Go to line number \fIn\fR.
  .Ip "\fB\-server\fR" 4
  .IX Item "-server"
  Designate this session as an NEdit server, for processing commands from the
 -\&\fInc\fR\|(1) program. \fInc\fR\|(1) can be used to interface NEdit to code development
-+\&\fIncl\fR\|(1) program. \fIncl\fR\|(1) can be used to interface NEdit to code development
++\&\fInc1\fR\|(1) program. \fInc1\fR\|(1) can be used to interface NEdit to code development
  environments, mailers, etc., or just as a quick way to open files from the
  shell command line without starting a new NEdit session.
  .Ip "\fB\-do\fR \fIcommand\fR" 4
  .IX Item "-do command"
  Execute an NEdit macro or action. On each file following the \fB\-do\fR argument on
 -the command line. \fB\-do\fR is particularly useful from the \fInc\fR\|(1) program, where
--\&\f(CW\*(C`nc \-do\*(C'\fR can remotely execute commands in an nedit \fB\-server\fR session.
-+the command line. \fB\-do\fR is particularly useful from the \fIncl\fR\|(1) program, where
-+\&\f(CW\*(C`ncl \-do\*(C'\fR can remotely execute commands in an nedit \fB\-server\fR session.
+-`nc \-do' can remotely execute commands in an nedit \fB\-server\fR session.
++the command line. \fB\-do\fR is particularly useful from the \fInc1\fR\|(1) program, where
++`nc1 \-do' can remotely execute commands in an nedit \fB\-server\fR session.
  .Ip "\fB\-tags\fR \fIfile\fR" 4
  .IX Item "-tags file"
  Load a file of directions for finding definitions of program subroutines and
-@@ -252,7 +252,7 @@ Set the value of an X resource to overri
+@@ -257,7 +257,7 @@ Set the value of an X resource to overri
  .Ip "\fB\-svrname\fR \fIname\fR" 4
  .IX Item "-svrname name"
  When starting nedit in server mode, name the server, such that it responds to
 -requests only when \fInc\fR\|(1) is given a corresponding \fB\-svrname\fR argument.  By
-+requests only when \fIncl\fR\|(1) is given a corresponding \fB\-svrname\fR argument.  By
++requests only when \fInc1\fR\|(1) is given a corresponding \fB\-svrname\fR argument.  By
  naming servers, you can run several simultaneously, and direct files and
  commands specifically to any one.
  .Ip "\fB\-import\fR \fIfile\fR" 4
-@@ -300,7 +300,7 @@ NEdit sources, executables, additional d
+@@ -341,7 +341,7 @@ NEdit sources, executables, additional d
  are available from the NEdit web site at http://nedit.org.
  .SH "SEE ALSO"
  .IX Header "SEE ALSO"
--\&\fInc\fR\|(1), X(1), \fImwm\fR\|(1), \fIvi\fR\|(1), \fIemacs\fR\|(1), \fIctags\fR\|(1)
-+\&\fIncl\fR\|(1), X(1), \fImwm\fR\|(1), \fIvi\fR\|(1), \fIemacs\fR\|(1), \fIctags\fR\|(1)
+-\&\fInc\fR\|(1), X(1), \fImwm\fR\|(1), \fIctags\fR\|(1), \fIetags\fR\|(1)
++\&\fInc1\fR\|(1), X(1), \fImwm\fR\|(1), \fIctags\fR\|(1), \fIetags\fR\|(1)
  .SH "AUTHORS"
  .IX Header "AUTHORS"
  NEdit was written by Mark Edel, Joy Kyriakopulos, Christopher Conrad, Jim
Index: patches/patch-makefiles_Makefile_openbsd
===================================================================
RCS file: /cvs/ports/editors/nedit/patches/patch-makefiles_Makefile_openbsd,v
retrieving revision 1.1
diff -u -r1.1 patch-makefiles_Makefile_openbsd
--- patches/patch-makefiles_Makefile_openbsd	13 Jun 2002 05:44:57 -0000	1.1
+++ patches/patch-makefiles_Makefile_openbsd	14 Jan 2004 06:59:23 -0000
@@ -1,8 +1,8 @@
 $OpenBSD: patch-makefiles_Makefile_openbsd,v 1.1 2002/06/13 05:44:57 form Exp $
---- makefiles/Makefile.openbsd.orig	Thu Nov 15 20:28:28 2001
-+++ makefiles/Makefile.openbsd	Thu Jun 13 12:22:13 2002
-@@ -1,14 +1,18 @@
- # $Id: patch-makefiles_Makefile_openbsd,v 1.1 2002/06/13 05:44:57 form Exp $
+--- makefiles/Makefile.openbsd.orig	2003-09-29 01:03:10.000000000 +1000
++++ makefiles/Makefile.openbsd	2003-12-04 22:38:12.000000000 +1100
+@@ -1,6 +1,6 @@
+ # $Id: Makefile.openbsd,v 1.3.2.1 2003/09/28 15:03:10 edg Exp $
 -CC=cc
 -AR=ar
 +CC?=cc
@@ -10,8 +10,9 @@
  
  # For editres, add -DEDITRES to CFLAGS and -lXmu to LIBS
  #
- # To evaluate an alternative layout for the Replace/Find dialog, add
- # -DREPLACE_SCOPE to the CFLAGS. See the README file for more information.
+@@ -10,9 +10,13 @@ AR=ar
+ # To test if the Motif library exports the runtime version
+ # add -DHAVE__XMVERSIONSTRING to CFLAGS
  #
 -CFLAGS=-O -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD
 +LOCALBASE?=/usr/local
@@ -24,3 +25,4 @@
 +LIBS=-L${X11BASE}/lib ${MOTIFLIB} -lXpm -lXp -lXext -lXt -lSM -lICE -lX11 -lm
  
  include Makefile.common
+ 
Index: patches/patch-source_file_c
===================================================================
RCS file: /cvs/ports/editors/nedit/patches/patch-source_file_c,v
retrieving revision 1.3
diff -u -r1.3 patch-source_file_c
--- patches/patch-source_file_c	13 Jun 2002 05:44:57 -0000	1.3
+++ patches/patch-source_file_c	14 Jan 2004 06:59:23 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-source_file_c,v 1.3 2002/06/13 05:44:57 form Exp $
---- source/file.c.orig	Sat Mar  2 23:02:22 2002
-+++ source/file.c	Thu Jun 13 12:41:13 2002
-@@ -1066,7 +1066,12 @@ void PrintWindow(WindowInfo *window, int
+--- source/file.c.orig	2003-09-29 00:18:12.000000000 +1000
++++ source/file.c	2003-12-04 22:24:52.000000000 +1100
+@@ -1218,7 +1218,12 @@ void PrintWindow(WindowInfo *window, int
  */
  void PrintString(const char *string, int length, Widget parent, const char *jobName)
  {
@@ -14,7 +14,7 @@
      FILE *fp;
      int fd;
  
-@@ -1077,6 +1082,10 @@ void PrintString(const char *string, int
+@@ -1229,6 +1234,10 @@ void PrintString(const char *string, int
  	    1. Create a filename
  	    2. Open the file with the O_CREAT|O_EXCL flags
  	So all an attacker can do is a DoS on the print function. */
@@ -25,11 +25,11 @@
      tmpnam(tmpFileName);
  
      /* open the temporary file */
-@@ -1085,6 +1094,7 @@ void PrintString(const char *string, int
+@@ -1237,6 +1246,7 @@ void PrintString(const char *string, int
  #else
      if ((fd = open(tmpFileName, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR | S_IWUSR)) < 0 || (fp = fdopen(fd, "w")) == NULL)
  #endif /* VMS */
 +#endif /* HAVE_MKSTEMP */
      {
-     	DialogF(DF_WARN, parent, 1, "Unable to write file for printing:\n%s",
- 		"Dismiss", errorString());
+         DialogF(DF_WARN, parent, 1, "Error while Printing",
+                 "Unable to write file for printing:\n%s", "Dismiss",

Follow-Ups:
- Re: nedit update
  - From: Laurence Tratt

Prev by Date: pkg_info -R output
Next by Date: nmap problem -> no route to host and No buffer space available
Previous by thread: pkg_info -R output
Next by thread: Re: nedit update
Index(es):
- Date
- Thread

Visit your host, monkey.org