the gettext autoconf macros included with gettext 0.20 depend on an

additional macro file
This commit is contained in:
naddy 2019-05-22 11:54:37 +00:00
parent 1e1521f098
commit 0b82059baf
4 changed files with 31 additions and 4 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.43 2019/05/20 22:15:19 naddy Exp $
# $OpenBSD: Makefile,v 1.44 2019/05/22 11:54:37 naddy Exp $
COMMENT = graphical network monitor
@ -42,6 +42,6 @@ LIB_DEPENDS = x11/gtk+2 \
BUILD_DEPENDS += devel/gettext,-tools
post-patch:
cd ${LOCALBASE}/share/aclocal && \
cp lib-link.m4 lib-prefix.m4 ${WRKSRC}/m4
cp lib-link.m4 lib-prefix.m4 host-cpu-c-abi.m4 ${WRKSRC}/m4
.include <bsd.port.mk>

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-aclocal_m4,v 1.1 2019/05/22 11:54:37 naddy Exp $
Index: aclocal.m4
--- aclocal.m4.orig
+++ aclocal.m4
@@ -1393,6 +1393,7 @@ AC_SUBST([am__untar])
m4_include([m4/gettext.m4])
m4_include([m4/gnome-doc-utils.m4])
+m4_include([m4/host-cpu-c-abi.m4])
m4_include([m4/iconv.m4])
m4_include([m4/lib-ld.m4])
m4_include([m4/lib-link.m4])

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.58 2019/05/20 22:15:20 naddy Exp $
# $OpenBSD: Makefile,v 1.59 2019/05/22 11:54:37 naddy Exp $
COMMENT= SLang-based newsreader
@ -42,7 +42,8 @@ MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/autoconf
# replace bundled m4 files with the newer (working ;) ones from gettext
do-gen:
.for i in gettext lib-ld lib-prefix nls progtest iconv lib-link po
.for i in gettext lib-ld lib-prefix host-cpu-c-abi nls progtest iconv \
lib-link po
cp ${LOCALBASE}/share/aclocal/$i.m4 ${WRKSRC}/autoconf/include/
.endfor
cd ${WRKSRC}/autoconf && \

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-autoconf_configure_ac,v 1.1 2019/05/22 11:54:37 naddy Exp $
Index: autoconf/configure.ac
--- autoconf/configure.ac.orig
+++ autoconf/configure.ac
@@ -213,6 +213,7 @@ m4_include([./include/po.m4])
m4_include([./include/lib-ld.m4])
m4_include([./include/lib-link.m4])
m4_include([./include/lib-prefix.m4])
+m4_include([./include/host-cpu-c-abi.m4])
m4_include([./include/mkdirp.m4])
m4_include([./include/progtest.m4])
AM_ICONV