From 94d4dd0da905908febaa16ad03d21cc76db2e4cc Mon Sep 17 00:00:00 2001
From: antoine <antoine@FreeBSD.org>
Date: Sat, 2 Nov 2013 08:54:02 +0000
Subject: - Update to 4.7.2 - Use option helpers - Convert to STAGEDIR

PR:		ports/183099
Approved by:	maintainer timeout (2 weeks)
---
 security/metasploit/Makefile | 24 +++++++++---------------
 security/metasploit/distinfo |  4 ++--
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/security/metasploit/Makefile b/security/metasploit/Makefile
index b55c379c6b37..7579a8f3fc47 100644
--- a/security/metasploit/Makefile
+++ b/security/metasploit/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	metasploit
-DISTVERSION=	4.7.0
-PORTREVISION=	1
+DISTVERSION=	4.7.2
 CATEGORIES=	security
 MASTER_SITES=	http://downloads.metasploit.com/data/releases/archive/
 DISTNAME=	framework-${DISTVERSION}
@@ -36,32 +35,27 @@ OPTIONS_DEFINE=	DB
 OPTIONS_DEFAULT=DB
 DB_DESC=	Database support
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDB}
-RUN_DEPENDS+=	rubygem-activerecord>=0:${PORTSDIR}/databases/rubygem-activerecord \
+DB_RUN_DEPENDS=	rubygem-activerecord>=0:${PORTSDIR}/databases/rubygem-activerecord \
 		rubygem-metasploit_data_models>=0.15.1:${PORTSDIR}/security/rubygem-metasploit_data_models \
 		rubygem-pg>=0.11:${PORTSDIR}/databases/rubygem-pg
-.endif
 
 post-patch:
 	${REINPLACE_CMD} 's|bundler/setup|rubygems|' ${WRKSRC}/lib/msfenv.rb
 
 do-install:
-	@${MKDIR} ${DATADIR}
-	${CP} -Rp ${WRKSRC}/ ${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${CP} -Rp ${WRKSRC}/ ${STAGEDIR}${DATADIR}
 .for f in ${SCRIPTS}
-	${LN} -s ${DATADIR}/${f} ${PREFIX}/bin/${f}
+	${LN} -s ${DATADIR}/${f} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
 
 post-install:
 .for f in ${SCRIPTS}
 	${ECHO} "bin/${f}" >> ${TMPPLIST}
 .endfor
-	@${FIND} ${DATADIR} -type f | ${SED} 's,${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${DATADIR} -type l | ${SED} 's,${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${DATADIR} -type d | ${SORT} -r | \
-		${SED} 's,${PREFIX}/,, ; s,^,@dirrm ,' >> ${TMPPLIST}
+	@${FIND} ${STAGEDIR}${DATADIR} -type f | ${SED} 's,${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
+	@${FIND} ${STAGEDIR}${DATADIR} -type l | ${SED} 's,${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
+	@${FIND} ${STAGEDIR}${DATADIR} -type d | ${SORT} -r | \
+		${SED} 's,${STAGEDIR}${PREFIX}/,, ; s,^,@dirrm ,' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/security/metasploit/distinfo b/security/metasploit/distinfo
index 9889f3893d5a..26b37d4ad724 100644
--- a/security/metasploit/distinfo
+++ b/security/metasploit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (framework-4.7.0.tar.bz2) = 2727c20c895cae12944a213fa42fda3e7ead8523e7714bc195fc4d9a49c0eca2
-SIZE (framework-4.7.0.tar.bz2) = 35123599
+SHA256 (framework-4.7.2.tar.bz2) = bbbb0cc85585fa148d9e7eefeae09b4eeaf061ba457a7490dee450ca7b150f8f
+SIZE (framework-4.7.2.tar.bz2) = 35591358
-- 
cgit