svn commit: r365523 - in head/japanese/ne: . files
John Marino
marino at FreeBSD.org
Wed Aug 20 23:55:07 UTC 2014
Author: marino
Date: Wed Aug 20 23:55:06 2014
New Revision: 365523
URL: http://svnweb.freebsd.org/changeset/ports/365523
QAT: https://qat.redports.org/buildarchive/r365523/
Log:
Stage japanese/ne, unbreak on FreeBSD 10+, unbreak on amd64
PR: 192801
Submitted by: Ports Fury
Added:
head/japanese/ne/files/
head/japanese/ne/files/patch-src__menu.c (contents, props changed)
Modified:
head/japanese/ne/Makefile
head/japanese/ne/pkg-plist
Modified: head/japanese/ne/Makefile
==============================================================================
--- head/japanese/ne/Makefile Wed Aug 20 23:46:28 2014 (r365522)
+++ head/japanese/ne/Makefile Wed Aug 20 23:55:06 2014 (r365523)
@@ -9,26 +9,34 @@ MASTER_SITES= http://hp.vector.co.jp/aut
MAINTAINER= ports at 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>
Added: head/japanese/ne/files/patch-src__menu.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/japanese/ne/files/patch-src__menu.c Wed Aug 20 23:55:06 2014 (r365523)
@@ -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);
+ }
+
+
Modified: head/japanese/ne/pkg-plist
==============================================================================
--- head/japanese/ne/pkg-plist Wed Aug 20 23:46:28 2014 (r365522)
+++ head/japanese/ne/pkg-plist Wed Aug 20 23:55:06 2014 (r365523)
@@ -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%%
- at dirrm etc/ne
+ at dirrm %%ETCDIR%%
More information about the svn-ports-all
mailing list