Update to release 5.6.

7 files changed, 43 insertions, 30 deletions

diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile
index 26555397967e..ac989fcd54ed 100644
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@@ -2,28 +2,37 @@
 # $FreeBSD$
 
 PORTNAME=	nedit
-PORTVERSION=	5.5
-PORTREVISION=	4
+PORTVERSION=	5.6
 CATEGORIES=	editors
 MASTER_SITES=	http://people.freebsd.org/~deischen/distfiles/ \
 		${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.nluug.nl/pub/editors/NEdit/contrib/misc/
-MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}-source/${PORTVERSION}
-DISTFILES=	nedit-5.5-src.tar.bz2 nedit.app-defaults
-EXTRACT_ONLY=	nedit-5.5-src.tar.bz2
+MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}-source
+DISTFILES=	nedit-5.6-src.tar.gz nedit.app-defaults
+EXTRACT_ONLY=	nedit-5.6-src.tar.gz
 
 MAINTAINER=	deischen@FreeBSD.org
 COMMENT=	X11/Motif GUI text editor for programs and plain text files
 
 LICENSE=	GPLv1
 
-USES=		motif tar:bzip2
+USES=		motif perl5
 USE_XORG=	xpm
+USE_PERL=	build
 ALL_TARGET=	freebsd
 
+PLIST_FILES=	bin/nclient \
+		bin/nedit \
+		man/man1/nclient.1.gz \
+		man/man1/nedit.1.gz \
+		lib/X11/app-defaults/NEdit.ad
+
 post-extract:
 	${CP} ${DISTDIR}/nedit.app-defaults ${WRKSRC}/NEdit.ad
 
+post-build:
+	cd ${WRKSRC} && make docs
+
 post-install::
 .for file in nedit nclient
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${file}
diff --git a/editors/nedit/distinfo b/editors/nedit/distinfo
index 3073da8ed584..7cbda54cd440 100644
--- a/editors/nedit/distinfo
+++ b/editors/nedit/distinfo
@@ -1,4 +1,4 @@
-SHA256 (nedit-5.5-src.tar.bz2) = 0f6ae7205753080e8b047fb45759a7d6036b19396045c0b5c4a979441231966b
-SIZE (nedit-5.5-src.tar.bz2) = 1124825
+SHA256 (nedit-5.6-src.tar.gz) = ca7eb3db14588eb931e4904af5fb97cfa99182514d9e6bdefeb69ec2f0e57008
+SIZE (nedit-5.6-src.tar.gz) = 1344887
 SHA256 (nedit.app-defaults) = f7dd96054854d2831d77820c2640207ac1fb41f97a442a160a4d576b6499b600
 SIZE (nedit.app-defaults) = 7634
diff --git a/editors/nedit/files/patch-Makefile b/editors/nedit/files/patch-Makefile
index f2e9fc0158cb..bdc56b3e719b 100644
--- a/editors/nedit/files/patch-Makefile
+++ b/editors/nedit/files/patch-Makefile
@@ -1,6 +1,14 @@
---- Makefile.orig	2004-10-01 04:51:05.000000000 +0800
-+++ Makefile	2014-06-15 11:03:09.564113068 +0800
-@@ -44,6 +44,12 @@ docs:
+--- Makefile.orig	2014-12-07 00:03:44.000000000 -0500
++++ Makefile	2015-03-30 08:28:03.000000000 -0400
+@@ -17,6 +17,7 @@
+ 	@echo "Please specify target:"
+ 	@echo "(For example, type \"make linux\" for a Linux system.)"
+ 	@(cd makefiles && ls -C Makefile* | sed -e 's/Makefile.//g')
++	@(cd doc; $(MAKE) man)
+ 
+ .DEFAULT:
+ 	@- (cd Microline/XmL;   if [ -f ../../makefiles/Makefile.$@ -a ! -f ./Makefile.$@ ];\
+@@ -44,6 +45,12 @@
  # that doesn't work since we require the user to specify the target.  More
  # thought is needed
  
diff --git a/editors/nedit/files/patch-doc_nc.man b/editors/nedit/files/patch-doc_nc.man
deleted file mode 100644
index 12cdc67f5583..000000000000
--- a/editors/nedit/files/patch-doc_nc.man
+++ /dev/null
@@ -1,12 +0,0 @@
---- doc/nc.man.orig	Thu Nov 20 18:40:13 2003
-+++ doc/nc.man	Sat Feb  7 14:54:18 2004
-@@ -285,6 +285,9 @@
- .PP
- For more information see NEdit's online help, or \fInedit.doc\fR in the NEdit
- distribution kit.
-+.PP
-+In FreeBSD, \fInc\fR is installed as \fInclient\fR so it does not
-+conflict with the \fInetcat\fR port which also installs an \fInc\fR.
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
- \&\fInedit\fR\|(1), X(1), \fImwm\fR\|(1), \fIctags\fR\|(1), \fIetags\fR\|(1)
diff --git a/editors/nedit/files/patch-doc_nc.pod b/editors/nedit/files/patch-doc_nc.pod
new file mode 100644
index 000000000000..3b9379b937cf
--- /dev/null
+++ b/editors/nedit/files/patch-doc_nc.pod
@@ -0,0 +1,12 @@
+--- doc/nc.pod.orig	2014-12-06 10:52:01.000000000 -0500
++++ doc/nc.pod	2015-04-02 12:56:29.000000000 -0400
+@@ -193,6 +193,9 @@
+ For more information see NEdit's online help, or I<nedit.doc> in the NEdit
+ distribution kit.
+ 
++In FreeBSD, I<nc> is installed as I<nclient> so it does not
++conflict with the I<netcat> port which also installs an I<nc>.
++
+ =head1 SEE ALSO
+ 
+ nedit(1), X(1), mwm(1), ctags(1), etags(1)
diff --git a/editors/nedit/pkg-descr b/editors/nedit/pkg-descr
index 4764993bf936..8e04722ecef2 100644
--- a/editors/nedit/pkg-descr
+++ b/editors/nedit/pkg-descr
@@ -7,7 +7,8 @@ to which the users of modern GUI based environments are accustomed.
 For users of older style Unix editors, welcome to the world of
 mouse-based editing!
 
-This port requires Motif to build, however it works reasonably well
-with the free Motif clone LessTif.
+This port requires a Motif library to build and run.  It is
+recommended that you use OpenMotif as Nedit has font aliasing
+issues when using LessTif.
 
 WWW: http://www.nedit.org/
diff --git a/editors/nedit/pkg-plist b/editors/nedit/pkg-plist
deleted file mode 100644
index 2a8e80ec8210..000000000000
--- a/editors/nedit/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/nclient
-bin/nedit
-man/man1/nclient.1.gz
-man/man1/nedit.1.gz
-lib/X11/app-defaults/NEdit.ad