diff options
author | bapt <bapt@FreeBSD.org> | 2013-11-19 15:42:41 +0800 |
---|---|---|
committer | bapt <bapt@FreeBSD.org> | 2013-11-19 15:42:41 +0800 |
commit | de9200bc01cd9ef17feb7767e7d37d75fab80f84 (patch) | |
tree | bc51861eca74afe2aa615c07a66f7c51f3b3f8cc /www | |
parent | f08079d3dd06953166a1808bde1ce483da32c485 (diff) | |
download | freebsd-ports-gnome-de9200bc01cd9ef17feb7767e7d37d75fab80f84.tar.gz freebsd-ports-gnome-de9200bc01cd9ef17feb7767e7d37d75fab80f84.tar.zst freebsd-ports-gnome-de9200bc01cd9ef17feb7767e7d37d75fab80f84.zip |
Convert from USE_DOS2UNIX to USES=dos2unix
While here:
- support stage,
- use bsdtar to extract when supported.
- Cleanup
Diffstat (limited to 'www')
-rw-r--r-- | www/paros/Makefile | 12 | ||||
-rw-r--r-- | www/php-templates/Makefile | 20 |
2 files changed, 12 insertions, 20 deletions
diff --git a/www/paros/Makefile b/www/paros/Makefile index 660f311dfc07..92503d0fcc6e 100644 --- a/www/paros/Makefile +++ b/www/paros/Makefile @@ -8,7 +8,7 @@ MASTER_SITES= SF/${PORTNAME}/Paros/Version%20${PORTVERSION} 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> diff --git a/www/php-templates/Makefile b/www/php-templates/Makefile index 361f64b03051..92536d76dbd8 100644 --- a/www/php-templates/Makefile +++ b/www/php-templates/Makefile @@ -8,15 +8,13 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.7:ext \ 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> |