Add STAGING support

Update MASTER_SITES
Use shebangfix

3 files changed, 52 insertions, 59 deletions

diff --git a/sysutils/DTraceToolkit/Makefile b/sysutils/DTraceToolkit/Makefile
index 3096939fab97..189e9be3e268 100644
--- a/sysutils/DTraceToolkit/Makefile
+++ b/sysutils/DTraceToolkit/Makefile
@@ -4,40 +4,33 @@
 PORTNAME=	DTraceToolkit
 PORTVERSION=	0.99
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.brendangregg.com/ \
-		http://mirror.transact.net.au/sourceforge/d/dt/dtracetoolkit/
+MASTER_SITES=	http://www.brendangregg.com/DTraceToolkit/
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Collection of useful scripts for DTrace
 
+USES=	shebangfix
+sh_OLD_CMD=	/usr/bin/sh
+sh_CMD=	${SH}
+SHEBANG_LANG+=	sh
+
+SHEBANG_FILES=	hotkernel procsystime
 NO_BUILD=	YES
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} <= 701000
 IGNORE=	needs to have dtrace enabled kernel
 .endif
 
-pre-patch:
-	${REINPLACE_CMD} -e \
-		"s|\#\!/usr/bin/perl|\#\!${PREFIX}/bin/perl|g" \
-		${WRKSRC}/hotkernel
-
-	${REINPLACE_CMD} -e \
-		"s|\#\!/usr/bin/sh|\#\!/bin/sh|g" \
-		${WRKSRC}/procsystime
-
 do-install:
-	${RM} ${WRKSRC}/hotkernel.bak
-	${RM} ${WRKSRC}/procsystime.bak
-	${MKDIR} ${DATADIR}
+	${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}; ${TAR} cf - . ) | \
-		(cd ${DATADIR}/; ${TAR} xvf -)
-	${LN} -fs ${DATADIR}/hotkernel ${PREFIX}/bin/hotkernel
-	${LN} -fs ${DATADIR}/procsystime ${PREFIX}/bin/procsystime
+		(cd ${STAGEDIR}${DATADIR}/; ${TAR} xvf -)
 
 post-install:
+	${LN} -fs ${DATADIR}/hotkernel ${STAGEDIR}${PREFIX}/bin/hotkernel
+	${LN} -fs ${DATADIR}/procsystime ${STAGEDIR}${PREFIX}/bin/procsystime
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/DTraceToolkit/pkg-descr b/sysutils/DTraceToolkit/pkg-descr
index 21d8266da962..a3dd3676086f 100644
--- a/sysutils/DTraceToolkit/pkg-descr
+++ b/sysutils/DTraceToolkit/pkg-descr
@@ -1,4 +1,4 @@
 The DTraceToolkit is a collection of useful documented scripts developed
 by the OpenSolaris DTrace community.
 
-WWW: http://www.opensolaris.org/os/community/dtrace/dtracetoolkit/ 
+WWW: http://www.brendangregg.com/dtracetoolkit.html
diff --git a/sysutils/DTraceToolkit/pkg-plist b/sysutils/DTraceToolkit/pkg-plist
index 0222c17f978c..50c59856dcb5 100644
--- a/sysutils/DTraceToolkit/pkg-plist
+++ b/sysutils/DTraceToolkit/pkg-plist
@@ -1007,43 +1007,43 @@
 %%DATADIR%%/opensnoop
 bin/procsystime
 bin/hotkernel
-@dirrmtry %%DATADIR%%/Mem
-@dirrmtry %%DATADIR%%/Man/man1m
-@dirrmtry %%DATADIR%%/Man
-@dirrmtry %%DATADIR%%/Locks
-@dirrmtry %%DATADIR%%/Bin
-@dirrmtry %%DATADIR%%/Shell
-@dirrmtry %%DATADIR%%/Apps
-@dirrmtry %%DATADIR%%/Proc
-@dirrmtry %%DATADIR%%/Disk
-@dirrmtry %%DATADIR%%/Docs
-@dirrmtry %%DATADIR%%/Cpu
-@dirrmtry %%DATADIR%%/Php
-@dirrmtry %%DATADIR%%/System
-@dirrmtry %%DATADIR%%/Python
-@dirrmtry %%DATADIR%%/Ruby
-@dirrmtry %%DATADIR%%/Kernel
-@dirrmtry %%DATADIR%%/Examples
-@dirrmtry %%DATADIR%%/User
-@dirrmtry %%DATADIR%%/Code/Shell
-@dirrmtry %%DATADIR%%/Code/Php
-@dirrmtry %%DATADIR%%/Code/JavaScript
-@dirrmtry %%DATADIR%%/Code/Tcl
-@dirrmtry %%DATADIR%%/Code/Perl
-@dirrmtry %%DATADIR%%/Code/C
-@dirrmtry %%DATADIR%%/Code/Ruby
-@dirrmtry %%DATADIR%%/Code/Python
-@dirrmtry %%DATADIR%%/Code/Java
-@dirrmtry %%DATADIR%%/Code
-@dirrmtry %%DATADIR%%/Snippits
-@dirrmtry %%DATADIR%%/FS
-@dirrmtry %%DATADIR%%/JavaScript
-@dirrmtry %%DATADIR%%/Perl
-@dirrmtry %%DATADIR%%/Zones
-@dirrmtry %%DATADIR%%/Misc
-@dirrmtry %%DATADIR%%/Notes
-@dirrmtry %%DATADIR%%/Net
-@dirrmtry %%DATADIR%%/Include
-@dirrmtry %%DATADIR%%/Tcl
-@dirrmtry %%DATADIR%%/Java
-@dirrmtry %%DATADIR%%
+@dirrm %%DATADIR%%/Mem
+@dirrm %%DATADIR%%/Man/man1m
+@dirrm %%DATADIR%%/Man
+@dirrm %%DATADIR%%/Locks
+@dirrm %%DATADIR%%/Bin
+@dirrm %%DATADIR%%/Shell
+@dirrm %%DATADIR%%/Apps
+@dirrm %%DATADIR%%/Proc
+@dirrm %%DATADIR%%/Disk
+@dirrm %%DATADIR%%/Docs
+@dirrm %%DATADIR%%/Cpu
+@dirrm %%DATADIR%%/Php
+@dirrm %%DATADIR%%/System
+@dirrm %%DATADIR%%/Python
+@dirrm %%DATADIR%%/Ruby
+@dirrm %%DATADIR%%/Kernel
+@dirrm %%DATADIR%%/Examples
+@dirrm %%DATADIR%%/User
+@dirrm %%DATADIR%%/Code/Shell
+@dirrm %%DATADIR%%/Code/Php
+@dirrm %%DATADIR%%/Code/JavaScript
+@dirrm %%DATADIR%%/Code/Tcl
+@dirrm %%DATADIR%%/Code/Perl
+@dirrm %%DATADIR%%/Code/C
+@dirrm %%DATADIR%%/Code/Ruby
+@dirrm %%DATADIR%%/Code/Python
+@dirrm %%DATADIR%%/Code/Java
+@dirrm %%DATADIR%%/Code
+@dirrm %%DATADIR%%/Snippits
+@dirrm %%DATADIR%%/FS
+@dirrm %%DATADIR%%/JavaScript
+@dirrm %%DATADIR%%/Perl
+@dirrm %%DATADIR%%/Zones
+@dirrm %%DATADIR%%/Misc
+@dirrm %%DATADIR%%/Notes
+@dirrm %%DATADIR%%/Net
+@dirrm %%DATADIR%%/Include
+@dirrm %%DATADIR%%/Tcl
+@dirrm %%DATADIR%%/Java
+@dirrm %%DATADIR%%