Index: head/security/metasploit/Makefile
===================================================================
--- head/security/metasploit/Makefile	(revision 448811)
+++ head/security/metasploit/Makefile	(revision 448812)
@@ -1,144 +1,144 @@
 # Created by: Yonatan <onatan@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	metasploit
-PORTVERSION=	4.15.5
+PORTVERSION=	4.16.2
 CATEGORIES=	security
 
 MAINTAINER=	tanawts@gmail.com
 COMMENT=	Exploit-Framework for Penetration-Testing
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	nmap:security/nmap \
 		rubygem-activerecord4>=4.2.6:databases/rubygem-activerecord4 \
 		rubygem-activesupport4>=4.2.6:devel/rubygem-activesupport4 \
 		rubygem-actionpack4>=4.2.6:www/rubygem-actionpack4 \
 		rubygem-backports>=0:devel/rubygem-backports \
 		rubygem-bcrypt>=0:security/rubygem-bcrypt \
 		rubygem-bundler>=0:sysutils/rubygem-bundler \
 		rubygem-jsobfu>=0:www/rubygem-jsobfu \
 		rubygem-json1>=0:devel/rubygem-json1 \
 		rubygem-metasm>=0:devel/rubygem-metasm \
 		rubygem-metasploit-aggregator>=0:security/rubygem-metasploit-aggregator \
 		rubygem-metasploit-concern>=0:security/rubygem-metasploit-concern \
 		rubygem-metasploit-credential>=0:security/rubygem-metasploit-credential \
 		rubygem-metasploit_data_models>=0:security/rubygem-metasploit_data_models \
 		rubygem-metasploit-model>=0:security/rubygem-metasploit-model \
-		rubygem-metasploit-payloads>=1.2.46:security/rubygem-metasploit-payloads \
-		rubygem-metasploit_payloads-mettle>=0.1.14:security/rubygem-metasploit_payloads-mettle \
+		rubygem-metasploit-payloads>=1.3.1:security/rubygem-metasploit-payloads \
+		rubygem-metasploit_payloads-mettle>=0.2.0:security/rubygem-metasploit_payloads-mettle \
 		rubygem-msgpack1>=0:devel/rubygem-msgpack1 \
 		rubygem-network_interface>=0:net/rubygem-network_interface \
 		rubygem-rubyntlm>=0:net/rubygem-rubyntlm \
 		rubygem-nokogiri>=0:textproc/rubygem-nokogiri \
 		rubygem-packetfu>=0:net/rubygem-packetfu \
 		rubygem-pcaprub>=0:net/rubygem-pcaprub \
 		rubygem-pg>=0:databases/rubygem-pg \
 		rubygem-railties4>=4.2.6:www/rubygem-railties4 \
 		rubygem-recog>=0:security/rubygem-recog \
 		rubygem-openssl-ccm>=0:security/rubygem-openssl-ccm \
 		rubygem-octokit>=0:net/rubygem-octokit \
 		rubygem-redcarpet>=0:textproc/rubygem-redcarpet \
 		rubygem-patch_finder>=0:devel/rubygem-patch_finder \
 		rubygem-sshkey>=0:security/rubygem-sshkey \
 		rubygem-bit-struct>=0:devel/rubygem-bit-struct \
 		rubygem-windows_error>=0:devel/rubygem-windows_error \
 		rubygem-pdf-reader>=0:print/rubygem-pdf-reader \
 		rubygem-dnsruby>=0:dns/rubygem-dnsruby \
 		rubygem-net-ssh>=0:security/rubygem-net-ssh \
 		rubygem-ruby_smb>=0:net/rubygem-ruby_smb \
 		rubygem-rex-arch>=0:security/rubygem-rex-arch \
 		rubygem-rex-bin_tools>=0:security/rubygem-rex-bin_tools \
 		rubygem-rex-core>=0:security/rubygem-rex-core \
 		rubygem-rex-encoder>=0:security/rubygem-rex-encoder \
 		rubygem-rex-exploitation>=0:security/rubygem-rex-exploitation \
 		rubygem-rex-java>=0:security/rubygem-rex-java \
 		rubygem-rex-mime>=0:security/rubygem-rex-mime \
 		rubygem-rex-nop>=0:security/rubygem-rex-nop \
 		rubygem-rex-ole>=0:security/rubygem-rex-ole \
 		rubygem-rex-powershell>=0:security/rubygem-rex-powershell \
 		rubygem-rex-random_identifier>=0:security/rubygem-rex-random_identifier \
 		rubygem-rex-registry>=0:security/rubygem-rex-registry \
 		rubygem-rex-rop_builder>=0:security/rubygem-rex-rop_builder \
 		rubygem-rex-socket>=0:security/rubygem-rex-socket \
 		rubygem-rex-sslscan>=0:security/rubygem-rex-sslscan \
 		rubygem-rex-struct2>=0:security/rubygem-rex-struct2 \
 		rubygem-rex-text>=0:security/rubygem-rex-text \
 		rubygem-rex-zip>=0:security/rubygem-rex-zip \
 		rubygem-robots>=0:www/rubygem-robots \
 		rubygem-rubyzip>=0:archivers/rubygem-rubyzip \
 		rubygem-sqlite3>=0:databases/rubygem-sqlite3 \
 		rubygem-tzinfo>=0:devel/rubygem-tzinfo \
 		rubygem-tzinfo-data>=0:devel/rubygem-tzinfo-data \
 		rubygem-filesize>=0:devel/rubygem-filesize \
 		rubygem-openvas-omp>=0:security/rubygem-openvas-omp \
 		rubygem-nessus_rest>=0:security/rubygem-nessus_rest \
 		rubygem-nexpose>=0:security/rubygem-nexpose \
 		rubygem-xdr>=0:converters/rubygem-xdr
 
 SCRIPTS=	msfconsole msfd msfrpc msfrpcd msfvenom
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rapid7
 GH_PROJECT=	metasploit-framework
 
 NO_ARCH=	yes
 NO_ARCH_IGNORE=	template_x64_bsd.bin template_x86_bsd.bin CVE-2013-2171.bin
 STRIP=
 
 USES=		python shebangfix
 USE_RUBY=	yes
 PYTHON_NO_DEPENDS=	yes
 SHEBANG_FILES=	data/exploits/CVE-2017-7494/build.sh \
 		data/exploits/CVE-2017-7494/install-deps.sh \
 		external/source/shellcode/windows/build.sh \
 		external/source/msfJavaToolkit/compile.sh \
 		external/source/msfJavaToolkit/testKeytool.rb \
 		external/source/msfJavaToolkit/testCompilation.rb \
 		external/source/metsvc/test.rb \
 		docker/bin/msfvenom \
 		docker/bin/msfvenom-dev \
 		docker/bin/msfconsole \
 		docker/bin/msfconsole-dev \
 		tools/hardware/killerbee_msfrelay \
 		tools/dev/import-dev-keys.sh \
 		tools/dev/sign-dev-keys.sh
 
 .include <bsd.port.pre.mk>
 
 .if ${RUBY_VER} >= 2.4
 RUN_DEPENDS+=	rubygem-xmlrpc>=0:net/rubygem-xmlrpc
 .endif
 
 post-patch:
 	${REINPLACE_CMD} 's,git ls-files,find . ! -type d | sed "s|^./||", ; \
 		/bcrypt_pbkdf/d ; \
 		/rbnacl/d ; \
 		/rb-readline/d' \
 		${WRKSRC}/metasploit-framework.gemspec
 	${REINPLACE_CMD} "/pg/s|, '0.20.0'||" ${WRKSRC}/metasploit-framework.gemspec
 .if ${RUBY_VER} < 2.4
 	${REINPLACE_CMD} '/xmlrpc/d' ${WRKSRC}/metasploit-framework.gemspec
 .endif
 
 do-build:
 	${RM} ${WRKSRC}/Gemfile.lock
 	${TOUCH} ${WRKSRC}/Gemfile.lock
 	${REINPLACE_CMD} '/^group :coverage/,/^end/d ; /^group :development/,/^end/d ; /^group :test/,/^end/d ; /git:/d' \
 		${WRKSRC}/Gemfile
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC} && ${PAX} -rw . ${STAGEDIR}${DATADIR}
 .for f in ${SCRIPTS}
-	${LN} -s ../${DATADIR_REL}/${f} ${STAGEDIR}${PREFIX}/bin/${f}
+	${RLN} ${STAGEDIR}${DATADIR}/${f} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
 
 post-install:
 	@${FIND} ${STAGEDIR} ! -type d | \
 		${SED} 's,${STAGEDIR}${PREFIX}/,, ; /Gemfile.lock/s|^|@(,,0666) |' >> ${TMPPLIST}
 	@${FIND} -ds ${STAGEDIR}${DATADIR} -type d -empty | \
 		${SED} 's,${STAGEDIR}${PREFIX}/,, ; s,^,@dir ,' >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
Index: head/security/metasploit/distinfo
===================================================================
--- head/security/metasploit/distinfo	(revision 448811)
+++ head/security/metasploit/distinfo	(revision 448812)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501956463
-SHA256 (rapid7-metasploit-framework-4.15.5_GH0.tar.gz) = 41e1a9904161341ba004e49e7a86ea2490308c6892a1b235ec6074340e479276
-SIZE (rapid7-metasploit-framework-4.15.5_GH0.tar.gz) = 24037977
+TIMESTAMP = 1503684772
+SHA256 (rapid7-metasploit-framework-4.16.2_GH0.tar.gz) = 564072e633da3243252c3eb2cd005e406c005e0e4bbff56b22f7ae0640a3ee34
+SIZE (rapid7-metasploit-framework-4.16.2_GH0.tar.gz) = 24061575