Fix build on macOS, from Kurt Schreiner on pkgsrc-users@.

This commit is contained in:
schmonz 2020-09-07 07:58:11 +00:00
parent c34cf5faf7
commit 46f678f96a
3 changed files with 7 additions and 5 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.6 2020/01/18 21:50:48 jperkin Exp $
# $NetBSD: Makefile,v 1.7 2020/09/07 07:58:11 schmonz Exp $
DISTNAME= sslsplit-0.5.5
PKGREVISION= 1
@ -17,6 +17,7 @@ USE_TOOLS+= gmake
MAKE_ENV+= LIBEVENT_BASE=${BUILDLINK_PREFIX.libevent}
MAKE_ENV+= OPENSSL_BASE=${BUILDLINK_PREFIX.openssl}
MAKE_ENV+= LIBNET_BASE=${BUILDLINK_PREFIX.libnet11}
MAKE_ENV+= LIBPCAP_BASE=${BUILDLINK_PREFIX.libpcap}
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
@ -26,5 +27,6 @@ do-install:
.include "../../devel/libevent/buildlink3.mk"
.include "../../devel/libnet11/buildlink3.mk"
.include "../../net/libpcap/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.3 2019/12/30 22:17:29 rhialto Exp $
$NetBSD: distinfo,v 1.4 2020/09/07 07:58:11 schmonz Exp $
SHA1 (sslsplit-0.5.5.tar.bz2) = 1e861265cfb0e9738a325155a58c52380261d640
RMD160 (sslsplit-0.5.5.tar.bz2) = 9835bd8286383453a916aa906516b3ee60b85e2b
SHA512 (sslsplit-0.5.5.tar.bz2) = 1d4968382659e975cd59692f3de80d79831a7842c9b909bb3cefedb5e2928254394e0f593c3409e3d5b1d0b192d8f8123ae10b08cecfd65584d790437d9f3d2a
Size (sslsplit-0.5.5.tar.bz2) = 532788 bytes
SHA1 (patch-GNUmakefile) = 0d6f386ffbaacaaa5bcfdb514e7c1272d696bbfc
SHA1 (patch-main.c) = b0483283a99cf2aaca5248dcd2a66a64e7d0cd39
SHA1 (patch-main.c) = 5a0515e7bbda4ffc8592be06d53d0d7b92384563

View file

@ -1,4 +1,4 @@
$NetBSD: patch-main.c,v 1.1 2019/12/30 22:17:29 rhialto Exp $
$NetBSD: patch-main.c,v 1.2 2020/09/07 07:58:11 schmonz Exp $
Our libnet11 package does not have the libnet_version() function,
apparently similar to OpenBSD.
@ -10,7 +10,7 @@ apparently similar to OpenBSD.
#ifndef WITHOUT_MIRROR
fprintf(stderr, "compiled against libnet %s\n", LIBNET_VERSION);
-#ifndef __OpenBSD__
+#if !defined(__OpenBSD__) && !defined(__NetBSD__)
+#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__APPLE__)
const char *lnv = libnet_version();
if (!strncmp(lnv, "libnet version ", 15))
lnv += 15;