- Switch regripper to USE_GITHUB

- Update regripper to a recent snapshot (2.8.20160225)
- Merge regripperplugins into regripper

8 files changed, 18 insertions, 44 deletions

diff --git a/MOVED b/MOVED
index 774ff5997dde..5f664a8d4ba6 100644
--- a/MOVED
+++ b/MOVED
@@ -8225,3 +8225,4 @@ audio/waheela||2016-03-06|Has expired: Distfiles unavailable and no updates in 6
 sysutils/logstash-contrib||2016-03-06|Has expired: Upstream now distributing plugins separately: see https://github.com/logstash-plugins
 devel/p5-DateTime-Event-SolarTerm|devel/p5-DateTime-Astro|2016-03-07|Has been part of DateTime-Astro for a long time
 devel/p5-DateTime-Util-Astro|devel/p5-DateTime-Astro|2016-03-07|Has been part of DateTime-Astro for a long time
+security/regripperplugins||2016-03-07|Merged into security/regripper
diff --git a/security/Makefile b/security/Makefile
index 48ec166604cb..9ae47705036f 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -944,7 +944,6 @@
     SUBDIR += rcracki_mt
     SUBDIR += rdigest
     SUBDIR += regripper
-    SUBDIR += regripperplugins
     SUBDIR += reop
     SUBDIR += retranslator
     SUBDIR += revealrk
diff --git a/security/regripper/Makefile b/security/regripper/Makefile
index 113a3ab2562a..50d44e05cc47 100644
--- a/security/regripper/Makefile
+++ b/security/regripper/Makefile
@@ -2,10 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	regripper
-DISTVERSION=	2.8
+PORTVERSION=	2.8.20160225
 CATEGORIES=	security
-MASTER_SITES=	GOOGLE_CODE
-DISTNAME=	rrv${DISTVERSION}
 
 MAINTAINER=	antoine@FreeBSD.org
 COMMENT=	Tool for registry analysis in forensics examinations
@@ -14,20 +12,29 @@ LICENSE=	GPLv3
 
 RUN_DEPENDS=	p5-Parse-Win32Registry>=0:${PORTSDIR}/devel/p5-Parse-Win32Registry
 
-NO_WRKSUBDIR=	yes
+USE_GITHUB=	yes
+GH_ACCOUNT=	keydet89
+GH_PROJECT=	RegRipper2.8
+GH_TAGNAME=	c538c7a
+
+NO_ARCH=	yes
 NO_BUILD=	yes
-USES=		dos2unix perl5 zip shebangfix
+USES=		perl5 shebangfix
 SHEBANG_FILES=	rip.pl
 perl_OLD_CMD=	c:\\\\perl\\\\bin\\\\perl.exe
 USE_PERL5=	run
 
 PLIST_FILES=	bin/rip.pl
+PORTDATA=	plugins/*.pl plugins/all plugins/ntuser plugins/sam \
+		plugins/security plugins/software plugins/system \
+		plugins/usrclass
 
 post-patch:
-	${REINPLACE_CMD} -e 's|plugindir = $$str|plugindir = "${DATADIR}"| ; \
-		s|require "plugins/|require "${DATADIR}plugins/|' ${WRKSRC}/rip.pl
+	${REINPLACE_CMD} 's|"plugins"|"${DATADIR}/plugins"|' ${WRKSRC}/rip.pl
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/rip.pl ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins
+	${INSTALL_DATA} ${PORTDATA:S,^,${WRKSRC}/,} ${STAGEDIR}${DATADIR}/plugins
 
 .include <bsd.port.mk>
diff --git a/security/regripper/distinfo b/security/regripper/distinfo
index 3c686ab47011..6c19db937e2b 100644
--- a/security/regripper/distinfo
+++ b/security/regripper/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rrv2.8.zip) = 376617527bb0ad5895800159bbd82d12ea2c5a3c7ed61e6d4a2371481782e897
-SIZE (rrv2.8.zip) = 4255741
+SHA256 (keydet89-RegRipper2.8-2.8.20160225-c538c7a_GH0.tar.gz) = f48cc93bde55a19dd1f99db50721bf7175ada248b8e96fc7a888fad32a67367c
+SIZE (keydet89-RegRipper2.8-2.8.20160225-c538c7a_GH0.tar.gz) = 3448230
diff --git a/security/regripper/pkg-descr b/security/regripper/pkg-descr
index 9a96cd27b46e..c1b368ecad7f 100644
--- a/security/regripper/pkg-descr
+++ b/security/regripper/pkg-descr
@@ -2,4 +2,4 @@ RegRipper is an open source tool, written in Perl, for extracting/parsing
 information (keys, values, data) from the Registry and presenting it for
 analysis.
 
-WWW: http://code.google.com/p/regripper/
+WWW: https://github.com/keydet89/RegRipper2.8
diff --git a/security/regripperplugins/Makefile b/security/regripperplugins/Makefile
deleted file mode 100644
index ac3c728b0e22..000000000000
--- a/security/regripperplugins/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# Created by: Antoine Brodin <antoine@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	regripperplugins
-PORTVERSION=	20140414
-CATEGORIES=	security
-# Downloaded from https://www.dropbox.com/s/6a37htpkf3iq7eg/rr_20140414.zip
-MASTER_SITES=	LOCAL/antoine
-DISTNAME=	rr_${PORTVERSION}
-
-MAINTAINER=	antoine@FreeBSD.org
-COMMENT=	Supplemental plugins for Harlan Carvey's RegRipper
-
-LICENSE=	GPLv3
-
-RUN_DEPENDS=	regripper>=0:${PORTSDIR}/security/regripper
-
-USES=		dos2unix zip
-NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/regripper
-
-PORTDATA=	*.pl all amcache.txt ntuser sam security software system usrclass
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${PORTDATA:S,^,${WRKSRC}/plugins/,} ${STAGEDIR}${DATADIR}
-
-.include <bsd.port.mk>
diff --git a/security/regripperplugins/distinfo b/security/regripperplugins/distinfo
deleted file mode 100644
index 9d8f22d3cf1b..000000000000
--- a/security/regripperplugins/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (rr_20140414.zip) = 1db3d187d536377ebfcf85e34701d8f5d9f04de94bdf8de3470d9e0a5e894dc4
-SIZE (rr_20140414.zip) = 5538269
diff --git a/security/regripperplugins/pkg-descr b/security/regripperplugins/pkg-descr
deleted file mode 100644
index b0d7a5081287..000000000000
--- a/security/regripperplugins/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Supplemental plugins for Harlan Carvey's RegRipper.
-
-WWW: http://code.google.com/p/regripper/