Sat Sep 12 22:07:56 2009 UTC ()
Fix build under Mac OS X Snow Leopard.


(tron)
diff -r1.55 -r1.56 pkgsrc/net/mtr/Makefile
cvs diff -r1.55 -r1.56 pkgsrc/net/mtr/Makefile (expand / switch to unified diff)

--- pkgsrc/net/mtr/Makefile 2009/08/26 19:58:45 1.55
+++ pkgsrc/net/mtr/Makefile 2009/09/12 22:07:56 1.56
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.55 2009/08/26 19:58:45 sno Exp $ 1# $NetBSD: Makefile,v 1.56 2009/09/12 22:07:56 tron Exp $
2 2
3DISTNAME= mtr-0.75 3DISTNAME= mtr-0.75
4CATEGORIES= net 4CATEGORIES= net
5MASTER_SITES= ftp://ftp.bitwizard.nl/mtr/ 5MASTER_SITES= ftp://ftp.bitwizard.nl/mtr/
6PKGREVISION= 2 6PKGREVISION= 2
7 7
8MAINTAINER= sommerfeld@NetBSD.org 8MAINTAINER= sommerfeld@NetBSD.org
9HOMEPAGE= http://www.bitwizard.nl/mtr/ 9HOMEPAGE= http://www.bitwizard.nl/mtr/
10COMMENT= Traceroute and ping in a single graphical network diagnostic tool 10COMMENT= Traceroute and ping in a single graphical network diagnostic tool
11 11
12PKG_INSTALLATION_TYPES= overwrite pkgviews 12PKG_INSTALLATION_TYPES= overwrite pkgviews
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
@@ -21,20 +21,24 @@ INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbi @@ -21,20 +21,24 @@ INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbi
21# mtr uses libtermcap by default, but needs wattr_{on,off} from (n)curses, 21# mtr uses libtermcap by default, but needs wattr_{on,off} from (n)curses,
22# so we rewrite -ltermcap to -lncurses (which will be auto-mangled into 22# so we rewrite -ltermcap to -lncurses (which will be auto-mangled into
23# -lcurses on the appropriate platforms). 23# -lcurses on the appropriate platforms).
24BUILDLINK_TRANSFORM+= l:termcap:ncurses 24BUILDLINK_TRANSFORM+= l:termcap:ncurses
25 25
26SPECIAL_PERMS= sbin/mtr ${SETUID_ROOT_PERMS} 26SPECIAL_PERMS= sbin/mtr ${SETUID_ROOT_PERMS}
27 27
28# Remove hard-coded compiler option that GCC 3.x doesn't support. 28# Remove hard-coded compiler option that GCC 3.x doesn't support.
29.include "../../mk/compiler.mk" 29.include "../../mk/compiler.mk"
30.if !empty(CC_VERSION:Mgcc-3.*) 30.if !empty(CC_VERSION:Mgcc-3.*)
31BUILDLINK_TRANSFORM+= rm:-Wno-pointer-sign 31BUILDLINK_TRANSFORM+= rm:-Wno-pointer-sign
32.endif 32.endif
33 33
 34.if !empty(MACHINE_PLATFORM:MDarwin-??.*-*)
 35LIBS+= -lresolv
 36.endif
 37
34do-install: 38do-install:
35 ${INSTALL_PROGRAM} ${WRKSRC}/mtr ${DESTDIR}${PREFIX}/sbin 39 ${INSTALL_PROGRAM} ${WRKSRC}/mtr ${DESTDIR}${PREFIX}/sbin
36 ${INSTALL_DATA} ${WRKSRC}/mtr.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 40 ${INSTALL_DATA} ${WRKSRC}/mtr.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
37 ${INSTALL_DATA} ${WRKSRC}/SECURITY ${DESTDIR}${PREFIX}/share/doc/mtr 41 ${INSTALL_DATA} ${WRKSRC}/SECURITY ${DESTDIR}${PREFIX}/share/doc/mtr
38 42
39.include "../../devel/ncurses/buildlink3.mk" 43.include "../../devel/ncurses/buildlink3.mk"
40.include "../../mk/bsd.pkg.mk" 44.include "../../mk/bsd.pkg.mk"