cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net/weex: update to 2.8.3, which also fixes the build with -fno-common

Browse Source 
With some guidance from the FreeBSD port how to wrangle the incoherent
autotool files into buildable shape.
This commit is contained in:
naddy 2021-02-23 20:06:01 +00:00
parent 0126d2ea7e
commit b9e31b47d8
10 changed files with 55 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
net/weex/Makefile
View File

@ -1,31 +1,36 @@
# $OpenBSD: Makefile,v 1.18 2019/07/12 20:48:52 sthen Exp $
# $OpenBSD: Makefile,v 1.19 2021/02/23 20:06:01 naddy 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

4
net/weex/distinfo
View File

@ -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

11
net/weex/patches/patch-Makefile_am Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-Makefile_am,v 1.1 2021/02/23 20:06:01 naddy Exp $
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

16
net/weex/patches/patch-aclocal_m4
View File

@ -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

18
net/weex/patches/patch-configure_in
View File

@ -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: patch-configure_in,v 1.2 2021/02/23 20:06:01 naddy Exp $
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)

67
net/weex/patches/patch-po_Makefile_in_in
View File

@ -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

14
net/weex/patches/patch-po_fr_po Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-po_fr_po,v 1.1 2021/02/23 20:06:01 naddy Exp $
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"

14
net/weex/patches/patch-src_Makefile_in
View File

@ -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 =

12
net/weex/patches/patch-src_log_c
View File

@ -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);

5
net/weex/pkg/PLIST
View File

@ -1,7 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2004/10/09 18:55:20 naddy Exp $
bin/weex
@comment $OpenBSD: PLIST,v 1.2 2021/02/23 20:06:01 naddy Exp $
@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