diff -Naur phpbb3.orig/Makefile phpbb3/Makefile --- phpbb3.orig/Makefile 2014-08-13 13:05:42.000000000 +0200 +++ phpbb3/Makefile 2014-08-13 12:58:52.000000000 +0200 @@ -2,13 +2,13 @@ # $FreeBSD: head/www/phpbb3/Makefile 364158 2014-08-06 09:11:57Z olgeni $ PORTNAME= phpbb -PORTVERSION= 3.0.11 +PORTVERSION= 3.0.12 CATEGORIES= www MASTER_SITES= https://www.phpbb.com/files/release/ -DISTNAME= phpBB-${PORTVERSION} PKGNAMESUFFIX= 3 +DISTNAME= phpBB-${PORTVERSION} -MAINTAINER= appleboy.tw@gmail.com +MAINTAINER= coco@executive-computing.de COMMENT= PHP-based bulletin board / discussion forum system LICENSE= GPLv2 @@ -19,13 +19,10 @@ 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,34 +32,29 @@ PLIST_SUB+= PHPBBDIR=${PHPBBDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} -# Set custom variables: -# PHPBBDIR= ${WWWDOCROOT}/${PHPBBURL} PKGOPTS= ${FILESDIR}/pkg-opts -PORTDOCS= * + +.include 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} '-------------------------------------------------------------------------') .endif do-install: - @ cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${PHPBBDIR} "! -name config.php" - @ ${TOUCH} ${STAGEDIR}${PREFIX}/${PHPBBDIR}/config.php.sample - @ ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${PREFIX}/${PHPBBDIR} - @ ${CHMOD} -R 0755 ${STAGEDIR}${PREFIX}/${PHPBBDIR} - @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \ - ${PHPBBDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST} - -post-install: - @ ${MKDIR} ${STAGEDIR}${DOCSDIR} - @ cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} +. if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} +. endif + @[ -f ${WRKSRC}/config.php ] && ${MV} ${WRKSRC}/config.php ${WRKSRC}/config.php.sample + @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${PHPBBDIR} "! -name config.php" .include diff -Naur phpbb3.orig/distinfo phpbb3/distinfo --- phpbb3.orig/distinfo 2014-08-13 13:05:42.000000000 +0200 +++ phpbb3/distinfo 2014-08-13 12:10:39.000000000 +0200 @@ -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 diff -Naur phpbb3.orig/files/pkg-message.in phpbb3/files/pkg-message.in --- phpbb3.orig/files/pkg-message.in 2014-08-13 13:05:42.000000000 +0200 +++ phpbb3/files/pkg-message.in 2014-08-13 12:10:39.000000000 +0200 @@ -6,8 +6,8 @@ PHP installation has been compiled with support for your database or database access method. You have to create a database for phpBB3 to use, and ensure that this database may be accessed and changed by the user id -under which your web server executes. Further information on these -installation procedures may be found in: +under which your web server executes. If you chose to install the +documentation, further information may be found in: %%DOCSDIR%%/README.html @@ -17,6 +17,6 @@ http://localhost/%%PHPBBURL%%/ After configuring phpBB3 and ensuring that it is operational, you MUST -remove or rename the install/ directory from %%PREFIX%%/%%PHPBBDIR%%: +remove or rename the install/ directory from %%PREFIX%%/%%PHPBBDIR%%. ---------------------------------------------------------------------------- diff -Naur phpbb3.orig/pkg-plist phpbb3/pkg-plist --- phpbb3.orig/pkg-plist 2014-08-13 13:05:42.000000000 +0200 +++ phpbb3/pkg-plist 2014-08-13 13:01:40.000000000 +0200 @@ -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 +@group %%WWWGRP%% +@owner %%WWWOWN%% +@mode 0644 %%PHPBBDIR%%/.htaccess %%PHPBBDIR%%/adm/images/arrow_down.gif %%PHPBBDIR%%/adm/images/arrow_left.gif @@ -128,6 +149,7 @@ %%PHPBBDIR%%/cache/.htaccess %%PHPBBDIR%%/cache/index.htm %%PHPBBDIR%%/common.php +%%PHPBBDIR%%/config.php.sample %%PHPBBDIR%%/cron.php %%PHPBBDIR%%/docs/AUTHORS %%PHPBBDIR%%/docs/CHANGELOG.html @@ -329,6 +351,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 @@ -563,7 +586,7 @@ %%PHPBBDIR%%/styles/prosilver/imageset/icon_contact_icq.gif %%PHPBBDIR%%/styles/prosilver/imageset/icon_contact_jabber.gif %%PHPBBDIR%%/styles/prosilver/imageset/icon_contact_msnm.gif -%%PHPBBDIR%%/styles/prosilver/imageset/icon_contact_www.gif +%%PHPBBDIR%%/styles/prosilver/imageset/icon_contact_%%WWWOWN%%.gif %%PHPBBDIR%%/styles/prosilver/imageset/icon_contact_yahoo.gif %%PHPBBDIR%%/styles/prosilver/imageset/icon_offline.gif %%PHPBBDIR%%/styles/prosilver/imageset/icon_online.gif @@ -784,7 +807,7 @@ %%PHPBBDIR%%/styles/subsilver2/imageset/en/icon_contact_jabber.gif %%PHPBBDIR%%/styles/subsilver2/imageset/en/icon_contact_msnm.gif %%PHPBBDIR%%/styles/subsilver2/imageset/en/icon_contact_pm.gif -%%PHPBBDIR%%/styles/subsilver2/imageset/en/icon_contact_www.gif +%%PHPBBDIR%%/styles/subsilver2/imageset/en/icon_contact_%%WWWOWN%%.gif %%PHPBBDIR%%/styles/subsilver2/imageset/en/icon_contact_yahoo.gif %%PHPBBDIR%%/styles/subsilver2/imageset/en/icon_post_delete.gif %%PHPBBDIR%%/styles/subsilver2/imageset/en/icon_post_edit.gif @@ -966,62 +989,74 @@ %%PHPBBDIR%%/viewonline.php %%PHPBBDIR%%/viewtopic.php %%PHPBBDIR%%/web.config -@sample %%PHPBBDIR%%/config.php.sample -@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 -@dirrmtry %%PHPBBDIR%%/images/avatars/upload +@group +@owner +@mode 0755 +%%PORTDOCS%%@dirrmtry %%DOCSDIR%% +@group %%WWWGRP%% +@owner %%WWWOWN%% +@mode 0755 +@dirrmtry %%PHPBBDIR%%/adm/images +@dirrmtry %%PHPBBDIR%%/adm/style +@dirrmtry %%PHPBBDIR%%/adm +@mode 0777 +@dirrmtry %%PHPBBDIR%%/cache +@dirrmtry %%PHPBBDIR%%/docs +@mode 0755 +@dirrmtry %%PHPBBDIR%%/download +@mode 0777 +@dirrmtry %%PHPBBDIR%%/files +@mode 0755 @dirrmtry %%PHPBBDIR%%/images/avatars/gallery +@mode 0777 +@dirrmtry %%PHPBBDIR%%/images/avatars/upload +@mode 0755 @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%%