Attachment 144219 Details for Bug 191456 – phpbb3-3.0.12.patch

[patch] phpbb3-3.0.12.patch

phpbb3-3.0.12.patch (text/plain), 9.30 KB, created by Marco Steinbach on 2014-06-28 11:57:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marco Steinbach

Created: 2014-06-28 11:57:57 UTC

Size: 9.30 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 359518)
>+++ Makefile	(working copy)
>@@ -2,11 +2,11 @@
> # $FreeBSD$
> 
> PORTNAME=	phpbb
>-PORTVERSION=	3.0.11
>+PORTVERSION=	3.0.12
> CATEGORIES=	www
> MASTER_SITES=	https://www.phpbb.com/files/release/
>+PKGNAMESUFFIX=	3
> DISTNAME=	phpBB-${PORTVERSION}
>-PKGNAMESUFFIX=	3
> 
> MAINTAINER=	appleboy.tw@gmail.com
> COMMENT=	A PHP-based bulletin board / discussion forum system
>@@ -16,16 +16,13 @@
> CONFLICTS=	phpbb-tw-[0-9]* phpbb-devel-[0-9]* \
> 		phpbb-[0-2]*
> 
>-USE_BZIP2=	yes
>+USES=		tar:bzip2
> USE_PHP=	yes
> 
>-# The phpBB3 port supports a number of variables that may be tweaked at build
>-# time.  Perform a "make options" to see more information on these variables.
>-#
>+OPTIONS_DEFINE=	DOCS
>+
> WWWDOCROOT?=	www
> PHPBBURL?=	phpBB3
>-#
>-# End of user-configurable variables.
> 
> WRKSRC=		${WRKDIR}/phpBB3
> NO_BUILD=	yes
>@@ -35,20 +32,16 @@
> 
> PLIST_SUB+=	PHPBBDIR=${PHPBBDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
> 
>-NO_STAGE=	yes
>-# Set custom variables:
>-#
> PHPBBDIR=	${WWWDOCROOT}/${PHPBBURL}
> PKGOPTS=	${FILESDIR}/pkg-opts
>-PORTDOCS=	*
> 
> options:
>-	@ ${ECHO_MSG} "===>  Build options for ${PKGNAME}:"
>-	@ ${CAT} ${PKGOPTS}
>+	@${ECHO_MSG} "===>  Build options for ${PKGNAME}:"
>+	@${CAT} ${PKGOPTS}
> 
> pre-everything::
> .if !defined(BATCH)
>-	@ ${TEST} -r ${PKGOPTS} && \
>+	@${TEST} -r ${PKGOPTS} && \
> 	  (${ECHO_MSG} '-------------------------------------------------------------------------'; \
> 	   ${ECHO_MSG} 'Perform a "make options" to see a list of available installation options.'; \
> 	   ${ECHO_MSG} '-------------------------------------------------------------------------')
>@@ -55,21 +48,21 @@
> .endif
> 
> do-install:
>-	@ cd ${WRKSRC} && ${COPYTREE_SHARE} . ${PREFIX}/${PHPBBDIR} "! -name config.php"
>-	@ [ -f ${PREFIX}/${PHPBBDIR}/config.php ] || ${TOUCH} ${PREFIX}/${PHPBBDIR}/config.php
>-	@ ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${PHPBBDIR}
>-	@ ${CHMOD} -R 0755 ${PREFIX}/${PHPBBDIR}
>-	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \
>-		${PHPBBDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST}
>+	@[ -f ${WRKSRC}/config.php ] && ${MV} ${WRKSRC}/config.php ${WRKSRC}/config.php.sample
>+	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${PHPBBDIR} "! -name config.php"
>+	@${FIND} ${STAGEDIR}${PREFIX}/${PHPBBDIR} -type f -exec ${CHMOD} 0644 {} \;
>+	@${FIND} ${STAGEDIR}${PREFIX}/${PHPBBDIR} -type d -exec ${CHMOD} 0755 {} \;
>+.for m in files cache store images/avatars/upload
>+	@[ -d ${STAGEDIR}${PREFIX}/${PHPBBDIR}/${m} ] && \
>+	    ${CHMOD} 0777 ${STAGEDIR}${PREFIX}/${PHPBBDIR}/${m}
>+.endfor
> 
>+.include <bsd.port.options.mk>
>+
> post-install:
>-.if !defined(NOPORTDOCS)
>-	@ ${MKDIR} ${DOCSDIR}
>-	@ cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
>-
>-.if !defined(BATCH)
>-	@ ${CAT} ${PKGMESSAGE}
>+.if ${PORT_OPTIONS:MDOCS}
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	@cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
> .endif
>-.endif
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 359518)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (phpBB-3.0.11.tar.bz2) = b8c40b8cad58a458442bf04cb2632e350a76e7fb688e2820f8afd92887e751f2
>-SIZE (phpBB-3.0.11.tar.bz2) = 1589870
>+SHA256 (phpBB-3.0.12.tar.bz2) = 14f216807063017a0110c6b36f1e4c0131e0ba4c42322ec6be77392059a197a8
>+SIZE (phpBB-3.0.12.tar.bz2) = 1600626
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 359518)
>+++ pkg-plist	(working copy)
>@@ -1,3 +1,24 @@
>+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
>+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.html
>+%%PORTDOCS%%%%DOCSDIR%%/COPYING
>+%%PORTDOCS%%%%DOCSDIR%%/FAQ.html
>+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
>+%%PORTDOCS%%%%DOCSDIR%%/README.html
>+%%PORTDOCS%%%%DOCSDIR%%/auth_api.html
>+%%PORTDOCS%%%%DOCSDIR%%/bg_header.gif
>+%%PORTDOCS%%%%DOCSDIR%%/coding-guidelines.html
>+%%PORTDOCS%%%%DOCSDIR%%/corners_left.gif
>+%%PORTDOCS%%%%DOCSDIR%%/corners_left.png
>+%%PORTDOCS%%%%DOCSDIR%%/corners_right.gif
>+%%PORTDOCS%%%%DOCSDIR%%/corners_right.png
>+%%PORTDOCS%%%%DOCSDIR%%/hook_system.html
>+%%PORTDOCS%%%%DOCSDIR%%/lighttpd.sample.conf
>+%%PORTDOCS%%%%DOCSDIR%%/nginx.sample.conf
>+%%PORTDOCS%%%%DOCSDIR%%/site_logo.gif
>+%%PORTDOCS%%%%DOCSDIR%%/stylesheet.css
>+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
>+@group %%WWWGRP%%
>+@owner %%WWWOWN%%
> %%PHPBBDIR%%/.htaccess
> %%PHPBBDIR%%/adm/images/arrow_down.gif
> %%PHPBBDIR%%/adm/images/arrow_left.gif
>@@ -329,6 +350,7 @@
> %%PHPBBDIR%%/includes/functions_compress.php
> %%PHPBBDIR%%/includes/functions_content.php
> %%PHPBBDIR%%/includes/functions_convert.php
>+%%PHPBBDIR%%/includes/functions_database_helper.php
> %%PHPBBDIR%%/includes/functions_display.php
> %%PHPBBDIR%%/includes/functions_install.php
> %%PHPBBDIR%%/includes/functions_jabber.php
>@@ -966,63 +988,62 @@
> %%PHPBBDIR%%/viewonline.php
> %%PHPBBDIR%%/viewtopic.php
> %%PHPBBDIR%%/web.config
>-@exec [ -f %D/%%PHPBBDIR%%/config.php ] || touch %D/%%PHPBBDIR%%/config.php
>-@unexec [ -s %D/%%PHPBBDIR%%/config.php ] || rm -f %D/%%PHPBBDIR%%/config.php
>-@dirrm %%PHPBBDIR%%/styles/subsilver2/theme/images
>-@dirrm %%PHPBBDIR%%/styles/subsilver2/theme
>-@dirrm %%PHPBBDIR%%/styles/subsilver2/template
>-@dirrm %%PHPBBDIR%%/styles/subsilver2/imageset/en
>-@dirrm %%PHPBBDIR%%/styles/subsilver2/imageset
>-@dirrm %%PHPBBDIR%%/styles/subsilver2
>-@dirrm %%PHPBBDIR%%/styles/prosilver/theme/images
>-@dirrm %%PHPBBDIR%%/styles/prosilver/theme
>-@dirrm %%PHPBBDIR%%/styles/prosilver/template
>-@dirrm %%PHPBBDIR%%/styles/prosilver/imageset/en
>-@dirrm %%PHPBBDIR%%/styles/prosilver/imageset
>-@dirrm %%PHPBBDIR%%/styles/prosilver
>-@dirrm %%PHPBBDIR%%/styles
>-@dirrm %%PHPBBDIR%%/store
>-@dirrm %%PHPBBDIR%%/language/en/mods
>-@dirrm %%PHPBBDIR%%/language/en/email
>-@dirrm %%PHPBBDIR%%/language/en/acp
>-@dirrm %%PHPBBDIR%%/language/en
>-@dirrm %%PHPBBDIR%%/language
>-@dirrm %%PHPBBDIR%%/install/schemas
>-@dirrm %%PHPBBDIR%%/install/convertors
>-@dirrm %%PHPBBDIR%%/install
>-@dirrm %%PHPBBDIR%%/includes/utf/data
>-@dirrm %%PHPBBDIR%%/includes/utf
>-@dirrm %%PHPBBDIR%%/includes/ucp/info
>-@dirrm %%PHPBBDIR%%/includes/ucp
>-@dirrm %%PHPBBDIR%%/includes/search
>-@dirrm %%PHPBBDIR%%/includes/questionnaire
>-@dirrm %%PHPBBDIR%%/includes/mcp/info
>-@dirrm %%PHPBBDIR%%/includes/mcp
>-@dirrm %%PHPBBDIR%%/includes/hooks
>-@dirrm %%PHPBBDIR%%/includes/diff
>-@dirrm %%PHPBBDIR%%/includes/db
>-@dirrm %%PHPBBDIR%%/includes/captcha/plugins
>-@dirrm %%PHPBBDIR%%/includes/captcha
>-@dirrm %%PHPBBDIR%%/includes/auth
>-@dirrm %%PHPBBDIR%%/includes/acp/info
>-@dirrm %%PHPBBDIR%%/includes/acp
>-@dirrm %%PHPBBDIR%%/includes/acm
>-@dirrm %%PHPBBDIR%%/includes
>-@dirrmtry %%PHPBBDIR%%/images/upload_icons
>-@dirrm %%PHPBBDIR%%/images/smilies
>-@dirrm %%PHPBBDIR%%/images/ranks
>-@dirrm %%PHPBBDIR%%/images/icons/smile
>-@dirrm %%PHPBBDIR%%/images/icons/misc
>-@dirrm %%PHPBBDIR%%/images/icons
>+@sample %%PHPBBDIR%%/config.php.sample
>+@dirrmtry %%PHPBBDIR%%/adm/images
>+@dirrmtry %%PHPBBDIR%%/adm/style
>+@dirrmtry %%PHPBBDIR%%/adm
>+@dirrmtry %%PHPBBDIR%%/cache
>+@dirrmtry %%PHPBBDIR%%/docs
>+@dirrmtry %%PHPBBDIR%%/download
>+@dirrmtry %%PHPBBDIR%%/files
>+@dirrmtry %%PHPBBDIR%%/images/avatars/gallery
> @dirrmtry %%PHPBBDIR%%/images/avatars/upload
>-@dirrmtry %%PHPBBDIR%%/images/avatars/gallery
> @dirrmtry %%PHPBBDIR%%/images/avatars
>+@dirrmtry %%PHPBBDIR%%/images/icons/misc
>+@dirrmtry %%PHPBBDIR%%/images/icons/smile
>+@dirrmtry %%PHPBBDIR%%/images/icons
>+@dirrmtry %%PHPBBDIR%%/images/ranks
>+@dirrmtry %%PHPBBDIR%%/images/smilies
>+@dirrmtry %%PHPBBDIR%%/images/upload_icons
> @dirrmtry %%PHPBBDIR%%/images
>-@dirrm %%PHPBBDIR%%/files
>-@dirrm %%PHPBBDIR%%/download
>-@dirrm %%PHPBBDIR%%/docs
>-@dirrm %%PHPBBDIR%%/cache
>-@dirrm %%PHPBBDIR%%/adm/style
>-@dirrm %%PHPBBDIR%%/adm/images
>-@dirrm %%PHPBBDIR%%/adm
>+@dirrmtry %%PHPBBDIR%%/includes/acm
>+@dirrmtry %%PHPBBDIR%%/includes/acp/info
>+@dirrmtry %%PHPBBDIR%%/includes/acp
>+@dirrmtry %%PHPBBDIR%%/includes/auth
>+@dirrmtry %%PHPBBDIR%%/includes/captcha/plugins
>+@dirrmtry %%PHPBBDIR%%/includes/captcha
>+@dirrmtry %%PHPBBDIR%%/includes/db
>+@dirrmtry %%PHPBBDIR%%/includes/diff
>+@dirrmtry %%PHPBBDIR%%/includes/hooks
>+@dirrmtry %%PHPBBDIR%%/includes/mcp/info
>+@dirrmtry %%PHPBBDIR%%/includes/mcp
>+@dirrmtry %%PHPBBDIR%%/includes/questionnaire
>+@dirrmtry %%PHPBBDIR%%/includes/search
>+@dirrmtry %%PHPBBDIR%%/includes/ucp/info
>+@dirrmtry %%PHPBBDIR%%/includes/ucp
>+@dirrmtry %%PHPBBDIR%%/includes/utf/data
>+@dirrmtry %%PHPBBDIR%%/includes/utf
>+@dirrmtry %%PHPBBDIR%%/includes
>+@dirrmtry %%PHPBBDIR%%/install/convertors
>+@dirrmtry %%PHPBBDIR%%/install/schemas
>+@dirrmtry %%PHPBBDIR%%/install
>+@dirrmtry %%PHPBBDIR%%/language/en/acp
>+@dirrmtry %%PHPBBDIR%%/language/en/email
>+@dirrmtry %%PHPBBDIR%%/language/en/mods
>+@dirrmtry %%PHPBBDIR%%/language/en
>+@dirrmtry %%PHPBBDIR%%/language
>+@dirrmtry %%PHPBBDIR%%/store
>+@dirrmtry %%PHPBBDIR%%/styles/prosilver/imageset/en
>+@dirrmtry %%PHPBBDIR%%/styles/prosilver/imageset
>+@dirrmtry %%PHPBBDIR%%/styles/prosilver/template
>+@dirrmtry %%PHPBBDIR%%/styles/prosilver/theme/images
>+@dirrmtry %%PHPBBDIR%%/styles/prosilver/theme
>+@dirrmtry %%PHPBBDIR%%/styles/prosilver
>+@dirrmtry %%PHPBBDIR%%/styles/subsilver2/imageset/en
>+@dirrmtry %%PHPBBDIR%%/styles/subsilver2/imageset
>+@dirrmtry %%PHPBBDIR%%/styles/subsilver2/template
>+@dirrmtry %%PHPBBDIR%%/styles/subsilver2/theme/images
>+@dirrmtry %%PHPBBDIR%%/styles/subsilver2/theme
>+@dirrmtry %%PHPBBDIR%%/styles/subsilver2
>+@dirrmtry %%PHPBBDIR%%/styles
> @dirrmtry %%PHPBBDIR%%
>--- phpbb3-3.0.12.patch ends here ---

Actions: View | Diff

Attachments on bug 191456: 144219 | 145613 | 145754