ports/101090: Prepare security/metasploit to meet security/metasploit-devel

[Yonatan]

>Number:         101090
>Category:       ports
>Synopsis:       Prepare security/metasploit to meet security/metasploit-devel
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 31 10:30:15 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Yonatan
>Release:        FreeBSD 6.1-STABLE i386
>Organization:
Afarsec
>Environment:
System: FreeBSD laptop.afarsec.com 6.1-STABLE FreeBSD 6.1-STABLE #1: Fri Jun 23 12:39:24 IDT 2006 root at laptop.afarsec.com:/usr/obj/usr/src/sys/GENERIC i386
>Description:
A new port, security/metasploit-devel is coming to town.
It will be based on Ruby instead of perl, have a different license, and some
utilities (msfconsole, msfencode...) will conflict with the current metasploit
package.
This update comes to preempt the conflicts and to clarify the pkg-descr.
I don't think it merits a PORTREVISION bump, but I don't feel strongly about
it.
>How-To-Repeat:
	
>Fix:

	

--- metasploit-2.6-pre-3.diff begins here ---
diff -urN metasploit.orig/Makefile metasploit/Makefile
--- metasploit.orig/Makefile	Thu Jun  1 04:12:23 2006
+++ metasploit/Makefile	Mon Jul 31 12:37:15 2006
@@ -18,6 +18,7 @@
 		${SITE_PERL}/mach/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay \
 		${LOCALBASE}/bin/nasm:${PORTSDIR}/devel/nasm
 
+CONFLICTS=	metasploit-3*
 NO_BUILD=	yes
 USE_PERL5_RUN=	yes
 REINPLACE_ARGS=	-i ''
diff -urN metasploit.orig/pkg-descr metasploit/pkg-descr
--- metasploit.orig/pkg-descr	Sun Dec 19 23:52:20 2004
+++ metasploit/pkg-descr	Mon Jul 31 12:35:42 2006
@@ -8,4 +8,7 @@
    tools and information on this site are provided for legal penetration
    testing and research purposes only.
 
+This is the stable version of Metasploit Framework. It is based on Perl, and
+will be replaced in the future with Metasploit Framework version 3.
+
 WWW: http://www.metasploit.org
--- metasploit-2.6-pre-3.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: