Index: head/www/phpbb/Makefile =================================================================== --- head/www/phpbb/Makefile (revision 84364) +++ head/www/phpbb/Makefile (revision 84365) @@ -1,94 +1,96 @@ # New ports collection makefile for: phpBB # Date created: 25 April 2002 # Whom: Johann Visagie # # $FreeBSD$ # PORTNAME= phpbb PORTVERSION= 2.0.5 -#PORTREVISION= 1 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} DISTNAME= phpBB-${PORTVERSION} -MAINTAINER= wjv@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A PHP-based bulletin board / discussion forum system RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:${PORTSDIR}/devel/pear-PEAR # The phpBB2 port supports a number of variables that may be tweaked at build # time. Perform a "make options" to see more information on these variables. # WWWDOCROOT?= www/data PHPBBURL?= phpBB2 WWWOWN?= www WWWGRP?= www # # End of user-configurable variables. # Set/override/append to variables from bsd.port.mk: # WRKSRC= ${WRKDIR}/phpBB2 NO_BUILD= yes USE_REINPLACE= yes PKGMESSAGE= ${WRKDIR}/pkg-message PLIST_SUB+= PHPBBDIR=${PHPBBDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} # Set custom variables: # PHPBBDIR= ${WWWDOCROOT}/${PHPBBURL} PKGOPTS= ${FILESDIR}/pkg-opts EXCEPTFILES= ${PREFIX}/${PHPBBDIR}/install/install.php \ ${PREFIX}/${PHPBBDIR}/install/upgrade.php \ ${PREFIX}/${PHPBBDIR}/install/update_to_${PORTVERSION:S/.//g}.php options: @ ${ECHO_MSG} "===> Build options for ${PKGNAME}:" @ ${CAT} ${PKGOPTS} pre-everything:: .if !defined(BATCH) @ ${TEST} -r ${PKGOPTS} && \ (${ECHO_MSG} '-------------------------------------------------------------------------'; \ ${ECHO_MSG} 'Perform a "make options" to see a list of available installation options.'; \ ${ECHO_MSG} '-------------------------------------------------------------------------') .endif post-patch: @ ${REINPLACE_CMD} -e "s#\.\./templates#/${PHPBBURL}/templates#" \ ${WRKSRC}/docs/*.html + @ ${RM} ${WRKSRC}/viewtopic.php.orig + @ ${RM} ${WRKSRC}/admin/admin_styles.php.orig post-configure: @ ${SED} \ -e 's#%%PREFIX%%#${PREFIX}#g' -e 's#%%DOCSDIR%%#${DOCSDIR}#g' \ -e 's#%%PHPBBURL%%#${PHPBBURL}#g' -e 's#%%PHPBBDIR%%#${PHPBBDIR}#g' \ -e 's#%%DATADIR%%#${DATADIR}#g' \ -e 's#%%DELETEFILES%%#${EXCEPTFILES}#g' pkg-message > ${PKGMESSAGE} do-install: @ ${MKDIR} -m 0775 ${PREFIX}/${PHPBBDIR} @ cd ${WRKSRC} && ${FIND} * \( -name config.php \ ${EXCEPTFILES:S/^/-o -name /} \ -o -name docs -a -prune -o -name contrib -a -prune \) -o -print \ | ${TAR} cTf - - | ${TAR} xUCf ${PREFIX}/${PHPBBDIR} - @ ${TOUCH} ${PREFIX}/${PHPBBDIR}/config.php @ ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${PHPBBDIR} @ ${MKDIR} ${DATADIR}/contrib @ cd ${WRKSRC} && ${INSTALL_DATA} ${EXCEPTFILES} ${DATADIR} @ cd ${WRKSRC}/contrib && ${INSTALL_DATA} * ${DATADIR}/contrib post-install: # @ cd ${DATADIR} && ${INSTALL} -c -o ${WWWOWN} -g ${WWWGRP} \ # ${EXCEPTFILES} ${PREFIX}/${PHPBBDIR} .if !defined(NOPORTOCS) @ ${MKDIR} ${DOCSDIR} @ cd ${WRKSRC}/docs && ${FIND} * -type f -maxdepth 0 \! -name \*.bak \ \! -name COPYING -exec ${INSTALL_DATA} {} ${DOCSDIR} \; .if !defined(BATCH) @ ${CAT} ${PKGMESSAGE} .endif .endif .include Property changes on: head/www/phpbb/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.9 \ No newline at end of property +1.10 \ No newline at end of property Index: head/www/phpbb/files/patch-admin::admin_styles.php =================================================================== --- head/www/phpbb/files/patch-admin::admin_styles.php (nonexistent) +++ head/www/phpbb/files/patch-admin::admin_styles.php (revision 84365) @@ -0,0 +1,24 @@ +--- admin/admin_styles.php.orig Sun Dec 22 04:09:58 2002 ++++ admin/admin_styles.php Mon Jul 7 12:59:05 2003 +@@ -39,16 +39,14 @@ + // Check if the user has cancled a confirmation message. + // + $phpbb_root_path = "./../"; ++require($phpbb_root_path . 'extension.inc'); + + $confirm = ( isset($HTTP_POST_VARS['confirm']) ) ? TRUE : FALSE; + $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : FALSE; + +-if (empty($HTTP_POST_VARS['send_file'])) +-{ +- $no_page_header = ( $cancel ) ? TRUE : FALSE; +- require($phpbb_root_path . 'extension.inc'); +- require('./pagestart.' . $phpEx); +-} ++$no_page_header = (!empty($HTTP_POST_VARS['send_file']) || $cancel) ? TRUE : FALSE; ++ ++require('./pagestart.' . $phpEx); + + if ($cancel) + { + Property changes on: head/www/phpbb/files/patch-admin::admin_styles.php ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/www/phpbb/files/patch-viewtopic.php =================================================================== --- head/www/phpbb/files/patch-viewtopic.php (nonexistent) +++ head/www/phpbb/files/patch-viewtopic.php (revision 84365) @@ -0,0 +1,27 @@ +--- viewtopic.php.orig Mon Jul 7 12:23:41 2003 ++++ viewtopic.php Mon Jul 7 12:25:01 2003 +@@ -29,6 +29,7 @@ + // + // Start initial var setup + // ++$topic_id = $post_id = false; + if ( isset($HTTP_GET_VARS[POST_TOPIC_URL]) ) + { + $topic_id = intval($HTTP_GET_VARS[POST_TOPIC_URL]); +@@ -134,11 +135,11 @@ + // also allows for direct linking to a post (and the calculation of which + // page the post is on and the correct display of viewtopic) + // +-$join_sql_table = ( !isset($post_id) ) ? '' : ", " . POSTS_TABLE . " p, " . POSTS_TABLE . " p2 "; +-$join_sql = ( !isset($post_id) ) ? "t.topic_id = $topic_id" : "p.post_id = $post_id AND t.topic_id = p.topic_id AND p2.topic_id = p.topic_id AND p2.post_id <= $post_id"; +-$count_sql = ( !isset($post_id) ) ? '' : ", COUNT(p2.post_id) AS prev_posts"; ++$join_sql_table = ( empty($post_id) ) ? '' : ", " . POSTS_TABLE . " p, " . POSTS_TABLE . " p2 "; ++$join_sql = ( empty($post_id) ) ? "t.topic_id = $topic_id" : "p.post_id = $post_id AND t.topic_id = p.topic_id AND p2.topic_id = p.topic_id AND p2.post_id <= $post_id"; ++$count_sql = ( empty($post_id) ) ? '' : ", COUNT(p2.post_id) AS prev_posts"; + +-$order_sql = ( !isset($post_id) ) ? '' : "GROUP BY p.post_id, t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.topic_vote, t.topic_last_post_id, f.forum_name, f.forum_status, f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_sticky, f.auth_announce, f.auth_pollcreate, f.auth_vote, f.auth_attachments ORDER BY p.post_id ASC"; ++$order_sql = ( empty($post_id) ) ? '' : "GROUP BY p.post_id, t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.topic_vote, t.topic_last_post_id, f.forum_name, f.forum_status, f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_sticky, f.auth_announce, f.auth_pollcreate, f.auth_vote, f.auth_attachments ORDER BY p.post_id ASC"; + + $sql = "SELECT t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.topic_vote, t.topic_last_post_id, f.forum_name, f.forum_status, f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_sticky, f.auth_announce, f.auth_pollcreate, f.auth_vote, f.auth_attachments" . $count_sql . " + FROM " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f" . $join_sql_table . " + Property changes on: head/www/phpbb/files/patch-viewtopic.php ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property