svn commit: r408074 - head/lang/php_doc
Dmitry Marakasov
amdmi3 at FreeBSD.org
Thu Feb 4 18:47:17 UTC 2016
Author: amdmi3
Date: Thu Feb 4 18:47:15 2016
New Revision: 408074
URL: https://svnweb.freebsd.org/changeset/ports/408074
Log:
- Fix from r407972 was broken by PORTREVISION bump. Fix the port properly and add a check which will make it fail verbosely if there are more problems.
Approved by: portmgr blanket
Modified:
head/lang/php_doc/Makefile
Modified: head/lang/php_doc/Makefile
==============================================================================
--- head/lang/php_doc/Makefile Thu Feb 4 18:43:34 2016 (r408073)
+++ head/lang/php_doc/Makefile Thu Feb 4 18:47:15 2016 (r408074)
@@ -3,7 +3,7 @@
PORTNAME= php_doc
PORTVERSION?= 20131017
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES?= lang
MASTER_SITES= http://www.mavetju.org/download/adopted/
DISTNAME= php_manual_${PHP_LANG}-${PORTVERSION}
@@ -11,9 +11,9 @@ DISTNAME= php_manual_${PHP_LANG}-${PORTV
MAINTAINER= edwin at mavetju.org
COMMENT?= PHP documentation in HTML
-NO_BUILD= YES
+NO_BUILD= yes
NO_ARCH= yes
-NO_WRKSUBDIR= YES
+NO_WRKSUBDIR= yes
SLAVEDIRS= french/php_doc \
german/php_doc \
japanese/php_doc \
@@ -28,12 +28,12 @@ PLIST= ${WRKDIR}/pkg-plist
.for lang in ${PHP_HTML_NORMAL}
.if ${PHP_LANG} == ${lang}
-WRK_SRC= ${WRKDIR}/${PORTNAME}-${PHP_LANG}-${PORTVERSION}/html/
+WRK_SRC= ${WRKSRC}/html/
.endif
.endfor
.for lang in ${PHP_HTML_CHUNKED}
.if ${PHP_LANG} == ${lang}
-WRK_SRC= ${WRKDIR}/${PORTNAME}-${PHP_LANG}-${PORTVERSION}/php-chunked-xhtml/
+WRK_SRC= ${WRKSRC}/php-chunked-xhtml/
.endif
.endfor
@@ -57,6 +57,7 @@ pre-install:
${FIND} ${WRK_SRC} -type f ! -name '.*' ! -name pkg-plist | ${SED} -e "s,${WRK_SRC},%%PHPDOCDIR%%," > ${PLIST}
do-install:
+ @[ -d "${WRK_SRC}" ] # ensure dir exists, else we can silently get an empty package
@${MKDIR} ${STAGEDIR}${PHPDOCDIR}
${FIND} ${WRK_SRC} -type d | ${SED} -e "s,${WRK_SRC},${STAGEDIR}${PHPDOCDIR}/," | ${XARGS} ${MKDIR}
for f in `${FIND} ${WRK_SRC} -type f ! -name '.*' ! -name pkg-plist | ${SED} -e 's,${WRK_SRC},,'`; do \
More information about the svn-ports-all
mailing list