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)
svn path=/head/; revision=503716
2019-06-08 09:55:01 +00:00 · 2019-06-08 09:55:01 +00:00 · 2c9ab8d7ad · 2021-03-31 03:12:20 +00:00
commit 2c9ab8d7ad
parent c50bfa8d99
22 changed files with 1828 additions and 205 deletions
--- a/devel/gettext-runtime/Makefile
+++ b/devel/gettext-runtime/Makefile
@ -5,29 +5,35 @@
 # discretion.

 PORTNAME=	gettext-runtime
-PORTREVISION=	2
+PORTREVISION=	0

 COMMENT=	GNU gettext runtime libraries and programs

-LICENSE=	LGPL21 GPLv3
+LICENSE=	LGPL21+ GPLv3+
 LICENSE_COMB=	multi
 LICENSE_FILE_LGPL21=	${WRKSRC}/intl/COPYING.LIB
 LICENSE_FILE_GPLv3=	${WRKSRC}/../COPYING

 .include "${.CURDIR}/../gettext/Makefile.common"

+USES=		charsetfix cpe iconv libtool tar:xz
+USE_LDCONFIG=	yes
+
+CPE_PRODUCT=	gettext
+CPE_VENDOR=	gnu
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-csharp --disable-java --with-included-gettext \
 		ac_cv_lib_rt_sched_yield=no
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
-USES=		charsetfix cpe iconv libtool tar:xz
-USE_LDCONFIG=	yes
 WRKSRC_SUBDIR=	gettext-runtime

+DATADIR=	${PREFIX}/share/gettext
+DOCSDIR=	${PREFIX}/share/doc/gettext
 INFO=		autosprintf
-CPE_PRODUCT=	gettext
-CPE_VENDOR=	gnu
+
+OPTIONS_DEFINE=	DOCS

 .include <bsd.port.options.mk>

@ -35,15 +41,4 @@ CPE_VENDOR=	gnu
 CONFIGURE_ARGS+=--disable-threads
 .endif

-post-patch:
-# Do not install csharp and java documentation.
-	@${REINPLACE_CMD} -E '/^SUBDIRS =/s/(intl-csharp|intl-java)//g' \
-		${WRKSRC}/Makefile.in
-# Do not install html copies of manpages.
-	@${REINPLACE_CMD} \
-		-e '/^all-local:/s/html-local//' \
-		-e '/^install-data-local:/s/install-html//' \
-		-e '/^installdirs-local:/s/installdirs-html//' \
-		${WRKSRC}/libasprintf/Makefile.in ${WRKSRC}/man/Makefile.in
-
 .include <bsd.port.mk>
--- a/devel/gettext-runtime/files/patch-configure
+++ b/devel/gettext-runtime/files/patch-configure
@ -1,11 +1,11 @@
--- configure.orig	2014-07-14 07:30:12 UTC
+--- configure.orig	2019-05-12 15:08:34 UTC
 +++ configure
-@@ -16277,7 +16277,7 @@
-              # thread: pthread_create from libc will fail, whereas
-              # pthread_create will actually create a thread.
+@@ -17215,7 +17215,7 @@ if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; the
+              # On Solaris 10 or newer, this test is no longer needed, because
+              # libc contains the fully functional pthread functions.
              case "$host_os" in
-               solaris* | hpux*)
-+               solaris* | hpux* | freebsd*)
+-               solaris | solaris2.1-9 | solaris2.1-9.* | hpux*)
+               solaris | solaris2.1-9 | solaris2.1-9.* | hpux* | freebsd*)
 
 $as_echo "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h
 
--- a/devel/gettext-runtime/pkg-descr
+++ b/devel/gettext-runtime/pkg-descr
@ -3,4 +3,4 @@ and localisation of software.

 This package contains the runtime libraries and programs.

-WWW: http://www.gnu.org/software/gettext/
+WWW: https://www.gnu.org/software/gettext/
--- a/devel/gettext-runtime/pkg-plist
+++ b/devel/gettext-runtime/pkg-plist
@ -11,7 +11,7 @@ lib/libasprintf.so.0.0.0
 lib/libintl.a
 lib/libintl.so
 lib/libintl.so.8
-lib/libintl.so.8.1.5
+lib/libintl.so.8.1.6
 man/man1/envsubst.1.gz
 man/man1/gettext.1.gz
 man/man1/ngettext.1.gz
@ -24,7 +24,37 @@ man/man3/dngettext.3.gz
 man/man3/gettext.3.gz
 man/man3/ngettext.3.gz
 man/man3/textdomain.3.gz
+%%PORTDOCS%%%%DOCSDIR%%/bind_textdomain_codeset.3.html
+%%PORTDOCS%%%%DOCSDIR%%/bindtextdomain.3.html
+%%PORTDOCS%%%%DOCSDIR%%/csharpdoc/GNU_Gettext.html
+%%PORTDOCS%%%%DOCSDIR%%/csharpdoc/GNU_Gettext_GettextResourceManager.html
+%%PORTDOCS%%%%DOCSDIR%%/csharpdoc/GNU_Gettext_GettextResourceSet.html
+%%PORTDOCS%%%%DOCSDIR%%/csharpdoc/begin.html
+%%PORTDOCS%%%%DOCSDIR%%/csharpdoc/index.html
+%%PORTDOCS%%%%DOCSDIR%%/csharpdoc/namespaces.html
+%%PORTDOCS%%%%DOCSDIR%%/envsubst.1.html
+%%PORTDOCS%%%%DOCSDIR%%/gettext.1.html
+%%PORTDOCS%%%%DOCSDIR%%/gettext.3.html
+%%PORTDOCS%%%%DOCSDIR%%/javadoc2/allclasses-frame.html
+%%PORTDOCS%%%%DOCSDIR%%/javadoc2/deprecated-list.html
+%%PORTDOCS%%%%DOCSDIR%%/javadoc2/gnu/gettext/GettextResource.html
+%%PORTDOCS%%%%DOCSDIR%%/javadoc2/gnu/gettext/package-frame.html
+%%PORTDOCS%%%%DOCSDIR%%/javadoc2/gnu/gettext/package-summary.html
+%%PORTDOCS%%%%DOCSDIR%%/javadoc2/gnu/gettext/package-tree.html
+%%PORTDOCS%%%%DOCSDIR%%/javadoc2/help-doc.html
+%%PORTDOCS%%%%DOCSDIR%%/javadoc2/index-all.html
+%%PORTDOCS%%%%DOCSDIR%%/javadoc2/index.html
+%%PORTDOCS%%%%DOCSDIR%%/javadoc2/overview-tree.html
+%%PORTDOCS%%%%DOCSDIR%%/javadoc2/package-list
+%%PORTDOCS%%%%DOCSDIR%%/javadoc2/packages.html
+%%PORTDOCS%%%%DOCSDIR%%/javadoc2/serialized-form.html
+%%PORTDOCS%%%%DOCSDIR%%/javadoc2/stylesheet.css
+%%PORTDOCS%%%%DOCSDIR%%/ngettext.1.html
+%%PORTDOCS%%%%DOCSDIR%%/ngettext.3.html
+%%PORTDOCS%%%%DOCSDIR%%/textdomain.3.html
+%%PORTDOCS%%share/doc/libasprintf/autosprintf_all.html
 %%DATADIR%%/ABOUT-NLS
+share/locale/ast/LC_MESSAGES/gettext-runtime.mo
 share/locale/be/LC_MESSAGES/gettext-runtime.mo
 share/locale/bg/LC_MESSAGES/gettext-runtime.mo
 share/locale/ca/LC_MESSAGES/gettext-runtime.mo
--- a/devel/gettext-tools/Makefile
+++ b/devel/gettext-tools/Makefile
@ -5,56 +5,45 @@
 # discretion.

 PORTNAME=	gettext-tools
-PORTREVISION=	1
+PORTREVISION=	0

 COMMENT=	GNU gettext development and translation tools

-LICENSE=	GPLv3
+LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/../COPYING

 .include "${.CURDIR}/../gettext/Makefile.common"

+LIB_DEPENDS=	libtextstyle.so:devel/libtextstyle
+
+USES=		charsetfix cpe gettext-runtime iconv libtool tar:xz
+USE_LDCONFIG=	yes
+
+CPE_PRODUCT=	gettext
+CPE_VENDOR=	gnu
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-csharp --disable-java --disable-openmp \
 		--with-included-glib --with-included-libcroco \
 		--with-included-libunistring --with-included-libxml \
 		--without-emacs --without-git ac_cv_lib_rt_sched_yield=no
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
-PLIST_SUB=	VERSION=${PORTVERSION:R}
 TEST_TARGET=	check
-USES=		charsetfix cpe gettext-runtime iconv libtool tar:xz
-USE_LDCONFIG=	yes
 WRKSRC_SUBDIR=	gettext-tools

-CPE_PRODUCT=	gettext
-CPE_VENDOR=	gnu
+DATADIR=	${PREFIX}/share/gettext
+DOCSDIR=	${PREFIX}/share/doc/gettext
+PLIST_SUB=	PORTVERSION=${PORTVERSION} VERSION=${PORTVERSION:R}

-OPTIONS_DEFINE=	DOCS THREADS
+INFO=		gettext
+
+OPTIONS_DEFINE=	DOCS EXAMPLES THREADS
 OPTIONS_DEFAULT=THREADS
 OPTIONS_EXCLUDE_DragonFly=	THREADS

-DOCS_INFO=	gettext
-
 THREADS_CONFIGURE_ENABLE=	threads

-post-patch-DOCS-off:
-	@${REINPLACE_CMD} '/^SUBDIRS =/s/doc//' ${WRKSRC}/Makefile.in
-
 post-patch:
-# Exclude examples and gnulib-tests.
-	@${REINPLACE_CMD} -E '/^SUBDIRS =/s/(examples|gnulib-tests)//g' \
-		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} \
-		'/^install-data-am:/s/install-examplesbuildauxDATA//' \
-		${WRKSRC}/Makefile.in ${WRKSRC}/m4/Makefile.in
-# Do not install html copies of manpages.
-	@${REINPLACE_CMD} \
-		-e '/^all-local:/s/html-local//' \
-		-e '/^install-data-local:/s/install-html//' \
-		-e '/^installdirs-local:/s/installdirs-html//' \
-		${WRKSRC}/man/Makefile.in
 # Do not patch system float.h.
 	@${REINPLACE_CMD} 's/FLOAT_H=float\.h//' \
 		${WRKSRC}/configure
@ -64,5 +53,10 @@ post-patch:
 # Use libasprintf installed by gettext-runtime.
 	@${REINPLACE_CMD} 's,[^ ]*libasprintf.la,-lasprintf,' \
 		${WRKSRC}/tests/lang-c++
+# Use system libtextstyle.
+	@${REINPLACE_CMD} \
+		-e '/:/!s,[[:<:]]textstyle[^[:space:]]*\.h,,g' \
+		-e 's,\.\./\.\./libtextstyle/lib/libtextstyle\.la,-ltextstyle,' \
+		${WRKSRC}/src/Makefile.in

 .include <bsd.port.mk>
--- a/devel/gettext-tools/files/patch-configure
+++ b/devel/gettext-tools/files/patch-configure
@ -1,15 +1,15 @@
--- configure.orig	2014-07-14 07:30:23 UTC
+--- configure.orig	2019-05-12 15:09:13 UTC
 +++ configure
-@@ -18293,7 +18293,7 @@
-              # thread: pthread_create from libc will fail, whereas
-              # pthread_create will actually create a thread.
+@@ -19449,7 +19449,7 @@ if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; the
+              # On Solaris 10 or newer, this test is no longer needed, because
+              # libc contains the fully functional pthread functions.
              case "$host_os" in
-               solaris* | hpux*)
-+               solaris* | hpux* | freebsd*)
+-               solaris | solaris2.1-9 | solaris2.1-9.* | hpux*)
+               solaris | solaris2.1-9 | solaris2.1-9.* | hpux* | freebsd*)
 
 $as_echo "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h
 
-@@ -21679,7 +21679,7 @@
+@@ -23751,7 +23751,7 @@ $as_echo "$ac_res" >&6; }
                                         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
            || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
                 && test "$PACKAGE" != gettext-runtime \
--- a/devel/gettext-tools/pkg-descr
+++ b/devel/gettext-tools/pkg-descr
@ -3,4 +3,4 @@ and localisation of software.

 This package contains development and translation tools.

-WWW: http://www.gnu.org/software/gettext/
+WWW: https://www.gnu.org/software/gettext/
--- a/devel/gettext-tools/pkg-plist
+++ b/devel/gettext-tools/pkg-plist
--- a/devel/gettext/Makefile.common
+++ b/devel/gettext/Makefile.common
@ -4,7 +4,7 @@
 # experimental ports run.  Untested commits may be backed out at portmgr's
 # discretion.

-PORTVERSION=	0.19.8.1
+PORTVERSION=	0.20.1
 PORTREVISION?=	0 # Leave this zero. Set in Makefile instead.
 CATEGORIES=	devel
 MASTER_SITES=	GNU/gettext
@ -13,6 +13,3 @@ DISTNAME=	gettext-${PORTVERSION}
 MAINTAINER=	tijl@FreeBSD.org

 DISTINFO_FILE=	${.CURDIR}/../gettext/distinfo
-
-DATADIR=	${PREFIX}/share/gettext
-DOCSDIR=	${PREFIX}/share/doc/gettext
--- a/devel/gettext/distinfo
+++ b/devel/gettext/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1465727987
-SHA256 (gettext-0.19.8.1.tar.xz) = 105556dbc5c3fbbc2aa0edb46d22d055748b6f5c7cd7a8d99f8e7eb84e938be4
-SIZE (gettext-0.19.8.1.tar.xz) = 7209808
+TIMESTAMP = 1557680234
+SHA256 (gettext-0.20.1.tar.xz) = 53f02fbbec9e798b0faaf7c73272f83608e835c6288dd58be6c9bb54624a3800
+SIZE (gettext-0.20.1.tar.xz) = 9346544
--- a/devel/gettext/pkg-descr
+++ b/devel/gettext/pkg-descr
@ -1,4 +1,4 @@
 GNU gettext is a framework of libraries and tools for internationalisation
 and localisation of software.

-WWW: http://www.gnu.org/software/gettext/
+WWW: https://www.gnu.org/software/gettext/
--- a/devel/libtextstyle/Makefile
+++ b/devel/libtextstyle/Makefile
@ -1,21 +1,27 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 # $FreeBSD$

-PORTNAME=	libtextstyle
-PORTVERSION=	0.8
-CATEGORIES=	devel
-MASTER_SITES=	GNU_ALPHA/gettext
+# NOTE: before committing to this port, contact portmgr to arrange for an
+# experimental ports run.  Untested commits may be backed out at portmgr's
+# discretion.
+
+PORTNAME=	libtextstyle
+PORTREVISION=	0

-MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Text styling library

 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING

-USES=		iconv libtool ncurses
+.include "${.CURDIR}/../gettext/Makefile.common"
+
+USES=		iconv libtool ncurses tar:xz
+USE_LDCONFIG=	yes

 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-libncurses-prefix=${NCURSESBASE}
+INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
+WRKSRC_SUBDIR=	libtextstyle

 INFO=		libtextstyle

--- a/devel/libtextstyle/distinfo
+++ b/devel/libtextstyle/distinfo
@ -1,3 +0,0 @@
-TIMESTAMP = 1559381101
-SHA256 (libtextstyle-0.8.tar.gz) = 5cd91ef7683111af2734095e00f4ee4995c916cf32ea38e314aee251f8683216
-SIZE (libtextstyle-0.8.tar.gz) = 2917915
--- 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}
--- a/ftp/weex/files/patch-Makefile.am
+++ 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
--- a/ftp/weex/files/patch-configure.in
+++ 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)
--- a/ftp/weex/files/patch-po-fr.po
+++ 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"
--- a/ftp/weex/files/patch-src-Makefile.am
+++ 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
--- 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
--- a/games/lgeneral/Makefile
+++ b/games/lgeneral/Makefile
@ -18,24 +18,25 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BROKEN_powerpc=	does not install
 BROKEN_sparc64=	does not install

-USES=		autoreconf gettext-tools gmake localbase
+USES=		gmake localbase
 USE_CSTD=	gnu89
 USE_SDL=	sdl
+
 GNU_CONFIGURE=	yes

 OPTIONS_DEFINE=		DOCS NLS SOUND
 OPTIONS_DEFAULT=	SOUND
 OPTIONS_SUB=		yes

-NLS_USES=		gettext-runtime
+NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
-NLS_CONFIGURE_ENV_OFF=	am_cv_func_iconv=no
 SOUND_USE=		sdl=mixer
 SOUND_CONFIGURE_OFF=	--disable-sound

 post-patch:
 .for i in flags terrain units
-	@${REINPLACE_CMD} -e 's|$$(${i}dir)|$$(DESTDIR)/&|' ${WRKSRC}/src/gfx/${i}/Makefile.am
+	@${REINPLACE_CMD} -e '/mkinstalldirs/s/$$(${i}dir)/$$(DESTDIR)&/' \
+		${WRKSRC}/src/gfx/${i}/Makefile.in
 .endfor

 post-install:
--- a/www/sarg/Makefile
+++ b/www/sarg/Makefile
@ -42,8 +42,4 @@ ICONV_USES=		iconv
 ICONV_CONFIGURE_WITH=	iconv
 ICONV_LDFLAGS=		${ICONV_LIB}

-post-patch:
-	@${REINPLACE_CMD} -e '/test .*==/ s/==/=/' \
-		${WRKSRC}/configure
-
 .include <bsd.port.mk>
--- a/www/sarg/files/patch-configure.ac
+++ b/www/sarg/files/patch-configure.ac
@ -0,0 +1,10 @@
+--- configure.ac.orig	2018-01-14 19:01:22 UTC
+++ configure.ac
+@@ -2,6 +2,7 @@ dnl Process this file with autoconf or autoreconf to p
+ AC_INIT([sarg],[2.3.11])
+ AC_CONFIG_SRCDIR([log.c])
+ AC_CONFIG_AUX_DIR(cfgaux)
+AC_CONFIG_MACRO_DIR([m4])
+ 
+ AC_CANONICAL_HOST
+