Date: Tue, 11 Mar 2003 23:47:01 +0100 (CET) From: Thierry Thomas <thierry@pompo.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/49122: mail/turba: upgrading to 1.2. Message-ID: <20030311224701.347ED7513@graf.pompo.net>
next in thread | raw e-mail | index | archive | help
>Number: 49122 >Category: ports >Synopsis: mail/turba: upgrading to 1.2. >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Mar 11 14:50:04 PST 2003 >Closed-Date: >Last-Modified: >Originator: Thierry Thomas >Release: FreeBSD 4.8-PRERELEASE i386 >Organization: Kabbale Eros >Environment: System: FreeBSD graf.pompo.net 4.8-PRERELEASE FreeBSD 4.8-PRERELEASE #0: Fri Feb 28 22:45:45 CET 2003 root@graf.pompo.net:/usr/obj/mntsrc/src/sys/GRAF020727 i386 >Description: Changes since Turba 1.1 include: - distribution list support, - improved LDAP and Horde API capabilities, - linking of addresses to maps, - improved vCard support, - a preferences-based addressbook driver, - new Catalan, Latvian, Lithuanian, and Bulgarian translations, - import/export support for TSV, Mulberry, and Pine addressbooks, - and the usual minor bugfixes and useability improvements. >How-To-Repeat: N/A. >Fix: Related PR: this PR must be committed with ports/48645. Please apply the following patch: diff -urN mail/turba.orig/Makefile mail/turba/Makefile --- mail/turba.orig/Makefile Mon Feb 24 03:56:34 2003 +++ mail/turba/Makefile Tue Mar 11 23:26:27 2003 @@ -6,8 +6,7 @@ # PORTNAME= turba -PORTVERSION= 1.1 -PORTREVISION= 3 +PORTVERSION= 1.2 CATEGORIES= mail www MASTER_SITES= ftp://ftp.horde.org/pub/turba/ \ ftp://ftp.au.horde.org/pub/horde/turba/ \ @@ -19,8 +18,6 @@ MAINTAINER= thierry@pompo.net COMMENT= The Horde contact management application -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - #----------------------------------------------------------------------- # You may define these options: # @@ -46,9 +43,11 @@ NO_BUILD= yes USE_REINPLACE= yes +LDD= /usr/bin/ldd + REINPLACE_ARGS= -i.beforeTurba DOCS= COPYING README docs/CHANGES docs/CREDITS \ - docs/INSTALL docs/turba.dia docs/turba.pdf + docs/INSTALL docs/LDAP docs/UPDATE docs/turba.dia docs/turba.pdf CONFFILE= attributes.php conf.php html.php menu.php \ prefs.php sources.php SUB_DIRS= config graphics lib locale scripts templates po @@ -63,18 +62,19 @@ CONFDIR= ${TURBADIR}/config HORDE_INC= ${LOCALBASE}/etc/horde +PHPSO?= ${LOCALBASE}/libexec/apache/libphp4.so pre-install: .if !defined(WITHOUT_LDAP) .if defined(WITH_LDAP1) - @if ! ${LDCONFIG} -r | ${GREP} -q -e "ldap.1"; then \ + @if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libldap.so.1"; then \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} "Please configure PHP with OpenLDAP support." ; \ ${ECHO_MSG} "" ; \ ${FALSE} ; \ fi .else - @if ! ${LDCONFIG} -r | ${GREP} -q -e "ldap.2"; then \ + @if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libldap.so.2"; then \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} "Please configure PHP with OpenLDAP2 support." ; \ ${ECHO_MSG} "" ; \ diff -urN mail/turba.orig/distinfo mail/turba/distinfo --- mail/turba.orig/distinfo Tue Jun 18 09:39:35 2002 +++ mail/turba/distinfo Tue Mar 11 21:56:10 2003 @@ -1 +1 @@ -MD5 (turba-1.1.tar.gz) = 1b5b3cdf1eeb80fe8a1e9a2ae9000723 +MD5 (turba-1.2.tar.gz) = 7c082cdbeb499eef99ff4dbf6b3608f5 diff -urN mail/turba.orig/files/patch-ab mail/turba/files/patch-ab --- mail/turba.orig/files/patch-ab Tue Jun 18 20:28:27 2002 +++ mail/turba/files/patch-ab Tue Feb 25 21:52:30 2003 @@ -1,6 +1,6 @@ ---- config/sources.php.dist.orig Thu Jun 6 16:06:36 2002 -+++ config/sources.php.dist Tue Jun 11 19:28:01 2002 -@@ -134,10 +134,11 @@ +--- config/sources.php.dist.orig Mon Feb 10 02:14:22 2003 ++++ config/sources.php.dist Tue Feb 25 21:51:29 2003 +@@ -140,10 +140,11 @@ 'title' => 'My Addressbook', 'type' => 'sql', 'params' => array( @@ -14,3 +14,35 @@ 'database' => 'horde', 'table' => 'turba_objects' ), +@@ -181,6 +182,7 @@ + * A local address book in an LDAP directory. This implements a public + * (shared) address book. + */ ++/* + $cfgSources['localldap'] = array( + 'title' => 'Shared Directory', + 'type' => 'ldap', +@@ -219,6 +221,7 @@ + 'admin' => array(), + 'export' => true + ); ++*/ + + /** + * A personal adressbook. This assumes that the login is +@@ -229,6 +232,7 @@ + */ + + // First we need to get the uid. ++/* + $uid = Auth::getAuth(); + preg_match('/(^.*)@/', $uid, $uid); + $uid = $uid[1]; +@@ -284,6 +288,7 @@ + 'admin' => array($uid), + 'export' => true + ); ++*/ + + /** + * A preferences-based adressbook. This will always be private. You diff -urN mail/turba.orig/pkg-message mail/turba/pkg-message --- mail/turba.orig/pkg-message Wed May 15 22:00:19 2002 +++ mail/turba/pkg-message Tue Mar 11 22:32:11 2003 @@ -11,6 +11,12 @@ You have to create a table in your database; please see %%TURBADIR%%/scripts/drivers. +You might create a LDAP schema: please see the doc LDAP. + +WARNING! if you are upgrading from Turba v. 1.1, you have to alter your +******** schemas. Please read the doc UPDATE. An example is given for + MySQL in %%TURBADIR%%/scripts/drivers/: + - mysql_upgrade_1.1_to_1.2.sql. To protect your configuration files, you have to restart Apache. ************************************************************************ diff -urN mail/turba.orig/pkg-plist mail/turba/pkg-plist --- mail/turba.orig/pkg-plist Tue Jun 18 09:39:35 2002 +++ mail/turba/pkg-plist Tue Mar 11 22:23:31 2003 @@ -2,7 +2,9 @@ %%PORTDOCS%%share/doc/turba/COPYING %%PORTDOCS%%share/doc/turba/CREDITS %%PORTDOCS%%share/doc/turba/INSTALL +%%PORTDOCS%%share/doc/turba/LDAP %%PORTDOCS%%share/doc/turba/README +%%PORTDOCS%%share/doc/turba/UPDATE %%PORTDOCS%%share/doc/turba/turba.dia %%PORTDOCS%%share/doc/turba/turba.pdf %%TURBADIR%%/addobject.php @@ -31,9 +33,12 @@ %%TURBADIR%%/editobject.php %%TURBADIR%%/editobjectaction.php %%TURBADIR%%/graphics/add.gif +%%TURBADIR%%/graphics/checkbox.gif +%%TURBADIR%%/graphics/close.gif %%TURBADIR%%/graphics/down.gif %%TURBADIR%%/graphics/group.gif %%TURBADIR%%/graphics/lhand.gif +%%TURBADIR%%/graphics/map.gif %%TURBADIR%%/graphics/rhand.gif %%TURBADIR%%/graphics/search.gif %%TURBADIR%%/graphics/turba.gif @@ -44,6 +49,7 @@ %%TURBADIR%%/lib/AbstractObject.php %%TURBADIR%%/lib/Driver.php %%TURBADIR%%/lib/Driver/ldap.php +%%TURBADIR%%/lib/Driver/prefs.php %%TURBADIR%%/lib/Driver/sql.php %%TURBADIR%%/lib/Group.php %%TURBADIR%%/lib/List.php @@ -62,18 +68,25 @@ %%TURBADIR%%/lib/base.php %%TURBADIR%%/lib/version.php %%TURBADIR%%/locale/.htaccess +%%TURBADIR%%/locale/bg_BG/LC_MESSAGES/turba.mo +%%TURBADIR%%/locale/ca_ES/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/cs_CZ/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/da_DK/LC_MESSAGES/turba.mo +%%TURBADIR%%/locale/de_DE/help.xml %%TURBADIR%%/locale/de_DE/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/el_GR/LC_MESSAGES/turba.mo +%%TURBADIR%%/locale/en_US/help.xml %%TURBADIR%%/locale/es_ES/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/et_EE/LC_MESSAGES/turba.mo +%%TURBADIR%%/locale/fi_FI/help.xml %%TURBADIR%%/locale/fi_FI/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/fr_FR/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/hu_HU/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/it_IT/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/ja_JP/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/ko_KR/LC_MESSAGES/turba.mo +%%TURBADIR%%/locale/lt_LT/LC_MESSAGES/turba.mo +%%TURBADIR%%/locale/lv_LV/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/nb_NO/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/nl_NL/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/nn_NO/LC_MESSAGES/turba.mo @@ -82,6 +95,7 @@ %%TURBADIR%%/locale/pt_PT/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/ru_RU/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/ru_RU.KOI8-R/LC_MESSAGES/turba.mo +%%TURBADIR%%/locale/sk_SK/help.xml %%TURBADIR%%/locale/sk_SK/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/sl_SI/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/sv_SE/LC_MESSAGES/turba.mo @@ -92,6 +106,8 @@ %%TURBADIR%%/po/.htaccess %%TURBADIR%%/po/Makefile %%TURBADIR%%/po/README +%%TURBADIR%%/po/bg_BG.po +%%TURBADIR%%/po/ca_ES.po %%TURBADIR%%/po/cs_CZ.po %%TURBADIR%%/po/da_DK.po %%TURBADIR%%/po/de_DE.po @@ -105,6 +121,8 @@ %%TURBADIR%%/po/it_IT.po %%TURBADIR%%/po/ja_JP.po %%TURBADIR%%/po/ko_KR.po +%%TURBADIR%%/po/lt_LT.po +%%TURBADIR%%/po/lv_LV.po %%TURBADIR%%/po/nb_NO.po %%TURBADIR%%/po/nl_NL.po %%TURBADIR%%/po/nn_NO.po @@ -117,13 +135,21 @@ %%TURBADIR%%/po/sk_SK.po %%TURBADIR%%/po/sl_SI.po %%TURBADIR%%/po/sv_SE.po +%%TURBADIR%%/po/turba.pot %%TURBADIR%%/po/uk_UA.po %%TURBADIR%%/po/xgettext.sh %%TURBADIR%%/po/zh_CN.po %%TURBADIR%%/po/zh_TW.po %%TURBADIR%%/prefs.php %%TURBADIR%%/scripts/.htaccess +%%TURBADIR%%/scripts/Turba.reg +%%TURBADIR%%/scripts/drivers/mysql_create.sql +%%TURBADIR%%/scripts/drivers/mysql_upgrade_1.1_to_1.2.sql +%%TURBADIR%%/scripts/drivers/pgsql_create.sql %%TURBADIR%%/scripts/drivers/turba.sql +%%TURBADIR%%/scripts/ldap/addou +%%TURBADIR%%/scripts/ldap/addou.pl +%%TURBADIR%%/scripts/ldap/core.schema.patch %%TURBADIR%%/search.php %%TURBADIR%%/status.php %%TURBADIR%%/templates/.htaccess @@ -134,8 +160,15 @@ %%TURBADIR%%/templates/advanced/foot.inc %%TURBADIR%%/templates/advanced/head.inc %%TURBADIR%%/templates/advanced/results_head.inc -%%TURBADIR%%/templates/browse/foot.inc -%%TURBADIR%%/templates/browse/head.inc +%%TURBADIR%%/templates/browse/actions.inc +%%TURBADIR%%/templates/browse/column_footers.inc +%%TURBADIR%%/templates/browse/column_headers.inc +%%TURBADIR%%/templates/browse/contactrow.inc +%%TURBADIR%%/templates/browse/footer.inc +%%TURBADIR%%/templates/browse/header.inc +%%TURBADIR%%/templates/browse/javascript.inc +%%TURBADIR%%/templates/browse/search.inc +%%TURBADIR%%/templates/browse/select.inc %%TURBADIR%%/templates/common-footer.inc %%TURBADIR%%/templates/common-header.inc %%TURBADIR%%/templates/data/export.inc @@ -145,16 +178,13 @@ %%TURBADIR%%/templates/index/css.inc %%TURBADIR%%/templates/index/notconfigured.inc %%TURBADIR%%/templates/menu/menu.inc +%%TURBADIR%%/templates/miniwindow/frames.inc +%%TURBADIR%%/templates/miniwindow/menu.inc %%TURBADIR%%/templates/prefs/columnselect.inc %%TURBADIR%%/templates/search/foot.inc %%TURBADIR%%/templates/search/head.inc %%TURBADIR%%/templates/search/row.inc -%%TURBADIR%%/templates/wml/common-footer.inc -%%TURBADIR%%/templates/wml/common-header.inc -%%TURBADIR%%/templates/wml/menu/menu.inc -%%TURBADIR%%/templates/wml/search/foot.inc -%%TURBADIR%%/templates/wml/search/head.inc -%%TURBADIR%%/templates/wml/search/row.inc +%%TURBADIR%%/miniwindow.php etc/horde/httpd.conf.turba %%PORTDOCS%%@dirrm share/doc/turba @dirrm %%TURBADIR%%/config @@ -164,6 +194,10 @@ @dirrm %%TURBADIR%%/lib/ListView @dirrm %%TURBADIR%%/lib/ObjectView @dirrm %%TURBADIR%%/lib +@dirrm %%TURBADIR%%/locale/bg_BG/LC_MESSAGES +@dirrm %%TURBADIR%%/locale/bg_BG +@dirrm %%TURBADIR%%/locale/ca_ES/LC_MESSAGES +@dirrm %%TURBADIR%%/locale/ca_ES @dirrm %%TURBADIR%%/locale/cs_CZ/LC_MESSAGES @dirrm %%TURBADIR%%/locale/cs_CZ @dirrm %%TURBADIR%%/locale/da_DK/LC_MESSAGES @@ -172,6 +206,7 @@ @dirrm %%TURBADIR%%/locale/de_DE @dirrm %%TURBADIR%%/locale/el_GR/LC_MESSAGES @dirrm %%TURBADIR%%/locale/el_GR +@dirrm %%TURBADIR%%/locale/en_US @dirrm %%TURBADIR%%/locale/es_ES/LC_MESSAGES @dirrm %%TURBADIR%%/locale/es_ES @dirrm %%TURBADIR%%/locale/et_EE/LC_MESSAGES @@ -188,6 +223,10 @@ @dirrm %%TURBADIR%%/locale/ja_JP @dirrm %%TURBADIR%%/locale/ko_KR/LC_MESSAGES @dirrm %%TURBADIR%%/locale/ko_KR +@dirrm %%TURBADIR%%/locale/lt_LT/LC_MESSAGES +@dirrm %%TURBADIR%%/locale/lt_LT +@dirrm %%TURBADIR%%/locale/lv_LV/LC_MESSAGES +@dirrm %%TURBADIR%%/locale/lv_LV @dirrm %%TURBADIR%%/locale/nb_NO/LC_MESSAGES @dirrm %%TURBADIR%%/locale/nb_NO @dirrm %%TURBADIR%%/locale/nl_NL/LC_MESSAGES @@ -219,6 +258,7 @@ @dirrm %%TURBADIR%%/locale @dirrm %%TURBADIR%%/po @dirrm %%TURBADIR%%/scripts/drivers +@dirrm %%TURBADIR%%/scripts/ldap @dirrm %%TURBADIR%%/scripts @dirrm %%TURBADIR%%/templates/add @dirrm %%TURBADIR%%/templates/advanced @@ -228,11 +268,9 @@ @dirrm %%TURBADIR%%/templates/edit @dirrm %%TURBADIR%%/templates/index @dirrm %%TURBADIR%%/templates/menu +@dirrm %%TURBADIR%%/templates/miniwindow @dirrm %%TURBADIR%%/templates/prefs @dirrm %%TURBADIR%%/templates/search -@dirrm %%TURBADIR%%/templates/wml/menu -@dirrm %%TURBADIR%%/templates/wml/search -@dirrm %%TURBADIR%%/templates/wml @dirrm %%TURBADIR%%/templates @dirrm %%TURBADIR%% @unexec if cmp -s %D/www/horde/config/registry.php %D/www/horde/config/registry.php.afterTurba; then rm -f %D/www/horde/config/registry.php.afterTurba; mv %D/www/horde/config/registry.php.beforeTurba %D/www/horde/config/registry.php; fi >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030311224701.347ED7513>