Attachment 142911 Details for Bug 190014 – file.diff

[patch] file.diff

file.diff (text/plain), 2.88 KB, created by joe on 2014-05-20 16:40:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: joe

Created: 2014-05-20 16:40:00 UTC

Size: 2.88 KB

patch

obsolete

>diff --git a/www/bblog/Makefile b/www/bblog/Makefile
>index 93caa7c..aabd86d 100644
>--- a/www/bblog/Makefile
>+++ b/www/bblog/Makefile
>@@ -27,7 +27,6 @@ OPTIONS_DEFINE=	GD IMAGICK
> OPTIONS_DEFAULT=GD
> IMAGICK_DESC=	${IMAGEMAGICK_DESC}
> 
>-NO_STAGE=	yes
> .include <bsd.port.pre.mk>
> 
> .if ${PORT_OPTIONS:MGD}
>@@ -44,18 +43,19 @@ pre-patch:
> .endif
> 
> do-install:
>-	@${MKDIR} ${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}
>-	@${CHOWN} ${WWWOWN}:${WWWGRP} ${PREFIX}/${BBLOGDIR}
>-	@${CHGRP} -R ${WWWGRP} ${PREFIX}/${BBLOGDIR}
>-	@${CHMOD} 755 ${PREFIX}/${BBLOGDIR}
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}
>+	@${CHOWN} ${WWWOWN}:${WWWGRP} ${STAGEDIR}${PREFIX}/${BBLOGDIR}
>+	@${CHGRP} -R ${WWWGRP} ${STAGEDIR}${PREFIX}/${BBLOGDIR}
>+	@${CHMOD} 755 ${STAGEDIR}${PREFIX}/${BBLOGDIR}
> .for f in archives.php documentation.txt htaccess-cleanurls index.php item rss.php search.php section
>-	${INSTALL_DATA} ${WRKDIR}/${f} ${PREFIX}/${BBLOGDIR}
>+	${INSTALL_DATA} ${WRKDIR}/${f} ${STAGEDIR}${PREFIX}/${BBLOGDIR}
> .endfor
>-	@${CP} -Rv ${WRKSRC}/* ${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}
>-	@${CHMOD} 775 ${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}/compiled_templates/
>-	@${CHMOD} 775 ${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}/cache/
>-	@${CHMOD} 775 ${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}/cache/favorites.xml
>-	@${CHMOD} 775 ${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}/config.php
>+	@${CP} -Rv ${WRKSRC}/* ${STAGEDIR}${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}
>+	@${CHMOD} 775 ${STAGEDIR}${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}/compiled_templates/
>+	@${CHMOD} 775 ${STAGEDIR}${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}/cache/
>+	@${CHMOD} 775 ${STAGEDIR}${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}/cache/favorites.xml
>+	@${CHMOD} 775 ${STAGEDIR}${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}/config.php
>+	@${MV} ${STAGEDIR}${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}/config.php ${STAGEDIR}${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}/config.php.sample
> 
> post-install:
> 	@${CAT} ${PKGMESSAGE}
>diff --git a/www/bblog/pkg-plist b/www/bblog/pkg-plist
>index 99ba39a..572c2c3 100644
>--- a/www/bblog/pkg-plist
>+++ b/www/bblog/pkg-plist
>@@ -1,3 +1,5 @@
>+@owner %%WWWOWN%%
>+@group %%WWWGRP%%
> %%WWWDOCROOT%%/%%BBLOGURL%%/archives.php
> %%WWWDOCROOT%%/%%BBLOGURL%%/bblog/bBlog_plugins/admin.comments.php
> %%WWWDOCROOT%%/%%BBLOGURL%%/bblog/bBlog_plugins/admin.links.php
>@@ -52,7 +54,9 @@
> %%WWWDOCROOT%%/%%BBLOGURL%%/bblog/bblog.css
> %%WWWDOCROOT%%/%%BBLOGURL%%/bblog/cache/favorites.xml
> %%WWWDOCROOT%%/%%BBLOGURL%%/bblog/compiled_templates/this_file_is_here_so_the_directory_is_extracted
>-%%WWWDOCROOT%%/%%BBLOGURL%%/bblog/config.php
>+@unexec if cmp -s %D/%%WWWDOCROOT%%/%%BBLOGURL%%/bblog/config.php %D/%%WWWDOCROOT%%/%%BBLOGURL%%/bblog/config.php.sample; then rm -f %D/%%WWWDOCROOT%%/%%BBLOGURL%%/bblog/config.php; fi
>+%%WWWDOCROOT%%/%%BBLOGURL%%/bblog/config.php.sample
>+@exec cp -n %D/%F %B/config.php
> %%WWWDOCROOT%%/%%BBLOGURL%%/bblog/cp.css
> %%WWWDOCROOT%%/%%BBLOGURL%%/bblog/docs/LICENCE.txt
> %%WWWDOCROOT%%/%%BBLOGURL%%/bblog/docs/README.txt

Actions: View | Diff

Attachments on bug 190014: 142911