Stage japanese/ne, unbreak on FreeBSD 10+, unbreak on amd64

PR:		192801
Submitted by:	Ports Fury

3 files changed, 59 insertions, 30 deletions

diff --git a/japanese/ne/Makefile b/japanese/ne/Makefile
index 9b1889c0dfa4..f4b6d28aa915 100644
--- a/japanese/ne/Makefile
+++ b/japanese/ne/Makefile
@@ -9,26 +9,34 @@ MASTER_SITES=	http://hp.vector.co.jp/authors/VA018758/archive/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	VZ like full-screen text editor with Japanese support
 
-WRKSRC=		${WRKDIR}/ne
+LICENSE=	GPLv2
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
 GNU_CONFIGURE=	yes
-MAN1=		ne.1
-MANLANG=	ja
-DOCS=		BUGS.jp CHANGES.jp HISTORY.jp INSTALL.jp README.jp TODO.jp
-MAKE_ENV=	LANG=${MANLANG}
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64" || ${ARCH} == "powerpc"
-BROKEN=		Does not compile on amd64 or powerpc
-.endif
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/ne
-.for i in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/ne
+
+CFLAGS+=	-Wno-error=return-type
+
+BROKEN_powerpc=	Does not compile on powerpc
+
+OPTIONS_DEFINE=	DOCS
+
+do-install:
+	(cd ${WRKSRC}/src && ${INSTALL_PROGRAM} ne \
+		${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC}/src && ${INSTALL_MAN} ne_en.1 \
+		${STAGEDIR}${MANPREFIX}/man/man1/ne.1)
+	(cd ${WRKSRC}/src && ${INSTALL_MAN} ne.1 \
+		${STAGEDIR}${MANPREFIX}/man/ja/man1/ne.1)
+	@${MKDIR} ${STAGEDIR}${ETCDIR}
+.for i in key* nerc* term*
+	(cd ${WRKSRC}/etc && ${INSTALL_DATA} ${i} \
+		${STAGEDIR}${ETCDIR})
+.endfor
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for i in BUGS.jp CHANGES.jp HISTORY.jp INSTALL.jp README.jp TODO.jp
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} \
+		${STAGEDIR}${DOCSDIR})
 .endfor
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/ne/files/patch-src__menu.c b/japanese/ne/files/patch-src__menu.c
new file mode 100644
index 000000000000..778eec12aceb
--- /dev/null
+++ b/japanese/ne/files/patch-src__menu.c
@@ -0,0 +1,19 @@
+--- src/menu.c.orig
++++ src/menu.c
+@@ -105,14 +105,14 @@
+ 	va_list 	args;
+ 	char	*p;
+ 
+-	args=*(va_list *)vp;
++	va_copy(args, *(va_list *)vp);
+ 
+ 	p=va_arg(args, char *);
+ 	if (p==NULL)
+ 		strcpy(mip->str,"null"); else
+ 		strcpy(mip->str,p);
+ 
+-	*(va_list *)vp=args;
++	va_copy(*(va_list *)vp, args);
+ }
+ 
+ 
diff --git a/japanese/ne/pkg-plist b/japanese/ne/pkg-plist
index 7d429bebf2dc..c4da2fa8bf58 100644
--- a/japanese/ne/pkg-plist
+++ b/japanese/ne/pkg-plist
@@ -1,13 +1,15 @@
 bin/ne
-etc/ne/key.eff
-etc/ne/key.ele
-etc/ne/key.system
-etc/ne/key.vz
-etc/ne/nerc
-etc/ne/nerc.ele
-etc/ne/term
-etc/ne/term.kterm
-etc/ne/term.rxvt
+%%ETCDIR%%/key.eff
+%%ETCDIR%%/key.ele
+%%ETCDIR%%/key.system
+%%ETCDIR%%/key.vz
+%%ETCDIR%%/nerc
+%%ETCDIR%%/nerc.ele
+%%ETCDIR%%/term
+%%ETCDIR%%/term.kterm
+%%ETCDIR%%/term.rxvt
+man/man1/ne.1.gz
+man/ja/man1/ne.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/BUGS.jp
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES.jp
 %%PORTDOCS%%%%DOCSDIR%%/HISTORY.jp
@@ -15,4 +17,4 @@ etc/ne/term.rxvt
 %%PORTDOCS%%%%DOCSDIR%%/README.jp
 %%PORTDOCS%%%%DOCSDIR%%/TODO.jp
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm etc/ne
+@dirrm %%ETCDIR%%