aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2021-09-07 19:53:43 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2021-09-07 19:53:43 +0000
commit75237f055fc917d0b6430079f3db410b4fc4e22b (patch)
tree9aa0cf78cae300153531eb4601bc2ad933c4910e
parent496ef87ce4279d334bf7e7095165e7b4af5df501 (diff)
downloadports-75237f055fc917d0b6430079f3db410b4fc4e22b.tar.gz
ports-75237f055fc917d0b6430079f3db410b4fc4e22b.zip
print/a2ps: Fix build for CURRENT
-rw-r--r--print/a2ps/Makefile4
-rw-r--r--print/a2ps/files/patch-regex.c11
2 files changed, 15 insertions, 0 deletions
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;