Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 23 Aug 2006 16:14:37 +0200 (CEST)
From:      koutek@o-k.cz
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/102433: port upgrade: www/campsite 2.6.0 -> 2.6.1
Message-ID:  <20060823141437.D38ED11620@s1.mediaturtle.com>
Resent-Message-ID: <200608231420.k7NEKWJi024651@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         102433
>Category:       ports
>Synopsis:       port upgrade: www/campsite 2.6.0 -> 2.6.1
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 23 14:20:19 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Ondra Koutek
>Release:        FreeBSD 6.1-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD s1.mediaturtle.com 6.1-RELEASE-p3 FreeBSD 6.1-RELEASE-p3 #17: Tue Jul 18 14:34:26 CEST 2006 root@s1.mediaturtle.com:/usr/obj/usr/src/sys/S1 i386


	
>Description:
	port upgrade: www/campsite to 2.6.1: bugfixies, removed dependency to pecl-imagick
>How-To-Repeat:
	
>Fix:

	

--- campsite.diff begins here ---
diff -ruN campsite.orig/Makefile campsite/Makefile
--- campsite.orig/Makefile	Mon Jul 24 03:31:47 2006
+++ campsite/Makefile	Wed Aug 23 16:08:50 2006
@@ -6,18 +6,17 @@
 #
 
 PORTNAME=	campsite
-PORTVERSION=	2.6.0
-PORTSUBVERSION=	03
-PORTREVISION=	1
+PORTVERSION=	2.6.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-${PORTSUBVERSION}
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	koutek@o-k.cz
 COMMENT=	The free and open multilingual web publishing tool for news sites
 
-LIB_DEPENDS=	idn.16:${PORTSDIR}/dns/libidn
+LIB_DEPENDS=	idn.16:${PORTSDIR}/dns/libidn \
+		GraphicsMagick.1:${PORTSDIR}/graphics/GraphicsMagick
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 		gm4:${PORTSDIR}/devel/m4 \
 		pear:${PORTSDIR}/devel/pear
@@ -32,7 +31,7 @@
 
 USE_APACHE=	YES
 
-USE_PHP=	mysql curl pcre xml xmlrpc imagick gd session
+USE_PHP=	mysql curl pcre xml xmlrpc gd session
 WANT_PHP_CLI=	YES
 USE_PHP_BUILD=	YES
 
diff -ruN campsite.orig/distinfo campsite/distinfo
--- campsite.orig/distinfo	Mon Jul 17 16:51:00 2006
+++ campsite/distinfo	Wed Aug 23 15:38:12 2006
@@ -1,3 +1,3 @@
-MD5 (campsite-2.6.0-03.tar.gz) = 2451dc814ece7977d124f76d992207bb
-SHA256 (campsite-2.6.0-03.tar.gz) = 08a18441de7f2e0f88822a8433498853a0c846cc3cb3065e8ca579aa17d3db17
-SIZE (campsite-2.6.0-03.tar.gz) = 4386489
+MD5 (campsite-2.6.1.tar.gz) = 78235fcf34d3d2be58d3f03b80af298d
+SHA256 (campsite-2.6.1.tar.gz) = 0aa4bc8a217176cabe0919d3d1d3c9109f378204f1b1fbf9dbfcbce6e8b437a2
+SIZE (campsite-2.6.1.tar.gz) = 4412045
diff -ruN campsite.orig/files/patch-actions.cpp campsite/files/patch-actions.cpp
--- campsite.orig/files/patch-actions.cpp	Mon Jul 17 16:32:16 2006
+++ campsite/files/patch-actions.cpp	Thu Jan  1 01:00:00 1970
@@ -1,69 +0,0 @@
---- implementation/parser/parser/actions.cpp (revision 5607)
-+++ implementation/parser/parser/actions.cpp (revision 5648)
-@@ -1919,5 +1919,5 @@
- 	if (modifier == CMS_ST_ARTICLECOMMENT)
- 	{
--		if (!c.ArticleCommentEnabled())
-+		if (!c.ArticleCommentEnabled() || c.ArticleComment() == NULL)
- 		{
- 			return ERR_NODATA;
-@@ -2444,7 +2444,7 @@
- 			run = c.ArticleCommentEnabled() ? 0 : 1;
- 		}
--		else if (!c.ArticleCommentEnabled())
--		{
--				return ERR_NODATA;
-+		else if (!c.ArticleCommentEnabled() || c.ArticleComment() == NULL)
-+		{
-+			return ERR_NODATA;
- 		}
- 		if (case_comp(param.attribute(), "Defined") == 0)
-@@ -2872,7 +2872,11 @@
- 	}
- 	else
-+	{
- 		return -1;
-+	}
- 	if (modifier != CMS_ST_LANGUAGE && modifier != CMS_ST_PUBLICATION && param.attrType() == "")
-+	{
- 		SetNrField("IdPublication", c.Publication(), buf, w);
-+	}
- 	if (need_lang)
- 	{
-@@ -2883,7 +2887,11 @@
- 	string coQuery = string("select ") + field + " from " + tables;
- 	if (w.length())
-+	{
- 		coQuery += string(" where ") + w;
-+	}
- 	if (need_lang)
-+	{
- 		coQuery += " order by IdLanguage desc";
-+	}
- 	DEBUGAct("takeAction()", coQuery.c_str(), fs);
- 	SQLQuery(&m_coSql, coQuery.c_str());
-@@ -2892,5 +2900,7 @@
- 	FetchRow(*res, row);
- 	if (row[0] == NULL)
-+	{
- 		return ERR_NODATA;
-+	}
- 	if (modifier == CMS_ST_ARTICLE && param.attrType() != "" && !m_bStrictType)
- 	{
-@@ -2928,10 +2938,16 @@
- 	}
- 	else
-+	{
- 		run_first = row[0] == value;
-+	}
- 	run_first = m_bNegated ? !run_first : run_first;
- 	if (run_first)
-+	{
- 		runActions(block, c, fs);
-+	}
- 	else
-+	{
- 		runActions(sec_block, c, fs);
-+	}
- 	return RES_OK;
- 	TK_CATCH_ERR
diff -ruN campsite.orig/files/patch-lex.cpp campsite/files/patch-lex.cpp
--- campsite.orig/files/patch-lex.cpp	Mon Jul 17 16:31:14 2006
+++ campsite/files/patch-lex.cpp	Thu Jan  1 01:00:00 1970
@@ -1,54 +0,0 @@
---- implementation/parser/parser/lex.cpp (revision 5608)
-+++ implementation/parser/parser/lex.cpp (revision 5648)
-@@ -238,5 +238,5 @@
- 	pcoCtx->insertAttr(new CIntegerAttr("number", "Number"));
- 	pcoCtx->insertAttr(new CStringAttr("name", "Name"));
--	pcoCtx->insertAttr(new CDateAttr("publish_date", "PublicationDate"));
-+	pcoCtx->insertAttr(new CDateTimeAttr("publish_date", "PublicationDate"));
- 	pcoCtx->insertAttr(new CAttribute("iscurrent"));
- 	pcoCtx->insertAttr(new CAttribute("defined"));
-@@ -247,5 +247,5 @@
- 	pcoCtx->insertAttr(new CStringAttr("name", "Name"));
- 	pcoCtx->insertAttr(new CIntegerAttr("number", "Number"));
--	pcoCtx->insertAttr(new CDateAttr("publish_date", "PublicationDate"));
-+	pcoCtx->insertAttr(new CDateTimeAttr("publish_date", "PublicationDate"));
- 	pcoCtx->insertAttr(new CIntegerAttr("publish_year", "YEAR(PublicationDate)"));
- 	pcoCtx->insertAttr(new CIntegerAttr("publish_month", "MONTH(PublicationDate)"));
-@@ -264,5 +264,5 @@
- 	pcoCtx->insertAttr(new CStringAttr("name", "Name"));
- 	pcoCtx->insertAttr(new CIntegerAttr("number", "Number"));
--	pcoCtx->insertAttr(new CDateAttr("date", "PublicationDate"));
-+	pcoCtx->insertAttr(new CDateTimeAttr("date", "PublicationDate"));
- 	pcoCtx->insertAttr(new CIntegerAttr("year", "YEAR(PublicationDate)"));
- 	pcoCtx->insertAttr(new CIntegerAttr("mon_nr", "MONTH(PublicationDate)"));
-@@ -322,5 +322,5 @@
- 	pcoCtx = new CStatementContext(CMS_CT_IF);
- 	pcoCtx->insertAttr(new CStringAttr("name", "Name"));
--	pcoCtx->insertAttr(new CDateAttr("upload_date", "UploadDate"));
-+	pcoCtx->insertAttr(new CDateTimeAttr("upload_date", "UploadDate"));
- 	pcoCtx->insertAttr(new CDateTimeAttr("publish_date", "PublishDate"));
- 	pcoCtx->insertAttr(new CAttribute("has_keyword"));
-@@ -338,5 +338,5 @@
- 	pcoCtx->insertAttr(new CStringAttr("name", "Name"));
- 	pcoCtx->insertAttr(new CIntegerAttr("number", "Number"));
--	pcoCtx->insertAttr(new CDateAttr("upload_date", "UploadDate"));
-+	pcoCtx->insertAttr(new CDateTimeAttr("upload_date", "UploadDate"));
- 	pcoCtx->insertAttr(new CDateTimeAttr("publish_date", "PublishDate"));
- 	pcoCtx->insertAttr(new CStringAttr("keyword", "Keywords"));
-@@ -363,6 +363,6 @@
- 	pcoCtx->insertAttr(new CStringAttr("mon_name", "UploadDate"));
- 	pcoCtx->insertAttr(new CStringAttr("wday_name", "UploadDate"));
--	pcoCtx->insertAttr(new CDateAttr("upload_date", "UploadDate"));
--	pcoCtx->insertAttr(new CDateAttr("uploaddate", "UploadDate"));
-+	pcoCtx->insertAttr(new CDateTimeAttr("upload_date", "UploadDate"));
-+	pcoCtx->insertAttr(new CDateTimeAttr("uploaddate", "UploadDate"));
- 	pcoCtx->insertAttr(new CDateTimeAttr("publishdate", "PublishDate"));
- 	pcoCtx->insertAttr(new CStringAttr("template"));
-@@ -918,5 +918,5 @@
- 	pcoCtx->insertAttr(new CStringAttr("ReaderEMail"));
- 	pcoCtx->insertAttr(new CStringAttr("ReaderEMailObfuscated"));
--	pcoCtx->insertAttr(new CDateAttr("SubmitDate"));
-+	pcoCtx->insertAttr(new CDateTimeAttr("SubmitDate"));
- 	pcoCtx->insertAttr(new CStringAttr("Subject"));
- 	pcoCtx->insertAttr(new CStringAttr("Content"));
-
diff -ruN campsite.orig/files/patch-transfer_images.php campsite/files/patch-transfer_images.php
--- campsite.orig/files/patch-transfer_images.php	Thu Jan  1 01:00:00 1970
+++ campsite/files/patch-transfer_images.php	Mon Aug 21 14:28:45 2006
@@ -0,0 +1,11 @@
+--- implementation/database/upgrade/2.1.x/transfer_images.php.orig	Mon Aug 21 14:15:42 2006
++++ implementation/database/upgrade/2.1.x/transfer_images.php	Mon Aug 21 14:17:36 2006
+@@ -120,7 +120,7 @@
+ //	$transferQuery = "INSERT INTO ImagesDup (Description, Photographer, Place, Date, ContentType, Location, URL, NrArticle, Number, Image) SELECT Description, Photographer, Place, Date, ContentType, 'local', '', NrArticle, Number, Image FROM Images";
+ //	mysql_query($transferQuery);
+ 	
+-	$thumbnailCommand = 'convert -sample 64x64';
++	$thumbnailCommand = 'gm convert -sample 64x64';
+ 	$queryStr = "SELECT Id, Image FROM ImagesDup";
+ 	$query = mysql_query($queryStr);
+ 	//mkdir($p_destDir, 0755);
diff -ruN campsite.orig/pkg-plist campsite/pkg-plist
--- campsite.orig/pkg-plist	Mon Jul 17 17:29:38 2006
+++ campsite/pkg-plist	Wed Aug 23 15:56:43 2006
@@ -22,6 +22,7 @@
 campsite/instance/database/upgrade/2.1.x/data-required.sql
 campsite/instance/database/upgrade/2.1.x/tables.sql
 campsite/instance/database/upgrade/2.1.x/transfer_images.php
+campsite/instance/database/upgrade/2.1.x/transfer_images.php.orig
 campsite/instance/database/upgrade/2.1.x/transfer_templates.php
 campsite/instance/database/upgrade/2.2.x/data-required.sql
 campsite/instance/database/upgrade/2.2.x/tables.sql
@@ -36,6 +37,8 @@
 campsite/instance/database/upgrade/2.5.x/tables.sql
 campsite/instance/database/upgrade/2.5.x/upgrade_article_types.php
 campsite/instance/database/upgrade/2.5.x/upgrade_user_perms.php
+campsite/instance/database/upgrade/2.6.0/data-required.sql
+campsite/instance/database/upgrade/2.6.0/tables.sql
 campsite/sbin/campsite_autopublish
 campsite/sbin/campsite_autopublish.php
 campsite/sbin/campsite_config
@@ -82,6 +85,7 @@
 campsite/www-common/html/classes/Phorum_user.php
 campsite/www-common/html/classes/Publication.php
 campsite/www-common/html/classes/Section.php
+campsite/www-common/html/classes/ShortURL.php
 campsite/www-common/html/classes/SimplePager.php
 campsite/www-common/html/classes/Subscription.php
 campsite/www-common/html/classes/SubscriptionDefaultTime.php
@@ -2123,6 +2127,7 @@
 campsite/www-common/html/priv/lang/kr/user_types.php
 campsite/www-common/html/priv/lang/kr/users.php
 campsite/www-common/html/priv/lang/nl/api.php
+campsite/www-common/html/priv/lang/nl/article_comments.php
 campsite/www-common/html/priv/lang/nl/article_files.php
 campsite/www-common/html/priv/lang/nl/article_images.php
 campsite/www-common/html/priv/lang/nl/article_topics.php
@@ -2130,6 +2135,7 @@
 campsite/www-common/html/priv/lang/nl/article_types.php
 campsite/www-common/html/priv/lang/nl/articles.php
 campsite/www-common/html/priv/lang/nl/bug_reporting.php
+campsite/www-common/html/priv/lang/nl/comments.php
 campsite/www-common/html/priv/lang/nl/country.php
 campsite/www-common/html/priv/lang/nl/feedback.php
 campsite/www-common/html/priv/lang/nl/globals.php
@@ -2141,6 +2147,7 @@
 campsite/www-common/html/priv/lang/nl/logs.php
 campsite/www-common/html/priv/lang/nl/pub.php
 campsite/www-common/html/priv/lang/nl/sections.php
+campsite/www-common/html/priv/lang/nl/system_pref.php
 campsite/www-common/html/priv/lang/nl/templates.php
 campsite/www-common/html/priv/lang/nl/topics.php
 campsite/www-common/html/priv/lang/nl/user_subscription_sections.php
@@ -2772,6 +2779,7 @@
 @dirrm campsite/www-common
 @dirrm campsite/www
 @dirrm campsite/sbin
+@dirrm campsite/instance/database/upgrade/2.6.0
 @dirrm campsite/instance/database/upgrade/2.5.x
 @dirrm campsite/instance/database/upgrade/2.4.x
 @dirrm campsite/instance/database/upgrade/2.3.x
--- campsite.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060823141437.D38ED11620>