Date: Sun, 19 May 2002 09:59:50 +0200 (CEST) From: Thierry Thomas <thierry@pompo.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/38280: devel/chora: upgrade to 1.1 RC1. Message-ID: <20020519075950.0F76A750E@graf.pompo.net>
next in thread | raw e-mail | index | archive | help
>Number: 38280 >Category: ports >Synopsis: devel/chora: upgrade to 1.1 RC1. >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun May 19 01:00:06 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Thierry Thomas >Release: FreeBSD 4.6-PRERELEASE i386 >Organization: Kabbale Eros >Environment: System: FreeBSD graf.pompo.net 4.6-PRERELEASE FreeBSD 4.6-PRERELEASE #0: Sat May 4 07:26:38 CEST 2002 root@graf.pompo.net:/usr/obj/mntsrc/src/sys/GRAF010429 i386 >Description: Upgrade of Chora to 1.1 Release Candidate 1. >How-To-Repeat: N. A. >Fix: Pre-requisite: PR ports/38261 must be committed. Then, apply the following patch: diff -urN /usr/ports/devel/chora.orig/Makefile /usr/ports/devel/chora/Makefile --- /usr/ports/devel/chora.orig/Makefile Wed May 15 21:59:36 2002 +++ /usr/ports/devel/chora/Makefile Sun May 19 09:29:53 2002 @@ -6,14 +6,16 @@ # PORTNAME= chora -PORTVERSION= 1.0 -PORTREVISION= 1 +PORTVERSION= 1.1 CATEGORIES= devel www MASTER_SITES= ftp://ftp.horde.org/pub/chora/tarballs/ \ ftp://ftp.uk.horde.org/mirrors/ftp.horde.org/pub/chora/tarballs/ +DISTNAME= ${PORTNAME}-${PORTVERSION}-RC1 MAINTAINER= thierry@pompo.net +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} + #----------------------------------------------------------------------- # You may define these options: # @@ -45,7 +47,8 @@ DOCS= COPYING README docs/BUGS docs/CHANGES docs/CREDITS \ docs/GOALS docs/INSTALL CONFFILE= conf.php cvsroots.php html.php longIntro.txt \ - mime_drivers.php + mime_drivers.php prefs.php +SUB_DIRS= config graphics lib locale po templates LHORDEDIR?= www/horde LCHORADIR?= ${LHORDEDIR}/chora @@ -60,8 +63,9 @@ do-install: @${MKDIR} ${CHORADIR} - @${CP} -Rp ${WRKSRC}/config ${WRKSRC}/graphics ${WRKSRC}/lib ${CHORADIR} - @${CP} -Rp ${WRKSRC}/locale ${WRKSRC}/po ${WRKSRC}/templates ${CHORADIR} +.for REP in ${SUB_DIRS} + @${CP} -Rp ${WRKSRC}/${REP} ${CHORADIR} +.endfor @${CP} -p ${WRKSRC}/*.php ${CHORADIR} .for FILE in ${CONFFILE} @if [ ! -f ${CONFDIR}/${FILE} ]; then \ diff -urN /usr/ports/devel/chora.orig/distinfo /usr/ports/devel/chora/distinfo --- /usr/ports/devel/chora.orig/distinfo Tue Feb 5 22:36:22 2002 +++ /usr/ports/devel/chora/distinfo Sun May 19 09:15:35 2002 @@ -1 +1 @@ -MD5 (chora-1.0.tar.gz) = c2f3f5fe6f653fbcdd5fa97e33734c17 +MD5 (chora-1.1-RC1.tar.gz) = b90276bbf6d731943f596cefdd16c863 diff -urN /usr/ports/devel/chora.orig/files/patch-aa /usr/ports/devel/chora/files/patch-aa --- /usr/ports/devel/chora.orig/files/patch-aa Thu Nov 29 22:01:49 2001 +++ /usr/ports/devel/chora/files/patch-aa Sun May 19 09:42:29 2002 @@ -1,6 +1,6 @@ ---- config/cvsroots.php.dist.orig Fri Jun 8 22:59:42 2001 -+++ config/cvsroots.php.dist Tue Nov 27 22:42:41 2001 -@@ -27,6 +27,15 @@ +--- config/cvsroots.php.dist.orig Wed Mar 20 21:30:06 2002 ++++ config/cvsroots.php.dist Sun May 19 09:41:40 2002 +@@ -30,6 +30,15 @@ $cvsroots = array(); @@ -16,10 +16,17 @@ $cvsroots['php4'] = array( 'name' => 'PHP4', 'location' => '/home/cvs/php4', -@@ -48,5 +57,6 @@ - 'location' => '/home/cvs/openbsd', - 'title' => 'OpenBSD CVS Repository' +@@ -47,8 +56,9 @@ + 'restrictions' => array('^/?hordeweb/config/defaults.php') ); -+*/ - ?> +-$cvsroots['openbsd'] = array( +- 'name' => 'OpenBSD', +- 'location' => '/home/cvs/openbsd', +- 'title' => 'OpenBSD CVS Repository' ++$cvsroots['freebsd'] = array( ++ 'name' => 'FreeBSD', ++ 'location' => '/home/cvs/freebsd', ++ 'title' => 'FreeBSD CVS Repository' + ); ++*/ diff -urN /usr/ports/devel/chora.orig/files/patch-cvs.php /usr/ports/devel/chora/files/patch-cvs.php --- /usr/ports/devel/chora.orig/files/patch-cvs.php Mon Apr 1 15:32:17 2002 +++ /usr/ports/devel/chora/files/patch-cvs.php Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- cvs.php.orig Wed Jan 2 18:05:18 2002 -+++ cvs.php Sat Feb 16 20:29:37 2002 -@@ -176,7 +176,7 @@ - } - - $textURL= Chora::url('co', $where, array('r'=>$rev)); -- $commitDate = gmdate('jS F Y, g:ia', $lg->date); -+ $commitDate = date('jS F Y, g:ia', $lg->date); - $readableDate = CVSLib_File::readableTime($lg->date, true); - - $aid = $lg->queryAuthor(); diff -urN /usr/ports/devel/chora.orig/files/patch-history.php /usr/ports/devel/chora/files/patch-history.php --- /usr/ports/devel/chora.orig/files/patch-history.php Mon Apr 1 15:32:17 2002 +++ /usr/ports/devel/chora/files/patch-history.php Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- history.php.orig Wed Jan 2 18:05:19 2002 -+++ history.php Sat Feb 16 19:36:54 2002 -@@ -197,7 +197,7 @@ - $bg = isset($branchColours[$bgbr]) ? $branchColours[$bgbr] : 'white'; - $log = $fl->logs[$rev]; - $author = Chora::showAuthorName($log->queryAuthor()); -- $date = gmdate('jS M Y', $log->queryDate()); -+ $date = strftime('%e %b %Y', $log->queryDate()); - $lines = $log->queryChangedLines(); - include $registry->getTemplatePath() . '/history/rev.inc'; - diff -urN /usr/ports/devel/chora.orig/files/patch-lib_CVSLib_Log.php /usr/ports/devel/chora/files/patch-lib_CVSLib_Log.php --- /usr/ports/devel/chora.orig/files/patch-lib_CVSLib_Log.php Mon Apr 1 15:32:17 2002 +++ /usr/ports/devel/chora/files/patch-lib_CVSLib_Log.php Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- lib/CVSLib/Log.php.orig Sat Aug 11 22:59:31 2001 -+++ lib/CVSLib/Log.php Sat Feb 16 19:39:47 2002 -@@ -45,7 +45,7 @@ - case CVSLIB_LOG_DATE: - $line = array_shift($raw); - if (preg_match("|^date:\s+(\d+)/(\d+)/(\d+)\s+(\d+):(\d+):(\d+);\s+author:\s+(\S+);\s+state:\s+(\S+);(\s+lines:\s+([0-9\s+-]+))?|", $line, $parts)) { -- $this->date = mktime($parts[4], $parts[5], $parts[6], $parts[2], $parts[3], $parts[1]); -+ $this->date = gmmktime($parts[4], $parts[5], $parts[6], $parts[2], $parts[3], $parts[1]); - $this->author = $parts[7]; - $this->state = $parts[8]; - $this->lines = isset($parts[10])?$parts[10]:''; diff -urN /usr/ports/devel/chora.orig/pkg-plist /usr/ports/devel/chora/pkg-plist --- /usr/ports/devel/chora.orig/pkg-plist Thu May 16 20:44:09 2002 +++ /usr/ports/devel/chora/pkg-plist Sun May 19 09:32:54 2002 @@ -20,6 +20,8 @@ %%CHORADIR%%/config/longIntro.txt.dist %%CHORADIR%%/config/mime_drivers.php %%CHORADIR%%/config/mime_drivers.php.dist +%%CHORADIR%%/config/prefs.php +%%CHORADIR%%/config/prefs.php.dist %%CHORADIR%%/cvs.php %%CHORADIR%%/diff.php %%CHORADIR%%/graphics/back.gif @@ -40,7 +42,6 @@ %%CHORADIR%%/lib/CVSLib/Error.php %%CHORADIR%%/lib/CVSLib/File.php %%CHORADIR%%/lib/CVSLib/Log.php -%%CHORADIR%%/lib/CVSLib/Log.php.orig %%CHORADIR%%/lib/CVSLib/Rev.php %%CHORADIR%%/lib/Chora.php %%CHORADIR%%/lib/MIME/Viewer/text.php @@ -53,8 +54,8 @@ %%CHORADIR%%/locale/de_DE/LC_MESSAGES/chora.mo %%CHORADIR%%/locale/es_ES/LC_MESSAGES/chora.mo %%CHORADIR%%/locale/fr_FR/LC_MESSAGES/chora.mo +%%CHORADIR%%/locale/nb_NO/LC_MESSAGES/chora.mo %%CHORADIR%%/locale/nl_NL/LC_MESSAGES/chora.mo -%%CHORADIR%%/locale/no_BOK/LC_MESSAGES/chora.mo %%CHORADIR%%/locale/pl_PL/LC_MESSAGES/chora.mo %%CHORADIR%%/locale/pt_BR/LC_MESSAGES/chora.mo %%CHORADIR%%/locale/sv_SE/LC_MESSAGES/chora.mo @@ -66,8 +67,8 @@ %%CHORADIR%%/po/es_ES.po %%CHORADIR%%/po/extract.pl %%CHORADIR%%/po/fr_FR.po +%%CHORADIR%%/po/nb_NO.po %%CHORADIR%%/po/nl_NL.po -%%CHORADIR%%/po/no_BOK.po %%CHORADIR%%/po/pl_PL.po %%CHORADIR%%/po/pt_BR.po %%CHORADIR%%/po/shtool @@ -124,10 +125,10 @@ @dirrm %%CHORADIR%%/locale/es_ES @dirrm %%CHORADIR%%/locale/fr_FR/LC_MESSAGES @dirrm %%CHORADIR%%/locale/fr_FR +@dirrm %%CHORADIR%%/locale/nb_NO/LC_MESSAGES +@dirrm %%CHORADIR%%/locale/nb_NO @dirrm %%CHORADIR%%/locale/nl_NL/LC_MESSAGES @dirrm %%CHORADIR%%/locale/nl_NL -@dirrm %%CHORADIR%%/locale/no_BOK/LC_MESSAGES -@dirrm %%CHORADIR%%/locale/no_BOK @dirrm %%CHORADIR%%/locale/pl_PL/LC_MESSAGES @dirrm %%CHORADIR%%/locale/pl_PL @dirrm %%CHORADIR%%/locale/pt_BR/LC_MESSAGES >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020519075950.0F76A750E>