diff options
| author | ehaupt <ehaupt@FreeBSD.org> | 2013-04-02 20:59:10 +0800 |
|---|---|---|
| committer | ehaupt <ehaupt@FreeBSD.org> | 2013-04-02 20:59:10 +0800 |
| commit | 0ed3014802623e2f2da67e04d43e153d94b3e165 (patch) | |
| tree | d73f1c4d12219d333b0d89b566eaf37794792ee6 /ftp/weex | |
| parent | 2236d64f2951975afd25b77812dea5695d0f043f (diff) | |
| download | freebsd-ports-gnome-0ed3014802623e2f2da67e04d43e153d94b3e165.tar.gz freebsd-ports-gnome-0ed3014802623e2f2da67e04d43e153d94b3e165.tar.zst freebsd-ports-gnome-0ed3014802623e2f2da67e04d43e153d94b3e165.zip | |
- Fix build on amd64
- Provide NLS option
Approved by: portmgr (bapt)
Diffstat (limited to 'ftp/weex')
| -rw-r--r-- | ftp/weex/Makefile | 14 | ||||
| -rw-r--r-- | ftp/weex/files/patch-src__log.c (renamed from ftp/weex/files/patch-src_log.c) | 0 | ||||
| -rw-r--r-- | ftp/weex/files/patch-src__strlib.c | 11 | ||||
| -rw-r--r-- | ftp/weex/pkg-plist | 10 |
4 files changed, 26 insertions, 9 deletions
diff --git a/ftp/weex/Makefile b/ftp/weex/Makefile index 1566cbb9e882..5dcd6371be9c 100644 --- a/ftp/weex/Makefile +++ b/ftp/weex/Makefile @@ -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> diff --git a/ftp/weex/files/patch-src_log.c b/ftp/weex/files/patch-src__log.c index e94c8332ac12..e94c8332ac12 100644 --- a/ftp/weex/files/patch-src_log.c +++ b/ftp/weex/files/patch-src__log.c diff --git a/ftp/weex/files/patch-src__strlib.c b/ftp/weex/files/patch-src__strlib.c new file mode 100644 index 000000000000..9691284d8306 --- /dev/null +++ b/ftp/weex/files/patch-src__strlib.c @@ -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 */ diff --git a/ftp/weex/pkg-plist b/ftp/weex/pkg-plist index b766a1b72fe5..bb098e1e292c 100644 --- a/ftp/weex/pkg-plist +++ b/ftp/weex/pkg-plist @@ -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%% |