devel/gettext*:

- Update to 0.20.1.
- Add options to install documentation and examples.

devel/libtextstyle:
- Take maintainership because it is now released as part of gettext.

ftp/weex:
- Remove bundled gettext (intl/): no longer supported.
- Patch configure.in, Makefile.am and src/Makefile.am to remove references
  to bundled gettext.
- Patch configure.in to add AC_CONFIG_MACRO_DIR([m4]) so aclocal.m4 will
  include gettext .m4 files from m4/ (matching the version set with
  AM_GNU_GETTEXT_VERSION) instead of /usr/local/share/aclocal.
- Port to modern gettext: add po/Makevars and fix a problem in the French
  translation.
- Patch configure.in to fix detection of OpenSSL 1.1.
- In port Makefile: add EXAMPLES and NLS options, add ports OpenSSL support,
  set default path for root certificates.

games/lgeneral:
- Patch Makefile.in instead of Makefile.am so USES=autoreconf isn't needed.

www/sarg:
- Patch configure.ac to add AC_CONFIG_MACRO_DIR([m4]) so aclocal.m4 will
  include gettext .m4 files from m4/ (matching the version set with
  AM_GNU_GETTEXT_VERSION) instead of /usr/local/share/aclocal.
- Port Makefile: remove obsolete post-patch, patching configure also has no
  effect with USES=autoreconf.

PR:		238277
Exp-run by:	antoine
Approved by:	portmgr (antoine)

6 files changed, 86 insertions, 6 deletions

diff --git a/ftp/weex/Makefile b/ftp/weex/Makefile
index 016a9b801d0c..db3b21cae311 100644
--- a/ftp/weex/Makefile
+++ b/ftp/weex/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	weex
 PORTVERSION=	2.8.2
+PORTREVISION=	1
 CATEGORIES=	ftp
 MASTER_SITES=	SF/weex/weex
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -14,16 +15,25 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/COPYING
 
 USES=		autoreconf gmake ssl gettext-tools
-GNU_CONFIGURE=	yes
 
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-cafile=${LOCALBASE}/share/certs/ca-root-nss.crt
+CPPFLAGS+=	-I${OPENSSLINC}
+LIBS+=		-L${OPENSSLLIB}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-# NLS support is very broken in this release
-CONFIGURE_ARGS=	--disable-nls
+OPTIONS_DEFINE=	EXAMPLES NLS
+OPTIONS_SUB=	yes
+
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext-runtime
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|^\(SUBDIRS.*\)debian|\1|' \
-		${WRKSRC}/Makefile.in
+	@${RM} -r ${WRKSRC}/intl
+
+pre-configure:
+	${CP} ${LOCALBASE}/share/gettext/po/Makevars.template \
+		${WRKSRC}/po/Makevars
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/ftp/weex/files/patch-Makefile.am b/ftp/weex/files/patch-Makefile.am
new file mode 100644
index 000000000000..1fe744f94c4e
--- /dev/null
+++ b/ftp/weex/files/patch-Makefile.am
@@ -0,0 +1,8 @@
+--- Makefile.am.orig	2000-06-13 11:56:56 UTC
++++ 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
diff --git a/ftp/weex/files/patch-configure.in b/ftp/weex/files/patch-configure.in
new file mode 100644
index 000000000000..0c9c08eb9032
--- /dev/null
+++ b/ftp/weex/files/patch-configure.in
@@ -0,0 +1,36 @@
+--- configure.in.orig	2014-09-19 21:34:27 UTC
++++ configure.in
+@@ -1,5 +1,6 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(src/weex.c)
++AC_CONFIG_MACRO_DIR([m4])
+ 
+ PACKAGE=weex
+ VERSION=2.8.0
+@@ -24,8 +25,8 @@ AC_PROG_CC
+ AC_PROG_INSTALL
+ 
+ dnl for gettext
+-AM_GNU_GETTEXT
+-AC_CHECK_FUNC(gettext,,AC_CHECK_LIB(intl, gettext))
++AM_GNU_GETTEXT_VERSION([0.20])
++AM_GNU_GETTEXT([external])
+ localedir='${prefix}/share/locale'
+ AC_SUBST(localedir)
+ 
+@@ -33,7 +34,7 @@ dnl Checks for libraries.
+ AC_CHECK_LIB(socket,socket)
+ AC_CHECK_LIB(nsl,gethostbyname)
+ AC_CHECK_LIB([crypto],[CRYPTO_new_ex_data],
+-    AC_CHECK_LIB([ssl],[SSL_library_init], 
++    AC_CHECK_LIB([ssl],[SSL_new], 
+ 	[LIBS="$LIBS -lssl -lcrypto"; CFLAGS="$CFLAGS -DUSE_SSL=1"], [])
+     )
+ 
+@@ -79,5 +80,5 @@ if test x$CC = xgcc; then
+ fi     
+       
+ 
+-AC_OUTPUT(Makefile intl/Makefile src/Makefile po/Makefile.in \
++AC_OUTPUT(Makefile src/Makefile po/Makefile.in \
+ debian/Makefile doc/Makefile man/Makefile)
diff --git a/ftp/weex/files/patch-po-fr.po b/ftp/weex/files/patch-po-fr.po
new file mode 100644
index 000000000000..184aab736903
--- /dev/null
+++ b/ftp/weex/files/patch-po-fr.po
@@ -0,0 +1,11 @@
+--- po/fr.po.orig	2000-06-13 11:57:11 UTC
++++ 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"
diff --git a/ftp/weex/files/patch-src-Makefile.am b/ftp/weex/files/patch-src-Makefile.am
new file mode 100644
index 000000000000..38d86e86acd0
--- /dev/null
+++ b/ftp/weex/files/patch-src-Makefile.am
@@ -0,0 +1,10 @@
+--- src/Makefile.am.orig	2014-09-19 09:09:22 UTC
++++ src/Makefile.am
+@@ -3,6 +3,5 @@ weex_SOURCES=config.c ftplib.c ftplib.h weex.c intl.h 
+ parsecfg.c parsecfg.h proto.h shhopt.c shhopt.h strlib.c strlib.h variable.h \
+ ftpmain.c message.c cache.c sub.c filedata.c log.c
+ 
+-LDADD=$(INTLLIBS)
++LDADD=$(LIBINTL)
+ AM_CPPFLAGS=-DLOCALEDIR=\""$(localedir)"\"
+-INCLUDES=-I$(top_srcdir)/intl -I$(top_builddir)/intl
diff --git a/ftp/weex/pkg-plist b/ftp/weex/pkg-plist
index 224d57c7e386..d0d96f1cb15c 100644
--- a/ftp/weex/pkg-plist
+++ b/ftp/weex/pkg-plist
@@ -1,3 +1,8 @@
 bin/weex
 man/man1/weex.1.gz
-%%EXAMPLESDIR%%/sample.weexrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.weexrc
+%%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