Convert from USE_DOS2UNIX to USES=dos2unix

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

6 files changed, 23 insertions, 35 deletions

diff --git a/textproc/asm-xml/Makefile b/textproc/asm-xml/Makefile
index 492624161deb..7fbfa222dfbe 100644
--- a/textproc/asm-xml/Makefile
+++ b/textproc/asm-xml/Makefile
@@ -12,21 +12,14 @@ COMMENT=	Very fast XML parser and decoder written in pure assembler
 BUILD_DEPENDS=	fasm:${PORTSDIR}/lang/fasm
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_DOS2UNIX=	YES
+USES=		dos2unix uidfix
 
 PLIST_FILES=	include/asm-xml.h lib/libasm-xml.a
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-BROKEN=		does not build on 6.X
-.endif
-
 post-extract:
 	${RM} -rf ${WRKSRC}/obj
 
 post-patch:
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}/Makefile
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/p5-XML-DBMS/Makefile b/textproc/p5-XML-DBMS/Makefile
index bec5f995edcf..7ebd4260c788 100644
--- a/textproc/p5-XML-DBMS/Makefile
+++ b/textproc/p5-XML-DBMS/Makefile
@@ -12,6 +12,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl port of Java package XML-DBMS v1.0
 
+OPTIONS_DEFINE=	EXAMPLES
+
 BUILD_DEPENDS=	p5-libxml>=0:${PORTSDIR}/textproc/p5-libxml \
 		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
 		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
@@ -19,15 +21,12 @@ BUILD_DEPENDS=	p5-libxml>=0:${PORTSDIR}/textproc/p5-libxml \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-USES=		perl5
+USES=		dos2unix perl5
 USE_PERL5=	configure
 USE_DOS2UNIX=	yes
 
 post-install:
-.ifndef(NOPORTDOCS)
-	@${ECHO_MSG} "===>   Installing examples for ${PKGNAME}"
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/samples/*.* ${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-XML-DBMS/pkg-plist b/textproc/p5-XML-DBMS/pkg-plist
index f1b624d60284..961cbfb65cb4 100644
--- a/textproc/p5-XML-DBMS/pkg-plist
+++ b/textproc/p5-XML-DBMS/pkg-plist
@@ -1,12 +1,12 @@
 %%SITE_PERL%%/XML/XMLtoDBMS.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XMLtoDBMS/.packlist
-%%PORTDOCS%%%%EXAMPLESDIR%%/sales.map
-%%PORTDOCS%%%%EXAMPLESDIR%%/sales.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/sales.sql
-%%PORTDOCS%%%%EXAMPLESDIR%%/sales.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/sales1.map
-%%PORTDOCS%%%%EXAMPLESDIR%%/sales2.map
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sales.map
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sales.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sales.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sales.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sales1.map
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sales2.map
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XMLtoDBMS
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
 @dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/s5/Makefile b/textproc/s5/Makefile
index 7f7a951aa6ff..9a3389cfc533 100644
--- a/textproc/s5/Makefile
+++ b/textproc/s5/Makefile
@@ -7,36 +7,32 @@ PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://meyerweb.com/eric/tools/s5/v/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
+EXTRACT_SUFX=	.zip
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A simple HTML-based presentation system
+COMMENT=	Simple HTML-based presentation system
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
-USE_DOS2UNIX=	yes
+USES=		dos2unix
 DOS2UNIX_REGEX=	.*\.(css|htc|html|js|txt)
-USE_ZIP=	yes
 WRKSRC=		${WRKDIR}
 NO_BUILD=	yes
 
-MAN1=		s5.1
-MANCOMPRESSED=	no
-
 S5_DIR=		${PREFIX}/share/${PORTNAME}
 S5_SUBDIRS=	pix primer s5-blank ui
 
-NO_STAGE=	yes
 post-extract:
-		cd ${WRKSRC} && ${UNZIP_CMD} s5-blank.zip
+		cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} s5-blank.zip ${EXTRACT_AFTER_ARGS}
 		${SED} -e "s,/usr/local,${PREFIX}," ${FILESDIR}/s5.sh > ${WRKDIR}/s5
 		${SED} -e "s,/usr/local,${PREFIX}," ${FILESDIR}/s5.1 > ${WRKDIR}/s5.1
 		${FIND} ${WRKDIR} -type f -name .DS_Store -delete
 
 do-install:
-		${MKDIR} ${S5_DIR}
+		${MKDIR} ${STAGEDIR}${S5_DIR}
 		(cd ${WRKDIR} && \
-			${COPYTREE_SHARE} "*.html ${S5_SUBDIRS}" ${S5_DIR})
-		${INSTALL_SCRIPT} ${WRKDIR}/s5 ${PREFIX}/bin/s5
-		${INSTALL_DATA} ${WRKDIR}/s5.1 ${PREFIX}/man/man1/s5.1
+			${COPYTREE_SHARE} "*.html ${S5_SUBDIRS}" ${STAGEDIR}${S5_DIR})
+		${INSTALL_SCRIPT} ${WRKDIR}/s5 ${STAGEDIR}${PREFIX}/bin/s5
+		${INSTALL_DATA} ${WRKDIR}/s5.1 ${STAGEDIR}${PREFIX}/man/man1/s5.1
 
 .include <bsd.port.mk>
diff --git a/textproc/s5/pkg-plist b/textproc/s5/pkg-plist
index 71daf8b41129..a83aea61b01c 100644
--- a/textproc/s5/pkg-plist
+++ b/textproc/s5/pkg-plist
@@ -58,6 +58,7 @@ bin/s5
 %%DATADIR%%/s5-blank/ui/default/s5-core.css
 %%DATADIR%%/s5-blank/ui/default/slides.css
 %%DATADIR%%/s5-blank/ui/default/slides.js
+man/man1/s5.1.gz
 @dirrm %%DATADIR%%/pix
 @dirrm %%DATADIR%%/primer
 @dirrm %%DATADIR%%/s5-blank/ui/default
diff --git a/textproc/silvercity/Makefile b/textproc/silvercity/Makefile
index e33a241307ad..e33f3ca93253 100644
--- a/textproc/silvercity/Makefile
+++ b/textproc/silvercity/Makefile
@@ -8,12 +8,11 @@ MASTER_SITES=	SF/${PORTNAME}/Python%20SilverCity%20Bindings/${PORTVERSION}
 DISTNAME=	SilverCity-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A lexing package for over 20 programming and markup languages
+COMMENT=	Lexing package for over 20 programming and markup languages
 
+USES=		dos2unix
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	SilverCity
-USE_DOS2UNIX=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>