Sat Mar 20 00:04:21 2010 UTC ()
MacOS 10.6 needs -lresolv


(schwarz)
diff -r1.1.1.1 -r1.2 pkgsrc/net/traceroute-nanog/DESCR
diff -r1.1.1.1 -r1.2 pkgsrc/net/traceroute-nanog/Makefile
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/traceroute-nanog/DESCR (expand / switch to unified diff)

--- pkgsrc/net/traceroute-nanog/DESCR 2010/03/14 18:19:22 1.1.1.1
+++ pkgsrc/net/traceroute-nanog/DESCR 2010/03/20 00:04:21 1.2
@@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
1Traceroute-nanog is based on the Van Jacobson/BSD traceroute and has 1Traceroute-nanog is based on the Van Jacobson/BSD traceroute and has
2additional features like AS lookup, TOS support, microsecond timestamps,  2additional features like AS lookup, TOS support, microsecond timestamps,
3path MTU discovery, parallel probing and others. 3path MTU discovery, parallel probing and others.
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/traceroute-nanog/Makefile (expand / switch to unified diff)

--- pkgsrc/net/traceroute-nanog/Makefile 2010/03/14 18:19:22 1.1.1.1
+++ pkgsrc/net/traceroute-nanog/Makefile 2010/03/20 00:04:21 1.2
@@ -1,62 +1,63 @@ @@ -1,62 +1,63 @@
1# $NetBSD: Makefile,v 1.1.1.1 2010/03/14 18:19:22 pettai Exp $ 1# $NetBSD: Makefile,v 1.2 2010/03/20 00:04:21 schwarz Exp $
2 2
3DISTNAME= traceroute-nanog-6.4.2 3DISTNAME= traceroute-nanog-6.4.2
4CATEGORIES= net 4CATEGORIES= net
5MASTER_SITES= ftp://ftp.login.com/pub/software/traceroute/ 5MASTER_SITES= ftp://ftp.login.com/pub/software/traceroute/
6MASTER_SITES+= http://gd.tuwien.ac.at/infosys/network/tools/traceroute/ 6MASTER_SITES+= http://gd.tuwien.ac.at/infosys/network/tools/traceroute/
7DISTFILES= traceroute.c 7DISTFILES= traceroute.c
8DIST_SUBDIR= traceroute-nanog 8DIST_SUBDIR= traceroute-nanog
9 9
10# for the man page: 10# for the man page:
11PATCH_SITES= ${MASTER_SITE_DEBIAN:=pool/main/t/traceroute-nanog/} 11PATCH_SITES= ${MASTER_SITE_DEBIAN:=pool/main/t/traceroute-nanog/}
12PATCHFILES= traceroute-nanog_6.3.10-2.diff.gz 12PATCHFILES= traceroute-nanog_6.3.10-2.diff.gz
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16COMMENT= Traceroute implementation with extend features 16COMMENT= Traceroute implementation with extend features
17MAINTAINER= schwarz@NetBSD.org 17MAINTAINER= schwarz@NetBSD.org
18 18
19WRKSRC= ${WRKDIR} 19WRKSRC= ${WRKDIR}
20NO_CONFIGURE= YES 20NO_CONFIGURE= YES
21USE_FEATURES+= snprintf 21USE_FEATURES+= snprintf
22 22
23TRN_EXTRALIBS= 
24 
25.include "../../mk/bsd.prefs.mk" 23.include "../../mk/bsd.prefs.mk"
26.if empty(PKGSRC_COMPILER:Mgcc*) 24.if empty(PKGSRC_COMPILER:Mgcc*)
27CPPFLAGS+= -D__attribute__= 25CPPFLAGS+= -D__attribute__=
28.endif 26.endif
29 27
30.if ${OPSYS} == "SunOS" 28.if ${OPSYS} == "SunOS"
31.if ${OS_VERSION} >= 5.0 29.if ${OS_VERSION} >= 5.0
32.if ${OS_VERSION} != 5.4 30.if ${OS_VERSION} != 5.4
33CPPFLAGS+= -DSOLARIS 31CPPFLAGS+= -DSOLARIS
34TRN_EXTRALIBS+= -lresolv -lsocket -lnsl 32LIBS+= -lresolv -lsocket -lnsl
35.endif 33.endif
36.if ${LOWER_ARCH} == "i386" 34.if ${LOWER_ARCH} == "i386"
37CPPFLAGS+= -DBYTESWAP_IP_LEN 35CPPFLAGS+= -DBYTESWAP_IP_LEN
38.endif 36.endif
39.endif 37.endif
40.elif ${OPSYS} == "Linux" 38.elif ${OPSYS} == "Linux"
41TRN_EXTRALIBS+= -lresolv 39LIBS+= -lresolv
42CPPFLAGS+= -DSTRING 40CPPFLAGS+= -DSTRING
43.elif ${OPSYS} == "FreeBSD" 41.elif ${OPSYS} == "FreeBSD"
44CPPFLAGS+= -DSTRING 42CPPFLAGS+= -DSTRING
45.elif ${OPSYS} == "Darwin" 43.elif ${OPSYS} == "Darwin"
46CPPFLAGS+= -DBIND_8_COMPAT -DRA_SERVICE=\"nicname\" 44CPPFLAGS+= -DBIND_8_COMPAT -DRA_SERVICE=\"nicname\"
 45.if !empty(OS_VERSION:M10.*) # MacOS X 10.6.X aka Snow Leopard
 46LIBS+= -lresolv
 47.endif
47.elif !empty(LOWER_OPSYS:Mirix5*) 48.elif !empty(LOWER_OPSYS:Mirix5*)
48CPPFLAGS+= -Dsocklen_t=int 49CPPFLAGS+= -Dsocklen_t=int
49.endif 50.endif
50 51
51INSTALLATION_DIRS= sbin ${PKGMANDIR}/man8 52INSTALLATION_DIRS= sbin ${PKGMANDIR}/man8
52 53
53do-extract: 54do-extract:
54 ${CP} ${DISTDIR}/${DIST_SUBDIR}/traceroute.c ${WRKSRC} 55 ${CP} ${DISTDIR}/${DIST_SUBDIR}/traceroute.c ${WRKSRC}
55do-build: 56do-build:
56 cd ${WRKSRC} && ${CC} ${CPPFLAGS} ${CFLAGS} traceroute.c -o traceroute-nanog ${LDFLAGS} -lm ${TRN_EXTRALIBS} 57 cd ${WRKSRC} && ${CC} ${CPPFLAGS} ${CFLAGS} traceroute.c -o traceroute-nanog ${LDFLAGS} -lm ${LIBS}
57 58
58do-install: 59do-install:
59 ${INSTALL_PROGRAM} ${WRKSRC}/traceroute-nanog ${DESTDIR}${PREFIX}/sbin 60 ${INSTALL_PROGRAM} ${WRKSRC}/traceroute-nanog ${DESTDIR}${PREFIX}/sbin
60 ${INSTALL_MAN} ${WRKDIR}/traceroute-nanog-6.3.10/debian/traceroute-nanog.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 61 ${INSTALL_MAN} ${WRKDIR}/traceroute-nanog-6.3.10/debian/traceroute-nanog.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
61 62
62.include "../../mk/bsd.pkg.mk" 63.include "../../mk/bsd.pkg.mk"