Date: Tue, 19 Nov 2013 07:42:42 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334286 - in head: net/py-pcapy security/l0phtcrack security/py-trustedpickle security/shttpscanner textproc/asm-xml textproc/p5-XML-DBMS textproc/s5 textproc/silvercity www/paros www/p... Message-ID: <201311190742.rAJ7ggYL098493@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Tue Nov 19 07:42:41 2013 New Revision: 334286 URL: http://svnweb.freebsd.org/changeset/ports/334286 Log: Convert from USE_DOS2UNIX to USES=dos2unix While here: - support stage, - use bsdtar to extract when supported. - Cleanup Modified: head/net/py-pcapy/Makefile head/security/l0phtcrack/Makefile head/security/py-trustedpickle/Makefile head/security/shttpscanner/Makefile head/textproc/asm-xml/Makefile head/textproc/p5-XML-DBMS/Makefile head/textproc/p5-XML-DBMS/pkg-plist head/textproc/s5/Makefile head/textproc/s5/pkg-plist head/textproc/silvercity/Makefile head/www/paros/Makefile head/www/php-templates/Makefile Modified: head/net/py-pcapy/Makefile ============================================================================== --- head/net/py-pcapy/Makefile Tue Nov 19 07:41:52 2013 (r334285) +++ head/net/py-pcapy/Makefile Tue Nov 19 07:42:41 2013 (r334286) @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept FETCH_BEFORE_ARGS=-o ${DISTFILES} -USE_DOS2UNIX= yes +USES= dos2unix USE_PYTHON= yes USE_PYDISTUTILS=yes @@ -25,13 +25,9 @@ DOCSDIR= ${PREFIX}/share/doc/py-${PORTNA PLIST_FILES= %%PYTHON_SITELIBDIR%%/pcapy.so PORTDOCS= README pcapy.html -NO_STAGE= yes -.include <bsd.port.options.mk> post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: head/security/l0phtcrack/Makefile ============================================================================== --- head/security/l0phtcrack/Makefile Tue Nov 19 07:41:52 2013 (r334285) +++ head/security/l0phtcrack/Makefile Tue Nov 19 07:42:41 2013 (r334286) @@ -8,23 +8,20 @@ MASTER_SITES= http://www.mavetju.org/dow 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> Modified: head/security/py-trustedpickle/Makefile ============================================================================== --- head/security/py-trustedpickle/Makefile Tue Nov 19 07:41:52 2013 (r334285) +++ head/security/py-trustedpickle/Makefile Tue Nov 19 07:42:41 2013 (r334286) @@ -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%%/Trust 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> Modified: head/security/shttpscanner/Makefile ============================================================================== --- head/security/shttpscanner/Makefile Tue Nov 19 07:41:52 2013 (r334285) +++ head/security/shttpscanner/Makefile Tue Nov 19 07:42:41 2013 (r334286) @@ -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> Modified: head/textproc/asm-xml/Makefile ============================================================================== --- head/textproc/asm-xml/Makefile Tue Nov 19 07:41:52 2013 (r334285) +++ head/textproc/asm-xml/Makefile Tue Nov 19 07:42:41 2013 (r334286) @@ -12,21 +12,14 @@ COMMENT= Very fast XML parser and decode 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> Modified: head/textproc/p5-XML-DBMS/Makefile ============================================================================== --- head/textproc/p5-XML-DBMS/Makefile Tue Nov 19 07:41:52 2013 (r334285) +++ head/textproc/p5-XML-DBMS/Makefile Tue Nov 19 07:42:41 2013 (r334286) @@ -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}/ 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> Modified: head/textproc/p5-XML-DBMS/pkg-plist ============================================================================== --- head/textproc/p5-XML-DBMS/pkg-plist Tue Nov 19 07:41:52 2013 (r334285) +++ head/textproc/p5-XML-DBMS/pkg-plist Tue Nov 19 07:42:41 2013 (r334286) @@ -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 Modified: head/textproc/s5/Makefile ============================================================================== --- head/textproc/s5/Makefile Tue Nov 19 07:41:52 2013 (r334285) +++ head/textproc/s5/Makefile Tue Nov 19 07:42:41 2013 (r334286) @@ -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> Modified: head/textproc/s5/pkg-plist ============================================================================== --- head/textproc/s5/pkg-plist Tue Nov 19 07:41:52 2013 (r334285) +++ head/textproc/s5/pkg-plist Tue Nov 19 07:42:41 2013 (r334286) @@ -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 Modified: head/textproc/silvercity/Makefile ============================================================================== --- head/textproc/silvercity/Makefile Tue Nov 19 07:41:52 2013 (r334285) +++ head/textproc/silvercity/Makefile Tue Nov 19 07:42:41 2013 (r334286) @@ -8,12 +8,11 @@ MASTER_SITES= SF/${PORTNAME}/Python%20Si 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> Modified: head/www/paros/Makefile ============================================================================== --- head/www/paros/Makefile Tue Nov 19 07:41:52 2013 (r334285) +++ head/www/paros/Makefile Tue Nov 19 07:42:41 2013 (r334286) @@ -8,7 +8,7 @@ MASTER_SITES= SF/${PORTNAME}/Paros/Versi DISTNAME= ${PORTNAME}-${PORTVERSION}-unix MAINTAINER= ports@FreeBSD.org -COMMENT= An HTTP/HTTPS proxy for assessing web application vulnerability +COMMENT= HTTP/HTTPS proxy for assessing web application vulnerability WRKSRC= ${WRKDIR}/${PORTNAME} @@ -18,20 +18,20 @@ JAVA_VERSION= 1.6 USE_ZIP= yes NO_BUILD= yes -USE_DOS2UNIX= release.txt +USES= dos2unix +DOS2UNIX_FILES= release.txt DATADIR= ${JAVASHAREDIR}/${PORTNAME} -NO_STAGE= yes post-patch: ${REINPLACE_CMD} -e 's|java -jar \(paros.jar\)|cd ${DATADIR} \&\& java -jar ${DATADIR}/\1|g' \ ${WRKSRC}/startserver.sh ${RM} ${WRKSRC}/startserver.sh.bak do-install: - @${MKDIR} ${JAVASHAREDIR}/${PORTNAME} - (cd ${WRKSRC} && ${COPYTREE_BIN} \* ${JAVASHAREDIR}/${PORTNAME} \ + @${MKDIR} ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME} + (cd ${WRKSRC} && ${COPYTREE_BIN} \* ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME} \ "! -name startserver.sh") - ${INSTALL_SCRIPT} ${WRKSRC}/startserver.sh ${PREFIX}/bin/paros + ${INSTALL_SCRIPT} ${WRKSRC}/startserver.sh ${STAGEDIR}${PREFIX}/bin/paros .include <bsd.port.mk> Modified: head/www/php-templates/Makefile ============================================================================== --- head/www/php-templates/Makefile Tue Nov 19 07:41:52 2013 (r334285) +++ head/www/php-templates/Makefile Tue Nov 19 07:42:41 2013 (r334286) @@ -8,15 +8,13 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME} SF/${PORTNAME}/${PORTNAME}-doc/html:doc DISTNAME= php_templates-${PORTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:ext -.if !defined(NOPORTDOCS) DISTFILES+= php_templates-doc-eng-1.1${EXTRACT_SUFX}:doc -.endif MAINTAINER= ports@FreeBSD.org -COMMENT= A template framework for PHP +COMMENT= Template framework for PHP WRKSRC= ${WRKDIR}/templates -USE_DOS2UNIX= yes +USES= dos2unix USE_PHP= yes USE_PHPIZE= yes @@ -27,17 +25,11 @@ SUB_FILES= pkg-message PORTDOCS= * -NO_STAGE= yes do-install: - @${MKDIR} ${PREFIX}/lib/php/${PHP_EXT_DIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR} @${INSTALL_DATA} ${WRKSRC}/modules/templates.so \ - ${PREFIX}/lib/php/${PHP_EXT_DIR} -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}-doc/* ${DOCSDIR} -.endif - -post-install: - @${CAT} ${PKGMESSAGE} + ${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${STAGEDIR}${WRKSRC}-doc/* ${DOCSDIR} .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311190742.rAJ7ggYL098493>