aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsunpoet <sunpoet@FreeBSD.org>2014-02-13 00:10:43 +0800
committersunpoet <sunpoet@FreeBSD.org>2014-02-13 00:10:43 +0800
commit4ff90aa2f3f94ade0926e94a21464614455a5a56 (patch)
treef6403bff90de7ccfb0bd397f8a9e626063f3f714
parent98a1e8ffa9bc307f189ed23d17f41b69ba270f66 (diff)
downloadfreebsd-ports-gnome-4ff90aa2f3f94ade0926e94a21464614455a5a56.tar.gz
freebsd-ports-gnome-4ff90aa2f3f94ade0926e94a21464614455a5a56.tar.zst
freebsd-ports-gnome-4ff90aa2f3f94ade0926e94a21464614455a5a56.zip
- Fix PLIST: update empty directories handling
- Bump PORTREVISION for package change
-rw-r--r--www/zenphoto/Makefile5
-rw-r--r--www/zenphoto/pkg-plist13
2 files changed, 11 insertions, 7 deletions
diff --git a/www/zenphoto/Makefile b/www/zenphoto/Makefile
index 8bca8ce77d0f..337ee1bf1adf 100644
--- a/www/zenphoto/Makefile
+++ b/www/zenphoto/Makefile
@@ -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}
diff --git a/www/zenphoto/pkg-plist b/www/zenphoto/pkg-plist
index 4e02338672f6..3d2b3e2e7a86 100644
--- a/www/zenphoto/pkg-plist
+++ b/www/zenphoto/pkg-plist
@@ -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