From owner-svn-ports-all@FreeBSD.ORG Wed Feb 12 16:10:44 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 54359501; Wed, 12 Feb 2014 16:10:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 325371290; Wed, 12 Feb 2014 16:10:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1CGAixP068386; Wed, 12 Feb 2014 16:10:44 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1CGAh2f068384; Wed, 12 Feb 2014 16:10:43 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201402121610.s1CGAh2f068384@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Wed, 12 Feb 2014 16:10:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343936 - head/www/zenphoto 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.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Feb 2014 16:10:44 -0000 Author: sunpoet Date: Wed Feb 12 16:10:43 2014 New Revision: 343936 URL: http://svnweb.freebsd.org/changeset/ports/343936 QAT: https://qat.redports.org/buildarchive/r343936/ Log: - Fix PLIST: update empty directories handling - Bump PORTREVISION for package change Modified: head/www/zenphoto/Makefile head/www/zenphoto/pkg-plist Modified: head/www/zenphoto/Makefile ============================================================================== --- head/www/zenphoto/Makefile Wed Feb 12 15:58:43 2014 (r343935) +++ head/www/zenphoto/Makefile Wed Feb 12 16:10:43 2014 (r343936) @@ -3,6 +3,7 @@ PORTNAME= zenphoto PORTVERSION= 1.4.5.9 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/archive/ @@ -23,6 +24,9 @@ SUB_FILES= pkg-message pkg-deinstall SUB_LIST= PORTNAME=${PORTNAME} post-extract: + @${MKDIR} ${WRKSRC}/cache/ + @${FIND} ${WRKSRC} -name .gitignore -delete + @${FIND} -s ${WRKSRC}/ -type d -empty | ${XARGS} -I % ${TOUCH} %/.keepme @${RM} ${WRKSRC}/doc_files/Zenphoto\ license.txt ${WRKSRC}/doc_files/README.html ${WRKSRC}/zp-core/Zenphoto.package do-install: @@ -35,7 +39,6 @@ MS_DIRRMTRY= albums cache themes zp-core MS_PLIST= ${WRKDIR}/.ms-pkg-plist genplist: do-clean extract - cd ${WRKSRC}/ && ${MKDIR} ${MS_DIRRMTRY} ${ECHO} "@owner www" > ${MS_PLIST} ${ECHO} "@group www" >> ${MS_PLIST} cd ${WRKSRC}/ && ${FIND} -s * -type f | ${SED} 's|^|%%WWWDIR%%/|' >> ${MS_PLIST} Modified: head/www/zenphoto/pkg-plist ============================================================================== --- head/www/zenphoto/pkg-plist Wed Feb 12 15:58:43 2014 (r343935) +++ head/www/zenphoto/pkg-plist Wed Feb 12 16:10:43 2014 (r343936) @@ -2,12 +2,13 @@ @group www %%WWWDIR%%/CHANGELOG.md %%WWWDIR%%/README.md -%%WWWDIR%%/albums/.gitignore +%%WWWDIR%%/albums/.keepme +%%WWWDIR%%/cache/.keepme %%WWWDIR%%/doc_files/zenphoto_database_quick_reference.pdf %%WWWDIR%%/index.php -%%WWWDIR%%/plugins/gd_fonts/.gitignore -%%WWWDIR%%/plugins/imagick_fonts/.gitignore -%%WWWDIR%%/plugins/watermarks/.gitignore +%%WWWDIR%%/plugins/gd_fonts/.keepme +%%WWWDIR%%/plugins/imagick_fonts/.keepme +%%WWWDIR%%/plugins/watermarks/.keepme %%WWWDIR%%/themes/default/404.php %%WWWDIR%%/themes/default/album.php %%WWWDIR%%/themes/default/archive.php @@ -238,7 +239,7 @@ %%WWWDIR%%/themes/zpmobile/theme.png %%WWWDIR%%/themes/zpmobile/theme_description.php %%WWWDIR%%/themes/zpmobile/themeoptions.php -%%WWWDIR%%/uploaded/.gitignore +%%WWWDIR%%/uploaded/.keepme %%WWWDIR%%/zp-core/404.php %%WWWDIR%%/zp-core/admin-albumsort.php %%WWWDIR%%/zp-core/admin-dynamic-album.php @@ -1543,7 +1544,7 @@ %%WWWDIR%%/zp-core/zp-extensions/zenphoto_sendmail.php %%WWWDIR%%/zp-core/zp-extensions/zpCaptcha/c.php %%WWWDIR%%/zp-core/zp-extensions/zpCaptcha.php -%%WWWDIR%%/zp-data/.gitignore +%%WWWDIR%%/zp-data/.keepme @dirrm %%WWWDIR%%/zp-data @dirrm %%WWWDIR%%/zp-core/zp-extensions/zpCaptcha @dirrm %%WWWDIR%%/zp-core/zp-extensions/zenphoto_news