Date: Tue, 2 Apr 2013 12:59:10 +0000 (UTC) From: Emanuel Haupt <ehaupt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r315672 - in head/ftp/weex: . files Message-ID: <201304021259.r32CxAHi093813@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ehaupt Date: Tue Apr 2 12:59:10 2013 New Revision: 315672 URL: http://svnweb.freebsd.org/changeset/ports/315672 Log: - Fix build on amd64 - Provide NLS option Approved by: portmgr (bapt) Added: head/ftp/weex/files/patch-src__log.c - copied unchanged from r315671, head/ftp/weex/files/patch-src_log.c head/ftp/weex/files/patch-src__strlib.c (contents, props changed) Deleted: head/ftp/weex/files/patch-src_log.c Modified: head/ftp/weex/Makefile head/ftp/weex/pkg-plist Modified: head/ftp/weex/Makefile ============================================================================== --- head/ftp/weex/Makefile Tue Apr 2 11:06:55 2013 (r315671) +++ head/ftp/weex/Makefile Tue Apr 2 12:59:10 2013 (r315672) @@ -3,7 +3,7 @@ PORTNAME= weex PORTVERSION= 2.6.1.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= ftp MASTER_SITES= SF @@ -17,10 +17,18 @@ MAKE_JOBS_SAFE= yes PORTDOCS= ChangeLog README MAN1= weex.1 -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOCS NLS .include <bsd.port.options.mk> +.if ${PORT_OPTIONS:MNLS} +USE_GETTEXT= yes +PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " +.endif + post-patch: @${REINPLACE_CMD} -e 's|^\(SUBDIRS.*\)debian|\1|' \ ${WRKSRC}/Makefile.in @@ -36,6 +44,4 @@ post-install: .endfor .endif -NOT_FOR_ARCHS= amd64 - .include <bsd.port.mk> Copied: head/ftp/weex/files/patch-src__log.c (from r315671, head/ftp/weex/files/patch-src_log.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ftp/weex/files/patch-src__log.c Tue Apr 2 12:59:10 2013 (r315672, copy of r315671, head/ftp/weex/files/patch-src_log.c) @@ -0,0 +1,11 @@ +--- src/log.c.orig Mon Aug 18 11:52:38 2003 ++++ src/log.c Sun Oct 2 11:06:58 2005 +@@ -183,7 +183,7 @@ + + fp=log_open(); + for(i=0;i<max_log;i++){ +- fprintf(fp,log_str[i]); ++ fprintf(fp,"%s",log_str[i]); + free(log_str[i]); + } + free(log_str); Added: head/ftp/weex/files/patch-src__strlib.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ftp/weex/files/patch-src__strlib.c Tue Apr 2 12:59:10 2013 (r315672) @@ -0,0 +1,11 @@ +--- ./src/strlib.c.orig 2013-04-02 14:27:50.088885186 +0200 ++++ ./src/strlib.c 2013-04-02 14:29:17.656194116 +0200 +@@ -42,6 +42,8 @@ + # define G_VA_COPY(ap1, ap2) (*(ap1) = *(ap2)) + # elif defined (G_VA_COPY_AS_ARRAY) + # define G_VA_COPY(ap1, ap2) g_memmove ((ap1), (ap2), sizeof (va_list)) ++# elif defined (__x86_64__) ++# define G_VA_COPY(ap1, ap2) memmove ((ap1), (ap2), sizeof (va_list)) + # else /* va_list is a pointer */ + # define G_VA_COPY(ap1, ap2) ((ap1) = (ap2)) + # endif /* va_list is a pointer */ Modified: head/ftp/weex/pkg-plist ============================================================================== --- head/ftp/weex/pkg-plist Tue Apr 2 11:06:55 2013 (r315671) +++ head/ftp/weex/pkg-plist Tue Apr 2 12:59:10 2013 (r315672) @@ -1,8 +1,8 @@ bin/weex -share/locale/de/LC_MESSAGES/weex.mo -share/locale/es/LC_MESSAGES/weex.mo -share/locale/fr/LC_MESSAGES/weex.mo -share/locale/ja/LC_MESSAGES/weex.mo -share/locale/nl/LC_MESSAGES/weex.mo +%%NLS%%share/locale/de/LC_MESSAGES/weex.mo +%%NLS%%share/locale/es/LC_MESSAGES/weex.mo +%%NLS%%share/locale/fr/LC_MESSAGES/weex.mo +%%NLS%%share/locale/ja/LC_MESSAGES/weex.mo +%%NLS%%share/locale/nl/LC_MESSAGES/weex.mo %%EXAMPLESDIR%%/sample.weexrc @dirrm %%EXAMPLESDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304021259.r32CxAHi093813>