diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile index ad5858b7da2e..36ce4a7fe945 100644 --- a/mail/horde-turba/Makefile +++ b/mail/horde-turba/Makefile @@ -6,7 +6,7 @@ # PORTNAME= turba -PORTVERSION= 1.2.2 +PORTVERSION= 2.0 CATEGORIES= mail www MASTER_SITES= ftp://ftp.horde.org/pub/turba/ \ ftp://ftp.planetmirror.com/pub/horde/turba/ \ @@ -17,6 +17,7 @@ MASTER_SITES= ftp://ftp.horde.org/pub/turba/ \ ftp://ftp.nl.horde.org/mirror/horde-ftp/pub/turba/ \ ftp://ftp.uk.horde.org/mirrors/ftp.horde.org/pub/turba/ \ http://ftp.horde.org/pub/turba/ +DISTNAME= ${PORTNAME}-h3-${PORTVERSION} MAINTAINER= thierry@FreeBSD.org COMMENT= The Horde contact management application @@ -28,48 +29,37 @@ COMMENT= The Horde contact management application # #----------------------------------------------------------------------- -RUN_DEPENDS= ${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde2 +RUN_DEPENDS+= ${LOCALBASE}/www/horde/rpc.php:${PORTSDIR}/www/horde .if !defined(WITHOUT_LDAP) -USE_OPENLDAP= yes +USE_PHP= ldap .endif NO_BUILD= yes USE_REINPLACE= yes -REINPLACE_ARGS= -i.beforeTurba +REINPLACE_ARGS= -i "" DOCS= COPYING README docs/CHANGES docs/CREDITS docs/INSTALL \ - docs/INSTALL docs/LDAP docs/RELEASE_NOTES 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 + docs/LDAP docs/RELEASE_NOTES docs/TODO docs/UPGRADING +CONFFILE= attributes.php menu.php prefs.php sources.php +SUB_DIRS= config lib locale po scripts templates themes LHORDEDIR?= www/horde LTURBADIR?= ${LHORDEDIR}/turba -PLIST_SUB= HORDEDIR=${LHORDEDIR} TURBADIR=${LTURBADIR} +PLIST_SUB= TURBADIR=${LTURBADIR} +PKGMESSAGE= ${WRKDIR}/pkg-message -HORDEDIR= ${PREFIX}/${LHORDEDIR} TURBADIR= ${PREFIX}/${LTURBADIR} CONFDIR= ${TURBADIR}/config HORDE_INC= ${LOCALBASE}/etc/horde -post-patch: - @${RM} ${WRKSRC}/config/conf.php.dist.orig \ - ${WRKSRC}/config/prefs.php.dist.orig \ - ${WRKSRC}/config/sources.php.dist.orig - -pre-install: -.if !defined(WITHOUT_LDAP) - @if ! php -m | ${GREP} -q -e "ldap"; then \ - ${ECHO_MSG} "" ; \ - ${ECHO_MSG} "Please configure PHP with OpenLDAP support." ; \ - ${ECHO_MSG} "" ; \ - ${FALSE} ; \ - fi -.endif +pre-configure: + @${SED} -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" \ + ${FILESDIR}/httpd.conf.turba > ${WRKDIR}/httpd.conf.turba + @${REINPLACE_CMD} -e "s:/usr/bin/ldapadd:${LOCALBASE}/bin/ldapadd:" \ + ${WRKSRC}/scripts/ldap/addou.pl do-install: @${MKDIR} ${TURBADIR} @@ -82,16 +72,9 @@ do-install: ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \ fi .endfor - @${CHOWN} -R www:www ${TURBADIR} + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TURBADIR} @${CHMOD} -R o-rwx ${CONFDIR} - @${CP} -p ${FILESDIR}/httpd.conf.turba ${HORDE_INC} - @${REINPLACE_CMD} -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" \ - ${HORDE_INC}/httpd.conf.turba - @${RM} ${HORDE_INC}/httpd.conf.turba.beforeTurba - @${REINPLACE_CMD} -e "s://UNCOMMENTWHENINSTTURBA::" \ - ${HORDEDIR}/config/registry.php - @${CP} -p ${HORDEDIR}/config/registry.php \ - ${HORDEDIR}/config/registry.php.afterTurba + @${INSTALL_DATA} ${WRKDIR}/httpd.conf.turba ${HORDE_INC} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for FILE in ${DOCS} @@ -101,9 +84,10 @@ do-install: .endif post-install: + @${SED} -e "s:%%TURBADIR%%:${TURBADIR}:;s:%%CONFDIR%%:${CONFDIR}:" \ + < ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} @${ECHO_MSG} - @${SED} -e "s:%%TURBADIR%%:${TURBADIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g" \ - -e "s:%%CONFDIR%%:${CONFDIR}:g" ${PKGMESSAGE} + @${CAT} ${PKGMESSAGE} @${ECHO_MSG} .include diff --git a/mail/horde-turba/distinfo b/mail/horde-turba/distinfo index c06cf61b8683..c766d26b8bd2 100644 --- a/mail/horde-turba/distinfo +++ b/mail/horde-turba/distinfo @@ -1,2 +1,2 @@ -MD5 (turba-1.2.2.tar.gz) = 27d9ebbe6723dcb0e4aa61045feb60b0 -SIZE (turba-1.2.2.tar.gz) = 508914 +MD5 (turba-h3-2.0.tar.gz) = 23f143958fb72b9bf94a04a14e1cfd92 +SIZE (turba-h3-2.0.tar.gz) = 1153884 diff --git a/mail/horde-turba/files/patch-aa b/mail/horde-turba/files/patch-aa deleted file mode 100644 index 81d0eeaf6419..000000000000 --- a/mail/horde-turba/files/patch-aa +++ /dev/null @@ -1,7 +0,0 @@ ---- config/conf.php.dist.orig Fri Apr 12 18:21:30 2002 -+++ config/conf.php.dist Sun May 19 00:11:06 2002 -@@ -30,3 +30,4 @@ - // example providing a link to IMP (an email program) would be: - // $conf['menu']['apps'] = array('imp'); - $conf['menu']['apps'] = array(); -+//UNCOMMENTWHENINSTIMP$conf['menu']['apps'] = array('imp'); diff --git a/mail/horde-turba/files/patch-ab b/mail/horde-turba/files/patch-ab deleted file mode 100644 index 4cfdc762ef3d..000000000000 --- a/mail/horde-turba/files/patch-ab +++ /dev/null @@ -1,48 +0,0 @@ ---- 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( -+// 'phptype' => 'pgsql', - 'phptype' => 'mysql', - 'hostspec' => 'localhost', -- 'username' => 'horde', -- 'password' => '*****', -+ 'username' => 'hordemgr', -+ 'password' => 'hordemgr', - '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 --git a/mail/horde-turba/files/patch-ac b/mail/horde-turba/files/patch-ac deleted file mode 100644 index 74914cb6d40e..000000000000 --- a/mail/horde-turba/files/patch-ac +++ /dev/null @@ -1,16 +0,0 @@ ---- config/prefs.php.dist.orig Mon Oct 22 09:09:23 2001 -+++ config/prefs.php.dist Sun Nov 18 01:21:42 2001 -@@ -16,4 +16,13 @@ - 'type' => 'select', - 'desc' => _("Select your preferred language:") - ); -+ -+// Addressbook -+$_prefs['searchsource'] = array( -+ 'value' => 'localsql', -+ 'locked' => false, -+ 'shared' => true, -+ 'type' => 'select', -+ 'desc' => _("from") -+); - ?> diff --git a/mail/horde-turba/files/pkg-message.in b/mail/horde-turba/files/pkg-message.in new file mode 100644 index 000000000000..f7347f3f3413 --- /dev/null +++ b/mail/horde-turba/files/pkg-message.in @@ -0,0 +1,21 @@ +************************************************************************ +Turba has been installed in %%TURBADIR%% with your blank +configuration files. + +Horde must be configured; if not, see `pkg_info -D -x horde'. + +Then, you might have to tune the configuration files located in +%%CONFDIR%%/, specially the file sources.php. + +Then, you must login to Horde as a Horde Administrator to finish the +configuration. + +You have to create a table in your database; please see +%%TURBADIR%%/scripts/. +You might create a LDAP schema: please see the doc LDAP. + +WARNING! if you are upgrading from Turba v. 1.2.x, you have to alter your +******** schemas. Please read the doc UPGRADING. + +To protect your configuration files, you have to restart Apache. +************************************************************************ diff --git a/mail/horde-turba/pkg-message b/mail/horde-turba/pkg-message deleted file mode 100644 index f7cbdecc9737..000000000000 --- a/mail/horde-turba/pkg-message +++ /dev/null @@ -1,22 +0,0 @@ -************************************************************************ -Turba has been installed in %%TURBADIR%% with your blank -configuration files. - -Horde must be configured; if not, see -%%PORTSDIR%%/www/horde2/pkg-message. - -Then, you will have to tune the configuration files located in -%%CONFDIR%%/, specially the files conf.php and -sources.php. - -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 --git a/mail/horde-turba/pkg-plist b/mail/horde-turba/pkg-plist index 3f3ebe8ab813..cbcd497949cb 100644 --- a/mail/horde-turba/pkg-plist +++ b/mail/horde-turba/pkg-plist @@ -5,21 +5,14 @@ %%PORTDOCS%%%%DOCSDIR%%/LDAP %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES -%%PORTDOCS%%%%DOCSDIR%%/UPDATE -%%PORTDOCS%%%%DOCSDIR%%/turba.dia -%%PORTDOCS%%%%DOCSDIR%%/turba.pdf +%%PORTDOCS%%%%DOCSDIR%%/TODO +%%PORTDOCS%%%%DOCSDIR%%/UPGRADING %%TURBADIR%%/add.php -%%TURBADIR%%/addobject.php -%%TURBADIR%%/addobjectaction.php -%%TURBADIR%%/advanced.php %%TURBADIR%%/browse.php %%TURBADIR%%/config/.htaccess %%TURBADIR%%/config/attributes.php %%TURBADIR%%/config/attributes.php.dist -%%TURBADIR%%/config/conf.php -%%TURBADIR%%/config/conf.php.dist -%%TURBADIR%%/config/html.php -%%TURBADIR%%/config/html.php.dist +%%TURBADIR%%/config/conf.xml %%TURBADIR%%/config/menu.php %%TURBADIR%%/config/menu.php.dist %%TURBADIR%%/config/prefs.php @@ -28,28 +21,15 @@ %%TURBADIR%%/config/sources.php.dist %%TURBADIR%%/data.php %%TURBADIR%%/delete.php -%%TURBADIR%%/deleteobject.php %%TURBADIR%%/display.php -%%TURBADIR%%/displayobject.php %%TURBADIR%%/edit.php -%%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 -%%TURBADIR%%/graphics/up.gif -%%TURBADIR%%/graphics/user.gif %%TURBADIR%%/index.php %%TURBADIR%%/lib/.htaccess %%TURBADIR%%/lib/AbstractObject.php +%%TURBADIR%%/lib/Block/minisearch.php %%TURBADIR%%/lib/Driver.php +%%TURBADIR%%/lib/Driver/imsp.php +%%TURBADIR%%/lib/Driver/kolab.php %%TURBADIR%%/lib/Driver/ldap.php %%TURBADIR%%/lib/Driver/prefs.php %%TURBADIR%%/lib/Driver/sql.php @@ -64,10 +44,11 @@ %%TURBADIR%%/lib/ObjectView.php %%TURBADIR%%/lib/ObjectView/List.php %%TURBADIR%%/lib/ObjectView/PhotoID.php -%%TURBADIR%%/lib/Source.php +%%TURBADIR%%/lib/Renderer.php %%TURBADIR%%/lib/Turba.php %%TURBADIR%%/lib/api.php %%TURBADIR%%/lib/base.php +%%TURBADIR%%/lib/prefs.php %%TURBADIR%%/lib/version.php %%TURBADIR%%/locale/.htaccess %%TURBADIR%%/locale/ar_SY/LC_MESSAGES/turba.mo @@ -75,17 +56,18 @@ %%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/de_DE/help.xml %%TURBADIR%%/locale/el_GR/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/en_US/help.xml %%TURBADIR%%/locale/es_ES/LC_MESSAGES/turba.mo +%%TURBADIR%%/locale/es_ES/help.xml %%TURBADIR%%/locale/et_EE/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/fi_FI/help.xml +%%TURBADIR%%/locale/fa_IR/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/fi_FI/LC_MESSAGES/turba.mo +%%TURBADIR%%/locale/fi_FI/help.xml %%TURBADIR%%/locale/fr_FR/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/gl_ES/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/hu_HU/help.xml %%TURBADIR%%/locale/hu_HU/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/it_IT/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/ja_JP/LC_MESSAGES/turba.mo @@ -96,23 +78,22 @@ %%TURBADIR%%/locale/nb_NO/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/nl_NL/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/nn_NO/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/pl_PL/help.xml %%TURBADIR%%/locale/pl_PL/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/pt_BR/LC_MESSAGES/turba.mo +%%TURBADIR%%/locale/pt_BR/help.xml %%TURBADIR%%/locale/pt_PT/LC_MESSAGES/turba.mo +%%TURBADIR%%/locale/pt_PT/help.xml %%TURBADIR%%/locale/ro_RO/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/sk_SK/help.xml %%TURBADIR%%/locale/sl_SI/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/sv_SE/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/uk_UA/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/zh_CN/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/zh_TW/LC_MESSAGES/turba.mo -%%TURBADIR%%/menu.php +%%TURBADIR%%/minisearch.php %%TURBADIR%%/po/.htaccess -%%TURBADIR%%/po/Makefile %%TURBADIR%%/po/README %%TURBADIR%%/po/ar_SY.po %%TURBADIR%%/po/bg_BG.po @@ -123,7 +104,7 @@ %%TURBADIR%%/po/el_GR.po %%TURBADIR%%/po/es_ES.po %%TURBADIR%%/po/et_EE.po -%%TURBADIR%%/po/extract.pl +%%TURBADIR%%/po/fa_IR.po %%TURBADIR%%/po/fi_FI.po %%TURBADIR%%/po/fr_FR.po %%TURBADIR%%/po/gl_ES.po @@ -142,65 +123,57 @@ %%TURBADIR%%/po/pt_PT.po %%TURBADIR%%/po/ro_RO.po %%TURBADIR%%/po/ru_RU.po -%%TURBADIR%%/po/ru_RU.KOI8-R.po -%%TURBADIR%%/po/shtool %%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%%/scripts/ldap/rfc2739.schema +%%TURBADIR%%/scripts/sql/turba_objects.mysql.sql +%%TURBADIR%%/scripts/sql/turba_objects.oci8.sql +%%TURBADIR%%/scripts/sql/turba_objects.pgsql.sql +%%TURBADIR%%/scripts/sql/turba_objects.sql +%%TURBADIR%%/scripts/sql/turba_weddingguests.sql +%%TURBADIR%%/scripts/upgrades/1.2_to_2.0.mysql.sql +%%TURBADIR%%/scripts/upgrades/2004-10-26_create_default_histories.php %%TURBADIR%%/search.php -%%TURBADIR%%/status.php %%TURBADIR%%/templates/.htaccess -%%TURBADIR%%/templates/add/add.inc -%%TURBADIR%%/templates/add/noadd.inc -%%TURBADIR%%/templates/add/select.inc -%%TURBADIR%%/templates/advanced/criteria.inc -%%TURBADIR%%/templates/advanced/foot.inc -%%TURBADIR%%/templates/advanced/head.inc -%%TURBADIR%%/templates/advanced/results_head.inc +%%TURBADIR%%/templates/block/minisearch.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/footerAlpha.inc %%TURBADIR%%/templates/browse/header.inc %%TURBADIR%%/templates/browse/javascript.inc %%TURBADIR%%/templates/browse/search.inc +%%TURBADIR%%/templates/browse/search_criteria.inc %%TURBADIR%%/templates/browse/select.inc -%%TURBADIR%%/templates/common-footer.inc %%TURBADIR%%/templates/common-header.inc %%TURBADIR%%/templates/data/export.inc %%TURBADIR%%/templates/data/import.inc -%%TURBADIR%%/templates/display/display.inc -%%TURBADIR%%/templates/edit/edit.inc -%%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/menu.inc %%TURBADIR%%/templates/prefs/columnselect.inc -%%TURBADIR%%/templates/search/foot.inc -%%TURBADIR%%/templates/search/head.inc -%%TURBADIR%%/templates/search/row.inc -%%TURBADIR%%/miniwindow.php +%%TURBADIR%%/test.php +%%TURBADIR%%/themes/graphics/contact.png +%%TURBADIR%%/themes/graphics/group.png +%%TURBADIR%%/themes/graphics/menu/browse.png +%%TURBADIR%%/themes/graphics/menu/new.png +%%TURBADIR%%/themes/graphics/new.png +%%TURBADIR%%/themes/graphics/turba.png +%%TURBADIR%%/themes/screen.css +%%TURBADIR%%/vcard.php etc/horde/httpd.conf.turba %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm %%TURBADIR%%/config -@dirrm %%TURBADIR%%/graphics +@dirrm %%TURBADIR%%/lib/Block @dirrm %%TURBADIR%%/lib/Driver @dirrm %%TURBADIR%%/lib/List @dirrm %%TURBADIR%%/lib/ListView @@ -225,6 +198,8 @@ etc/horde/httpd.conf.turba @dirrm %%TURBADIR%%/locale/es_ES @dirrm %%TURBADIR%%/locale/et_EE/LC_MESSAGES @dirrm %%TURBADIR%%/locale/et_EE +@dirrm %%TURBADIR%%/locale/fa_IR/LC_MESSAGES +@dirrm %%TURBADIR%%/locale/fa_IR @dirrm %%TURBADIR%%/locale/fi_FI/LC_MESSAGES @dirrm %%TURBADIR%%/locale/fi_FI @dirrm %%TURBADIR%%/locale/fr_FR/LC_MESSAGES @@ -261,8 +236,6 @@ etc/horde/httpd.conf.turba @dirrm %%TURBADIR%%/locale/ro_RO @dirrm %%TURBADIR%%/locale/ru_RU/LC_MESSAGES @dirrm %%TURBADIR%%/locale/ru_RU -@dirrm %%TURBADIR%%/locale/ru_RU.KOI8-R/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/ru_RU.KOI8-R @dirrm %%TURBADIR%%/locale/sk_SK/LC_MESSAGES @dirrm %%TURBADIR%%/locale/sk_SK @dirrm %%TURBADIR%%/locale/sl_SI/LC_MESSAGES @@ -277,20 +250,17 @@ etc/horde/httpd.conf.turba @dirrm %%TURBADIR%%/locale/zh_TW @dirrm %%TURBADIR%%/locale @dirrm %%TURBADIR%%/po -@dirrm %%TURBADIR%%/scripts/drivers @dirrm %%TURBADIR%%/scripts/ldap +@dirrm %%TURBADIR%%/scripts/sql +@dirrm %%TURBADIR%%/scripts/upgrades @dirrm %%TURBADIR%%/scripts -@dirrm %%TURBADIR%%/templates/add -@dirrm %%TURBADIR%%/templates/advanced +@dirrm %%TURBADIR%%/templates/block @dirrm %%TURBADIR%%/templates/browse @dirrm %%TURBADIR%%/templates/data -@dirrm %%TURBADIR%%/templates/display -@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 -@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 +@dirrm %%TURBADIR%%/themes/graphics/menu +@dirrm %%TURBADIR%%/themes/graphics +@dirrm %%TURBADIR%%/themes +@unexec rmdir %D/%%TURBADIR%%/config 2>/dev/null || true +@unexec rmdir %D/%%TURBADIR%% 2>/dev/null || true diff --git a/mail/horde4-turba/Makefile b/mail/horde4-turba/Makefile index ad5858b7da2e..36ce4a7fe945 100644 --- a/mail/horde4-turba/Makefile +++ b/mail/horde4-turba/Makefile @@ -6,7 +6,7 @@ # PORTNAME= turba -PORTVERSION= 1.2.2 +PORTVERSION= 2.0 CATEGORIES= mail www MASTER_SITES= ftp://ftp.horde.org/pub/turba/ \ ftp://ftp.planetmirror.com/pub/horde/turba/ \ @@ -17,6 +17,7 @@ MASTER_SITES= ftp://ftp.horde.org/pub/turba/ \ ftp://ftp.nl.horde.org/mirror/horde-ftp/pub/turba/ \ ftp://ftp.uk.horde.org/mirrors/ftp.horde.org/pub/turba/ \ http://ftp.horde.org/pub/turba/ +DISTNAME= ${PORTNAME}-h3-${PORTVERSION} MAINTAINER= thierry@FreeBSD.org COMMENT= The Horde contact management application @@ -28,48 +29,37 @@ COMMENT= The Horde contact management application # #----------------------------------------------------------------------- -RUN_DEPENDS= ${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde2 +RUN_DEPENDS+= ${LOCALBASE}/www/horde/rpc.php:${PORTSDIR}/www/horde .if !defined(WITHOUT_LDAP) -USE_OPENLDAP= yes +USE_PHP= ldap .endif NO_BUILD= yes USE_REINPLACE= yes -REINPLACE_ARGS= -i.beforeTurba +REINPLACE_ARGS= -i "" DOCS= COPYING README docs/CHANGES docs/CREDITS docs/INSTALL \ - docs/INSTALL docs/LDAP docs/RELEASE_NOTES 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 + docs/LDAP docs/RELEASE_NOTES docs/TODO docs/UPGRADING +CONFFILE= attributes.php menu.php prefs.php sources.php +SUB_DIRS= config lib locale po scripts templates themes LHORDEDIR?= www/horde LTURBADIR?= ${LHORDEDIR}/turba -PLIST_SUB= HORDEDIR=${LHORDEDIR} TURBADIR=${LTURBADIR} +PLIST_SUB= TURBADIR=${LTURBADIR} +PKGMESSAGE= ${WRKDIR}/pkg-message -HORDEDIR= ${PREFIX}/${LHORDEDIR} TURBADIR= ${PREFIX}/${LTURBADIR} CONFDIR= ${TURBADIR}/config HORDE_INC= ${LOCALBASE}/etc/horde -post-patch: - @${RM} ${WRKSRC}/config/conf.php.dist.orig \ - ${WRKSRC}/config/prefs.php.dist.orig \ - ${WRKSRC}/config/sources.php.dist.orig - -pre-install: -.if !defined(WITHOUT_LDAP) - @if ! php -m | ${GREP} -q -e "ldap"; then \ - ${ECHO_MSG} "" ; \ - ${ECHO_MSG} "Please configure PHP with OpenLDAP support." ; \ - ${ECHO_MSG} "" ; \ - ${FALSE} ; \ - fi -.endif +pre-configure: + @${SED} -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" \ + ${FILESDIR}/httpd.conf.turba > ${WRKDIR}/httpd.conf.turba + @${REINPLACE_CMD} -e "s:/usr/bin/ldapadd:${LOCALBASE}/bin/ldapadd:" \ + ${WRKSRC}/scripts/ldap/addou.pl do-install: @${MKDIR} ${TURBADIR} @@ -82,16 +72,9 @@ do-install: ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \ fi .endfor - @${CHOWN} -R www:www ${TURBADIR} + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TURBADIR} @${CHMOD} -R o-rwx ${CONFDIR} - @${CP} -p ${FILESDIR}/httpd.conf.turba ${HORDE_INC} - @${REINPLACE_CMD} -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" \ - ${HORDE_INC}/httpd.conf.turba - @${RM} ${HORDE_INC}/httpd.conf.turba.beforeTurba - @${REINPLACE_CMD} -e "s://UNCOMMENTWHENINSTTURBA::" \ - ${HORDEDIR}/config/registry.php - @${CP} -p ${HORDEDIR}/config/registry.php \ - ${HORDEDIR}/config/registry.php.afterTurba + @${INSTALL_DATA} ${WRKDIR}/httpd.conf.turba ${HORDE_INC} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for FILE in ${DOCS} @@ -101,9 +84,10 @@ do-install: .endif post-install: + @${SED} -e "s:%%TURBADIR%%:${TURBADIR}:;s:%%CONFDIR%%:${CONFDIR}:" \ + < ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} @${ECHO_MSG} - @${SED} -e "s:%%TURBADIR%%:${TURBADIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g" \ - -e "s:%%CONFDIR%%:${CONFDIR}:g" ${PKGMESSAGE} + @${CAT} ${PKGMESSAGE} @${ECHO_MSG} .include diff --git a/mail/horde4-turba/distinfo b/mail/horde4-turba/distinfo index c06cf61b8683..c766d26b8bd2 100644 --- a/mail/horde4-turba/distinfo +++ b/mail/horde4-turba/distinfo @@ -1,2 +1,2 @@ -MD5 (turba-1.2.2.tar.gz) = 27d9ebbe6723dcb0e4aa61045feb60b0 -SIZE (turba-1.2.2.tar.gz) = 508914 +MD5 (turba-h3-2.0.tar.gz) = 23f143958fb72b9bf94a04a14e1cfd92 +SIZE (turba-h3-2.0.tar.gz) = 1153884 diff --git a/mail/horde4-turba/files/patch-aa b/mail/horde4-turba/files/patch-aa deleted file mode 100644 index 81d0eeaf6419..000000000000 --- a/mail/horde4-turba/files/patch-aa +++ /dev/null @@ -1,7 +0,0 @@ ---- config/conf.php.dist.orig Fri Apr 12 18:21:30 2002 -+++ config/conf.php.dist Sun May 19 00:11:06 2002 -@@ -30,3 +30,4 @@ - // example providing a link to IMP (an email program) would be: - // $conf['menu']['apps'] = array('imp'); - $conf['menu']['apps'] = array(); -+//UNCOMMENTWHENINSTIMP$conf['menu']['apps'] = array('imp'); diff --git a/mail/horde4-turba/files/patch-ab b/mail/horde4-turba/files/patch-ab deleted file mode 100644 index 4cfdc762ef3d..000000000000 --- a/mail/horde4-turba/files/patch-ab +++ /dev/null @@ -1,48 +0,0 @@ ---- 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( -+// 'phptype' => 'pgsql', - 'phptype' => 'mysql', - 'hostspec' => 'localhost', -- 'username' => 'horde', -- 'password' => '*****', -+ 'username' => 'hordemgr', -+ 'password' => 'hordemgr', - '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 --git a/mail/horde4-turba/files/patch-ac b/mail/horde4-turba/files/patch-ac deleted file mode 100644 index 74914cb6d40e..000000000000 --- a/mail/horde4-turba/files/patch-ac +++ /dev/null @@ -1,16 +0,0 @@ ---- config/prefs.php.dist.orig Mon Oct 22 09:09:23 2001 -+++ config/prefs.php.dist Sun Nov 18 01:21:42 2001 -@@ -16,4 +16,13 @@ - 'type' => 'select', - 'desc' => _("Select your preferred language:") - ); -+ -+// Addressbook -+$_prefs['searchsource'] = array( -+ 'value' => 'localsql', -+ 'locked' => false, -+ 'shared' => true, -+ 'type' => 'select', -+ 'desc' => _("from") -+); - ?> diff --git a/mail/horde4-turba/files/pkg-message.in b/mail/horde4-turba/files/pkg-message.in new file mode 100644 index 000000000000..f7347f3f3413 --- /dev/null +++ b/mail/horde4-turba/files/pkg-message.in @@ -0,0 +1,21 @@ +************************************************************************ +Turba has been installed in %%TURBADIR%% with your blank +configuration files. + +Horde must be configured; if not, see `pkg_info -D -x horde'. + +Then, you might have to tune the configuration files located in +%%CONFDIR%%/, specially the file sources.php. + +Then, you must login to Horde as a Horde Administrator to finish the +configuration. + +You have to create a table in your database; please see +%%TURBADIR%%/scripts/. +You might create a LDAP schema: please see the doc LDAP. + +WARNING! if you are upgrading from Turba v. 1.2.x, you have to alter your +******** schemas. Please read the doc UPGRADING. + +To protect your configuration files, you have to restart Apache. +************************************************************************ diff --git a/mail/horde4-turba/pkg-message b/mail/horde4-turba/pkg-message deleted file mode 100644 index f7cbdecc9737..000000000000 --- a/mail/horde4-turba/pkg-message +++ /dev/null @@ -1,22 +0,0 @@ -************************************************************************ -Turba has been installed in %%TURBADIR%% with your blank -configuration files. - -Horde must be configured; if not, see -%%PORTSDIR%%/www/horde2/pkg-message. - -Then, you will have to tune the configuration files located in -%%CONFDIR%%/, specially the files conf.php and -sources.php. - -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 --git a/mail/horde4-turba/pkg-plist b/mail/horde4-turba/pkg-plist index 3f3ebe8ab813..cbcd497949cb 100644 --- a/mail/horde4-turba/pkg-plist +++ b/mail/horde4-turba/pkg-plist @@ -5,21 +5,14 @@ %%PORTDOCS%%%%DOCSDIR%%/LDAP %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES -%%PORTDOCS%%%%DOCSDIR%%/UPDATE -%%PORTDOCS%%%%DOCSDIR%%/turba.dia -%%PORTDOCS%%%%DOCSDIR%%/turba.pdf +%%PORTDOCS%%%%DOCSDIR%%/TODO +%%PORTDOCS%%%%DOCSDIR%%/UPGRADING %%TURBADIR%%/add.php -%%TURBADIR%%/addobject.php -%%TURBADIR%%/addobjectaction.php -%%TURBADIR%%/advanced.php %%TURBADIR%%/browse.php %%TURBADIR%%/config/.htaccess %%TURBADIR%%/config/attributes.php %%TURBADIR%%/config/attributes.php.dist -%%TURBADIR%%/config/conf.php -%%TURBADIR%%/config/conf.php.dist -%%TURBADIR%%/config/html.php -%%TURBADIR%%/config/html.php.dist +%%TURBADIR%%/config/conf.xml %%TURBADIR%%/config/menu.php %%TURBADIR%%/config/menu.php.dist %%TURBADIR%%/config/prefs.php @@ -28,28 +21,15 @@ %%TURBADIR%%/config/sources.php.dist %%TURBADIR%%/data.php %%TURBADIR%%/delete.php -%%TURBADIR%%/deleteobject.php %%TURBADIR%%/display.php -%%TURBADIR%%/displayobject.php %%TURBADIR%%/edit.php -%%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 -%%TURBADIR%%/graphics/up.gif -%%TURBADIR%%/graphics/user.gif %%TURBADIR%%/index.php %%TURBADIR%%/lib/.htaccess %%TURBADIR%%/lib/AbstractObject.php +%%TURBADIR%%/lib/Block/minisearch.php %%TURBADIR%%/lib/Driver.php +%%TURBADIR%%/lib/Driver/imsp.php +%%TURBADIR%%/lib/Driver/kolab.php %%TURBADIR%%/lib/Driver/ldap.php %%TURBADIR%%/lib/Driver/prefs.php %%TURBADIR%%/lib/Driver/sql.php @@ -64,10 +44,11 @@ %%TURBADIR%%/lib/ObjectView.php %%TURBADIR%%/lib/ObjectView/List.php %%TURBADIR%%/lib/ObjectView/PhotoID.php -%%TURBADIR%%/lib/Source.php +%%TURBADIR%%/lib/Renderer.php %%TURBADIR%%/lib/Turba.php %%TURBADIR%%/lib/api.php %%TURBADIR%%/lib/base.php +%%TURBADIR%%/lib/prefs.php %%TURBADIR%%/lib/version.php %%TURBADIR%%/locale/.htaccess %%TURBADIR%%/locale/ar_SY/LC_MESSAGES/turba.mo @@ -75,17 +56,18 @@ %%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/de_DE/help.xml %%TURBADIR%%/locale/el_GR/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/en_US/help.xml %%TURBADIR%%/locale/es_ES/LC_MESSAGES/turba.mo +%%TURBADIR%%/locale/es_ES/help.xml %%TURBADIR%%/locale/et_EE/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/fi_FI/help.xml +%%TURBADIR%%/locale/fa_IR/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/fi_FI/LC_MESSAGES/turba.mo +%%TURBADIR%%/locale/fi_FI/help.xml %%TURBADIR%%/locale/fr_FR/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/gl_ES/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/hu_HU/help.xml %%TURBADIR%%/locale/hu_HU/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/it_IT/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/ja_JP/LC_MESSAGES/turba.mo @@ -96,23 +78,22 @@ %%TURBADIR%%/locale/nb_NO/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/nl_NL/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/nn_NO/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/pl_PL/help.xml %%TURBADIR%%/locale/pl_PL/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/pt_BR/LC_MESSAGES/turba.mo +%%TURBADIR%%/locale/pt_BR/help.xml %%TURBADIR%%/locale/pt_PT/LC_MESSAGES/turba.mo +%%TURBADIR%%/locale/pt_PT/help.xml %%TURBADIR%%/locale/ro_RO/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/sk_SK/help.xml %%TURBADIR%%/locale/sl_SI/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/sv_SE/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/uk_UA/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/zh_CN/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/zh_TW/LC_MESSAGES/turba.mo -%%TURBADIR%%/menu.php +%%TURBADIR%%/minisearch.php %%TURBADIR%%/po/.htaccess -%%TURBADIR%%/po/Makefile %%TURBADIR%%/po/README %%TURBADIR%%/po/ar_SY.po %%TURBADIR%%/po/bg_BG.po @@ -123,7 +104,7 @@ %%TURBADIR%%/po/el_GR.po %%TURBADIR%%/po/es_ES.po %%TURBADIR%%/po/et_EE.po -%%TURBADIR%%/po/extract.pl +%%TURBADIR%%/po/fa_IR.po %%TURBADIR%%/po/fi_FI.po %%TURBADIR%%/po/fr_FR.po %%TURBADIR%%/po/gl_ES.po @@ -142,65 +123,57 @@ %%TURBADIR%%/po/pt_PT.po %%TURBADIR%%/po/ro_RO.po %%TURBADIR%%/po/ru_RU.po -%%TURBADIR%%/po/ru_RU.KOI8-R.po -%%TURBADIR%%/po/shtool %%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%%/scripts/ldap/rfc2739.schema +%%TURBADIR%%/scripts/sql/turba_objects.mysql.sql +%%TURBADIR%%/scripts/sql/turba_objects.oci8.sql +%%TURBADIR%%/scripts/sql/turba_objects.pgsql.sql +%%TURBADIR%%/scripts/sql/turba_objects.sql +%%TURBADIR%%/scripts/sql/turba_weddingguests.sql +%%TURBADIR%%/scripts/upgrades/1.2_to_2.0.mysql.sql +%%TURBADIR%%/scripts/upgrades/2004-10-26_create_default_histories.php %%TURBADIR%%/search.php -%%TURBADIR%%/status.php %%TURBADIR%%/templates/.htaccess -%%TURBADIR%%/templates/add/add.inc -%%TURBADIR%%/templates/add/noadd.inc -%%TURBADIR%%/templates/add/select.inc -%%TURBADIR%%/templates/advanced/criteria.inc -%%TURBADIR%%/templates/advanced/foot.inc -%%TURBADIR%%/templates/advanced/head.inc -%%TURBADIR%%/templates/advanced/results_head.inc +%%TURBADIR%%/templates/block/minisearch.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/footerAlpha.inc %%TURBADIR%%/templates/browse/header.inc %%TURBADIR%%/templates/browse/javascript.inc %%TURBADIR%%/templates/browse/search.inc +%%TURBADIR%%/templates/browse/search_criteria.inc %%TURBADIR%%/templates/browse/select.inc -%%TURBADIR%%/templates/common-footer.inc %%TURBADIR%%/templates/common-header.inc %%TURBADIR%%/templates/data/export.inc %%TURBADIR%%/templates/data/import.inc -%%TURBADIR%%/templates/display/display.inc -%%TURBADIR%%/templates/edit/edit.inc -%%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/menu.inc %%TURBADIR%%/templates/prefs/columnselect.inc -%%TURBADIR%%/templates/search/foot.inc -%%TURBADIR%%/templates/search/head.inc -%%TURBADIR%%/templates/search/row.inc -%%TURBADIR%%/miniwindow.php +%%TURBADIR%%/test.php +%%TURBADIR%%/themes/graphics/contact.png +%%TURBADIR%%/themes/graphics/group.png +%%TURBADIR%%/themes/graphics/menu/browse.png +%%TURBADIR%%/themes/graphics/menu/new.png +%%TURBADIR%%/themes/graphics/new.png +%%TURBADIR%%/themes/graphics/turba.png +%%TURBADIR%%/themes/screen.css +%%TURBADIR%%/vcard.php etc/horde/httpd.conf.turba %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm %%TURBADIR%%/config -@dirrm %%TURBADIR%%/graphics +@dirrm %%TURBADIR%%/lib/Block @dirrm %%TURBADIR%%/lib/Driver @dirrm %%TURBADIR%%/lib/List @dirrm %%TURBADIR%%/lib/ListView @@ -225,6 +198,8 @@ etc/horde/httpd.conf.turba @dirrm %%TURBADIR%%/locale/es_ES @dirrm %%TURBADIR%%/locale/et_EE/LC_MESSAGES @dirrm %%TURBADIR%%/locale/et_EE +@dirrm %%TURBADIR%%/locale/fa_IR/LC_MESSAGES +@dirrm %%TURBADIR%%/locale/fa_IR @dirrm %%TURBADIR%%/locale/fi_FI/LC_MESSAGES @dirrm %%TURBADIR%%/locale/fi_FI @dirrm %%TURBADIR%%/locale/fr_FR/LC_MESSAGES @@ -261,8 +236,6 @@ etc/horde/httpd.conf.turba @dirrm %%TURBADIR%%/locale/ro_RO @dirrm %%TURBADIR%%/locale/ru_RU/LC_MESSAGES @dirrm %%TURBADIR%%/locale/ru_RU -@dirrm %%TURBADIR%%/locale/ru_RU.KOI8-R/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/ru_RU.KOI8-R @dirrm %%TURBADIR%%/locale/sk_SK/LC_MESSAGES @dirrm %%TURBADIR%%/locale/sk_SK @dirrm %%TURBADIR%%/locale/sl_SI/LC_MESSAGES @@ -277,20 +250,17 @@ etc/horde/httpd.conf.turba @dirrm %%TURBADIR%%/locale/zh_TW @dirrm %%TURBADIR%%/locale @dirrm %%TURBADIR%%/po -@dirrm %%TURBADIR%%/scripts/drivers @dirrm %%TURBADIR%%/scripts/ldap +@dirrm %%TURBADIR%%/scripts/sql +@dirrm %%TURBADIR%%/scripts/upgrades @dirrm %%TURBADIR%%/scripts -@dirrm %%TURBADIR%%/templates/add -@dirrm %%TURBADIR%%/templates/advanced +@dirrm %%TURBADIR%%/templates/block @dirrm %%TURBADIR%%/templates/browse @dirrm %%TURBADIR%%/templates/data -@dirrm %%TURBADIR%%/templates/display -@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 -@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 +@dirrm %%TURBADIR%%/themes/graphics/menu +@dirrm %%TURBADIR%%/themes/graphics +@dirrm %%TURBADIR%%/themes +@unexec rmdir %D/%%TURBADIR%%/config 2>/dev/null || true +@unexec rmdir %D/%%TURBADIR%% 2>/dev/null || true diff --git a/mail/turba/Makefile b/mail/turba/Makefile index ad5858b7da2e..36ce4a7fe945 100644 --- a/mail/turba/Makefile +++ b/mail/turba/Makefile @@ -6,7 +6,7 @@ # PORTNAME= turba -PORTVERSION= 1.2.2 +PORTVERSION= 2.0 CATEGORIES= mail www MASTER_SITES= ftp://ftp.horde.org/pub/turba/ \ ftp://ftp.planetmirror.com/pub/horde/turba/ \ @@ -17,6 +17,7 @@ MASTER_SITES= ftp://ftp.horde.org/pub/turba/ \ ftp://ftp.nl.horde.org/mirror/horde-ftp/pub/turba/ \ ftp://ftp.uk.horde.org/mirrors/ftp.horde.org/pub/turba/ \ http://ftp.horde.org/pub/turba/ +DISTNAME= ${PORTNAME}-h3-${PORTVERSION} MAINTAINER= thierry@FreeBSD.org COMMENT= The Horde contact management application @@ -28,48 +29,37 @@ COMMENT= The Horde contact management application # #----------------------------------------------------------------------- -RUN_DEPENDS= ${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde2 +RUN_DEPENDS+= ${LOCALBASE}/www/horde/rpc.php:${PORTSDIR}/www/horde .if !defined(WITHOUT_LDAP) -USE_OPENLDAP= yes +USE_PHP= ldap .endif NO_BUILD= yes USE_REINPLACE= yes -REINPLACE_ARGS= -i.beforeTurba +REINPLACE_ARGS= -i "" DOCS= COPYING README docs/CHANGES docs/CREDITS docs/INSTALL \ - docs/INSTALL docs/LDAP docs/RELEASE_NOTES 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 + docs/LDAP docs/RELEASE_NOTES docs/TODO docs/UPGRADING +CONFFILE= attributes.php menu.php prefs.php sources.php +SUB_DIRS= config lib locale po scripts templates themes LHORDEDIR?= www/horde LTURBADIR?= ${LHORDEDIR}/turba -PLIST_SUB= HORDEDIR=${LHORDEDIR} TURBADIR=${LTURBADIR} +PLIST_SUB= TURBADIR=${LTURBADIR} +PKGMESSAGE= ${WRKDIR}/pkg-message -HORDEDIR= ${PREFIX}/${LHORDEDIR} TURBADIR= ${PREFIX}/${LTURBADIR} CONFDIR= ${TURBADIR}/config HORDE_INC= ${LOCALBASE}/etc/horde -post-patch: - @${RM} ${WRKSRC}/config/conf.php.dist.orig \ - ${WRKSRC}/config/prefs.php.dist.orig \ - ${WRKSRC}/config/sources.php.dist.orig - -pre-install: -.if !defined(WITHOUT_LDAP) - @if ! php -m | ${GREP} -q -e "ldap"; then \ - ${ECHO_MSG} "" ; \ - ${ECHO_MSG} "Please configure PHP with OpenLDAP support." ; \ - ${ECHO_MSG} "" ; \ - ${FALSE} ; \ - fi -.endif +pre-configure: + @${SED} -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" \ + ${FILESDIR}/httpd.conf.turba > ${WRKDIR}/httpd.conf.turba + @${REINPLACE_CMD} -e "s:/usr/bin/ldapadd:${LOCALBASE}/bin/ldapadd:" \ + ${WRKSRC}/scripts/ldap/addou.pl do-install: @${MKDIR} ${TURBADIR} @@ -82,16 +72,9 @@ do-install: ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \ fi .endfor - @${CHOWN} -R www:www ${TURBADIR} + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TURBADIR} @${CHMOD} -R o-rwx ${CONFDIR} - @${CP} -p ${FILESDIR}/httpd.conf.turba ${HORDE_INC} - @${REINPLACE_CMD} -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" \ - ${HORDE_INC}/httpd.conf.turba - @${RM} ${HORDE_INC}/httpd.conf.turba.beforeTurba - @${REINPLACE_CMD} -e "s://UNCOMMENTWHENINSTTURBA::" \ - ${HORDEDIR}/config/registry.php - @${CP} -p ${HORDEDIR}/config/registry.php \ - ${HORDEDIR}/config/registry.php.afterTurba + @${INSTALL_DATA} ${WRKDIR}/httpd.conf.turba ${HORDE_INC} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for FILE in ${DOCS} @@ -101,9 +84,10 @@ do-install: .endif post-install: + @${SED} -e "s:%%TURBADIR%%:${TURBADIR}:;s:%%CONFDIR%%:${CONFDIR}:" \ + < ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} @${ECHO_MSG} - @${SED} -e "s:%%TURBADIR%%:${TURBADIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g" \ - -e "s:%%CONFDIR%%:${CONFDIR}:g" ${PKGMESSAGE} + @${CAT} ${PKGMESSAGE} @${ECHO_MSG} .include diff --git a/mail/turba/distinfo b/mail/turba/distinfo index c06cf61b8683..c766d26b8bd2 100644 --- a/mail/turba/distinfo +++ b/mail/turba/distinfo @@ -1,2 +1,2 @@ -MD5 (turba-1.2.2.tar.gz) = 27d9ebbe6723dcb0e4aa61045feb60b0 -SIZE (turba-1.2.2.tar.gz) = 508914 +MD5 (turba-h3-2.0.tar.gz) = 23f143958fb72b9bf94a04a14e1cfd92 +SIZE (turba-h3-2.0.tar.gz) = 1153884 diff --git a/mail/turba/files/patch-aa b/mail/turba/files/patch-aa deleted file mode 100644 index 81d0eeaf6419..000000000000 --- a/mail/turba/files/patch-aa +++ /dev/null @@ -1,7 +0,0 @@ ---- config/conf.php.dist.orig Fri Apr 12 18:21:30 2002 -+++ config/conf.php.dist Sun May 19 00:11:06 2002 -@@ -30,3 +30,4 @@ - // example providing a link to IMP (an email program) would be: - // $conf['menu']['apps'] = array('imp'); - $conf['menu']['apps'] = array(); -+//UNCOMMENTWHENINSTIMP$conf['menu']['apps'] = array('imp'); diff --git a/mail/turba/files/patch-ab b/mail/turba/files/patch-ab deleted file mode 100644 index 4cfdc762ef3d..000000000000 --- a/mail/turba/files/patch-ab +++ /dev/null @@ -1,48 +0,0 @@ ---- 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( -+// 'phptype' => 'pgsql', - 'phptype' => 'mysql', - 'hostspec' => 'localhost', -- 'username' => 'horde', -- 'password' => '*****', -+ 'username' => 'hordemgr', -+ 'password' => 'hordemgr', - '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 --git a/mail/turba/files/patch-ac b/mail/turba/files/patch-ac deleted file mode 100644 index 74914cb6d40e..000000000000 --- a/mail/turba/files/patch-ac +++ /dev/null @@ -1,16 +0,0 @@ ---- config/prefs.php.dist.orig Mon Oct 22 09:09:23 2001 -+++ config/prefs.php.dist Sun Nov 18 01:21:42 2001 -@@ -16,4 +16,13 @@ - 'type' => 'select', - 'desc' => _("Select your preferred language:") - ); -+ -+// Addressbook -+$_prefs['searchsource'] = array( -+ 'value' => 'localsql', -+ 'locked' => false, -+ 'shared' => true, -+ 'type' => 'select', -+ 'desc' => _("from") -+); - ?> diff --git a/mail/turba/files/pkg-message.in b/mail/turba/files/pkg-message.in new file mode 100644 index 000000000000..f7347f3f3413 --- /dev/null +++ b/mail/turba/files/pkg-message.in @@ -0,0 +1,21 @@ +************************************************************************ +Turba has been installed in %%TURBADIR%% with your blank +configuration files. + +Horde must be configured; if not, see `pkg_info -D -x horde'. + +Then, you might have to tune the configuration files located in +%%CONFDIR%%/, specially the file sources.php. + +Then, you must login to Horde as a Horde Administrator to finish the +configuration. + +You have to create a table in your database; please see +%%TURBADIR%%/scripts/. +You might create a LDAP schema: please see the doc LDAP. + +WARNING! if you are upgrading from Turba v. 1.2.x, you have to alter your +******** schemas. Please read the doc UPGRADING. + +To protect your configuration files, you have to restart Apache. +************************************************************************ diff --git a/mail/turba/pkg-message b/mail/turba/pkg-message deleted file mode 100644 index f7cbdecc9737..000000000000 --- a/mail/turba/pkg-message +++ /dev/null @@ -1,22 +0,0 @@ -************************************************************************ -Turba has been installed in %%TURBADIR%% with your blank -configuration files. - -Horde must be configured; if not, see -%%PORTSDIR%%/www/horde2/pkg-message. - -Then, you will have to tune the configuration files located in -%%CONFDIR%%/, specially the files conf.php and -sources.php. - -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 --git a/mail/turba/pkg-plist b/mail/turba/pkg-plist index 3f3ebe8ab813..cbcd497949cb 100644 --- a/mail/turba/pkg-plist +++ b/mail/turba/pkg-plist @@ -5,21 +5,14 @@ %%PORTDOCS%%%%DOCSDIR%%/LDAP %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES -%%PORTDOCS%%%%DOCSDIR%%/UPDATE -%%PORTDOCS%%%%DOCSDIR%%/turba.dia -%%PORTDOCS%%%%DOCSDIR%%/turba.pdf +%%PORTDOCS%%%%DOCSDIR%%/TODO +%%PORTDOCS%%%%DOCSDIR%%/UPGRADING %%TURBADIR%%/add.php -%%TURBADIR%%/addobject.php -%%TURBADIR%%/addobjectaction.php -%%TURBADIR%%/advanced.php %%TURBADIR%%/browse.php %%TURBADIR%%/config/.htaccess %%TURBADIR%%/config/attributes.php %%TURBADIR%%/config/attributes.php.dist -%%TURBADIR%%/config/conf.php -%%TURBADIR%%/config/conf.php.dist -%%TURBADIR%%/config/html.php -%%TURBADIR%%/config/html.php.dist +%%TURBADIR%%/config/conf.xml %%TURBADIR%%/config/menu.php %%TURBADIR%%/config/menu.php.dist %%TURBADIR%%/config/prefs.php @@ -28,28 +21,15 @@ %%TURBADIR%%/config/sources.php.dist %%TURBADIR%%/data.php %%TURBADIR%%/delete.php -%%TURBADIR%%/deleteobject.php %%TURBADIR%%/display.php -%%TURBADIR%%/displayobject.php %%TURBADIR%%/edit.php -%%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 -%%TURBADIR%%/graphics/up.gif -%%TURBADIR%%/graphics/user.gif %%TURBADIR%%/index.php %%TURBADIR%%/lib/.htaccess %%TURBADIR%%/lib/AbstractObject.php +%%TURBADIR%%/lib/Block/minisearch.php %%TURBADIR%%/lib/Driver.php +%%TURBADIR%%/lib/Driver/imsp.php +%%TURBADIR%%/lib/Driver/kolab.php %%TURBADIR%%/lib/Driver/ldap.php %%TURBADIR%%/lib/Driver/prefs.php %%TURBADIR%%/lib/Driver/sql.php @@ -64,10 +44,11 @@ %%TURBADIR%%/lib/ObjectView.php %%TURBADIR%%/lib/ObjectView/List.php %%TURBADIR%%/lib/ObjectView/PhotoID.php -%%TURBADIR%%/lib/Source.php +%%TURBADIR%%/lib/Renderer.php %%TURBADIR%%/lib/Turba.php %%TURBADIR%%/lib/api.php %%TURBADIR%%/lib/base.php +%%TURBADIR%%/lib/prefs.php %%TURBADIR%%/lib/version.php %%TURBADIR%%/locale/.htaccess %%TURBADIR%%/locale/ar_SY/LC_MESSAGES/turba.mo @@ -75,17 +56,18 @@ %%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/de_DE/help.xml %%TURBADIR%%/locale/el_GR/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/en_US/help.xml %%TURBADIR%%/locale/es_ES/LC_MESSAGES/turba.mo +%%TURBADIR%%/locale/es_ES/help.xml %%TURBADIR%%/locale/et_EE/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/fi_FI/help.xml +%%TURBADIR%%/locale/fa_IR/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/fi_FI/LC_MESSAGES/turba.mo +%%TURBADIR%%/locale/fi_FI/help.xml %%TURBADIR%%/locale/fr_FR/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/gl_ES/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/hu_HU/help.xml %%TURBADIR%%/locale/hu_HU/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/it_IT/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/ja_JP/LC_MESSAGES/turba.mo @@ -96,23 +78,22 @@ %%TURBADIR%%/locale/nb_NO/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/nl_NL/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/nn_NO/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/pl_PL/help.xml %%TURBADIR%%/locale/pl_PL/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/pt_BR/LC_MESSAGES/turba.mo +%%TURBADIR%%/locale/pt_BR/help.xml %%TURBADIR%%/locale/pt_PT/LC_MESSAGES/turba.mo +%%TURBADIR%%/locale/pt_PT/help.xml %%TURBADIR%%/locale/ro_RO/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/sk_SK/help.xml %%TURBADIR%%/locale/sl_SI/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/sv_SE/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/uk_UA/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/zh_CN/LC_MESSAGES/turba.mo %%TURBADIR%%/locale/zh_TW/LC_MESSAGES/turba.mo -%%TURBADIR%%/menu.php +%%TURBADIR%%/minisearch.php %%TURBADIR%%/po/.htaccess -%%TURBADIR%%/po/Makefile %%TURBADIR%%/po/README %%TURBADIR%%/po/ar_SY.po %%TURBADIR%%/po/bg_BG.po @@ -123,7 +104,7 @@ %%TURBADIR%%/po/el_GR.po %%TURBADIR%%/po/es_ES.po %%TURBADIR%%/po/et_EE.po -%%TURBADIR%%/po/extract.pl +%%TURBADIR%%/po/fa_IR.po %%TURBADIR%%/po/fi_FI.po %%TURBADIR%%/po/fr_FR.po %%TURBADIR%%/po/gl_ES.po @@ -142,65 +123,57 @@ %%TURBADIR%%/po/pt_PT.po %%TURBADIR%%/po/ro_RO.po %%TURBADIR%%/po/ru_RU.po -%%TURBADIR%%/po/ru_RU.KOI8-R.po -%%TURBADIR%%/po/shtool %%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%%/scripts/ldap/rfc2739.schema +%%TURBADIR%%/scripts/sql/turba_objects.mysql.sql +%%TURBADIR%%/scripts/sql/turba_objects.oci8.sql +%%TURBADIR%%/scripts/sql/turba_objects.pgsql.sql +%%TURBADIR%%/scripts/sql/turba_objects.sql +%%TURBADIR%%/scripts/sql/turba_weddingguests.sql +%%TURBADIR%%/scripts/upgrades/1.2_to_2.0.mysql.sql +%%TURBADIR%%/scripts/upgrades/2004-10-26_create_default_histories.php %%TURBADIR%%/search.php -%%TURBADIR%%/status.php %%TURBADIR%%/templates/.htaccess -%%TURBADIR%%/templates/add/add.inc -%%TURBADIR%%/templates/add/noadd.inc -%%TURBADIR%%/templates/add/select.inc -%%TURBADIR%%/templates/advanced/criteria.inc -%%TURBADIR%%/templates/advanced/foot.inc -%%TURBADIR%%/templates/advanced/head.inc -%%TURBADIR%%/templates/advanced/results_head.inc +%%TURBADIR%%/templates/block/minisearch.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/footerAlpha.inc %%TURBADIR%%/templates/browse/header.inc %%TURBADIR%%/templates/browse/javascript.inc %%TURBADIR%%/templates/browse/search.inc +%%TURBADIR%%/templates/browse/search_criteria.inc %%TURBADIR%%/templates/browse/select.inc -%%TURBADIR%%/templates/common-footer.inc %%TURBADIR%%/templates/common-header.inc %%TURBADIR%%/templates/data/export.inc %%TURBADIR%%/templates/data/import.inc -%%TURBADIR%%/templates/display/display.inc -%%TURBADIR%%/templates/edit/edit.inc -%%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/menu.inc %%TURBADIR%%/templates/prefs/columnselect.inc -%%TURBADIR%%/templates/search/foot.inc -%%TURBADIR%%/templates/search/head.inc -%%TURBADIR%%/templates/search/row.inc -%%TURBADIR%%/miniwindow.php +%%TURBADIR%%/test.php +%%TURBADIR%%/themes/graphics/contact.png +%%TURBADIR%%/themes/graphics/group.png +%%TURBADIR%%/themes/graphics/menu/browse.png +%%TURBADIR%%/themes/graphics/menu/new.png +%%TURBADIR%%/themes/graphics/new.png +%%TURBADIR%%/themes/graphics/turba.png +%%TURBADIR%%/themes/screen.css +%%TURBADIR%%/vcard.php etc/horde/httpd.conf.turba %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm %%TURBADIR%%/config -@dirrm %%TURBADIR%%/graphics +@dirrm %%TURBADIR%%/lib/Block @dirrm %%TURBADIR%%/lib/Driver @dirrm %%TURBADIR%%/lib/List @dirrm %%TURBADIR%%/lib/ListView @@ -225,6 +198,8 @@ etc/horde/httpd.conf.turba @dirrm %%TURBADIR%%/locale/es_ES @dirrm %%TURBADIR%%/locale/et_EE/LC_MESSAGES @dirrm %%TURBADIR%%/locale/et_EE +@dirrm %%TURBADIR%%/locale/fa_IR/LC_MESSAGES +@dirrm %%TURBADIR%%/locale/fa_IR @dirrm %%TURBADIR%%/locale/fi_FI/LC_MESSAGES @dirrm %%TURBADIR%%/locale/fi_FI @dirrm %%TURBADIR%%/locale/fr_FR/LC_MESSAGES @@ -261,8 +236,6 @@ etc/horde/httpd.conf.turba @dirrm %%TURBADIR%%/locale/ro_RO @dirrm %%TURBADIR%%/locale/ru_RU/LC_MESSAGES @dirrm %%TURBADIR%%/locale/ru_RU -@dirrm %%TURBADIR%%/locale/ru_RU.KOI8-R/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/ru_RU.KOI8-R @dirrm %%TURBADIR%%/locale/sk_SK/LC_MESSAGES @dirrm %%TURBADIR%%/locale/sk_SK @dirrm %%TURBADIR%%/locale/sl_SI/LC_MESSAGES @@ -277,20 +250,17 @@ etc/horde/httpd.conf.turba @dirrm %%TURBADIR%%/locale/zh_TW @dirrm %%TURBADIR%%/locale @dirrm %%TURBADIR%%/po -@dirrm %%TURBADIR%%/scripts/drivers @dirrm %%TURBADIR%%/scripts/ldap +@dirrm %%TURBADIR%%/scripts/sql +@dirrm %%TURBADIR%%/scripts/upgrades @dirrm %%TURBADIR%%/scripts -@dirrm %%TURBADIR%%/templates/add -@dirrm %%TURBADIR%%/templates/advanced +@dirrm %%TURBADIR%%/templates/block @dirrm %%TURBADIR%%/templates/browse @dirrm %%TURBADIR%%/templates/data -@dirrm %%TURBADIR%%/templates/display -@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 -@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 +@dirrm %%TURBADIR%%/themes/graphics/menu +@dirrm %%TURBADIR%%/themes/graphics +@dirrm %%TURBADIR%%/themes +@unexec rmdir %D/%%TURBADIR%%/config 2>/dev/null || true +@unexec rmdir %D/%%TURBADIR%% 2>/dev/null || true