Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 12 Jun 2002 00:00:33 +0200 (CEST)
From:      Thierry Thomas <thierry@pompo.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/39172: devel/chora: upgrade to 1.1 final.
Message-ID:  <20020611220033.C903375FD@graf.pompo.net>

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

>Number:         39172
>Category:       ports
>Synopsis:       devel/chora: upgrade to 1.1 final.
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 11 15:10:04 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:
	This PR upgrades devel/chora from 1.1-RC1 to 1.1 final.

>How-To-Repeat:
	N/A.

>Fix:

	Pre-requisite: PR ports/39170 (www/horde2) 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	Sat May 25 21:34:19 2002
+++ /usr/ports/devel/chora/Makefile	Tue Jun 11 23:04:46 2002
@@ -7,15 +7,13 @@
 
 PORTNAME=	chora
 PORTVERSION=	1.1
+PORTREVISION=	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
+MASTER_SITES=	ftp://ftp.horde.org/pub/chora/tarballs/%SUBDIR%/
+MASTER_SITE_SUBDIR=	. old
 
 MAINTAINER=	thierry@pompo.net
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 #-----------------------------------------------------------------------
 # You may define these options:
 #
@@ -79,12 +77,20 @@
 	@${CP} -p ${FILESDIR}/httpd.conf.chora ${HORDE_INC}
 	@${PERL} -pi -e "s:/home/httpd/html/horde/chora:${CHORADIR}:g" \
 		${HORDE_INC}/httpd.conf.chora
+	@${CP} -p ${HORDEDIR}/config/registry.php		\
+		${HORDEDIR}/config/registry.php.beforeChora
+	@${CP} -p ${HORDEDIR}/config/mime_drivers.php		\
+		${HORDEDIR}/config/mime_drivers.php.beforeChora
 	@${PERL} -pi -e "s://UNCOMMENTWHENINSTCHORA::" \
 		${HORDEDIR}/config/registry.php
 .if !defined(WITHOUT_ENSCRIPT)
 	@${PERL} -pi -e "s://UNCOMMENTWHENINSTCHORA::" \
 		${HORDEDIR}/config/mime_drivers.php
 .endif
+	@${CP} -p ${HORDEDIR}/config/registry.php		\
+		${HORDEDIR}/config/registry.php.afterChora
+	@${CP} -p ${HORDEDIR}/config/mime_drivers.php		\
+		${HORDEDIR}/config/mime_drivers.php.afterChora
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCS}
diff -urN /usr/ports/devel/chora.orig/distinfo /usr/ports/devel/chora/distinfo
--- /usr/ports/devel/chora.orig/distinfo	Sat May 25 21:34:19 2002
+++ /usr/ports/devel/chora/distinfo	Tue Jun 11 23:07:16 2002
@@ -1 +1 @@
-MD5 (chora-1.1-RC1.tar.gz) = b90276bbf6d731943f596cefdd16c863
+MD5 (chora-1.1.tar.gz) = fffcdc04a6440ec42bdc62de79941a4a
diff -urN /usr/ports/devel/chora.orig/pkg-plist /usr/ports/devel/chora/pkg-plist
--- /usr/ports/devel/chora.orig/pkg-plist	Sat May 25 21:34:19 2002
+++ /usr/ports/devel/chora/pkg-plist	Wed May 22 23:03:40 2002
@@ -147,3 +147,5 @@
 @dirrm %%CHORADIR%%/templates/log
 @dirrm %%CHORADIR%%/templates
 @dirrm %%CHORADIR%%
+@unexec if cmp -s %D/www/horde/config/mime_drivers.php %D/www/horde/config/mime_drivers.php.afterChora; then rm -f %D/www/horde/config/mime_drivers.php.afterChora; mv %D/www/horde/config/mime_drivers.php.beforeChora %D/www/horde/config/mime_drivers.php; fi
+@unexec if cmp -s %D/www/horde/config/registry.php %D/www/horde/config/registry.php.afterChora; then rm -f %D/www/horde/config/registry.php.afterChora; mv %D/www/horde/config/registry.php.beforeChora %D/www/horde/config/registry.php; fi
>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?20020611220033.C903375FD>