From antoine@pepperseed.dreadbsd.org  Sat Oct 19 10:27:00 2013
Return-Path: <antoine@pepperseed.dreadbsd.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 29FBA2FC
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 19 Oct 2013 10:27:00 +0000 (UTC)
	(envelope-from antoine@pepperseed.dreadbsd.org)
Received: from pepperseed.dreadbsd.org (88-191-185-190.rev.dedibox.fr [88.191.185.190])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id AF806232C
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 19 Oct 2013 10:26:58 +0000 (UTC)
Received: from pepperseed.dreadbsd.org (localhost [127.0.0.1])
	by pepperseed.dreadbsd.org (8.14.7/8.14.7) with ESMTP id r9JAPZco099935
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 19 Oct 2013 10:25:35 GMT
	(envelope-from antoine@pepperseed.dreadbsd.org)
Received: (from antoine@localhost)
	by pepperseed.dreadbsd.org (8.14.7/8.14.7/Submit) id r9JAPUC8099934;
	Sat, 19 Oct 2013 10:25:30 GMT
	(envelope-from antoine)
Message-Id: <201310191025.r9JAPUC8099934@pepperseed.dreadbsd.org>
Date: Sat, 19 Oct 2013 10:25:30 GMT
From: Antoine Brodin <antoine@freebsd.org>
Reply-To: Antoine Brodin <antoine@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] update security/metasploit to 4.7.2
X-Send-Pr-Version: 3.114
X-GNATS-Notify: tanawts@gmail.com

>Number:         183099
>Category:       ports
>Synopsis:       [patch] update security/metasploit to 4.7.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    antoine
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Oct 19 10:30:00 UTC 2013
>Closed-Date:    Sat Nov 02 08:58:47 UTC 2013
>Last-Modified:  Sat Nov  2 09:00:00 UTC 2013
>Originator:     Antoine Brodin
>Release:        FreeBSD 9.2-RELEASE amd64
>Organization:
none
>Environment:
System: FreeBSD pepperseed.dreadbsd.org 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Thu Sep 26 22:50:31 UTC 2013 root@bake.isc.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64


>Description:
- Update to 4.7.2
- Convert to STAGEDIR
- Use options helper for depends
>How-To-Repeat:
>Fix:


--- msf.diff begins here ---
Index: security/metasploit/Makefile
===================================================================
--- security/metasploit/Makefile	(revision 330856)
+++ security/metasploit/Makefile	(working copy)
@@ -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,23 +35,18 @@
 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:
@@ -59,9 +53,9 @@
 .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>
Index: security/metasploit/distinfo
===================================================================
--- security/metasploit/distinfo	(revision 330856)
+++ security/metasploit/distinfo	(working copy)
@@ -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
--- msf.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sat Oct 19 10:30:08 UTC 2013 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183099 
Responsible-Changed-From-To: freebsd-ports-bugs->antoine 
Responsible-Changed-By: antoine 
Responsible-Changed-When: Sat Oct 19 10:31:04 UTC 2013 
Responsible-Changed-Why:  
Track 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183099 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: tanawts@gmail.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/183099: [patch] update security/metasploit to 4.7.2
Date: Sat, 19 Oct 2013 10:30:07 UT

 Maintainer of security/metasploit,
 
 Please note that PR ports/183099 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/183099
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
State-Changed-From-To: feedback->closed 
State-Changed-By: antoine 
State-Changed-When: Sat Nov 2 08:58:20 UTC 2013 
State-Changed-Why:  
Port updated 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183099 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/183099: commit references a PR
Date: Sat,  2 Nov 2013 08:54:09 +0000 (UTC)

 Author: antoine
 Date: Sat Nov  2 08:54:02 2013
 New Revision: 332457
 URL: http://svnweb.freebsd.org/changeset/ports/332457
 
 Log:
   - Update to 4.7.2
   - Use option helpers
   - Convert to STAGEDIR
   
   PR:		ports/183099
   Approved by:	maintainer timeout (2 weeks)
 
 Modified:
   head/security/metasploit/Makefile
   head/security/metasploit/distinfo
 
 Modified: head/security/metasploit/Makefile
 ==============================================================================
 --- head/security/metasploit/Makefile	Sat Nov  2 08:32:28 2013	(r332456)
 +++ head/security/metasploit/Makefile	Sat Nov  2 08:54:02 2013	(r332457)
 @@ -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>
 
 Modified: head/security/metasploit/distinfo
 ==============================================================================
 --- head/security/metasploit/distinfo	Sat Nov  2 08:32:28 2013	(r332456)
 +++ head/security/metasploit/distinfo	Sat Nov  2 08:54:02 2013	(r332457)
 @@ -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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
