From thierry@pompo.net  Wed Feb  5 13:52:30 2003
Return-Path: <thierry@pompo.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3ED6337B43D
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  5 Feb 2003 13:52:27 -0800 (PST)
Received: from postfix4-1.free.fr (postfix4-1.free.fr [213.228.0.62])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DE4A343F43
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  5 Feb 2003 13:52:24 -0800 (PST)
	(envelope-from thierry@pompo.net)
Received: from graf.pompo.net (lyon-2-a7-62-147-20-219.dial.proxad.net [62.147.20.219])
	by postfix4-1.free.fr (Postfix) with ESMTP id 3BE7815D04
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  5 Feb 2003 22:52:21 +0100 (CET)
Received: by graf.pompo.net (Postfix, from userid 1001)
	id C0B9B750F; Wed,  5 Feb 2003 22:50:13 +0100 (CET)
Message-Id: <20030205215013.C0B9B750F@graf.pompo.net>
Date: Wed,  5 Feb 2003 22:50:13 +0100 (CET)
From: Thierry Thomas <thierry@pompo.net>
Reply-To: Thierry Thomas <thierry@pompo.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: www/horde2: upgrading to 2.2.1.
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         47977
>Category:       ports
>Synopsis:       www/horde2: upgrading to 2.2.1.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Feb 05 14:00:25 PST 2003
>Closed-Date:    Sat Feb 15 15:47:50 PST 2003
>Last-Modified:  Sat Feb 15 15:47:50 PST 2003
>Originator:     Thierry Thomas
>Release:        FreeBSD 4.7-STABLE i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD graf.pompo.net 4.7-STABLE FreeBSD 4.7-STABLE #0: Sun Dec 29 12:46:07 CET 2002 root@graf.pompo.net:/usr/obj/mntsrc/src/sys/GRAF020727 i386


	
>Description:
	This version fixes a few bugs introduced with Horde 2.2.

	This PR fixes pkg-deinstall where there is no sed_inplace.

>How-To-Repeat:
	N/A.

>Fix:

	Please apply the following patch:
	(warning, patch-po_translation.php and patch-scripts_db_README
	are two new files)


diff -urN www/horde2.orig/Makefile www/horde2/Makefile
--- www/horde2.orig/Makefile	Thu Jan 30 14:42:37 2003
+++ www/horde2/Makefile	Wed Feb  5 22:12:37 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	horde
-PORTVERSION=	2.2
+PORTVERSION=	2.2.1
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.horde.org/pub/horde/				\
 		ftp://ftp.au.horde.org/pub/horde/			\
@@ -30,9 +30,9 @@
 .endif
 # Remark: pear-XML_sql2xml is included, but never used.
 RUN_DEPENDS=	${PHP_LIB}/Crypt/CBC.php:${PORTSDIR}/security/pear-Crypt_CBC	\
-		${PHP_LIB}/Date.php:${PORTSDIR}/devel/pear-Date		\
-		${PHP_LIB}/HTML/Select.php:${PORTSDIR}/devel/pear-HTML_Select	\
-		${PHP_LIB}/Log.php:${PORTSDIR}/sysutils/pear-Log	\
+		${PHP_LIB}/Date.php:${PORTSDIR}/devel/pear-Date			\
+		${PHP_LIB}/HTML/Select.php:${PORTSDIR}/devel/pear-HTML_Select_Common \
+		${PHP_LIB}/Log.php:${PORTSDIR}/sysutils/pear-Log		\
 		${PHP_LIB}/Mail/mime.php:${PORTSDIR}/mail/pear-Mail_Mime
 
 NO_BUILD=	yes
@@ -42,7 +42,8 @@
 
 REINPLACE_ARGS=	-i.beforeHorde
 DOCS=		COPYING README docs/CHANGES docs/CODING_STANDARDS \
-		docs/CONTRIBUTING docs/CREDITS docs/HACKING docs/INSTALL
+		docs/CONTRIBUTING docs/CREDITS docs/HACKING docs/INSTALL \
+		docs/TRANSLATIONS
 CONFFILE=	html.php lang.php mime_drivers.php mime_mapping.php \
 		motd.php prefs.php registry.php
 SUB_DIRS=	config graphics lib locale po scripts templates util
@@ -76,6 +77,12 @@
 	@if [ -f ${HORDEDIR}/index.php3 ]; then \
 	    ${ECHO_MSG} "" ; \
 	    ${ECHO_MSG} "Please deinstall the port www/horde." ; \
+	    ${ECHO_MSG} "" ; \
+	    ${FALSE} ; \
+	fi
+	@if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libxml2.so"; then \
+	    ${ECHO_MSG} "" ; \
+	    ${ECHO_MSG} "Please configure PHP with DOM XML support." ; \
 	    ${ECHO_MSG} "" ; \
 	    ${FALSE} ; \
 	fi
diff -urN www/horde2.orig/distinfo www/horde2/distinfo
--- www/horde2.orig/distinfo	Thu Jan 30 14:42:37 2003
+++ www/horde2/distinfo	Wed Feb  5 22:07:57 2003
@@ -1 +1 @@
-MD5 (horde-2.2.tar.gz) = 3074fe5e4a284e74af37e608f9981401
+MD5 (horde-2.2.1.tar.gz) = 0a1e087f5017524a6b1b3d62204f49bb
diff -urN www/horde2.orig/files/patch-po_translation.php www/horde2/files/patch-po_translation.php
--- www/horde2.orig/files/patch-po_translation.php	Thu Jan  1 01:00:00 1970
+++ www/horde2/files/patch-po_translation.php	Wed Jan 29 23:01:29 2003
@@ -0,0 +1,8 @@
+--- po/translation.php.orig	Tue Jan 21 16:05:36 2003
++++ po/translation.php	Wed Jan 29 23:00:27 2003
+@@ -1,4 +1,4 @@
+-#!/usr/bin/php -q
++#!/usr/local/bin/php -q
+ <?php
+ /**
+  * Translation helper application for the Horde framework.
diff -urN www/horde2.orig/files/patch-scripts_db_README www/horde2/files/patch-scripts_db_README
--- www/horde2.orig/files/patch-scripts_db_README	Thu Jan  1 01:00:00 1970
+++ www/horde2/files/patch-scripts_db_README	Wed Jan 29 23:11:15 2003
@@ -0,0 +1,11 @@
+--- scripts/db/README.orig	Wed Jul 17 22:19:29 2002
++++ scripts/db/README	Wed Jan 29 23:10:35 2003
+@@ -70,7 +70,7 @@
+ 
+ PostgreSQL
+ ~~~~~~~~~~
+-# su - postgres  (or whatever your database runs as... usually postgres)
++# su - pgsql  (or whatever your database runs as... usually pgsql)
+ $ psql -d template1 -f pgsql_create.sql
+ 
+ This script will create a "horde" database and a "horde" user.  You
diff -urN www/horde2.orig/pkg-deinstall www/horde2/pkg-deinstall
--- www/horde2.orig/pkg-deinstall	Thu Jan 30 14:42:38 2003
+++ www/horde2/pkg-deinstall	Mon Feb  3 00:22:18 2003
@@ -11,7 +11,7 @@
 if [ -f ${PKG_PREFIX}/etc/apache/httpd.conf.beforeHorde ] ; then
 	echo "Restoring httpd.conf..."
 	cp ${PKG_PREFIX}/etc/apache/httpd.conf ${PKG_PREFIX}/etc/apache/httpd.conf.deinstHorde
-	sed_inplace -i.tmp -e "s:Include ${PKG_PREFIX}/etc/horde:# Include ${PKG_PREFIX}/etc/horde:g" \
+	sed -i.tmp -e "s:Include ${PKG_PREFIX}/etc/horde:# Include ${PKG_PREFIX}/etc/horde:g" \
 		${PKG_PREFIX}/etc/apache/httpd.conf
 	rm ${PKG_PREFIX}/etc/apache/httpd.conf.tmp
 fi
diff -urN www/horde2.orig/pkg-plist www/horde2/pkg-plist
--- www/horde2.orig/pkg-plist	Thu Jan 30 14:42:38 2003
+++ www/horde2/pkg-plist	Wed Feb  5 22:16:06 2003
@@ -237,6 +237,7 @@
 %%HORDEDIR%%/po/sl_SI.po
 %%HORDEDIR%%/po/sv_SE.po
 %%HORDEDIR%%/po/translation.php
+%%HORDEDIR%%/po/translation.php.orig
 %%HORDEDIR%%/po/uk_UA.po
 %%HORDEDIR%%/po/xgettext.sh
 %%HORDEDIR%%/po/zh_CN.po
@@ -246,6 +247,7 @@
 %%HORDEDIR%%/scripts/.htaccess
 %%HORDEDIR%%/scripts/SCRIPTS
 %%HORDEDIR%%/scripts/db/README
+%%HORDEDIR%%/scripts/db/README.orig
 %%HORDEDIR%%/scripts/db/auth.sql
 %%HORDEDIR%%/scripts/db/category.sql
 %%HORDEDIR%%/scripts/db/category_mysql.sql
@@ -320,6 +322,7 @@
 %%PORTDOCS%%share/doc/horde/HACKING
 %%PORTDOCS%%share/doc/horde/INSTALL
 %%PORTDOCS%%share/doc/horde/README
+%%PORTDOCS%%share/doc/horde/TRANSLATIONS
 %%PORTDOCS%%@dirrm share/doc/horde
 @dirrm %%HORDEDIR%%/config
 @dirrm %%HORDEDIR%%/graphics/alerts
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: leeym 
State-Changed-When: Sat Feb 15 15:47:41 PST 2003 
State-Changed-Why:  
Committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=47977 
>Unformatted:
