CVS commit: pkgsrc/net/mtr

["Sevan Janiyan" <sevan%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sevan
Date:           Tue Mar  7 02:07:29 UTC 2017

Modified Files:
        pkgsrc/net/mtr: Makefile distinfo
Added Files:
        pkgsrc/net/mtr/patches: patch-asn.c

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 pkgsrc/net/mtr/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/net/mtr/distinfo
cvs rdiff -u -r0 -r1.5 pkgsrc/net/mtr/patches/patch-asn.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/mtr/Makefile
diff -u pkgsrc/net/mtr/Makefile:1.97 pkgsrc/net/mtr/Makefile:1.98
--- pkgsrc/net/mtr/Makefile:1.97        Sun Feb 12 06:25:52 2017
+++ pkgsrc/net/mtr/Makefile     Tue Mar  7 02:07:28 2017
@@ -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_PE
 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

Index: pkgsrc/net/mtr/distinfo
diff -u pkgsrc/net/mtr/distinfo:1.45 pkgsrc/net/mtr/distinfo:1.46
--- pkgsrc/net/mtr/distinfo:1.45        Sun Aug 21 07:00:22 2016
+++ pkgsrc/net/mtr/distinfo     Tue Mar  7 02:07:28 2017
@@ -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

Added files:

Index: pkgsrc/net/mtr/patches/patch-asn.c
diff -u /dev/null pkgsrc/net/mtr/patches/patch-asn.c:1.5
--- /dev/null   Tue Mar  7 02:07:29 2017
+++ pkgsrc/net/mtr/patches/patch-asn.c  Tue Mar  7 02:07:29 2017
@@ -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>