[pkgsrc/trunk]: pkgsrc/net/mtr Add DESTDIR and modular Xorg support.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5acbcb187bb8
branches:  trunk
changeset: 532368:5acbcb187bb8
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Aug 16 23:12:20 2007 +0000

description:
Add DESTDIR and modular Xorg support.

diffstat:

 net/mtr/Makefile   |  12 ++++++------
 net/mtr/options.mk |   3 +--
 2 files changed, 7 insertions(+), 8 deletions(-)

diffs (53 lines):

diff -r df386a1f6d2d -r 5acbcb187bb8 net/mtr/Makefile
--- a/net/mtr/Makefile  Thu Aug 16 22:59:08 2007 +0000
+++ b/net/mtr/Makefile  Thu Aug 16 23:12:20 2007 +0000
@@ -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 @@
 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 @@
 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 -r df386a1f6d2d -r 5acbcb187bb8 net/mtr/options.mk
--- a/net/mtr/options.mk        Thu Aug 16 22:59:08 2007 +0000
+++ b/net/mtr/options.mk        Thu Aug 16 23:12:20 2007 +0000
@@ -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 @@
 
 .if !empty(PKG_OPTIONS:Mgtk)
 .include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --without-gtk
 .endif