weex is still maintained, sort of, by the Debian packager.
Update to latest release 2.8.3, which also fixes the build with
-fno-common.
With some guidance from the FreeBSD port how to wrangle the incoherent
autotool files into buildable shape.
Note: I don't use this, I haven't tested it.
OK?
Patch attached rather than inline because there are ISO 8859-1
characters in there.
--
Christian "naddy" Weisgerber [email protected]
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/weex/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile 12 Jul 2019 20:48:52 -0000 1.18
+++ Makefile 19 Feb 2021 23:01:22 -0000
@@ -1,31 +1,36 @@
# $OpenBSD: Makefile,v 1.18 2019/07/12 20:48:52 sthen Exp $
-COMMENT= noninteractive ftp client
-DISTNAME= weex-2.6.1.5
-REVISION= 4
+COMMENT= noninteractive FTP/FTPS client for updating web pages
+
+VERSION= 2.8.3
+DISTNAME= weex-${VERSION}
CATEGORIES= net
HOMEPAGE= http://weex.sourceforge.net
-# GPL
+# GPLv2+
PERMIT_PACKAGE= Yes
-WANTLIB= c iconv intl
+WANTLIB= c crypto iconv intl ssl
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=weex/}
+DISTFILES= weex_${VERSION}.tar.gz
BUILD_DEPENDS= devel/gettext,-tools
LIB_DEPENDS= devel/gettext,-runtime
-SEPARATE_BUILD= Yes
-CONFIGURE_STYLE= autoconf
-AUTOCONF_VERSION= 2.13
+AUTOCONF_VERSION= 2.69
+AUTOMAKE_VERSION= 1.11
+CONFIGURE_STYLE= autoreconf
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+post-patch:
+ cp ${LOCALBASE}/share/gettext/po/Makevars.template \
+ ${WRKSRC}/po/Makevars
+
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/weex
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/weex
${INSTALL_DATA} ${WRKSRC}/doc/sample.weexrc \
${PREFIX}/share/examples/weex
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/weex/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 18 Jan 2015 03:14:54 -0000 1.4
+++ distinfo 19 Feb 2021 23:01:22 -0000
@@ -1,2 +1,2 @@
-SHA256 (weex-2.6.1.5.tar.gz) = 1PMHKT/xgjBkEJhyMnO6YkPl++ta+F+JqJOLgm6RrDg=
-SIZE (weex-2.6.1.5.tar.gz) = 206972
+SHA256 (weex_2.8.3.tar.gz) = cqWGq0ca2cgvdSmuF2hOJXU58hmnXBmKEqqDKHDhFgM=
+SIZE (weex_2.8.3.tar.gz) = 319900
Index: patches/patch-Makefile_am
===================================================================
RCS file: patches/patch-Makefile_am
diff -N patches/patch-Makefile_am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile_am 19 Feb 2021 23:01:22 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+
+Index: Makefile.am
+--- Makefile.am.orig
++++ Makefile.am
+@@ -1,4 +1,4 @@
+ AUTOMAKE_OPTIONS=foreign
+
+-SUBDIRS=po intl src doc man debian
++SUBDIRS=po src doc man debian
+ EXTRA_DIST=weex-2.6.1.spec
Index: patches/patch-aclocal_m4
===================================================================
RCS file: patches/patch-aclocal_m4
diff -N patches/patch-aclocal_m4
--- patches/patch-aclocal_m4 9 Oct 2004 18:55:20 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-aclocal_m4,v 1.1.1.1 2004/10/09 18:55:20 naddy Exp $
---- aclocal.m4.orig Tue Jun 13 13:56:57 2000
-+++ aclocal.m4 Sat Oct 9 19:34:35 2004
-@@ -173,10 +173,9 @@ AC_DEFUN(AM_WITH_NLS,
-
- if test "$gt_cv_func_gettext_libc" != "yes"; then
- AC_CHECK_LIB(intl, bindtextdomain,
-- [AC_CACHE_CHECK([for gettext in libintl],
-- gt_cv_func_gettext_libintl,
-+ [AC_CACHE_VAL(gt_cv_func_gettext_libintl,
- [AC_CHECK_LIB(intl, gettext,
-- gt_cv_func_gettext_libintl=yes,
-+ [gt_cv_func_gettext_libintl=yes; LIBS="$LIBS -lintl"],
- gt_cv_func_gettext_libintl=no)],
- gt_cv_func_gettext_libintl=no)])
- fi
Index: patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/net/weex/patches/patch-configure_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-configure_in
--- patches/patch-configure_in 19 Nov 2005 01:52:26 -0000 1.1
+++ patches/patch-configure_in 19 Feb 2021 23:01:22 -0000
@@ -1,11 +1,15 @@
-$OpenBSD: patch-configure_in,v 1.1 2005/11/19 01:52:26 alek Exp $
---- configure.in.orig Sat Nov 19 02:40:10 2005
-+++ configure.in Sat Nov 19 02:40:30 2005
-@@ -18,6 +18,7 @@ AC_PROG_INSTALL
-
+$OpenBSD$
+
+Index: configure.in
+--- configure.in.orig
++++ configure.in
+@@ -24,7 +24,8 @@ AC_PROG_CC
+ AC_PROG_INSTALL
dnl for gettext
-+LIBS="-liconv ${LIBS}"
- AM_GNU_GETTEXT
+-AM_GNU_GETTEXT
++AM_GNU_GETTEXT_VERSION([0.21])
++AM_GNU_GETTEXT([external])
AC_CHECK_FUNC(gettext,,AC_CHECK_LIB(intl, gettext))
localedir='${prefix}/share/locale'
+ AC_SUBST(localedir)
Index: patches/patch-po_Makefile_in_in
===================================================================
RCS file: patches/patch-po_Makefile_in_in
diff -N patches/patch-po_Makefile_in_in
--- patches/patch-po_Makefile_in_in 9 Oct 2004 18:55:20 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,67 +0,0 @@
-$OpenBSD: patch-po_Makefile_in_in,v 1.1.1.1 2004/10/09 18:55:20 naddy Exp $
---- po/Makefile.in.in.orig Mon Apr 24 16:44:53 2000
-+++ po/Makefile.in.in Sat Oct 9 18:55:54 2004
-@@ -24,6 +24,8 @@ gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
-
-+DESTDIR =
-+
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
-@@ -111,16 +113,16 @@ install-data: install-data-@USE_NLS@
- install-data-no: all
- install-data-yes: all
- if test -r "$(MKINSTALLDIRS)"; then \
-- $(MKINSTALLDIRS) $(datadir); \
-+ $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
- else \
-- $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
-+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
- fi
- @catalogs='$(CATALOGS)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
- case "$$cat" in \
-- *.gmo) destdir=$(gnulocaledir);; \
-- *) destdir=$(localedir);; \
-+ *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \
-+ *) destdir=$(DESTDIR)$(localedir);; \
- esac; \
- lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- dir=$$destdir/$$lang/LC_MESSAGES; \
-@@ -153,12 +155,12 @@ install-data-yes: all
- done
- if test "$(PACKAGE)" = "gettext"; then \
- if test -r "$(MKINSTALLDIRS)"; then \
-- $(MKINSTALLDIRS) $(gettextsrcdir); \
-+ $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
- else \
-- $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
-+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
- fi; \
- $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
-- $(gettextsrcdir)/Makefile.in.in; \
-+ $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
- else \
- : ; \
- fi
-@@ -171,12 +173,12 @@ uninstall:
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
- lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-- rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-- rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
-- rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-- rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
-+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
-+ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-+ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
- done
-- rm -f $(gettextsrcdir)/po-Makefile.in.in
-+ rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in
-
- check: all
-
Index: patches/patch-po_fr_po
===================================================================
RCS file: patches/patch-po_fr_po
diff -N patches/patch-po_fr_po
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-po_fr_po 19 Feb 2021 23:01:22 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: po/fr.po
+--- po/fr.po.orig
++++ po/fr.po
+@@ -32,7 +32,7 @@ msgstr "Cr�ation d'un nouveau fichier.\n"
+ #: src/cache.c:83 src/cache.c:89
+ #, c-format
+ msgid "Cache file `%s' is broken at line %d.\n"
+-msgstr "Le fichier de cache a une erreur � la ligne %d.\n"
++msgstr "Le fichier de cache `%s' a une erreur � la ligne %d.\n"
+
+ #: src/cache.c:200
+ msgid "Internal error: cache facility is broken.\n"
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: patches/patch-src_Makefile_in
diff -N patches/patch-src_Makefile_in
--- patches/patch-src_Makefile_in 19 Nov 2005 01:52:26 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_Makefile_in,v 1.2 2005/11/19 01:52:26 alek Exp $
---- src/Makefile.in.orig Tue Jun 13 13:57:12 2000
-+++ src/Makefile.in Sat Nov 19 02:44:58 2005
-@@ -89,8 +89,8 @@ weex_SOURCES = config.c ftplib.c ftplib.
-
-
- LDADD = $(INTLLIBS)
--CPPFLAGS = -DLOCALEDIR=\""$(localedir)"\"
--INCLUDES = -I$(top_srcdir)/intl -I$(top_builddir)/intl
-+CPPFLAGS = @CPPFLAGS@ -DLOCALEDIR=\""$(localedir)"\"
-+INCLUDES =
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES =
Index: patches/patch-src_log_c
===================================================================
RCS file: patches/patch-src_log_c
diff -N patches/patch-src_log_c
--- patches/patch-src_log_c 3 Oct 2005 14:23:27 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_log_c,v 1.1 2005/10/03 14:23:27 naddy Exp $
---- src/log.c.orig Mon Oct 3 15:56:58 2005
-+++ src/log.c Mon Oct 3 15:57:35 2005
-@@ -183,7 +183,7 @@ void log_flush(void)
-
- 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);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/weex/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 9 Oct 2004 18:55:20 -0000 1.1.1.1
+++ pkg/PLIST 19 Feb 2021 23:01:22 -0000
@@ -1,7 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2004/10/09 18:55:20 naddy Exp $
-bin/weex
+@bin bin/weex
@man man/man1/weex.1
-share/doc/weex/
share/examples/weex/
share/examples/weex/sample.weexrc
share/locale/de/LC_MESSAGES/weex.mo
