Sat Apr 29 11:49:17 2017 UTC ()
Pullup ticket #5305 - requested by sevan
net/traceroutr-nanog: build fix

Revisions pulled up:
- net/traceroute-nanog/Makefile                                 1.10

---
   Module Name:    pkgsrc
   Committed By:   schwarz
   Date:           Mon Apr 17 19:53:11 UTC 2017

   Modified Files:
           pkgsrc/net/traceroute-nanog: Makefile

   Log Message:
   -lresolv resolv is needed on MacOS later than 10.6, too.


(bsiegert)
diff -r1.9 -r1.9.2.1 pkgsrc/net/traceroute-nanog/Makefile
cvs diff -r1.9 -r1.9.2.1 pkgsrc/net/traceroute-nanog/Makefile (expand / switch to unified diff)

--- pkgsrc/net/traceroute-nanog/Makefile 2017/01/19 18:52:21 1.9
+++ pkgsrc/net/traceroute-nanog/Makefile 2017/04/29 11:49:16 1.9.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.9 2017/01/19 18:52:21 agc Exp $ 1# $NetBSD: Makefile,v 1.9.2.1 2017/04/29 11:49:16 bsiegert Exp $
2 2
3DISTNAME= traceroute-nanog_6.4.2.orig 3DISTNAME= traceroute-nanog_6.4.2.orig
4PKGNAME= ${DISTNAME:S/.orig//:S/_/-/} 4PKGNAME= ${DISTNAME:S/.orig//:S/_/-/}
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= ftp://unix.hensa.ac.uk/sites/archive.ubuntu.com/ubuntu/pool/universe/t/traceroute-nanog/ 6MASTER_SITES= ftp://unix.hensa.ac.uk/sites/archive.ubuntu.com/ubuntu/pool/universe/t/traceroute-nanog/
7MASTER_SITES+= http://www.ftp.uni-erlangen.de/pub/pc/TheOpenCD/old-images/ubuntu/pool/universe/t/traceroute-nanog/ 7MASTER_SITES+= http://www.ftp.uni-erlangen.de/pub/pc/TheOpenCD/old-images/ubuntu/pool/universe/t/traceroute-nanog/
8MASTER_SITES+= http://traceroute-nanog.sourcearchive.com/downloads/6.4.2-1/ 8MASTER_SITES+= http://traceroute-nanog.sourcearchive.com/downloads/6.4.2-1/
9 9
10# for the man page: 10# for the man page:
11PATCH_SITES= ${MASTER_SITES} 11PATCH_SITES= ${MASTER_SITES}
12PATCHFILES= traceroute-nanog_6.4.2-1.diff.gz 12PATCHFILES= traceroute-nanog_6.4.2-1.diff.gz
13 13
14COMMENT= Traceroute implementation with extend features 14COMMENT= Traceroute implementation with extend features
@@ -23,27 +23,27 @@ USE_FEATURES+= snprintf @@ -23,27 +23,27 @@ USE_FEATURES+= snprintf
23.if ${MACHINE_ARCH} == "i386" 23.if ${MACHINE_ARCH} == "i386"
24CPPFLAGS+= -DBYTESWAP_IP_LEN 24CPPFLAGS+= -DBYTESWAP_IP_LEN
25.endif 25.endif
26 26
27CPPFLAGS.FreeBSD+= -DSTRING 27CPPFLAGS.FreeBSD+= -DSTRING
28CPPFLAGS.Linux+= -DSTRING 28CPPFLAGS.Linux+= -DSTRING
29CPPFLAGS.SunOS+= -DSOLARIS 29CPPFLAGS.SunOS+= -DSOLARIS
30 30
31LIBS.Linux+= -lresolv 31LIBS.Linux+= -lresolv
32LIBS.SunOS+= -lresolv -lsocket -lnsl 32LIBS.SunOS+= -lresolv -lsocket -lnsl
33 33
34.if ${OPSYS} == "Darwin" 34.if ${OPSYS} == "Darwin"
35CPPFLAGS+= -DBIND_8_COMPAT -DRA_SERVICE=\"nicname\" 35CPPFLAGS+= -DBIND_8_COMPAT -DRA_SERVICE=\"nicname\"
36. if !empty(OS_VERSION:M10.*) # MacOS X 10.6.X aka Snow Leopard 36. if !empty(OS_VERSION:M1[0-9].*) # MacOS X 10.6.X aka Snow Leopard, or later
37LIBS+= -lresolv 37LIBS+= -lresolv
38. endif 38. endif
39.endif 39.endif
40 40
41.if !empty(LOWER_OPSYS:Mirix5*) 41.if !empty(LOWER_OPSYS:Mirix5*)
42CPPFLAGS+= -Dsocklen_t=int 42CPPFLAGS+= -Dsocklen_t=int
43.endif 43.endif
44 44
45INSTALLATION_DIRS= sbin ${PKGMANDIR}/man8 45INSTALLATION_DIRS= sbin ${PKGMANDIR}/man8
46 46
47do-build: 47do-build:
48 cd ${WRKSRC} && ${CC} ${CPPFLAGS} ${CFLAGS} traceroute.c -o traceroute-nanog ${LDFLAGS} -lm ${LIBS} 48 cd ${WRKSRC} && ${CC} ${CPPFLAGS} ${CFLAGS} traceroute.c -o traceroute-nanog ${LDFLAGS} -lm ${LIBS}
49 49