4 files changed, 4 insertions, 35 deletions

diff --git a/games/bubble-chains/Makefile b/games/bubble-chains/Makefile
index 76f909f719c3..6004302b4549 100644
--- a/games/bubble-chains/Makefile
+++ b/games/bubble-chains/Makefile
@@ -21,12 +21,9 @@ EXPIRATION_DATE=2016-04-23
 
 LICENSE=	GPLv2
 
-EXTRACT_DEPENDS=	7z:${PORTSDIR}/archivers/p7zip
-BUILD_DEPENDS=		7z:${PORTSDIR}/archivers/p7zip
-
 WRKSRC=		${WRKDIR}/chains-${DISTVERSION}-src
 
-USES=		dos2unix qmake
+USES=		7z dos2unix qmake
 DOS2UNIX_GLOB=	*.pro *.cpp  *.h *.ui *.ui *.rc *.htm *.dat *.css
 USE_SDL=	sdl image mixer
 USE_GL=		glut glew glu
@@ -41,14 +38,6 @@ OPTIONS_DEFINE=	DOCS
 DESKTOP_ENTRIES="Bubble Chains" "" "${PORTNAME}" \
 		"${PORTNAME}" "Game;ArcadeGame;" ""
 
-P7ZIP_CMD=	${LOCALBASE}/bin/7z
-P7ZIP_ARGS=	x -o${WRKDIR}
-
-do-extract:
-	@${MKDIR} ${WRKDIR}
-	@${P7ZIP_CMD} ${P7ZIP_ARGS} \
-		${_DISTDIR}/chains-${DISTVERSION}${EXTRACT_SUFX}
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local/games/chains|${DATADIR}|' \
 		${WRKSRC}/main.cpp ${WRKSRC}/Game.pro
diff --git a/security/rcracki_mt/Makefile b/security/rcracki_mt/Makefile
index bc75545e66f2..eb27d3329a94 100644
--- a/security/rcracki_mt/Makefile
+++ b/security/rcracki_mt/Makefile
@@ -5,24 +5,18 @@ PORTVERSION=	0.7.0
 CATEGORIES=	security
 MASTER_SITES=	SF/rcracki/rcracki_mt/rcracki_mt_${PORTVERSION}
 DISTNAME=	${PORTNAME}_${PORTVERSION}_src
-EXTRACT_SUFX=	.7z
 
 MAINTAINER=	olivier@FreeBSD.org
 COMMENT=	Rainbow table based crack tool
 
 LICENSE=	GPLv2
 
-EXTRACT_DEPENDS=7z:${PORTSDIR}/archivers/p7zip
-
 NOT_FOR_ARCHS=	arm sparc64
 NOT_FOR_ARCHS_REASON=	cannot detect endianness
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
 
-USES=		gmake
-EXTRACT_CMD=	${LOCALBASE}/bin/7z
-EXTRACT_BEFORE_ARGS=x -o${WRKDIR}
-EXTRACT_AFTER_ARGS=
+USES=		7z gmake
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	ChangeLog.txt README.txt
diff --git a/sysutils/namefix/Makefile b/sysutils/namefix/Makefile
index e8d8b75c7c5d..239f56b56769 100644
--- a/sysutils/namefix/Makefile
+++ b/sysutils/namefix/Makefile
@@ -7,28 +7,22 @@ PORTREVISION=	2
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}.pl/${PORTVERSION}
 DISTNAME=	${PORTNAME}.pl_${PORTVERSION}
-EXTRACT_SUFX=	.7z
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Batch file renamer
 
 LICENSE=	GPLv2
 
-EXTRACT_DEPENDS=7z:${PORTSDIR}/archivers/p7zip
 RUN_DEPENDS=	p5-MP3-Tag>=0:${PORTSDIR}/audio/p5-MP3-Tag \
 		p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk \
 		p5-Tk-JComboBox>=0:${PORTSDIR}/x11-toolkits/p5-Tk-JComboBox \
 		p5-Tk-DynaTabFrame>=0:${PORTSDIR}/x11-toolkits/p5-Tk-DynaTabFrame
 
-EXTRACT_CMD=	7z
-EXTRACT_BEFORE_ARGS=	x
-EXTRACT_AFTER_ARGS=	-bd -y >/dev/null 2>&1
-
 WRKSRC=		${WRKDIR}/${PORTNAME}.pl
 NO_BUILD=	yes
 NO_ARCH=	yes
 
-USES=		perl5 shebangfix
+USES=		7z perl5 shebangfix
 USE_PERL5=	run
 SHEBANG_FILES=	namefix-cli.pl namefix.pl
 
diff --git a/textproc/jalingo/Makefile b/textproc/jalingo/Makefile
index e9415be30e5d..686af0328648 100644
--- a/textproc/jalingo/Makefile
+++ b/textproc/jalingo/Makefile
@@ -8,24 +8,19 @@ PORTREVISION=	2
 CATEGORIES=	textproc java
 MASTER_SITES=	SF/${PORTNAME}/JaLingo/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
-EXTRACT_SUFX=	.7z
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Free OS independent dictionary application
 
 LICENSE=	GPLv2
 
-EXTRACT_DEPENDS=	7z:${PORTSDIR}/archivers/p7zip
-
+USES=		7z
 USE_ANT=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 
 ALL_TARGET=	dist
 
-P7ZIP_CMD=	${LOCALBASE}/bin/7z
-P7ZIP_ARGS=	x -o${WRKDIR}
-
 SUB_FILES=	${PORTNAME}
 SUB_LIST=	JALINGOJAR=${JALINGOJAR}
 PLIST_SUB=	JALINGOJAR=${JALINGOJAR}
@@ -34,9 +29,6 @@ DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
 JALINGOJAR=	${PORTNAME}.jar
 
-do-extract:
-	@${MKDIR} ${WRKDIR} && ${P7ZIP_CMD} ${P7ZIP_ARGS} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/dist/${JALINGOJAR} ${STAGEDIR}${DATADIR}/${JALINGOJAR}