Attachment 142994 Details for Bug 190114 – file.diff

[patch] file.diff

file.diff (text/plain), 2.35 KB, created by joe on 2014-05-22 16:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: joe

Created: 2014-05-22 16:40:01 UTC

Size: 2.35 KB

patch

obsolete

>diff --git a/www/geeklog/Makefile b/www/geeklog/Makefile
>index 7bceb50..a1563a6 100644
>--- a/www/geeklog/Makefile
>+++ b/www/geeklog/Makefile
>@@ -16,24 +16,20 @@ USE_MYSQL=	yes
> NO_BUILD=	yes
> USE_PHP=	yes
> 
>-NO_STAGE=	yes
> do-install:
>-	@${INSTALL} -o ${WWWOWN} -g ${WWWGRP} -m 555 -d ${WWWDIR}
>+	@${INSTALL} -o ${WWWOWN} -g ${WWWGRP} -m 555 -d ${STAGEDIR}${WWWDIR}
> 	@(cd ${WRKSRC} && \
>-		${COPYTREE_SHARE} \* ${WWWDIR} "! -name db-config.php \
>+		${COPYTREE_SHARE} \* ${STAGEDIR}${WWWDIR} "! -name db-config.php \
> 			-or -name siteconfig.php")
>-	@if [ ! -f ${WWWDIR}/db-config.php ]; then \
>-		${INSTALL_DATA} ${WRKSRC}/db-config.php ${WWWDIR}/db-config.php; \
>-	fi
>-	@if [ ! -f ${WWWDIR}/public_html/siteconfig.php ]; then \
>-		{INSTALL_DATA} ${WRKSRC}/public_html/siteconfig.php \
>-			${WWWDIR}/public_html/siteconfig.php; \
>-	fi
>+	@${INSTALL_DATA} ${WRKSRC}/db-config.php ${STAGEDIR}${WWWDIR}/db-config.php.sample; 
>+	@${INSTALL_DATA} ${WRKSRC}/public_html/siteconfig.php \
>+			${STAGEDIR}${WWWDIR}/public_html/siteconfig.php.sample
>+	@${RM} ${STAGEDIR}${WWWDIR}/public_html/siteconfig.php
> 
> post-install:
>-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
>+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
> .for i in db-config.php error.log siteconfig.php geeklog.rss
>-	@${FIND} ${WWWDIR} -name ${i} | ${XARGS} ${CHMOD} 755
>+	@${FIND} ${STAGEDIR}${WWWDIR} -name ${i} | ${XARGS} ${CHMOD} 755
> .endfor
> 	@${CAT} ${PKGMESSAGE}
> 
>diff --git a/www/geeklog/pkg-plist b/www/geeklog/pkg-plist
>index 745b1f5..d3cbb34 100644
>--- a/www/geeklog/pkg-plist
>+++ b/www/geeklog/pkg-plist
>@@ -1,5 +1,9 @@
>-@unexec if [ "`md5 -q %D/%%WWWDIR%%/db-config.php`" = "e152b8b4ebd7e8b5bf05c9466f618bfa" ]; then rm -f %D/%%WWWDIR%%/db-config.php; fi
>-@unexec if [ "`md5 -q %D/%%WWWDIR%%/public_html/siteconfig.php`" = "a713c0e73d143db728d350010f7cf289" ]; then rm -f %D/%%WWWDIR%%/public_html/siteconfig.php; fi
>+@unexec if cmp -s %D/%%WWWDIR%%/db-config.php %D/%%WWWDIR%%/db-config.php.sample; then rm -f %D/%%WWWDIR%%/db-config.php; fi
>+%%WWWDIR%%/db-config.php.sample
>+@exec cp -n %D/%F %B/db-config.php
>+@unexec if cmp -s %D/%%WWWDIR%%/public_html/siteconfig.php %D/%%WWWDIR%%/public_html/siteconfig.php.sample; then rm -f %D/%%WWWDIR%%/public_html/siteconfig.php; fi
>+%%WWWDIR%%/public_html/siteconfig.php.sample
>+@exec cp -n %D/%F %B/siteconfig.php
> %%WWWDIR%%/INSTALL
> %%WWWDIR%%/backups/README
> %%WWWDIR%%/data/README

Actions: View | Diff

Attachments on bug 190114: 142994