diff options
| author | sevan <sevan> | 2017-03-07 02:07:28 +0000 |
|---|---|---|
| committer | sevan <sevan> | 2017-03-07 02:07:28 +0000 |
| commit | 52fa1875bca03db0656aa0fd1892cb8316df336e (patch) | |
| tree | 5c8445c1bb233cb3cff2793df39b649149680dbf /net | |
| parent | a58351a93e1f8a88e5b426c767ca46dc5b0cea4f (diff) | |
| download | pkgsrc-52fa1875bca03db0656aa0fd1892cb8316df336e.tar.gz | |
Unbreak on legacy OS X by not defining BIND_8_COMPAT
The configure script now automatically adds resolv library to the linker list,
without intervention. Build tested on OS X 10.4 & 10.11
Diffstat (limited to 'net')
| -rw-r--r-- | net/mtr/Makefile | 6 | ||||
| -rw-r--r-- | net/mtr/distinfo | 3 | ||||
| -rw-r--r-- | net/mtr/patches/patch-asn.c | 16 |
3 files changed, 19 insertions, 6 deletions
diff --git a/net/mtr/Makefile b/net/mtr/Makefile index fe48d990993..029350d10ed 100644 --- a/net/mtr/Makefile +++ b/net/mtr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.97 2017/02/12 06:25:52 ryoon Exp $ +# $NetBSD: Makefile,v 1.98 2017/03/07 02:07:28 sevan Exp $ DISTNAME= mtr-0.87 PKGREVISION= 2 @@ -24,10 +24,6 @@ SPECIAL_PERMS= sbin/mtr ${SETUID_ROOT_PERMS} BUILDLINK_TRANSFORM+= rm:-Wno-pointer-sign .endif -.if !empty(MACHINE_PLATFORM:MDarwin-??.*-*) -LIBS+= -lresolv -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mtr ${DESTDIR}${PREFIX}/sbin ${INSTALL_DATA} ${WRKSRC}/mtr.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 diff --git a/net/mtr/distinfo b/net/mtr/distinfo index 7e6602d74b6..402b6a5a16c 100644 --- a/net/mtr/distinfo +++ b/net/mtr/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.45 2016/08/21 07:00:22 wiz Exp $ +$NetBSD: distinfo,v 1.46 2017/03/07 02:07:28 sevan Exp $ SHA1 (mtr-0.87.tar.gz) = afd192a765116f3d44e4bada9e11d4ccd79acefc RMD160 (mtr-0.87.tar.gz) = 9cc760ec31113462f9aeff94b3ba1af1cb4ed994 SHA512 (mtr-0.87.tar.gz) = 172ba2f78a6ee4deb427ac2fb00dff16843215dbd23663fbe41fcc957ffe278b408a73a0c7e1c05788b235e2d03fb53f9971b8b82d4de2f95edcaa9f2cff3cf9 Size (mtr-0.87.tar.gz) = 184645 bytes +SHA1 (patch-asn.c) = 37aec0ccc296122c93d60f7b5397fd5a61c94e86 SHA1 (patch-net.c) = b8a88ef7c4bad7cfbb502e60e12fd84b90e601dd SHA1 (patch-net.h) = b5209872236f078e29e124988324ab0be870c45c diff --git a/net/mtr/patches/patch-asn.c b/net/mtr/patches/patch-asn.c new file mode 100644 index 00000000000..ed04d255309 --- /dev/null +++ b/net/mtr/patches/patch-asn.c @@ -0,0 +1,16 @@ +$NetBSD: patch-asn.c,v 1.5 2017/03/07 02:07:29 sevan Exp $ + +Fix build on Darwin. + +--- asn.c.orig 2017-02-17 02:50:57.000000000 +0000 ++++ asn.c +@@ -23,9 +23,6 @@ + #include <stdlib.h> + #include <sys/types.h> + +-#ifdef __APPLE__ +-#define BIND_8_COMPAT +-#endif + #include <arpa/nameser.h> + #ifdef HAVE_ARPA_NAMESER_COMPAT_H + #include <arpa/nameser_compat.h> |