From 2de3d39a4493f5a98ff924c9f1c21e49e4ce51ad Mon Sep 17 00:00:00 2001
From: schwarz <schwarz@pkgsrc.org>
Date: Sat, 20 Mar 2010 00:04:21 +0000
Subject: MacOS 10.6 needs -lresolv

---
 net/traceroute-nanog/DESCR    |  2 +-
 net/traceroute-nanog/Makefile | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'net')

diff --git a/net/traceroute-nanog/DESCR b/net/traceroute-nanog/DESCR
index c526c740590..fa100add43b 100644
--- a/net/traceroute-nanog/DESCR
+++ b/net/traceroute-nanog/DESCR
@@ -1,3 +1,3 @@
 Traceroute-nanog is based on the Van Jacobson/BSD traceroute and has
-additional features like AS lookup, TOS support, microsecond timestamps, 
+additional features like AS lookup, TOS support, microsecond timestamps,
 path MTU discovery, parallel probing and others.
diff --git a/net/traceroute-nanog/Makefile b/net/traceroute-nanog/Makefile
index 50861063024..1e1cc08c030 100644
--- a/net/traceroute-nanog/Makefile
+++ b/net/traceroute-nanog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/03/14 18:19:22 pettai Exp $
+# $NetBSD: Makefile,v 1.2 2010/03/20 00:04:21 schwarz Exp $
 
 DISTNAME=	traceroute-nanog-6.4.2
 CATEGORIES=	net
@@ -20,8 +20,6 @@ WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	YES
 USE_FEATURES+=	snprintf
 
-TRN_EXTRALIBS=
-
 .include "../../mk/bsd.prefs.mk"
 .if empty(PKGSRC_COMPILER:Mgcc*)
 CPPFLAGS+=	-D__attribute__=
@@ -31,19 +29,22 @@ CPPFLAGS+=	-D__attribute__=
 .if ${OS_VERSION} >= 5.0
 .if ${OS_VERSION} != 5.4
 CPPFLAGS+=	-DSOLARIS
-TRN_EXTRALIBS+=	-lresolv -lsocket -lnsl
+LIBS+=	-lresolv -lsocket -lnsl
 .endif
 .if ${LOWER_ARCH} == "i386"
 CPPFLAGS+=	-DBYTESWAP_IP_LEN
 .endif
 .endif
 .elif ${OPSYS} == "Linux"
-TRN_EXTRALIBS+=	-lresolv
+LIBS+=	-lresolv
 CPPFLAGS+=	-DSTRING
 .elif ${OPSYS} == "FreeBSD"
 CPPFLAGS+=	-DSTRING
 .elif ${OPSYS} == "Darwin"
 CPPFLAGS+=	-DBIND_8_COMPAT -DRA_SERVICE=\"nicname\"
+.if !empty(OS_VERSION:M10.*) # MacOS X 10.6.X aka Snow Leopard
+LIBS+=	-lresolv
+.endif
 .elif !empty(LOWER_OPSYS:Mirix5*)
 CPPFLAGS+=	-Dsocklen_t=int
 .endif
@@ -53,7 +54,7 @@ INSTALLATION_DIRS=	sbin ${PKGMANDIR}/man8
 do-extract:
 		${CP} ${DISTDIR}/${DIST_SUBDIR}/traceroute.c ${WRKSRC}
 do-build:
-		cd ${WRKSRC} && ${CC} ${CPPFLAGS} ${CFLAGS} traceroute.c -o traceroute-nanog ${LDFLAGS} -lm ${TRN_EXTRALIBS}
+		cd ${WRKSRC} && ${CC} ${CPPFLAGS} ${CFLAGS} traceroute.c -o traceroute-nanog ${LDFLAGS} -lm ${LIBS}
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/traceroute-nanog ${DESTDIR}${PREFIX}/sbin
-- 
cgit v1.2.3