Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 17 Feb 2002 16:50:35 +0100 (CET)
From:      Thierry Thomas <thierry@pompo.net>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        portmgr@freebsd.org
Subject:   ports/35051: Repocopy request: www/horde-devel -> www/horde2 & mail/imp-devel -> mail/imp3
Message-ID:  <20020217155035.A1CC57523@graf.pompo.net>

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

>Number:         35051
>Category:       ports
>Synopsis:       Repocopy request: www/horde-devel -> www/horde2 & mail/imp-devel -> mail/imp3
>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 Feb 17 08:00:03 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Thierry Thomas
>Release:        FreeBSD 4.5-STABLE i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD graf.pompo.net 4.5-STABLE FreeBSD 4.5-STABLE #0: Sun Feb 3 16:21:08 CET 2002 root@graf.pompo.net:/usr/obj/mntsrc/src/sys/GRAF010429 i386


	
>Description:
	IMP 3.0 is the stable release of IMP, and Horde 2.0 the stable release of Horde.
	We have to keep the ports www/horde & mail/imp for sites using PHP3.
	There are new development versions for IMP v. 4 in the project's CVS.

>How-To-Repeat:
	N/A.

>Fix:

	Pre-requisites: please commit PR ports/35048 on devel/chora
	and PR ports/35049 on mail/imp-devel before this one.

	Then apply the following patches:

	1) mv /usr/ports/www/horde-devel /usr/ports/www/horde2
	and apply this patch:

diff -ur /usr/ports/www/horde-devel/Makefile /usr/ports/www/horde2/Makefile
--- /usr/ports/www/horde-devel/Makefile	Sat Feb 16 19:53:22 2002
+++ /usr/ports/www/horde2/Makefile	Sun Feb 17 14:01:56 2002
@@ -1,4 +1,4 @@
-# Ports collection makefile for:  horde-devel
+# Ports collection makefile for:  horde2
 # Date created:			  Sun Oct 07, 2001
 # Whom:				  Thierry Thomas (<thierry@thomas.as>)
 #
@@ -10,7 +10,6 @@
 PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.horde.org/pub/horde/tarballs/
-PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	thierry@pompo.net
 
diff -ur /usr/ports/www/horde-devel/pkg-descr /usr/ports/www/horde2/pkg-descr
--- /usr/ports/www/horde-devel/pkg-descr	Sat Jan 19 21:09:56 2002
+++ /usr/ports/www/horde2/pkg-descr	Sun Feb 17 14:37:42 2002
@@ -5,7 +5,7 @@
 included, the preferences system supports global or application scope
 for preferences, and assorted bugs have been fixed.
 
-Horde is used by these ports: mail/imp, mail/turba, devel/chora,
+Horde is used by these ports: mail/imp3, mail/turba, devel/chora,
 deskutils/kronolith, deskutils/nag, www/jonah and net/nic.
 
 WWW: http://www.horde.org/


	2) Apply this patch on mail/turba:

diff -ur /usr/ports/mail/turba.orig/Makefile /usr/ports/mail/turba/Makefile
--- /usr/ports/mail/turba.orig/Makefile	Sun Jan 20 23:32:44 2002
+++ /usr/ports/mail/turba/Makefile	Sun Feb 17 14:10:34 2002
@@ -35,7 +35,7 @@
 .endif
 .endif
 
-RUN_DEPENDS+=	${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde-devel
+RUN_DEPENDS+=	${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde2
 
 NO_BUILD=	yes
 DOCS=		COPYING README docs/CHANGES docs/CREDITS \
diff -ur /usr/ports/mail/turba.orig/pkg-descr /usr/ports/mail/turba/pkg-descr
--- /usr/ports/mail/turba.orig/pkg-descr	Mon Dec  3 03:40:11 2001
+++ /usr/ports/mail/turba/pkg-descr	Sun Feb 17 14:13:04 2002
@@ -1,9 +1,8 @@
-Turba is the Horde contact management application. It is currently in
-the development stages, and makes heavy use of the Horde framework to
-provide integration with other applications.
+Turba is the Horde contact management application. It makes heavy use
+of the Horde framework to provide integration with other applications.
 
-Right now, Turba is a fairly complete basic contact management
-application. SQL and LDAP backends are available and fairly well tested.
+Turba is a fairly complete basic contact management application.
+SQL and LDAP backends are available.
 You can define the fields in your addressbooks in a very flexible way,
 just by changing the config files.
 And there are Horde API functions to add and search for contacts.
diff -ur /usr/ports/mail/turba.orig/pkg-message /usr/ports/mail/turba/pkg-message
--- /usr/ports/mail/turba.orig/pkg-message	Wed Dec 12 21:09:16 2001
+++ /usr/ports/mail/turba/pkg-message	Sun Feb 17 14:11:06 2002
@@ -3,7 +3,7 @@
 configuration files.
 
 Horde must be configured; if not, see
-%%PORTSDIR%%/www/horde-devel/pkg-message.
+%%PORTSDIR%%/www/horde2/pkg-message.
 
 Then, you will have to tune the configuration files located in
 %%CONFDIR%%/, specially the files conf.php and


	3) mv /usr/ports/mail/imp-devel /usr/ports/mail/imp3
	and apply this patch:

diff -ur /usr/ports/mail/imp-devel/Makefile /usr/ports/mail/imp3/Makefile
--- /usr/ports/mail/imp-devel/Makefile	Sun Feb 17 11:45:30 2002
+++ /usr/ports/mail/imp3/Makefile	Sun Feb 17 14:23:15 2002
@@ -1,4 +1,4 @@
-# Ports collection makefile for:  imp-devel
+# Ports collection makefile for:  imp3
 # Date created:			  Mon Oct 08, 2001
 # Whom:				  Thierry Thomas (<thierry@thomas.as>)
 #
@@ -10,7 +10,6 @@
 PORTREVISION=	2
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.horde.org/pub/imp/tarballs/
-PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	thierry@pompo.net
 
@@ -71,7 +70,7 @@
 		lber.2:${PORTSDIR}/net/openldap2
 .endif
 .endif
-RUN_DEPENDS+=	${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde${PKGNAMESUFFIX}
+RUN_DEPENDS+=	${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde2
 .else
 RUN_DEPENDS+=	${LOCALBASE}/www/horde/turba/index.php:${PORTSDIR}/mail/turba
 .endif
diff -ur /usr/ports/mail/imp-devel/pkg-message /usr/ports/mail/imp3/pkg-message
--- /usr/ports/mail/imp-devel/pkg-message	Sat Jan 19 17:58:08 2002
+++ /usr/ports/mail/imp3/pkg-message	Sun Feb 17 14:18:39 2002
@@ -3,7 +3,7 @@
 configuration files.
 
 Horde must be configured and the tables created; if not, see
-%%PORTSDIR%%/www/horde-devel/pkg-message.
+%%PORTSDIR%%/www/horde2/pkg-message.
 
 Then, you will have to tune the configuration files located in
 %%CONFDIR%%/, specially the files conf.php and


	4) Apply this patch on deskutils/kronolith:

diff -ur /usr/ports/deskutils/kronolith.orig/Makefile /usr/ports/deskutils/kronolith/Makefile
--- /usr/ports/deskutils/kronolith.orig/Makefile	Sun Jan 20 23:32:42 2002
+++ /usr/ports/deskutils/kronolith/Makefile	Sun Feb 17 14:33:16 2002
@@ -13,7 +13,7 @@
 
 MAINTAINER=	thierry@pompo.net
 
-RUN_DEPENDS=	${LOCALBASE}/www/horde/imp/index.php:${PORTSDIR}/mail/imp-devel
+RUN_DEPENDS=	${LOCALBASE}/www/horde/imp/index.php:${PORTSDIR}/mail/imp3
 
 NO_BUILD=	yes
 
diff -ur /usr/ports/deskutils/kronolith.orig/pkg-message /usr/ports/deskutils/kronolith/pkg-message
--- /usr/ports/deskutils/kronolith.orig/pkg-message	Tue Dec 11 14:06:56 2001
+++ /usr/ports/deskutils/kronolith/pkg-message	Sun Feb 17 14:34:13 2002
@@ -3,8 +3,8 @@
 configuration files.
 
 Horde and IMP must be configured; if not, see:
-- %%PORTSDIR%%/www/horde-devel/pkg-message
-- %%PORTSDIR%%/mail/imp-devel/pkg-message
+- %%PORTSDIR%%/www/horde2/pkg-message
+- %%PORTSDIR%%/mail/imp3/pkg-message
 
 libmcal must be configured with the driver mstore for the user www:
 

	5) Apply this patch on devel/chora:

diff -ur /usr/ports/devel/chora.orig/Makefile /usr/ports/devel/chora/Makefile
--- /usr/ports/devel/chora.orig/Makefile	Sat Feb 16 19:05:45 2002
+++ /usr/ports/devel/chora/Makefile	Sun Feb 17 14:44:17 2002
@@ -23,7 +23,7 @@
 #
 #-----------------------------------------------------------------------
 
-RUN_DEPENDS=	${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde-devel
+RUN_DEPENDS=	${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde2
 .if !defined(WITHOUT_ENSCRIPT)
 .if defined(A4)
 RUN_DEPENDS=	${LOCALBASE}/bin/enscript:${PORTSDIR}/print/enscript-a4
diff -ur /usr/ports/devel/chora.orig/pkg-message /usr/ports/devel/chora/pkg-message
--- /usr/ports/devel/chora.orig/pkg-message	Mon Nov 26 23:29:53 2001
+++ /usr/ports/devel/chora/pkg-message	Sun Feb 17 14:45:19 2002
@@ -3,7 +3,7 @@
 configuration files.
 
 Horde must be configured; if not, see
-%%PORTSDIR%%/www/horde-devel/pkg-message.
+%%PORTSDIR%%/www/horde2/pkg-message.
 
 Then, you will have to tune the configuration files located in
 %%CONFDIR%%/, specially the files conf.php and


	6) Apply this patch on www/horde:

diff -ur /usr/ports/www/horde.orig/Makefile /usr/ports/www/horde/Makefile
--- /usr/ports/www/horde.orig/Makefile	Sat Feb 16 16:29:49 2002
+++ /usr/ports/www/horde/Makefile	Sun Feb 17 14:58:26 2002
@@ -77,7 +77,7 @@
 pre-install:
 	@if [ -f ${HORDEDIR}/index.php ]; then \
 		${ECHO_MSG} "" ; \
-		${ECHO_MSG} "Please deinstall the port www/horde-devel." ; \
+		${ECHO_MSG} "Please deinstall the port www/horde2." ; \
 		${ECHO_MSG} "" ; \
 		${FALSE} ; \
 	 fi
diff -ur /usr/ports/www/horde.orig/pkg-comment /usr/ports/www/horde/pkg-comment
--- /usr/ports/www/horde.orig/pkg-comment	Sat Aug 18 06:17:52 2001
+++ /usr/ports/www/horde/pkg-comment	Sun Feb 17 14:59:04 2002
@@ -1 +1 @@
-A common code-base used by Horde applications, written in PHP
+A common code-base used by Horde applications, written in PHP3
diff -ur /usr/ports/www/horde.orig/pkg-descr /usr/ports/www/horde/pkg-descr
--- /usr/ports/www/horde.orig/pkg-descr	Sat Aug 18 06:17:52 2001
+++ /usr/ports/www/horde/pkg-descr	Sun Feb 17 15:02:49 2002
@@ -1,3 +1,6 @@
+Note: this port is mostly for sites running PHP3.
+      For a new installation, please consider the port www/horde2.
+
 Horde is both a piece of software and a project.
 
 The Horde Project comprises a set of Web-based productivity, messaging,
@@ -12,5 +15,3 @@
 port mail/imp).
 
 WWW: http://www.horde.org/
-
-- Thierry Thomas <thierry@thomas.as>.


	7) Apply this patch on mail/imp:

diff -ru /usr/ports/mail/imp.orig/Makefile /usr/ports/mail/imp/Makefile
--- /usr/ports/mail/imp.orig/Makefile	Sun Jan 20 23:32:43 2002
+++ /usr/ports/mail/imp/Makefile	Sun Feb 17 15:06:35 2002
@@ -121,7 +121,7 @@
 # N.B.: database dependencies are binded with mod_php#, neither by Horde nor IMP.
 	@if [ -f ${IMPDIR}/index.php ]; then \
 	    ${ECHO_MSG} "" ; \
-	    ${ECHO_MSG} "Please deinstall the port mail/imp-devel." ; \
+	    ${ECHO_MSG} "Please deinstall the port mail/imp3." ; \
 	    ${ECHO_MSG} "" ; \
 	    ${FALSE} ; \
 	fi
diff -ru /usr/ports/mail/imp.orig/pkg-descr /usr/ports/mail/imp/pkg-descr
--- /usr/ports/mail/imp.orig/pkg-descr	Mon Sep  3 19:22:23 2001
+++ /usr/ports/mail/imp/pkg-descr	Sun Feb 17 15:08:08 2002
@@ -1,8 +1,9 @@
-IMP is a set of PHP scripts that implement an IMAP based webmail system.
+Note: this port is mostly for sites running PHP3.
+      For a new installation, please consider the port mail/imp3.
+
+IMP is a set of PHP3 scripts that implement an IMAP based webmail system.
 Assuming you have an account on a server that supports IMAP, you can use
 an installation of IMP to check your mail from anywhere that you have web
 access.
 
 WWW: http://www.horde.org/imp/
-
-- Thierry Thomas <thierry@thomas.as>.
>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?20020217155035.A1CC57523>