Sun Mar 22 16:21:44 2009 UTC ()
Fix gtk version reference


(smb)
diff -r1.53 -r1.54 pkgsrc/net/mtr/Makefile
diff -r1.2 -r1.3 pkgsrc/net/mtr/options.mk

cvs diff -r1.53 -r1.54 pkgsrc/net/mtr/Makefile (switch to unified diff)

--- pkgsrc/net/mtr/Makefile 2008/11/05 19:58:25 1.53
+++ pkgsrc/net/mtr/Makefile 2009/03/22 16:21:44 1.54
@@ -1,39 +1,40 @@ @@ -1,39 +1,40 @@
1# $NetBSD: Makefile,v 1.53 2008/11/05 19:58:25 wiz Exp $ 1# $NetBSD: Makefile,v 1.54 2009/03/22 16:21:44 smb 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= 1
6 7
7MAINTAINER= sommerfeld@NetBSD.org 8MAINTAINER= sommerfeld@NetBSD.org
8HOMEPAGE= http://www.bitwizard.nl/mtr/ 9HOMEPAGE= http://www.bitwizard.nl/mtr/
9COMMENT= Traceroute and ping in a single graphical network diagnostic tool 10COMMENT= Traceroute and ping in a single graphical network diagnostic tool
10 11
11PKG_INSTALLATION_TYPES= overwrite pkgviews 12PKG_INSTALLATION_TYPES= overwrite pkgviews
12PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
13 14
14GNU_CONFIGURE= YES 15GNU_CONFIGURE= YES
15USE_TOOLS+= gmake 16USE_TOOLS+= gmake
16INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin share/doc/mtr 17INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin share/doc/mtr
17 18
18.include "options.mk" 19.include "options.mk"
19 20
20# 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,
21# 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
22# -lcurses on the appropriate platforms). 23# -lcurses on the appropriate platforms).
23BUILDLINK_TRANSFORM+= l:termcap:ncurses 24BUILDLINK_TRANSFORM+= l:termcap:ncurses
24 25
25SPECIAL_PERMS= sbin/mtr ${SETUID_ROOT_PERMS} 26SPECIAL_PERMS= sbin/mtr ${SETUID_ROOT_PERMS}
26 27
27# 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.
28.include "../../mk/compiler.mk" 29.include "../../mk/compiler.mk"
29.if !empty(CC_VERSION:Mgcc-3.*) 30.if !empty(CC_VERSION:Mgcc-3.*)
30BUILDLINK_TRANSFORM+= rm:-Wno-pointer-sign 31BUILDLINK_TRANSFORM+= rm:-Wno-pointer-sign
31.endif 32.endif
32 33
33do-install: 34do-install:
34 ${INSTALL_PROGRAM} ${WRKSRC}/mtr ${DESTDIR}${PREFIX}/sbin 35 ${INSTALL_PROGRAM} ${WRKSRC}/mtr ${DESTDIR}${PREFIX}/sbin
35 ${INSTALL_DATA} ${WRKSRC}/mtr.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 36 ${INSTALL_DATA} ${WRKSRC}/mtr.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
36 ${INSTALL_DATA} ${WRKSRC}/SECURITY ${DESTDIR}${PREFIX}/share/doc/mtr 37 ${INSTALL_DATA} ${WRKSRC}/SECURITY ${DESTDIR}${PREFIX}/share/doc/mtr
37 38
38.include "../../devel/ncurses/buildlink3.mk" 39.include "../../devel/ncurses/buildlink3.mk"
39.include "../../mk/bsd.pkg.mk" 40.include "../../mk/bsd.pkg.mk"

cvs diff -r1.2 -r1.3 pkgsrc/net/mtr/options.mk (switch to unified diff)

--- pkgsrc/net/mtr/options.mk 2007/08/16 23:12:21 1.2
+++ pkgsrc/net/mtr/options.mk 2009/03/22 16:21:44 1.3
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1# $NetBSD: options.mk,v 1.2 2007/08/16 23:12:21 joerg Exp $ 1# $NetBSD: options.mk,v 1.3 2009/03/22 16:21:44 smb Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.mtr 3PKG_OPTIONS_VAR= PKG_OPTIONS.mtr
4PKG_SUPPORTED_OPTIONS= gtk 4PKG_SUPPORTED_OPTIONS= gtk
5 5
6.include "../../mk/bsd.options.mk" 6.include "../../mk/bsd.options.mk"
7 7
8.if !empty(PKG_OPTIONS:Mgtk) 8.if !empty(PKG_OPTIONS:Mgtk)
9.include "../../x11/gtk/buildlink3.mk" 9.include "../../x11/gtk2/buildlink3.mk"
10.else 10.else
11CONFIGURE_ARGS+= --without-gtk 11CONFIGURE_ARGS+= --without-gtk
12.endif 12.endif