Upgrade to version 1.1 .

PR:	ports/38280
Submitted by:	maintainer

14 files changed, 62 insertions, 104 deletions

diff --git a/devel/chora/Makefile b/devel/chora/Makefile
index 413a8a96fde9..9681232a0e11 100644
--- a/devel/chora/Makefile
+++ b/devel/chora/Makefile
@@ -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 @@ CVSROOT=	/home/cvs
 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 @@ HORDE_INC=	${LOCALBASE}/etc/horde
 
 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 --git a/devel/chora/distinfo b/devel/chora/distinfo
index 6af4d8a671e3..5f03ee081fe6 100644
--- a/devel/chora/distinfo
+++ b/devel/chora/distinfo
@@ -1 +1 @@
-MD5 (chora-1.0.tar.gz) = c2f3f5fe6f653fbcdd5fa97e33734c17
+MD5 (chora-1.1-RC1.tar.gz) = b90276bbf6d731943f596cefdd16c863
diff --git a/devel/chora/files/patch-aa b/devel/chora/files/patch-aa
index c010eb93de6e..544301000550 100644
--- a/devel/chora/files/patch-aa
+++ b/devel/chora/files/patch-aa
@@ -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 --git a/devel/chora/files/patch-cvs.php b/devel/chora/files/patch-cvs.php
deleted file mode 100644
index cbc547379172..000000000000
--- a/devel/chora/files/patch-cvs.php
+++ /dev/null
@@ -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 --git a/devel/chora/files/patch-history.php b/devel/chora/files/patch-history.php
deleted file mode 100644
index 3a19258f2365..000000000000
--- a/devel/chora/files/patch-history.php
+++ /dev/null
@@ -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 --git a/devel/chora/files/patch-lib_CVSLib_Log.php b/devel/chora/files/patch-lib_CVSLib_Log.php
deleted file mode 100644
index 6457e1c4045e..000000000000
--- a/devel/chora/files/patch-lib_CVSLib_Log.php
+++ /dev/null
@@ -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 --git a/devel/chora/pkg-plist b/devel/chora/pkg-plist
index 1372e791b870..e9df2d1c0e8d 100644
--- a/devel/chora/pkg-plist
+++ b/devel/chora/pkg-plist
@@ -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 @@ etc/horde/httpd.conf.chora
 @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
diff --git a/devel/horde-chora/Makefile b/devel/horde-chora/Makefile
index 413a8a96fde9..9681232a0e11 100644
--- a/devel/horde-chora/Makefile
+++ b/devel/horde-chora/Makefile
@@ -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 @@ CVSROOT=	/home/cvs
 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 @@ HORDE_INC=	${LOCALBASE}/etc/horde
 
 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 --git a/devel/horde-chora/distinfo b/devel/horde-chora/distinfo
index 6af4d8a671e3..5f03ee081fe6 100644
--- a/devel/horde-chora/distinfo
+++ b/devel/horde-chora/distinfo
@@ -1 +1 @@
-MD5 (chora-1.0.tar.gz) = c2f3f5fe6f653fbcdd5fa97e33734c17
+MD5 (chora-1.1-RC1.tar.gz) = b90276bbf6d731943f596cefdd16c863
diff --git a/devel/horde-chora/files/patch-aa b/devel/horde-chora/files/patch-aa
index c010eb93de6e..544301000550 100644
--- a/devel/horde-chora/files/patch-aa
+++ b/devel/horde-chora/files/patch-aa
@@ -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 --git a/devel/horde-chora/files/patch-cvs.php b/devel/horde-chora/files/patch-cvs.php
deleted file mode 100644
index cbc547379172..000000000000
--- a/devel/horde-chora/files/patch-cvs.php
+++ /dev/null
@@ -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 --git a/devel/horde-chora/files/patch-history.php b/devel/horde-chora/files/patch-history.php
deleted file mode 100644
index 3a19258f2365..000000000000
--- a/devel/horde-chora/files/patch-history.php
+++ /dev/null
@@ -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 --git a/devel/horde-chora/files/patch-lib_CVSLib_Log.php b/devel/horde-chora/files/patch-lib_CVSLib_Log.php
deleted file mode 100644
index 6457e1c4045e..000000000000
--- a/devel/horde-chora/files/patch-lib_CVSLib_Log.php
+++ /dev/null
@@ -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 --git a/devel/horde-chora/pkg-plist b/devel/horde-chora/pkg-plist
index 1372e791b870..e9df2d1c0e8d 100644
--- a/devel/horde-chora/pkg-plist
+++ b/devel/horde-chora/pkg-plist
@@ -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 @@ etc/horde/httpd.conf.chora
 @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