- Ports renamed for consistency

PR:		ports/112327
Repocopy by:	marcus
Approved by:	sat (maintainer)

7 files changed, 2 insertions, 292 deletions

diff --git a/devel/Makefile b/devel/Makefile
index f3e97e7f28e7..375d6f1608df 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -140,7 +140,6 @@
     SUBDIR += cgprof
     SUBDIR += charva
     SUBDIR += check
-    SUBDIR += chora
     SUBDIR += cil
     SUBDIR += cl-asdf
     SUBDIR += cl-asdf-clisp
@@ -421,6 +420,7 @@
     SUBDIR += hapy
     SUBDIR += hc12mem
     SUBDIR += highlighterkit
+    SUBDIR += horde-chora
     SUBDIR += hp48cc
     SUBDIR += hp48xgcc
     SUBDIR += hptools
diff --git a/devel/chora/Makefile b/devel/chora/Makefile
deleted file mode 100644
index 4775e240a353..000000000000
--- a/devel/chora/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-# Ports collection makefile for:  Chora
-# Date created:			  Mon Nov 26, 2001
-# Whom:				  Thierry Thomas (<thierry@pompo.net>)
-#
-# $FreeBSD$
-#
-
-PORTNAME=	chora
-PORTVERSION=	2.0.2
-PORTREVISION=	1
-CATEGORIES=	devel www
-DIST_SUBDIR=	horde
-
-MAINTAINER=	beech@FreeBSD.org
-COMMENT=	The Horde CVS web-viewer
-
-#-----------------------------------------------------------------------
-# You may define these options:
-#
-# - WITHOUT_SVN		: if you don't need subversion;
-#
-# - WITHOUT_CVSPS	: if you don't need cvsps;
-#
-# - WITHOUT_CVSGRAPH	: if you don't need cvsgraph;
-#
-# - A4 or DJ		: if you run enscript with this paper size.
-#
-#-----------------------------------------------------------------------
-
-.if !defined(WITHOUT_SVN)
-RUN_DEPENDS+=	${LOCALBASE}/bin/svn:${PORTSDIR}/devel/subversion
-.endif
-
-.if !defined(WITHOUT_CVSPS)
-RUN_DEPENDS+=	${LOCALBASE}/bin/cvsps:${PORTSDIR}/devel/cvsps-devel
-.endif
-
-.if !defined(WITHOUT_CVSGRAPH)
-RUN_DEPENDS+=	${LOCALBASE}/bin/cvsgraph:${PORTSDIR}/devel/cvsgraph
-.endif
-
-# Specify where your repository belongs.
-# (You can reconfigure it after installation anyway)
-.if defined(PACKAGE_BUILDING) || !defined(CVSROOT) || empty(CVSROOT)
-CVSROOT=	/home/cvs
-.endif
-
-USE_HORDE=	base pkg-message
-USE_GETTEXT=	yes
-PORTDOCS=	README BUGS CHANGES CREDITS INSTALL RELEASE_NOTES TODO
-
-pre-configure:
-	@${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|"		\
-		-e "s|/usr/bin/cvsgraph|${LOCALBASE}/bin/cvsgraph|"	\
-		-e "s|/usr/bin/svn|${LOCALBASE}/bin/svn|"		\
-		${WRKSRC}/config/conf.xml
-	@${REINPLACE_CMD} -e "s|%%CVSROOT%%|${CVSROOT}|"		\
-		-e "s|%%CONFDIR%%|${CONFDIR}|"				\
-		${WRKSRC}/config/sourceroots.php.dist
-
-pre-install:
-.if !defined(WITHOUT_CVSPS)
-	@if ! ${PKG_INFO} -I -x cvsps-devel > /dev/null ; then \
-	  ${ECHO_MSG} "Error: cvsps-devel is required, not cvsps." ; \
-	  ${FALSE} ; \
-	fi
-.endif
-
-.include "${.CURDIR}/../../www/horde-base/bsd.horde.mk"
-.include <bsd.port.mk>
diff --git a/devel/chora/distinfo b/devel/chora/distinfo
deleted file mode 100644
index 16b902da08dd..000000000000
--- a/devel/chora/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (horde/chora-h3-2.0.2.tar.gz) = dfddec61103e4437b5ad773888ae55c2
-SHA256 (horde/chora-h3-2.0.2.tar.gz) = bbadfc0f63ba3c5034c98c9c2cbf0913c2e01fa0656ac2d49d372c2c7d1c1745
-SIZE (horde/chora-h3-2.0.2.tar.gz) = 801775
diff --git a/devel/chora/files/patch-config::sourceroots.php.dist b/devel/chora/files/patch-config::sourceroots.php.dist
deleted file mode 100644
index 18c1a987243b..000000000000
--- a/devel/chora/files/patch-config::sourceroots.php.dist
+++ /dev/null
@@ -1,45 +0,0 @@
---- config/sourceroots.php.dist.orig	Wed Aug 27 16:08:21 2003
-+++ config/sourceroots.php.dist	Thu Dec  2 23:30:08 2004
-@@ -11,7 +11,7 @@
-  * 'name'     [M] : Short name for the repository.
-  *
-  * 'location' [M] : Location on the filesystem of the repository.
-- * 
-+ *
-  * 'title'    [M] : Long title for the repository.
-  *
-  * 'type'     [M] : Indicates software used, either 'cvs' or 'svn'.
-@@ -31,6 +31,17 @@
-  *                  whose contents should be protected and not displayed.
-  */
- 
-+$sourceroots['myprojects'] = array(
-+    'name' => 'Here',
-+    'location' => '%%CVSROOT%%',
-+    'title' => 'To be configured in %%CONFDIR%%/sourceroots.php',
-+    'intro' => 'longIntro.txt',
-+    'default' => true,
-+    'type' => 'cvs',
-+);
-+
-+/*
-+
- $sourceroots['php4'] = array(
-     'name' => 'PHP4',
-     'location' => '/home/cvs/php4',
-@@ -64,9 +75,11 @@
-     'type' => 'svn',
- );
- 
--$sourceroots['openbsd'] = array(
--    'name' => 'OpenBSD',
--    'location' => '/home/cvs/openbsd',
--    'title' => 'OpenBSD CVS Repository',
-+$sourceroots['freebsd'] = array(
-+    'name' => 'FreeBSD',
-+    'location' => '/home/cvs/freebsd',
-+    'title' => 'FreeBSD CVS Repository',
-     'type' => 'cvs',
- );
-+
-+*/
diff --git a/devel/chora/pkg-descr b/devel/chora/pkg-descr
deleted file mode 100644
index 25cf61a374ef..000000000000
--- a/devel/chora/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-Chora is the Horde CVS viewer; it provides an advanced web-based view of
-any local CVS repository. It now includes annotation support, visual
-branch viewing capability, and human-readable diffs.
-
-Other features are:
-
-- Support for multiple CVS repositories
-- MIME-awareness, to pretty-print code or convert PDFs to text
-- Visual branch histories, to view the flow of code through a project
-- Internationalisation, with several languages supported
-- Annotation (or 'blame') support
-
-... as well as all the usual CVS functions you are familiar with from
-other similar applications.
-
-WWW: http://horde.org/chora/
diff --git a/devel/chora/pkg-plist b/devel/chora/pkg-plist
deleted file mode 100644
index 26e439472b3f..000000000000
--- a/devel/chora/pkg-plist
+++ /dev/null
@@ -1,156 +0,0 @@
-%%HORDIR%%/.htaccess
-%%HORDIR%%/annotate.php
-%%HORDIR%%/browse.php
-%%HORDIR%%/co.php
-%%HORDIR%%/config/.htaccess
-%%HORDIR%%/config/conf.xml
-%%HORDIR%%/config/cvsgraph.conf.dist
-%%HORDIR%%/config/longIntro.txt.dist
-%%HORDIR%%/config/mime_drivers.php.dist
-%%HORDIR%%/config/prefs.php.dist
-%%HORDIR%%/config/sourceroots.php.dist
-%%HORDIR%%/cvs.php
-%%HORDIR%%/cvsgraph.php
-%%HORDIR%%/diff.php
-%%HORDIR%%/history.php
-%%HORDIR%%/index.php
-%%HORDIR%%/lib/.htaccess
-%%HORDIR%%/lib/Chora.php
-%%HORDIR%%/lib/base.php
-%%HORDIR%%/lib/version.php
-%%HORDIR%%/locale/.htaccess
-%%HORDIR%%/locale/cs_CZ/LC_MESSAGES/chora.mo
-%%HORDIR%%/locale/da_DK/LC_MESSAGES/chora.mo
-%%HORDIR%%/locale/de_DE/LC_MESSAGES/chora.mo
-%%HORDIR%%/locale/de_DE/help.xml
-%%HORDIR%%/locale/en_US/help.xml
-%%HORDIR%%/locale/es_ES/LC_MESSAGES/chora.mo
-%%HORDIR%%/locale/es_ES/help.xml
-%%HORDIR%%/locale/fi_FI/LC_MESSAGES/chora.mo
-%%HORDIR%%/locale/fi_FI/help.xml
-%%HORDIR%%/locale/fr_FR/LC_MESSAGES/chora.mo
-%%HORDIR%%/locale/nb_NO/LC_MESSAGES/chora.mo
-%%HORDIR%%/locale/nl_NL/LC_MESSAGES/chora.mo
-%%HORDIR%%/locale/pl_PL/LC_MESSAGES/chora.mo
-%%HORDIR%%/locale/pt_BR/LC_MESSAGES/chora.mo
-%%HORDIR%%/locale/ro_RO/LC_MESSAGES/chora.mo
-%%HORDIR%%/locale/ru_RU/LC_MESSAGES/chora.mo
-%%HORDIR%%/locale/sk_SK/LC_MESSAGES/chora.mo
-%%HORDIR%%/locale/sv_SE/LC_MESSAGES/chora.mo
-%%HORDIR%%/locale/zh_CN/LC_MESSAGES/chora.mo
-%%HORDIR%%/locale/zh_TW/LC_MESSAGES/chora.mo
-%%HORDIR%%/patchsets.php
-%%HORDIR%%/po/.htaccess
-%%HORDIR%%/po/README
-%%HORDIR%%/po/chora.pot
-%%HORDIR%%/po/cs_CZ.po
-%%HORDIR%%/po/da_DK.po
-%%HORDIR%%/po/de_DE.po
-%%HORDIR%%/po/es_ES.po
-%%HORDIR%%/po/fi_FI.po
-%%HORDIR%%/po/fr_FR.po
-%%HORDIR%%/po/nb_NO.po
-%%HORDIR%%/po/nl_NL.po
-%%HORDIR%%/po/pl_PL.po
-%%HORDIR%%/po/pt_BR.po
-%%HORDIR%%/po/ro_RO.po
-%%HORDIR%%/po/ru_RU.po
-%%HORDIR%%/po/sk_SK.po
-%%HORDIR%%/po/sv_SE.po
-%%HORDIR%%/po/zh_CN.po
-%%HORDIR%%/po/zh_TW.po
-%%HORDIR%%/stats.php
-%%HORDIR%%/templates/.htaccess
-%%HORDIR%%/templates/annotate/footer.inc
-%%HORDIR%%/templates/annotate/header.inc
-%%HORDIR%%/templates/annotate/line.inc
-%%HORDIR%%/templates/checkout/checkout.inc
-%%HORDIR%%/templates/common-header.inc
-%%HORDIR%%/templates/cvsgraph/cvsgraph.inc
-%%HORDIR%%/templates/diff/hr/add.inc
-%%HORDIR%%/templates/diff/hr/change.inc
-%%HORDIR%%/templates/diff/hr/empty.inc
-%%HORDIR%%/templates/diff/hr/footer.inc
-%%HORDIR%%/templates/diff/hr/header.inc
-%%HORDIR%%/templates/diff/hr/nochange.inc
-%%HORDIR%%/templates/diff/hr/remove.inc
-%%HORDIR%%/templates/diff/hr/row.inc
-%%HORDIR%%/templates/directory/back.inc
-%%HORDIR%%/templates/directory/dir.inc
-%%HORDIR%%/templates/directory/file.inc
-%%HORDIR%%/templates/directory/footer.inc
-%%HORDIR%%/templates/directory/header.inc
-%%HORDIR%%/templates/error_page.inc
-%%HORDIR%%/templates/headerbar.inc
-%%HORDIR%%/templates/history/blank.inc
-%%HORDIR%%/templates/history/branch_cell.inc
-%%HORDIR%%/templates/history/footer.inc
-%%HORDIR%%/templates/history/header.inc
-%%HORDIR%%/templates/history/rev.inc
-%%HORDIR%%/templates/history/row_end.inc
-%%HORDIR%%/templates/history/row_start.inc
-%%HORDIR%%/templates/log/request.inc
-%%HORDIR%%/templates/log/rev.inc
-%%HORDIR%%/templates/menu.inc
-%%HORDIR%%/templates/patchsets/ps.inc
-%%HORDIR%%/templates/stats/stats.inc
-%%HORDIR%%/themes/burntorange/screen.css
-%%HORDIR%%/themes/graphics/back.png
-%%HORDIR%%/themes/graphics/chora.png
-%%HORDIR%%/themes/graphics/deleted.png
-%%HORDIR%%/themes/graphics/favicon.ico
-%%HORDIR%%/themes/graphics/folder.png
-%%HORDIR%%/themes/screen.css
-@dirrmtry %%HORDIR%%/config
-@dirrm %%HORDIR%%/lib
-@dirrm %%HORDIR%%/locale/cs_CZ/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/cs_CZ
-@dirrm %%HORDIR%%/locale/da_DK/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/da_DK
-@dirrm %%HORDIR%%/locale/de_DE/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/de_DE
-@dirrm %%HORDIR%%/locale/en_US
-@dirrm %%HORDIR%%/locale/es_ES/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/es_ES
-@dirrm %%HORDIR%%/locale/fi_FI/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/fi_FI
-@dirrm %%HORDIR%%/locale/fr_FR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/fr_FR
-@dirrm %%HORDIR%%/locale/nb_NO/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nb_NO
-@dirrm %%HORDIR%%/locale/nl_NL/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nl_NL
-@dirrm %%HORDIR%%/locale/pl_PL/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pl_PL
-@dirrm %%HORDIR%%/locale/pt_BR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pt_BR
-@dirrm %%HORDIR%%/locale/ro_RO/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ro_RO
-@dirrm %%HORDIR%%/locale/ru_RU/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ru_RU
-@dirrm %%HORDIR%%/locale/sk_SK/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/sk_SK
-@dirrm %%HORDIR%%/locale/sv_SE/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/sv_SE
-@dirrm %%HORDIR%%/locale/zh_CN/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/zh_CN
-@dirrm %%HORDIR%%/locale/zh_TW/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/zh_TW
-@dirrm %%HORDIR%%/locale
-@dirrm %%HORDIR%%/po
-@dirrm %%HORDIR%%/templates/annotate
-@dirrm %%HORDIR%%/templates/checkout
-@dirrm %%HORDIR%%/templates/cvsgraph
-@dirrm %%HORDIR%%/templates/diff/hr
-@dirrm %%HORDIR%%/templates/diff
-@dirrm %%HORDIR%%/templates/directory
-@dirrm %%HORDIR%%/templates/history
-@dirrm %%HORDIR%%/templates/log
-@dirrm %%HORDIR%%/templates/patchsets
-@dirrm %%HORDIR%%/templates/stats
-@dirrm %%HORDIR%%/templates
-@dirrm %%HORDIR%%/themes/burntorange
-@dirrm %%HORDIR%%/themes/graphics
-@dirrm %%HORDIR%%/themes
-@dirrmtry %%HORDIR%%
-@dirrmtry %%HORBAS%%
diff --git a/devel/horde-chora/Makefile b/devel/horde-chora/Makefile
index 4775e240a353..0e545d7a0c31 100644
--- a/devel/horde-chora/Makefile
+++ b/devel/horde-chora/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel www
 DIST_SUBDIR=	horde
 
 MAINTAINER=	beech@FreeBSD.org
-COMMENT=	The Horde CVS web-viewer
+COMMENT=	CVS web-viewer
 
 #-----------------------------------------------------------------------
 # You may define these options: