diff options
| author | joerg <joerg@pkgsrc.org> | 2007-08-16 23:12:20 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-08-16 23:12:20 +0000 |
| commit | 23bc34e15a11d46c1294ba7421154a072ca57cdb (patch) | |
| tree | 1cd1152c4001e1744fc5ffd6316e11560f7c988c /net | |
| parent | da4298f57d6d68c72fe1b2ccb42fe733fa1fb65e (diff) | |
| download | pkgsrc-23bc34e15a11d46c1294ba7421154a072ca57cdb.tar.gz | |
Add DESTDIR and modular Xorg support.
Diffstat (limited to 'net')
| -rw-r--r-- | net/mtr/Makefile | 12 | ||||
| -rw-r--r-- | net/mtr/options.mk | 3 |
2 files changed, 7 insertions, 8 deletions
diff --git a/net/mtr/Makefile b/net/mtr/Makefile index 5abcfa605d0..909c1a05eeb 100644 --- a/net/mtr/Makefile +++ b/net/mtr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2007/01/07 09:14:04 rillig Exp $ +# $NetBSD: Makefile,v 1.48 2007/08/16 23:12:20 joerg Exp $ DISTNAME= mtr-0.72 CATEGORIES= net @@ -9,10 +9,11 @@ HOMEPAGE= http://www.bitwizard.nl/mtr/ COMMENT= Traceroute and ping in a single graphical network diagnostic tool PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= YES USE_TOOLS+= gmake -INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin share/doc/mtr .include "options.mk" @@ -22,10 +23,9 @@ INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin BUILDLINK_TRANSFORM+= l:termcap:ncurses do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mtr - ${INSTALL} -c -s -m 4755 -o ${ROOT_USER} -g ${ROOT_GROUP} ${WRKSRC}/mtr ${PREFIX}/sbin - ${INSTALL_DATA} ${WRKSRC}/mtr.8 ${PREFIX}/${PKGMANDIR}/man8 - ${INSTALL_DATA} ${WRKSRC}/SECURITY ${PREFIX}/share/doc/mtr + ${INSTALL} -c -s -m 4755 -o ${ROOT_USER} -g ${ROOT_GROUP} ${WRKSRC}/mtr ${DESTDIR}${PREFIX}/sbin + ${INSTALL_DATA} ${WRKSRC}/mtr.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 + ${INSTALL_DATA} ${WRKSRC}/SECURITY ${DESTDIR}${PREFIX}/share/doc/mtr .include "../../devel/ncurses/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/mtr/options.mk b/net/mtr/options.mk index fff2ab936aa..a45f48bd99d 100644 --- a/net/mtr/options.mk +++ b/net/mtr/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2006/04/03 18:38:58 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2007/08/16 23:12:21 joerg Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.mtr PKG_SUPPORTED_OPTIONS= gtk @@ -7,7 +7,6 @@ PKG_SUPPORTED_OPTIONS= gtk .if !empty(PKG_OPTIONS:Mgtk) .include "../../x11/gtk/buildlink3.mk" -.include "../../mk/x11.buildlink3.mk" .else CONFIGURE_ARGS+= --without-gtk .endif |