Install the nc binary as nclient so as not to conflict with the

"long standing" netcat port.

PR:		18454

5 files changed, 35 insertions, 18 deletions

diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile
index 091f23760311..8d21565b929f 100644
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 REQUIRES_MOTIF=	yes
 USE_X_PREFIX=	yes
 EXTRACT_ONLY=	nedit-5.1.1-src.tar.gz
-MAN1=		nedit.1 nc.1
+MAN1=		nclient.1 nedit.1
 ALL_TARGET=	freebsd
 
 post-extract:
diff --git a/editors/nedit/files/patch-aa b/editors/nedit/files/patch-aa
index be4a7bb1c56e..3439e869c62b 100644
--- a/editors/nedit/files/patch-aa
+++ b/editors/nedit/files/patch-aa
@@ -9,7 +9,7 @@
 + install::
 + 	(cd source; make -f Makefile.freebsd install)
 + 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 nedit.man ${PREFIX}/man/man1/nedit.1
-+ 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 nc.man ${PREFIX}/man/man1/nc.1
++ 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 nc.man ${PREFIX}/man/man1/nclient.1
 + 	${INSTALL} ${COPY} -m 644 NEdit.ad ${X11BASE}/lib/X11/app-defaults/NEdit
 + 
   clean:
diff --git a/editors/nedit/files/patch-ab b/editors/nedit/files/patch-ab
index a74c792799a8..d106e7895b76 100644
--- a/editors/nedit/files/patch-ab
+++ b/editors/nedit/files/patch-ab
@@ -1,15 +1,13 @@
-*** source/Makefile.common.orig	Tue Dec 14 22:58:24 1999
---- source/Makefile.common	Fri Mar 17 06:55:27 2000
-***************
-*** 15,20 ****
---- 15,24 ----
-  nc: nc.o
-  	$(CC) $(CFLAGS) nc.o ../util/libNUtil.a $(LIBS) -o $@
-  	
-+ install: nedit nc
-+ 	${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} nedit ${PREFIX}/bin
-+ 	${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} nc ${PREFIX}/bin
-+ 
-  help.o: help.c
-  	$(CC) $(CFLAGS) $(BIGGER_STRINGS) -c help.c -o $@
-  
+--- source/Makefile.common.orig	Tue Dec 14 21:58:24 1999
++++ source/Makefile.common	Sun May 28 19:31:01 2000
+@@ -15,6 +15,10 @@
+ nc: nc.o
+ 	$(CC) $(CFLAGS) nc.o ../util/libNUtil.a $(LIBS) -o $@
+ 	
++install: nedit nc
++	${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} nedit ${PREFIX}/bin
++	${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} nc ${PREFIX}/bin/nclient
++
+ help.o: help.c
+ 	$(CC) $(CFLAGS) $(BIGGER_STRINGS) -c help.c -o $@
+ 
diff --git a/editors/nedit/files/patch-ad b/editors/nedit/files/patch-ad
new file mode 100644
index 000000000000..67e296e3bae6
--- /dev/null
+++ b/editors/nedit/files/patch-ad
@@ -0,0 +1,19 @@
+--- nc.man.orig	Sun May 28 19:29:15 2000
++++ nc.man	Sun May 28 19:29:59 2000
+@@ -1,12 +1,12 @@
+-.TH NC 1
++.TH NCLIENT 1
+ .SH NAME
+-NC \- Client program for NEdit text editor
++NCLIENT \- Client program for NEdit text editor
+ .SH SYNOPSYS
+-.B nc [\-read] [\-create] [\-line n\ |\ +n] [\-do\ command]
++.B nclient [\-read] [\-create] [\-line n\ |\ +n] [\-do\ command]
+  [\-ask] [\-noask] [\-svrname\ name] [-svrcmd\ command]
+  [\-lm languagemode] [\-geometry\ geometry] [\-iconic] [file...]
+ .SH DESCRIPTION
+-nc is the client interface to the NEdit text editor.  To use nc, 
++nclient is the client interface to the NEdit text editor.  To use nclient, 
+ first run NEdit in server mode:
+ .PP
+ .EX
diff --git a/editors/nedit/pkg-plist b/editors/nedit/pkg-plist
index 713cf8f28195..b759ec33c043 100644
--- a/editors/nedit/pkg-plist
+++ b/editors/nedit/pkg-plist
@@ -1,3 +1,3 @@
+bin/nclient
 bin/nedit
-bin/nc
 lib/X11/app-defaults/NEdit