3 files changed, 45 insertions, 76 deletions

diff --git a/editors/ne/Makefile b/editors/ne/Makefile
index b5f59d5912c1..d96dc2c83734 100644
--- a/editors/ne/Makefile
+++ b/editors/ne/Makefile
@@ -2,100 +2,69 @@
 # $FreeBSD$
 
 PORTNAME=	ne
-PORTVERSION=	2.6
+PORTVERSION=	3.0.1
 CATEGORIES=	editors
 MASTER_SITES=	http://ne.di.unimi.it/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Nice and powerful editor
 
-LICENSE=	GPLv3
+LICENSE=	GPLv3 # (or later)
+#LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_WRKSRC=	${WRKSRC}/src
 
 USES=		gmake makeinfo perl5
 USE_PERL5=	build
+USE_CSTD=	c99
 MAKEFILE=	makefile
-ALL_TARGET=	${PORTNAME}
 MAKE_ARGS=	CC="${CC}" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="-lgnuregex" \
+		OPTS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
 		NE_GLOBAL_DIR="${DATADIR}"
+ALL_TARGET=	ne
 
-INFO=		${PORTNAME}
-PORTDOCS=	*
-PLIST_FILES=	bin/${PORTNAME} \
-		man/man1/${PORTNAME}.1.gz \
-		%%DATADIR%%/default.keys %%DATADIR%%/default.menus \
-		%%DATADIR%%/syntax/4gl.jsf %%DATADIR%%/syntax/ada.jsf \
-		%%DATADIR%%/syntax/ant.jsf %%DATADIR%%/syntax/batch.jsf \
-		%%DATADIR%%/syntax/asm.jsf %%DATADIR%%/syntax/awk.jsf \
-		%%DATADIR%%/syntax/c.jsf %%DATADIR%%/syntax/cobol.jsf \
-		%%DATADIR%%/syntax/classic_pascal.jsf \
-		%%DATADIR%%/syntax/comment_todo.jsf \
-		%%DATADIR%%/syntax/conf.jsf %%DATADIR%%/syntax/csh.jsf \
-		%%DATADIR%%/syntax/csharp.jsf %%DATADIR%%/syntax/debian.jsf \
-		%%DATADIR%%/syntax/css.jsf %%DATADIR%%/syntax/diff.jsf \
-		%%DATADIR%%/syntax/elixir.jsf %%DATADIR%%/syntax/erb.jsf \
-		%%DATADIR%%/syntax/erlang.jsf %%DATADIR%%/syntax/git-commit.jsf \
-		%%DATADIR%%/syntax/fortran.jsf %%DATADIR%%/syntax/haskell.jsf \
-		%%DATADIR%%/syntax/go.jsf %%DATADIR%%/syntax/haml.jsf \
-		%%DATADIR%%/syntax/html.jsf %%DATADIR%%/syntax/java.jsf \
-		%%DATADIR%%/syntax/htmlerb.jsf %%DATADIR%%/syntax/ini.jsf \
-		%%DATADIR%%/syntax/iptables.jsf %%DATADIR%%/syntax/js.jsf \
-		%%DATADIR%%/syntax/joerc.jsf %%DATADIR%%/syntax/jsf.jsf \
-		%%DATADIR%%/syntax/jsf_check.jsf %%DATADIR%%/syntax/lisp.jsf \
-		%%DATADIR%%/syntax/json.jsf %%DATADIR%%/syntax/md.jsf \
-		%%DATADIR%%/syntax/lua.jsf %%DATADIR%%/syntax/m4.jsf \
-		%%DATADIR%%/syntax/mail.jsf %%DATADIR%%/syntax/mason.jsf \
-		%%DATADIR%%/syntax/matlab.jsf %%DATADIR%%/syntax/ocaml.jsf \
-		%%DATADIR%%/syntax/pascal.jsf %%DATADIR%%/syntax/perl.jsf \
-		%%DATADIR%%/syntax/php.jsf %%DATADIR%%/syntax/ps.jsf \
-		%%DATADIR%%/syntax/powershell.jsf %%DATADIR%%/syntax/prolog.jsf \
-		%%DATADIR%%/syntax/properties.jsf %%DATADIR%%/syntax/puppet.jsf \
-		%%DATADIR%%/syntax/python.jsf %%DATADIR%%/syntax/rexx.jsf \
-		%%DATADIR%%/syntax/ruby.jsf %%DATADIR%%/syntax/sed.jsf \
-		%%DATADIR%%/syntax/sh.jsf %%DATADIR%%/syntax/skill.jsf \
-		%%DATADIR%%/syntax/sieve.jsf %%DATADIR%%/syntax/typescript.jsf \
-		%%DATADIR%%/syntax/sml.jsf %%DATADIR%%/syntax/spec.jsf \
-		%%DATADIR%%/syntax/sql.jsf %%DATADIR%%/syntax/tabs.jsf \
-		%%DATADIR%%/syntax/tcl.jsf %%DATADIR%%/syntax/tex.jsf \
-		%%DATADIR%%/syntax/texinfo.jsf %%DATADIR%%/syntax/troff.jsf \
-		%%DATADIR%%/syntax/txt2tags.jsf %%DATADIR%%/syntax/verilog.jsf \
-		%%DATADIR%%/syntax/whitespace.jsf %%DATADIR%%/syntax/yaml.jsf \
-		%%DATADIR%%/syntax/vhdl.jsf %%DATADIR%%/syntax/xml.jsf
+LDFLAGS+=	-lgnuregex
 
-OPTIONS_DEFINE=	DEBUG DOCS
+INFO=		ne
+PORTDOCS=	*
+PORTDATA=	*
+PLIST_FILES=	bin/ne man/man1/ne.1.gz
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=		DEBUG DOCS
 
-.if ! ${PORT_OPTIONS:MDEBUG}
-CFLAGS+=	-DNODEBUG
-.endif
+DEBUG_MAKE_ARGS=	NE_DEBUG=1
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|tmpnam(|mkstemp(|g' ${BUILD_WRKSRC}/actions.c
-	@${REINPLACE_CMD} -e 's|"regex\.h"|<gnu/regex.h>|g' \
-		${BUILD_WRKSRC}/ne.c \
-		${BUILD_WRKSRC}/search.c
-	@${REINPLACE_CMD} -e '/[[:space:]]regex.o/d ; \
-		 s|regex.h||g' ${BUILD_WRKSRC}/makefile
+	@${FIND} ${BUILD_WRKSRC} -name "*.c" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|"regex\.h"|<gnu/regex.h>|g'
+	@${REINPLACE_CMD} -e \
+		's|-O3|| ; \
+		 /[[:space:]]regex.o/d ; \
+		 s|regex.h$$||g' ${BUILD_WRKSRC}/makefile
 
 post-build:
-	cd ${WRKSRC}/doc && makeinfo ${PORTNAME}.texinfo
+	cd ${WRKSRC}/doc && makeinfo ne.texinfo
 
 do-install:
-	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 \
-		${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.info \
-		${STAGEDIR}${PREFIX}/${INFO_PATH}
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA}	${WRKSRC}/doc/default.* ${STAGEDIR}${DATADIR}
-	(cd ${WRKSRC} && ${COPYTREE_SHARE} syntax ${STAGEDIR}${DATADIR})
+	(cd ${BUILD_WRKSRC} && ${INSTALL_PROGRAM} ne \
+		${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC}/doc && ${INSTALL_MAN} ne.1 \
+		${STAGEDIR}${MANPREFIX}/man/man1)
+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} ne.info \
+		${STAGEDIR}${PREFIX}/${INFO_PATH})
+	@${MKDIR} ${STAGEDIR}${DATADIR}/macros
+	(cd ${WRKSRC}/macros && ${INSTALL_DATA} * \
+		${STAGEDIR}${DATADIR}/macros)
+	@${MKDIR} ${STAGEDIR}${DATADIR}/syntax
+	(cd ${WRKSRC}/syntax && ${INSTALL_DATA} *.jsf \
+		${STAGEDIR}${DATADIR}/syntax)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC} && ${INSTALL_DATA} CHANGES NEWS README \
-		doc/${PORTNAME}.pdf doc/${PORTNAME}.txt ${STAGEDIR}${DOCSDIR})
-	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})
+	(cd ${WRKSRC} && ${INSTALL_DATA} CHANGES NEWS README.md \
+		${STAGEDIR}${DOCSDIR})
+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} default.* ne.pdf ne.txt \
+		${STAGEDIR}${DOCSDIR})
+	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html \
+		${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/editors/ne/distinfo b/editors/ne/distinfo
index a3e453121eb2..7d86b5c38239 100644
--- a/editors/ne/distinfo
+++ b/editors/ne/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ne-2.6.tar.gz) = 4a3b2858d628fd599588a9f9fb1f0153f4d40a6408560f5d2676b99695d4b424
-SIZE (ne-2.6.tar.gz) = 1164236
+SHA256 (ne-3.0.1.tar.gz) = 92b646dd2ba64052e62deaa4239373821050a03e1b7d09d203ce04f2adfbd0e4
+SIZE (ne-3.0.1.tar.gz) = 1193311
diff --git a/editors/ne/pkg-descr b/editors/ne/pkg-descr
index c3e846596729..5e506ddc426a 100644
--- a/editors/ne/pkg-descr
+++ b/editors/ne/pkg-descr
@@ -1,6 +1,6 @@
-Ne is a free text editor based on the POSIX standard that runs (we
-hope) on almost any UN*X machine. ne is easy to use for the beginner, but
+Ne is a free text editor based on the POSIX standard that runs (we hope)
+on almost any UN*X machine. ne is easy to use for the beginner, but
 powerful and fully configurable for the wizard, and most sparing in its
-resource usage
+resource usage.
 
-WWW: http://ne.di.unimi.it/
+WWW: http://ne.dsi.unimi.it/