Update to 2.8.2

6 files changed, 13 insertions, 53 deletions

diff --git a/ftp/weex/Makefile b/ftp/weex/Makefile
index 6eaf9337c275..016a9b801d0c 100644
--- a/ftp/weex/Makefile
+++ b/ftp/weex/Makefile
@@ -2,23 +2,24 @@
 # $FreeBSD$
 
 PORTNAME=	weex
-PORTVERSION=	2.6.1.5
-PORTREVISION=	2
+PORTVERSION=	2.8.2
 CATEGORIES=	ftp
-MASTER_SITES=	SF
+MASTER_SITES=	SF/weex/weex
+DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Non-interactive FTP client
 
-GNU_CONFIGURE=	yes
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/doc/COPYING
 
-PORTDOCS=	ChangeLog README
+USES=		autoreconf gmake ssl gettext-tools
+GNU_CONFIGURE=	yes
 
-OPTIONS_DEFINE=	DOCS NLS
-OPTIONS_SUB=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-NLS_USES=	gettext
-NLS_CONFIGURE_ENABLE=	nls
+# NLS support is very broken in this release
+CONFIGURE_ARGS=	--disable-nls
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^\(SUBDIRS.*\)debian|\1|' \
@@ -27,9 +28,5 @@ post-patch:
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/sample.weexrc ${STAGEDIR}${EXAMPLESDIR}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR}
-.endfor
 
 .include <bsd.port.mk>
diff --git a/ftp/weex/distinfo b/ftp/weex/distinfo
index a973a0ef4959..63f6088f6754 100644
--- a/ftp/weex/distinfo
+++ b/ftp/weex/distinfo
@@ -1,2 +1,3 @@
-SHA256 (weex-2.6.1.5.tar.gz) = d4f307293ff18230641098723273ba6243e5fbeb5af85f89a8938b826e91ac38
-SIZE (weex-2.6.1.5.tar.gz) = 206972
+TIMESTAMP = 1481118411
+SHA256 (weex_2.8.2.tar.gz) = ed06ae375060e0c5fb1a428cae64d223f653fa918933acaa5a21332b613027c7
+SIZE (weex_2.8.2.tar.gz) = 319263
diff --git a/ftp/weex/files/patch-po__Makefile.in.in b/ftp/weex/files/patch-po__Makefile.in.in
deleted file mode 100644
index 75de961257c8..000000000000
--- a/ftp/weex/files/patch-po__Makefile.in.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./po/Makefile.in.in.orig	2013-11-11 16:27:04.341725450 +0100
-+++ ./po/Makefile.in.in	2013-11-11 16:29:31.102728126 +0100
-@@ -20,7 +20,7 @@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
- localedir = $(datadir)/locale
--gnulocaledir = $(prefix)/share/locale
-+gnulocaledir = $(DESTDIR)$(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
- 
diff --git a/ftp/weex/files/patch-src__log.c b/ftp/weex/files/patch-src__log.c
deleted file mode 100644
index e94c8332ac12..000000000000
--- a/ftp/weex/files/patch-src__log.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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);
diff --git a/ftp/weex/files/patch-src__strlib.c b/ftp/weex/files/patch-src__strlib.c
deleted file mode 100644
index 9691284d8306..000000000000
--- a/ftp/weex/files/patch-src__strlib.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./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 b9b8c41218dc..224d57c7e386 100644
--- a/ftp/weex/pkg-plist
+++ b/ftp/weex/pkg-plist
@@ -1,8 +1,3 @@
 bin/weex
 man/man1/weex.1.gz
-%%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