Date: Fri, 19 Jan 2007 19:53:36 +0000 (UTC) From: koutek@o-k.cz To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/108127: Port Upgrade: www/campsite 2.6.3 -> 2.6.4 Message-ID: <20070119195336.8FD05109F617@mail.mediaturtle.com> Resent-Message-ID: <200701192030.l0JKUE7t078286@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 108127 >Category: ports >Synopsis: Port Upgrade: www/campsite 2.6.3 -> 2.6.4 >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: Fri Jan 19 20:30:13 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Ondra Koutek >Release: FreeBSD 6.1-RELEASE-p12 i386 >Organization: >Environment: System: FreeBSD mail.mediaturtle.com 6.1-RELEASE-p12 FreeBSD 6.1-RELEASE-p12 #2: Thu Jan 11 21:40:39 CET 2007 root@s1.mediaturtle.com:/usr/obj/usr/src/sys/S1 i386 >Description: Upgrading port www/campsite from 2.6.3 to 2.6.4 - Bugfixies >How-To-Repeat: >Fix: --- campsite.diff begins here --- diff -ruN campsite.orig/Makefile campsite/Makefile --- campsite.orig/Makefile Thu Nov 23 19:43:08 2006 +++ campsite/Makefile Wed Jan 10 22:55:08 2007 @@ -2,11 +2,11 @@ # Date created: 5 August 2005 # Whom: Ondra Koutek <koutek@o-k.cz> # -# $FreeBSD: ports/www/campsite/Makefile,v 1.13 2006/11/14 07:33:37 miwi Exp $ +# $FreeBSD: ports/www/campsite/Makefile,v 1.14 2006/11/23 23:28:14 miwi Exp $ # PORTNAME= campsite -PORTVERSION= 2.6.3 +PORTVERSION= 2.6.4 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff -ruN campsite.orig/distinfo campsite/distinfo --- campsite.orig/distinfo Thu Nov 23 22:04:31 2006 +++ campsite/distinfo Thu Jan 18 21:07:43 2007 @@ -1,3 +1,3 @@ -MD5 (campsite-2.6.3.tar.gz) = ba8200394b9ed689367a45b8c287fb8e -SHA256 (campsite-2.6.3.tar.gz) = 680558a9f14cdf7050b74e01338ebf21300f02efa9d43202ac34d0f147766931 -SIZE (campsite-2.6.3.tar.gz) = 4414538 +MD5 (campsite-2.6.4.tar.gz) = aae88ebe1daddb0d73d67ab206715de7 +SHA256 (campsite-2.6.4.tar.gz) = d8a5e5627185207cd15cf54f09e13720e0a90f9d05d01d315fa6d82f48fa1773 +SIZE (campsite-2.6.4.tar.gz) = 4422988 diff -ruN campsite.orig/files/patch-check4_functions campsite/files/patch-check4_functions --- campsite.orig/files/patch-check4_functions Mon Jul 24 03:31:47 2006 +++ campsite/files/patch-check4_functions Wed Jan 10 23:05:37 2007 @@ -1,6 +1,6 @@ ---- install_conf/check4_functions.orig Tue Jul 11 22:45:07 2006 -+++ install_conf/check4_functions Tue Jul 11 23:04:11 2006 -@@ -1042,9 +1042,9 @@ +--- install_conf/check4_functions.orig Wed Jan 10 23:04:17 2007 ++++ install_conf/check4_functions Wed Jan 10 23:04:31 2007 +@@ -1065,9 +1065,9 @@ # output - error message (if any) check4_convert() { diff -ruN campsite.orig/files/patch-configuration.php campsite/files/patch-configuration.php --- campsite.orig/files/patch-configuration.php Mon Jul 24 03:31:47 2006 +++ campsite/files/patch-configuration.php Wed Jan 10 23:01:39 2007 @@ -1,11 +1,11 @@ ---- implementation/management/configuration.php.orig Tue Jul 11 22:45:21 2006 -+++ implementation/management/configuration.php Tue Jul 11 22:59:36 2006 -@@ -47,7 +47,7 @@ - $Campsite['ADMIN_IMAGE_BASE_URL'] = $Campsite['WEBSITE_URL'].'/css'; +--- implementation/management/configuration.php.orig Sat Jan 6 20:28:51 2007 ++++ implementation/management/configuration.php Wed Jan 10 22:59:30 2007 +@@ -46,7 +46,7 @@ $Campsite['IMAGE_PREFIX'] = 'cms-image-'; $Campsite['IMAGEMAGICK_INSTALLED'] = true; --$Campsite['THUMBNAIL_COMMAND'] = 'convert -sample 64x64'; -+$Campsite['THUMBNAIL_COMMAND'] = 'gm convert -sample 64x64'; + $Campsite['THUMBNAIL_MAX_SIZE'] = 64; +-$Campsite['THUMBNAIL_COMMAND'] = 'convert -sample ' ++$Campsite['THUMBNAIL_COMMAND'] = 'gm convert -sample ' + .$Campsite['THUMBNAIL_MAX_SIZE'].'x'.$Campsite['THUMBNAIL_MAX_SIZE']; $Campsite['THUMBNAIL_DIRECTORY'] = $Campsite['IMAGE_DIRECTORY'].'/thumbnails/'; $Campsite['THUMBNAIL_BASE_URL'] = $Campsite['WEBSITE_URL'].'/images/thumbnails/'; - $Campsite['THUMBNAIL_PREFIX'] = 'cms-thumb-'; diff -ruN campsite.orig/pkg-plist campsite/pkg-plist --- campsite.orig/pkg-plist Thu Nov 23 22:12:37 2006 +++ campsite/pkg-plist Wed Jan 10 23:17:14 2007 @@ -44,6 +44,7 @@ campsite/instance/database/upgrade/2.6.1/upgrade_phorum_users.php campsite/instance/database/upgrade/2.6.2/data-required.sql campsite/instance/database/upgrade/2.6.2/upgrade_phorum_users.php +campsite/instance/database/upgrade/2.6.3/data-required.sql campsite/sbin/campsite_autopublish campsite/sbin/campsite_autopublish.php campsite/sbin/campsite_config @@ -2476,8 +2477,6 @@ campsite/www-common/html/priv/users/subscriptions/sections/index.php campsite/www-common/html/priv/users/subscriptions/topay.php campsite/www-common/html/priv/users/users_common.php -@dirrm share/nls/en_US.US-ASCII -@dirrm share/nls/POSIX @dirrm campsite/www-common/html/priv/users/subscriptions/sections @dirrm campsite/www-common/html/priv/users/subscriptions @dirrm campsite/www-common/html/priv/users @@ -2790,6 +2789,7 @@ @dirrm campsite/www-common @dirrm campsite/www @dirrm campsite/sbin +@dirrm campsite/instance/database/upgrade/2.6.3 @dirrm campsite/instance/database/upgrade/2.6.2 @dirrm campsite/instance/database/upgrade/2.6.1 @dirrm campsite/instance/database/upgrade/2.6.0 --- 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?20070119195336.8FD05109F617>