From owner-svn-ports-all@freebsd.org  Thu Feb  4 18:47:17 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6306AA9B9BB;
 Thu,  4 Feb 2016 18:47:17 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1B32E838;
 Thu,  4 Feb 2016 18:47:17 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u14IlGTI080738;
 Thu, 4 Feb 2016 18:47:16 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u14IlGdA080737;
 Thu, 4 Feb 2016 18:47:16 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201602041847.u14IlGdA080737@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Thu, 4 Feb 2016 18:47:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r408074 - head/lang/php_doc
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2016 18:47:17 -0000

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@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 \