git: 75237f055fc9 - main - print/a2ps: Fix build for CURRENT

[Dirk Meyer]

The branch main has been updated by dinoex:

URL: https://cgit.FreeBSD.org/ports/commit/?id=75237f055fc917d0b6430079f3db410b4fc4e22b

commit 75237f055fc917d0b6430079f3db410b4fc4e22b
Author:     Dirk Meyer <dinoex at FreeBSD.org>
AuthorDate: 2021-09-07 19:53:43 +0000
Commit:     Dirk Meyer <dinoex at FreeBSD.org>
CommitDate: 2021-09-07 19:53:43 +0000

    print/a2ps: Fix build for CURRENT
---
 print/a2ps/Makefile            |  4 ++++
 print/a2ps/files/patch-regex.c | 11 +++++++++++
 2 files changed, 15 insertions(+)

diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index c2a75d53a2df..6474852bb6e6 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -51,6 +51,10 @@ EMACS_CONFIGURE_ON=	--with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}
 CONFIGURE_ENV+=	EMACS=no
 .endif
 
+.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1400000
+CFLAGS+=	-DHAVE_MEMPCPY
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e 's|^DESTDIR|#DESTDIR|' \
 		`${FIND} ${WRKSRC} -name "Makefile.in"`
diff --git a/print/a2ps/files/patch-regex.c b/print/a2ps/files/patch-regex.c
new file mode 100644
index 000000000000..1319311cbdd9
--- /dev/null
+++ b/print/a2ps/files/patch-regex.c
@@ -0,0 +1,11 @@
+--- src/regex.c.orig	1999-05-10 04:27:07 UTC
++++ src/regex.c
+@@ -5789,7 +5789,7 @@ regerror (errcode, preg, errbuf, errbuf_size)
+       if (msg_size > errbuf_size)
+         {
+ #if defined HAVE_MEMPCPY || defined _LIBC
+-	  *((char *) __mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
++	  *((char *) mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
+ #else
+           memcpy (errbuf, msg, errbuf_size - 1);
+           errbuf[errbuf_size - 1] = 0;