Convert from USE_DOS2UNIX to USES=dos2unix

While here:
- support stage,
- use bsdtar to extract when supported.
- Cleanup

3 files changed, 12 insertions, 20 deletions

diff --git a/security/l0phtcrack/Makefile b/security/l0phtcrack/Makefile
index df5e1ae773e2..0ba8e3587d0e 100644
--- a/security/l0phtcrack/Makefile
+++ b/security/l0phtcrack/Makefile
@@ -8,23 +8,20 @@ MASTER_SITES=	http://www.mavetju.org/download/adopted/ \
 		http://www.cotse.com/sw/WinNT/
 DISTNAME=	lcsrc
 DIST_SUBDIR=	${PORTNAME}
+EXTRACT_SUFX=	.zip
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cracks SAMBA or Windows NT passwords
 
-USES=		perl5
+USES=		dos2unix perl5
 DOCDIR=		share/doc/${PORTNAME}
 RESTRICTED=	uses GNU getopt with BSDish-licensed code from OpenSSL
 NO_WRKSUBDIR=	yes
 PLIST=		${WRKDIR}/pkg-plist
 USE_PERL5=	build
-USE_ZIP=	yes
-USE_DOS2UNIX=	yes
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-extract:
 	${RM} ${WRKDIR}/*exe
 	${REINPLACE_CMD} -i '' -e 's|ommited|omitted|' ${WRKDIR}/util.c
@@ -34,18 +31,14 @@ do-build:
 
 pre-install:
 	${ECHO_CMD} bin/lc_CLI > ${PLIST}
-.if ! ${PORT_OPTIONS:MDOCS}
 	for i in `${FIND} ${WRKDIR} -name '*txt'`; \
 		do ${ECHO_CMD} ${DOCDIR}/`${BASENAME} $${i}` >> ${PLIST}; \
 	done
 	${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}
-.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/lc_CLI ${STAGEDIR}${PREFIX}/bin
-.if ! ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${PREFIX}/${DOCDIR}
 	cd ${WRKSRC} && ${PAX} -r -w *txt ${STAGEDIR}${PREFIX}/${DOCDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/security/py-trustedpickle/Makefile b/security/py-trustedpickle/Makefile
index 1bdce2d042bb..2e9eb8c094a7 100644
--- a/security/py-trustedpickle/Makefile
+++ b/security/py-trustedpickle/Makefile
@@ -12,8 +12,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	TrustedPickle is a Python (de)Pickler with a way to verify the data
 
+USES=		dos2unix
 USE_PYTHON=	yes
-USE_DOS2UNIX=	yes
 
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/TrustedPickle.py \
 		%%PYTHON_SITELIBDIR%%/TrustedPickle.pyc \
@@ -21,14 +21,14 @@ PLIST_FILES=	%%PYTHON_SITELIBDIR%%/TrustedPickle.py \
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-NO_STAGE=	yes
 do-build:
 	@cd ${WRKSRC} && ${PYTHON_CMD} -OOOO -c 'import TrustedPickle' && \
 	${PYTHON_CMD} -c 'import TrustedPickle'
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/TrustedPickle.py ${PYTHON_SITELIBDIR}
-	${INSTALL_DATA} ${WRKSRC}/TrustedPickle.pyc ${PYTHON_SITELIBDIR}
-	${INSTALL_DATA} ${WRKSRC}/TrustedPickle.pyo ${PYTHON_SITELIBDIR}
+	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
+	${INSTALL_DATA} ${WRKSRC}/TrustedPickle.py ${STAGEDIR}${PYTHON_SITELIBDIR}
+	${INSTALL_DATA} ${WRKSRC}/TrustedPickle.pyc ${STAGEDIR}${PYTHON_SITELIBDIR}
+	${INSTALL_DATA} ${WRKSRC}/TrustedPickle.pyo ${STAGEDIR}${PYTHON_SITELIBDIR}
 
 .include <bsd.port.mk>
diff --git a/security/shttpscanner/Makefile b/security/shttpscanner/Makefile
index 1b56b94fbb21..b60efd5543a8 100644
--- a/security/shttpscanner/Makefile
+++ b/security/shttpscanner/Makefile
@@ -6,17 +6,16 @@ PORTVERSION=	0.4
 CATEGORIES=	security www
 MASTER_SITES=	SF/${PORTNAME}/sHTTPScanner/sHTTPScanner%20v${PORTVERSION}
 DISTNAME=	sHTTPScanner_v${DISTVERSION}
+EXTRACT_SUFX=	.zip
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple HTTP scanner
 
-USE_ZIP=	yes
-USE_DOS2UNIX=	yes
+USES=		dos2unix
 
 PLIST_FILES=	bin/${PORTNAME} %%DATADIR%%/requests.txt %%DATADIR%%/subdomains.txt
 PLIST_DIRS=	%%DATADIR%%
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -E '/^#define/s!([a-z]*\.txt)!${DATADIR}/\1!' ${WRKSRC}/${DISTNAME:L}.c
 
@@ -24,8 +23,8 @@ do-build:
 	@cd ${WRKSRC} && ${CC} ${CFLAGS} ${PTHREAD_CFLAGS} -o ${PORTNAME} ${DISTNAME:L}.c ${PTHREAD_LIBS}
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
-	@${INSTALL} -d ${DATADIR}/
-	@${INSTALL} ${WRKSRC}/requests.txt ${WRKSRC}/subdomains.txt ${DATADIR}/
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+	@${INSTALL} -d ${STAGEDIR}${DATADIR}/
+	${INSTALL} ${WRKSRC}/requests.txt ${WRKSRC}/subdomains.txt ${STAGEDIR}${DATADIR}/
 
 .include <bsd.port.mk>