Tue Mar 7 02:07:29 2017 UTC ()
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


(sevan)
diff -r1.97 -r1.98 pkgsrc/net/mtr/Makefile
diff -r1.45 -r1.46 pkgsrc/net/mtr/distinfo
diff -r0 -r1.5 pkgsrc/net/mtr/patches/patch-asn.c
cvs diff -r1.97 -r1.98 pkgsrc/net/mtr/Makefile (expand / switch to unified diff)

--- pkgsrc/net/mtr/Makefile 2017/02/12 06:25:52 1.97
+++ pkgsrc/net/mtr/Makefile 2017/03/07 02:07:28 1.98
@@ -1,37 +1,33 @@ @@ -1,37 +1,33 @@
1# $NetBSD: Makefile,v 1.97 2017/02/12 06:25:52 ryoon Exp $ 1# $NetBSD: Makefile,v 1.98 2017/03/07 02:07:28 sevan Exp $
2 2
3DISTNAME= mtr-0.87 3DISTNAME= mtr-0.87
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= ftp://ftp.bitwizard.nl/mtr/ 6MASTER_SITES= ftp://ftp.bitwizard.nl/mtr/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.bitwizard.nl/mtr/ 9HOMEPAGE= http://www.bitwizard.nl/mtr/
10COMMENT= Traceroute and ping in a single graphical network diagnostic tool 10COMMENT= Traceroute and ping in a single graphical network diagnostic tool
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13GNU_CONFIGURE= YES 13GNU_CONFIGURE= YES
14USE_TOOLS+= pkg-config 14USE_TOOLS+= pkg-config
15INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin share/doc/mtr 15INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin share/doc/mtr
16 16
17.include "options.mk" 17.include "options.mk"
18 18
19SPECIAL_PERMS= sbin/mtr ${SETUID_ROOT_PERMS} 19SPECIAL_PERMS= sbin/mtr ${SETUID_ROOT_PERMS}
20 20
21# Remove hard-coded compiler option that GCC 3.x doesn't support. 21# Remove hard-coded compiler option that GCC 3.x doesn't support.
22.include "../../mk/compiler.mk" 22.include "../../mk/compiler.mk"
23.if !empty(CC_VERSION:Mgcc-3.*) 23.if !empty(CC_VERSION:Mgcc-3.*)
24BUILDLINK_TRANSFORM+= rm:-Wno-pointer-sign 24BUILDLINK_TRANSFORM+= rm:-Wno-pointer-sign
25.endif 25.endif
26 26
27.if !empty(MACHINE_PLATFORM:MDarwin-??.*-*) 
28LIBS+= -lresolv 
29.endif 
30 
31do-install: 27do-install:
32 ${INSTALL_PROGRAM} ${WRKSRC}/mtr ${DESTDIR}${PREFIX}/sbin 28 ${INSTALL_PROGRAM} ${WRKSRC}/mtr ${DESTDIR}${PREFIX}/sbin
33 ${INSTALL_DATA} ${WRKSRC}/mtr.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 29 ${INSTALL_DATA} ${WRKSRC}/mtr.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
34 ${INSTALL_DATA} ${WRKSRC}/SECURITY ${DESTDIR}${PREFIX}/share/doc/mtr 30 ${INSTALL_DATA} ${WRKSRC}/SECURITY ${DESTDIR}${PREFIX}/share/doc/mtr
35 31
36.include "../../mk/curses.buildlink3.mk" 32.include "../../mk/curses.buildlink3.mk"
37.include "../../mk/bsd.pkg.mk" 33.include "../../mk/bsd.pkg.mk"
cvs diff -r1.45 -r1.46 pkgsrc/net/mtr/distinfo (expand / switch to unified diff)

--- pkgsrc/net/mtr/distinfo 2016/08/21 07:00:22 1.45
+++ pkgsrc/net/mtr/distinfo 2017/03/07 02:07:28 1.46
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.45 2016/08/21 07:00:22 wiz Exp $ 1$NetBSD: distinfo,v 1.46 2017/03/07 02:07:28 sevan Exp $
2 2
3SHA1 (mtr-0.87.tar.gz) = afd192a765116f3d44e4bada9e11d4ccd79acefc 3SHA1 (mtr-0.87.tar.gz) = afd192a765116f3d44e4bada9e11d4ccd79acefc
4RMD160 (mtr-0.87.tar.gz) = 9cc760ec31113462f9aeff94b3ba1af1cb4ed994 4RMD160 (mtr-0.87.tar.gz) = 9cc760ec31113462f9aeff94b3ba1af1cb4ed994
5SHA512 (mtr-0.87.tar.gz) = 172ba2f78a6ee4deb427ac2fb00dff16843215dbd23663fbe41fcc957ffe278b408a73a0c7e1c05788b235e2d03fb53f9971b8b82d4de2f95edcaa9f2cff3cf9 5SHA512 (mtr-0.87.tar.gz) = 172ba2f78a6ee4deb427ac2fb00dff16843215dbd23663fbe41fcc957ffe278b408a73a0c7e1c05788b235e2d03fb53f9971b8b82d4de2f95edcaa9f2cff3cf9
6Size (mtr-0.87.tar.gz) = 184645 bytes 6Size (mtr-0.87.tar.gz) = 184645 bytes
 7SHA1 (patch-asn.c) = 37aec0ccc296122c93d60f7b5397fd5a61c94e86
7SHA1 (patch-net.c) = b8a88ef7c4bad7cfbb502e60e12fd84b90e601dd 8SHA1 (patch-net.c) = b8a88ef7c4bad7cfbb502e60e12fd84b90e601dd
8SHA1 (patch-net.h) = b5209872236f078e29e124988324ab0be870c45c 9SHA1 (patch-net.h) = b5209872236f078e29e124988324ab0be870c45c
File Added: pkgsrc/net/mtr/patches/Attic/patch-asn.c
$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>