Fri Jan 11 00:04:22 2013 UTC ()
Do not remove __attribute__, at the very least this way leads to bad
syntax in system headers on NetBSD.


(joerg)
diff -r1.5 -r1.6 pkgsrc/net/traceroute-nanog/Makefile
cvs diff -r1.5 -r1.6 pkgsrc/net/traceroute-nanog/Makefile (expand / switch to unified diff)

--- pkgsrc/net/traceroute-nanog/Makefile 2012/10/23 17:19:14 1.5
+++ pkgsrc/net/traceroute-nanog/Makefile 2013/01/11 00:04:22 1.6
@@ -1,37 +1,34 @@ @@ -1,37 +1,34 @@
1# $NetBSD: Makefile,v 1.5 2012/10/23 17:19:14 asau Exp $ 1# $NetBSD: Makefile,v 1.6 2013/01/11 00:04:22 joerg 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/ \
7 http://www.ftp.uni-erlangen.de/pub/pc/TheOpenCD/old-images/ubuntu/pool/universe/t/traceroute-nanog/ \ 7 http://www.ftp.uni-erlangen.de/pub/pc/TheOpenCD/old-images/ubuntu/pool/universe/t/traceroute-nanog/ \
8 http://traceroute-nanog.sourcearchive.com/downloads/6.4.2-1/ 8 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
15MAINTAINER= schwarz@NetBSD.org 15MAINTAINER= schwarz@NetBSD.org
16 16
17WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} 17WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/}
18NO_CONFIGURE= YES 18NO_CONFIGURE= YES
19USE_FEATURES+= snprintf 19USE_FEATURES+= snprintf
20 20
21.include "../../mk/bsd.prefs.mk" 21.include "../../mk/bsd.prefs.mk"
22.if empty(PKGSRC_COMPILER:Mgcc*) 
23CPPFLAGS+= -D__attribute__= 
24.endif 
25 22
26.if ${OPSYS} == "SunOS" 23.if ${OPSYS} == "SunOS"
27.if ${OS_VERSION} >= 5.0 24.if ${OS_VERSION} >= 5.0
28.if ${OS_VERSION} != 5.4 25.if ${OS_VERSION} != 5.4
29CPPFLAGS+= -DSOLARIS 26CPPFLAGS+= -DSOLARIS
30LIBS+= -lresolv -lsocket -lnsl 27LIBS+= -lresolv -lsocket -lnsl
31.endif 28.endif
32.if ${LOWER_ARCH} == "i386" 29.if ${LOWER_ARCH} == "i386"
33CPPFLAGS+= -DBYTESWAP_IP_LEN 30CPPFLAGS+= -DBYTESWAP_IP_LEN
34.endif 31.endif
35.endif 32.endif
36.elif ${OPSYS} == "Linux" 33.elif ${OPSYS} == "Linux"
37LIBS+= -lresolv 34LIBS+= -lresolv