FreeBSD Bugzilla – Attachment 145976 Details for
Bug 192801
[stage] japanese/ne: Fix build with clang
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
japanese_ne.diff
japanese_ne.diff (text/plain), 2.97 KB, created by
tkato432
on 2014-08-18 18:39:04 UTC
(
hide
)
Description:
japanese_ne.diff
Filename:
MIME Type:
Creator:
tkato432
Created:
2014-08-18 18:39:04 UTC
Size:
2.97 KB
patch
obsolete
>diff -urN /usr/ports/japanese/ne/Makefile japanese/ne/Makefile >--- /usr/ports/japanese/ne/Makefile 2014-07-24 03:57:04.000000000 +0900 >+++ japanese/ne/Makefile 2014-09-19 00:00:00.000000000 +0900 >@@ -9,26 +9,34 @@ > 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 -urN /usr/ports/japanese/ne/files/patch-src__menu.c japanese/ne/files/patch-src__menu.c >--- /usr/ports/japanese/ne/files/patch-src__menu.c 1970-01-01 09:00:00.000000000 +0900 >+++ japanese/ne/files/patch-src__menu.c 2014-09-19 00:00:00.000000000 +0900 >@@ -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 -urN /usr/ports/japanese/ne/pkg-plist japanese/ne/pkg-plist >--- /usr/ports/japanese/ne/pkg-plist 2014-06-21 17:42:31.000000000 +0900 >+++ japanese/ne/pkg-plist 2014-09-19 00:00:00.000000000 +0900 >@@ -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 @@ > %%PORTDOCS%%%%DOCSDIR%%/README.jp > %%PORTDOCS%%%%DOCSDIR%%/TODO.jp > %%PORTDOCS%%@dirrm %%DOCSDIR%% >-@dirrm etc/ne >+@dirrm %%ETCDIR%%
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 192801
: 145976