From owner-svn-ports-all@freebsd.org  Mon Dec 21 21:08:17 2015
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 41EACA4EE75;
 Mon, 21 Dec 2015 21:08: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 ECE6A14D0;
 Mon, 21 Dec 2015 21:08:16 +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 tBLL8GZi005880;
 Mon, 21 Dec 2015 21:08:16 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBLL8F58005878;
 Mon, 21 Dec 2015 21:08:15 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201512212108.tBLL8F58005878@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: Mon, 21 Dec 2015 21:08:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r404193 - head/graphics/php5-swfed
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: Mon, 21 Dec 2015 21:08:17 -0000

Author: amdmi3
Date: Mon Dec 21 21:08:15 2015
New Revision: 404193
URL: https://svnweb.freebsd.org/changeset/ports/404193

Log:
  - Switch to options helpers
  - Modernize plist
  
  Approved by:	portmgr blanket

Modified:
  head/graphics/php5-swfed/Makefile
  head/graphics/php5-swfed/pkg-plist

Modified: head/graphics/php5-swfed/Makefile
==============================================================================
--- head/graphics/php5-swfed/Makefile	Mon Dec 21 20:58:08 2015	(r404192)
+++ head/graphics/php5-swfed/Makefile	Mon Dec 21 21:08:15 2015	(r404193)
@@ -24,7 +24,7 @@ DEFAULT_PHP_VER=	5
 USE_PHP=	zlib
 USE_PHPEXT=	yes
 
-WRKSRC=	${WRKDIR}/${DISTNAME}/src
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CONFIGURE_ARGS=	--with-png-dir=${LOCALBASE} --with-gif-dir=${LOCALBASE}
 
 PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
@@ -35,16 +35,23 @@ PORTEXAMPLES=	*
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-install:
+	@${MKDIR} ${STAGEDIR}${WWWDIR}
+	${CP} -R ${WRKDIR}/${DISTNAME}/www/ ${STAGEDIR}${WWWDIR}
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/doc/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/sample/${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
-	@${MKDIR} ${STAGEDIR}${WWWDIR}
-	${CP} -R ${WRKDIR}/${DISTNAME}/www/ ${STAGEDIR}${WWWDIR}
 
 x-generate-plist: stage
-	${FIND} ${STAGEDIR}${WWWDIR} -type f | ${SORT} | ${SED} -e 's,${STAGEDIR}${WWWDIR},%%WWWDIR%%,g' > pkg-plist.new
-	${FIND} ${STAGEDIR}${WWWDIR} -type d -depth | ${SORT} -r | ${SED} -e 's,${STAGEDIR}${WWWDIR},@dirrm %%WWWDIR%%,g' >> pkg-plist.new
-	${ECHO} '@exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%WWWDIR%%' >> pkg-plist.new
+	${ECHO_CMD} '@owner %%WWWOWN%%' > pkg-plist.new
+	${ECHO_CMD} '@group %%WWWGRP%%' >> pkg-plist.new
+	${FIND} ${STAGEDIR}${WWWDIR} -type f | ${SORT} | ${SED} -e 's,${STAGEDIR}${WWWDIR},%%WWWDIR%%,g' >> pkg-plist.new
+	${FIND} ${STAGEDIR}${WWWDIR} -type d -depth | ${SORT} -r | ${SED} -e 's,${STAGEDIR}${WWWDIR},@dir %%WWWDIR%%,g' >> pkg-plist.new
+	${ECHO_CMD} '@owner' >> pkg-plist.new
+	${ECHO_CMD} '@group' >> pkg-plist.new
 
 .include <bsd.port.mk>

Modified: head/graphics/php5-swfed/pkg-plist
==============================================================================
--- head/graphics/php5-swfed/pkg-plist	Mon Dec 21 20:58:08 2015	(r404192)
+++ head/graphics/php5-swfed/pkg-plist	Mon Dec 21 21:08:15 2015	(r404193)
@@ -1,3 +1,5 @@
+@owner %%WWWOWN%%
+@group %%WWWGRP%%
 %%WWWDIR%%/define.php
 %%WWWDIR%%/index.php
 %%WWWDIR%%/shapetpl.swf
@@ -5,5 +7,6 @@
 %%WWWDIR%%/swfimagelist.php
 %%WWWDIR%%/swfimagereplace.php
 %%WWWDIR%%/swfshape.php
-@dirrm %%WWWDIR%%
-@exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%WWWDIR%%
+@dir %%WWWDIR%%
+@owner
+@group