From 418178a58a18a8e17e4ef11e9f1b0136d1447c35 Mon Sep 17 00:00:00 2001 From: Beech Rintoul Date: Mon, 23 May 2011 19:08:44 +0000 Subject: [PATCH] -Framework for the new horde4 series. Update to 4.0.3 and hook into build. -The Horde Application Framework is a flexible, modular, general-purpose web -application framework written in PHP. It provides an extensive array of -components that are targeted at the common problems and tasks involved in -developing modern web applications. It is the basis for a large number of -production-level web applications, notably the Horde Groupware suites. For more -information on Horde or the Horde Groupware suites, visit http://www.horde.org. Approved by: itetcu (mentor)(implicit) --- www/Makefile | 1 + www/horde4-base/Makefile | 59 +- .../{bsd.horde.mk => bsd.horde4.mk} | 18 +- www/horde4-base/distinfo | 4 +- .../files/extra-patch-lib_Horde_NLS.php | 14 - .../files/patch-config_mime_drivers.php.dist | 334 -- .../files/patch-config_registry.php.dist | 17 - .../files/patch-po_translation.php | 8 - .../files/patch-scripts_sql_README | 11 - www/horde4-base/pkg-plist | 5063 ++++------------- 10 files changed, 1270 insertions(+), 4259 deletions(-) rename www/horde4-base/{bsd.horde.mk => bsd.horde4.mk} (91%) delete mode 100644 www/horde4-base/files/extra-patch-lib_Horde_NLS.php delete mode 100644 www/horde4-base/files/patch-config_mime_drivers.php.dist delete mode 100644 www/horde4-base/files/patch-config_registry.php.dist delete mode 100644 www/horde4-base/files/patch-po_translation.php delete mode 100644 www/horde4-base/files/patch-scripts_sql_README diff --git a/www/Makefile b/www/Makefile index b72c2e34273c..a33720c07a79 100644 --- a/www/Makefile +++ b/www/Makefile @@ -309,6 +309,7 @@ SUBDIR += horde-passwd SUBDIR += horde-trean SUBDIR += horde-wicked + SUBDIR += horde4-base SUBDIR += hotcrp SUBDIR += hs-HTTP SUBDIR += hs-cgi diff --git a/www/horde4-base/Makefile b/www/horde4-base/Makefile index 98643b2b1680..522b934073ee 100644 --- a/www/horde4-base/Makefile +++ b/www/horde4-base/Makefile @@ -6,12 +6,11 @@ # PORTNAME= horde -PORTVERSION= 3.3.11 +PORTVERSION= 4.0.2 DISTVERSIONPREFIX= -PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= -PKGNAMESUFFIX= -base +PKGNAMESUFFIX= 4-base MAINTAINER= beech@FreeBSD.org COMMENT= Common code-base used by Horde applications @@ -69,6 +68,7 @@ COMMENT= Common code-base used by Horde applications # #---------------------------------------------------------------------------- +LATEST_LINK= horde4-base RUN_DEPENDS+= ${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date \ ${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log \ ${PEARDIR}/Mail/RFC822.php:${PORTSDIR}/mail/pear-Mail \ @@ -79,10 +79,12 @@ RUN_DEPENDS+= ${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date \ ${PEARDIR}/Net/SMTP.php:${PORTSDIR}/net/pear-Net_SMTP \ ${PEARDIR}/MDB2/Schema/Validate.php:${PORTSDIR}/databases/pear-MDB2_Schema -CONFLICTS= horde-2.* +CONFLICTS= horde-3.* USE_GETTEXT= yes -USE_PHP= ctype gettext session +USE_PHP= ctype gettext session dom + +EXTRACT_SUFX= .tgz .if defined(WITH_SUPHP) && !defined(WITHOUT_SUPHP) RUN_DEPENDS+= ${LOCALBASE}/sbin/suphp:${PORTSDIR}/www/suphp @@ -193,52 +195,11 @@ RUN_DEPENDS+= ${PEARDIR}/Services/Weather.php:${PORTSDIR}/misc/pear-Services_Wea RUN_DEPENDS+= ${LOCALBASE}/share/GeoIP/GeoIP.dat:${PORTSDIR}/net/GeoIP .endif -PORTDOCS= README CHANGES CODING_STANDARDS CONTRIBUTING CREDITS HACKING INSTALL \ - PERFORMANCE RELEASE_NOTES SECURITY TODO TRANSLATIONS UPGRADING +PORTDOCS= README CHANGES CODING_STANDARDS CONTRIBUTING CREDITS INSTALL \ + PERFORMANCE RELEASE_NOTES SECURITY TRANSLATIONS UPGRADING .include -.if ${OSVERSION} < 700000 -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-lib_Horde_NLS.php -.endif - -.if ${PHP_VER} >= 5 -USE_PHP+= dom -.else -USE_PHP+= domxml -.endif - -pre-patch: -.if !defined(WITHOUT_X11) -. if !defined(WITHOUT_WV) - @${REINPLACE_CMD} -e "s://UNCOMMENTIFWV::" ${WRKSRC}/config/mime_drivers.php.dist -. endif -. if !defined(WITHOUT_XL) - @${REINPLACE_CMD} -e "s://UNCOMMENTIFXL::" ${WRKSRC}/config/mime_drivers.php.dist -. endif -.endif -.if !defined(WITHOUT_WEBCPP) - @${REINPLACE_CMD} -e "s://UNCOMMENTIFWCPP::" ${WRKSRC}/config/mime_drivers.php.dist -.endif -.if defined(WITH_SRCHIGH) - @${REINPLACE_CMD} -e "s://UNCOMMENTIFSRCHIGH::" ${WRKSRC}/config/mime_drivers.php.dist -.endif -.if defined(WITH_ENSCRIPT) - @${REINPLACE_CMD} -e "s://UNCOMMENTIFES::" ${WRKSRC}/config/mime_drivers.php.dist -.endif -.if defined(WITH_RPM) - @${REINPLACE_CMD} -e "s://UNCOMMENTIFRPM::" ${WRKSRC}/config/mime_drivers.php.dist -.endif -.if defined(WITH_DEB) - @${REINPLACE_CMD} -e "s://UNCOMMENTIFDEB::" ${WRKSRC}/config/mime_drivers.php.dist -.endif -.if !defined(WITHOUT_GEOIP) - @${REINPLACE_CMD} -e "s:GeoIP lookup will not be performed.\"/>:GeoIP lookup will not be performed.\">${LOCALBASE}/share/GeoIP/GeoIP.dat:" \ - ${WRKSRC}/config/conf.xml -.endif - @${REINPLACE_CMD} -e "s:/usr/local/apache/htdocs:${PREFIX}/www:g" \ - ${WRKDIR}/docs/INSTALL - pre-install: .if !defined(WITHOUT_SUPPORTED_DB) && exists(${LOCALBASE}/bin/php) @if ! php -m 2>&1 | ${GREP} -q -e "mysql" ; then \ @@ -263,5 +224,5 @@ pre-install: ${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .endif -.include "${.CURDIR}/../../www/horde-base/bsd.horde.mk" +.include "${.CURDIR}/../../www/horde4-base/bsd.horde4.mk" .include diff --git a/www/horde4-base/bsd.horde.mk b/www/horde4-base/bsd.horde4.mk similarity index 91% rename from www/horde4-base/bsd.horde.mk rename to www/horde4-base/bsd.horde4.mk index 39e8c7eb16ed..5a98fc3f20af 100644 --- a/www/horde4-base/bsd.horde.mk +++ b/www/horde4-base/bsd.horde4.mk @@ -1,21 +1,23 @@ #-*- mode: makefile; tab-width: 4; -* # ex:ts=4 # -# Maintainers: Beech Rintoul , -# Andrew Pantyukhin +# Maintainers: Beech Rintoul , +# Andrew Pantyukhin # -MASTER_SITES?= HORDE +MASTER_SITES?= http://pear.horde.org/get/ \ + LOCAL/beech DISTVERSIONPREFIX?= h3- -PKGNAMEPREFIX?= horde- +PKGNAMEPREFIX?= horde4- .if defined(USE_HORDE) && ${USE_HORDE:Mbase} -RUN_DEPENDS+= ${HORBAS}/rpc.php:${PORTSDIR}/www/horde-base +RUN_DEPENDS+= ${HORBAS}/rpc.php:${PORTSDIR}/www/horde4-base .endif -#USE_BZIP2= yes NO_BUILD= yes +EXTRACT_SUFX?= .tgz + PEARDIR?= ${LOCALBASE}/share/pear PORTREV_H?= ${LOCALBASE}/include/c-client/portrevision.h HORBAS?= ${PREFIX}/www/horde @@ -54,10 +56,10 @@ post-extract: .if !target(post-patch) post-patch: . for file in pkg-deinstall pkg-install - @${SED} ${_SUB_LIST_TEMP} -e '/^@comment /d' ${.CURDIR}/../../www/horde-base/files/${file}.in > ${WRKDIR}/${file} + @${SED} ${_SUB_LIST_TEMP} -e '/^@comment /d' ${.CURDIR}/../../www/horde4-base/files/${file}.in > ${WRKDIR}/${file} . endfor . if defined(USE_HORDE) && ${USE_HORDE:Mpkg-message} - @${SED} ${_SUB_LIST_TEMP} -e '/^@comment /d' ${.CURDIR}/../../www/horde-base/files/pkg-message.common.in >\ + @${SED} ${_SUB_LIST_TEMP} -e '/^@comment /d' ${.CURDIR}/../../www/horde4-base/files/pkg-message.common.in >\ ${WRKDIR}/pkg-message . endif @${EGREP} -lr '(/usr/local|%%LOCALBASE%%|/tmp/horde.log)' ${WRKSRC}/config/ |\ diff --git a/www/horde4-base/distinfo b/www/horde4-base/distinfo index 70199c4ae588..66dc8daaf705 100644 --- a/www/horde4-base/distinfo +++ b/www/horde4-base/distinfo @@ -1,2 +1,2 @@ -SHA256 (horde-3.3.11.tar.gz) = abc8f01f33655767303b70da44c90117f95ae37838e0371b46218e375eb7a760 -SIZE (horde-3.3.11.tar.gz) = 8788320 +SHA256 (horde-4.0.2.tgz) = 56f47ac3f22c64b3f28fd2a6a08cf27d8e30d2d29eedf015b6cd849b0f9597bf +SIZE (horde-4.0.2.tgz) = 3481124 diff --git a/www/horde4-base/files/extra-patch-lib_Horde_NLS.php b/www/horde4-base/files/extra-patch-lib_Horde_NLS.php deleted file mode 100644 index 96eff63ba486..000000000000 --- a/www/horde4-base/files/extra-patch-lib_Horde_NLS.php +++ /dev/null @@ -1,14 +0,0 @@ ---- lib/Horde/NLS.php.orig 2009-09-14 10:08:48.000000000 +0000 -+++ lib/Horde/NLS.php 2009-09-28 18:06:58.000000000 +0000 -@@ -133,6 +133,11 @@ - } - } - -+ /* avoid FreeBSD issapce(3) bug */ -+ if(NLS::getCharset() == "UTF-8"){ -+ setlocale(LC_CTYPE,"C"); -+ } -+ - @putenv('LC_ALL=' . $lang_charset); - @putenv('LANG=' . $lang_charset); - @putenv('LANGUAGE=' . $lang_charset); diff --git a/www/horde4-base/files/patch-config_mime_drivers.php.dist b/www/horde4-base/files/patch-config_mime_drivers.php.dist deleted file mode 100644 index 562a2e799bdf..000000000000 --- a/www/horde4-base/files/patch-config_mime_drivers.php.dist +++ /dev/null @@ -1,334 +0,0 @@ ---- config/mime_drivers.php.dist.orig 2007-12-02 22:13:52.000000000 -0900 -+++ config/mime_drivers.php.dist 2007-12-11 17:17:21.000000000 -0900 -@@ -42,40 +42,23 @@ - */ - $mime_drivers_map['horde']['registered'] = array( - 'audio', -- 'css', -- 'enriched', -- 'html', -- 'images', -- 'ooo', -- 'pdf', -- 'php', -- 'plain', -- 'rar', -- 'report', -- 'rfc822', -- 'richtext', -- 'security', -- 'simple', -- 'smil', -- 'tgz', -- 'tnef', -- 'vcard', -- 'zip', -- /* The following mime drivers require external applications to be -- * installed and are disabled by default. */ -- // 'deb', -- // 'enscript', -- // 'msword', -- // 'msexcel', -- // 'mspowerpoint', -- // 'rpm', -- // 'rtf', -- // 'srchighlite', -- // 'webcpp', -- // 'wordperfect', -+ 'css' -+//UNCOMMENTIFDEB , 'deb' -+ , 'enriched' -+//UNCOMMENTIFES , 'enscript' -+ , 'html', 'images' -+//UNCOMMENTIFWV , 'msword' -+//UNCOMMENTIFXL , 'msexcel', 'mspowerpoint' -+ , 'ooo', 'pdf', 'php', 'plain', 'rar', 'report', -+ 'rfc822', 'richtext' -+//UNCOMMENTIFRPM , 'rpm' -+ , 'security', 'simple', 'smil' -+//UNCOMMENTIFSRCHIGH , 'srchighlite' -+ , 'tgz', 'tnef', 'vcard' -+//UNCOMMENTIFWCPP , 'webcpp' -+ , 'zip' - ); - -- - /** - * If you want to specifically override any MIME type to be handled by - * a specific driver, then enter it here. Normally, this is safe to -@@ -255,78 +238,79 @@ - * Web C Plus Plus driver settings - * http://webcpp.sourceforge.net/ - */ --$mime_drivers['horde']['webcpp'] = array( -- 'location' => '/usr/bin/webcpp', -- 'inline' => true, -- 'handles' => array( -- 'text/xml', 'text/sgml', 'application/xml', 'application/x-sh', -- 'application/x-javascript', 'application/x-tcl', 'x-extension/asm', -- 'application/x-asp', 'x-extension/bas', 'x-extension/cs', -- 'text/x-csrc', 'x-extension/rc', 'text/x-c++src', 'text/x-c++src', -- 'text/x-c++src', 'text/x-chdr', 'x-extension/bat', 'text/x-fortran', -- 'x-extension/f77', 'x-extension/f90', 'x-extension/for', -- 'x-extension/ftn', 'text/x-java', 'application/x-javascript', -- 'text/sgml', 'text/xml', 'text/x-pascal', 'application/x-cgi', -- 'application/x-perl', 'application/x-python', 'text/x-sql', -- 'text/x-tcl', 'application/x-shellscript', 'x-extension/vhd', -- 'x-extension/vhdl' -- ), -- 'icons' => array( -- 'default' => 'text.png', -- 'text/xml' => 'xml.png', -- 'text/x-csrc' => 'source-c.png', -- 'text/x-chdr' => 'source-h.png', -- 'text/x-java' => 'source-java.png', -- 'application/x-javascript' => 'script-js.png' -- ) --); -+//UNCOMMENTIFWCPP$mime_drivers['horde']['webcpp'] = array( -+//UNCOMMENTIFWCPP 'location' => '%%LOCALBASE%%/bin/webcpp', -+//UNCOMMENTIFWCPP 'inline' => true, -+//UNCOMMENTIFWCPP 'handles' => array( -+//UNCOMMENTIFWCPP 'text/xml', 'text/sgml', 'application/xml', -+//UNCOMMENTIFWCPP 'application/x-sh', 'application/x-javascript', 'application/x-tcl', -+//UNCOMMENTIFWCPP 'x-extension/asm', 'application/x-asp', 'x-extension/bas', -+//UNCOMMENTIFWCPP 'x-extension/cs', 'text/x-csrc', 'x-extension/rc', -+//UNCOMMENTIFWCPP 'text/x-c++src', 'text/x-c++src', 'text/x-c++src', -+//UNCOMMENTIFWCPP 'text/x-chdr', 'x-extension/bat', 'text/x-fortran', -+//UNCOMMENTIFWCPP 'x-extension/f77', 'x-extension/f90', 'x-extension/for', -+//UNCOMMENTIFWCPP 'x-extension/ftn', 'text/x-java', 'application/x-javascript', -+//UNCOMMENTIFWCPP 'text/sgml', 'text/xml', 'text/x-pascal', -+//UNCOMMENTIFWCPP 'application/x-cgi', 'application/x-perl', 'application/x-python', -+//UNCOMMENTIFWCPP 'text/x-sql', 'text/x-tcl', -+//UNCOMMENTIFWCPP 'application/x-shellscript', 'x-extension/vhd', 'x-extension/vhdl' -+//UNCOMMENTIFWCPP ), -+//UNCOMMENTIFWCPP 'icons' => array( -+//UNCOMMENTIFWCPP 'default' => 'text.png', -+//UNCOMMENTIFWCPP 'text/xml' => 'xml.png', -+//UNCOMMENTIFWCPP 'text/x-csrc' => 'source-c.png', -+//UNCOMMENTIFWCPP 'text/x-chdr' => 'source-h.png', -+//UNCOMMENTIFWCPP 'text/x-java' => 'source-java.png', -+//UNCOMMENTIFWCPP 'application/x-javascript' => 'script-js.png' -+//UNCOMMENTIFWCPP ) -+//UNCOMMENTIFWCPP); - - - /** - * Source-Highlight driver settings - * http://www.gnu.org/software/src-highlite/ - */ --$mime_drivers['horde']['srchighlite'] = array( -- 'location' => '/usr/bin/source-highlight', -- 'inline' => true, -- 'handles' => array( -- 'text/x-csrc', 'text/x-c++src', 'text/x-java', 'application/x-perl', -- 'application/x-python', 'text/x-c++src', 'text/cpp' -- ), -- 'icons' => array( -- 'default' => 'text.png', -- 'text/x-csrc' => 'source-c.png', -- 'text/x-c++src' => 'source-c.png', -- 'text/cpp' => 'source-c.png', -- 'text/x-java' => 'source-java.png' -- ) --); -+//UNCOMMENTIFSRCHIGH$mime_drivers['horde']['srchighlite'] = array( -+//UNCOMMENTIFSRCHIGH 'location' => '%%LOCALBASE%%/source-highlight', -+//UNCOMMENTIFSRCHIGH 'inline' => true, -+//UNCOMMENTIFSRCHIGH 'handles' => array( -+//UNCOMMENTIFSRCHIGH 'text/x-csrc', 'text/x-c++src', 'text/x-java', 'application/x-perl', -+//UNCOMMENTIFSRCHIGH 'application/x-python', 'text/x-c++src', 'text/cpp' -+//UNCOMMENTIFSRCHIGH ), -+//UNCOMMENTIFSRCHIGH 'icons' => array( -+//UNCOMMENTIFSRCHIGH 'default' => 'text.png', -+//UNCOMMENTIFSRCHIGH 'text/x-csrc' => 'source-c.png', -+//UNCOMMENTIFSRCHIGH 'text/x-c++src' => 'source-c.png', -+//UNCOMMENTIFSRCHIGH 'text/cpp' => 'source-c.png', -+//UNCOMMENTIFSRCHIGH 'text/x-java' => 'source-java.png' -+//UNCOMMENTIFSRCHIGH ) -+//UNCOMMENTIFSRCHIGH); - - - /** - * GNU Enscript driver settings - */ --$mime_drivers['horde']['enscript'] = array( -- 'location' => '/usr/bin/enscript', -- 'inline' => true, -- 'handles' => array( -- 'application/x-cgi', 'application/x-shellscript', -- 'application/x-javascript', 'application/x-perl', 'application/xml', -- 'text/xml', 'text/diff', 'text/x-diff', 'text/x-patch', 'text/x-csrc', -- 'x-extension/cs', 'text/x-java', 'text/x-chdr', 'text/x-c++src', -- 'text/x-c++hdr', 'x-extension/vhd', 'x-extension/vhdl', 'text/x-sql', -- 'x-extension/vb', 'x-extension/vba', 'text/x-emacs-lisp', 'text/x-tex' -- ), -- 'icons' => array( -- 'default' => 'text.png', -- 'text/xml' => 'xml.png', -- 'application/xml' => 'xml.png', -- 'text/x-csrc' => 'source-c.png', -- 'text/x-chdr' => 'source-h.png', -- 'text/x-java' => 'source-java.png', -- 'application/x-javascript' => 'script-js.png' -- ) --); -+//UNCOMMENTIFES$mime_drivers['horde']['enscript'] = array( -+//UNCOMMENTIFES 'location' => '%%LOCALBASE%%/enscript', -+//UNCOMMENTIFES 'inline' => true, -+//UNCOMMENTIFES 'handles' => array( -+//UNCOMMENTIFES 'application/x-cgi', 'application/x-shellscript', -+//UNCOMMENTIFES 'application/x-javascript', 'application/x-perl', 'application/xml', -+//UNCOMMENTIFES 'text/xml', 'text/diff', 'text/x-diff', 'text/x-patch', 'text/x-csrc', -+//UNCOMMENTIFES 'x-extension/cs', 'text/x-java', 'text/x-chdr', 'text/x-c++src', -+//UNCOMMENTIFES 'text/x-c++hdr', 'x-extension/vhd', 'x-extension/vhdl', 'text/x-sql', -+//UNCOMMENTIFES 'x-extension/vb', 'x-extension/vba', 'text/x-emacs-lisp', 'text/x-tex' -+//UNCOMMENTIFES ), -+//UNCOMMENTIFES 'icons' => array( -+//UNCOMMENTIFES 'default' => 'text.png', -+//UNCOMMENTIFES 'text/xml' => 'xml.png', -+//UNCOMMENTIFES 'application/xml' => 'xml.png', -+//UNCOMMENTIFES 'text/x-csrc' => 'source-c.png', -+//UNCOMMENTIFES 'text/x-chdr' => 'source-h.png', -+//UNCOMMENTIFES 'text/x-java' => 'source-java.png', -+//UNCOMMENTIFES 'application/x-javascript' => 'script-js.png' -+//UNCOMMENTIFES ) -+//UNCOMMENTIFES); - - - /** -@@ -387,16 +371,16 @@ - * Embedded images in Word documents need extra configuration. See - * http://wiki.horde.org/GraphicswvHtml - */ --$mime_drivers['horde']['msword'] = array( -- 'location' => '/usr/bin/wvHtml', -- 'inline' => false, -- 'handles' => array( -- 'application/vnd.ms-word', 'application/msword' -- ), -- 'icons' => array( -- 'default' => 'msword.png' -- ) --); -+//UNCOMMENTIFWV$mime_drivers['horde']['msword'] = array( -+//UNCOMMENTIFWV 'location' => '%%LOCALBASE%%/wvHtml', -+//UNCOMMENTIFWV 'inline' => false, -+//UNCOMMENTIFWV 'handles' => array( -+//UNCOMMENTIFWV 'application/vnd.ms-word', 'application/msword' -+//UNCOMMENTIFWV ), -+//UNCOMMENTIFWV 'icons' => array( -+//UNCOMMENTIFWV 'default' => 'msword.png' -+//UNCOMMENTIFWV ) -+//UNCOMMENTIFWV); - - - /** -@@ -404,17 +388,17 @@ - * This driver requires xlhtml to be installed. - * xlhtml homepage: http://chicago.sourceforge.net/xlhtml/ - */ --$mime_drivers['horde']['msexcel'] = array( -- 'location' => '/usr/local/bin/xlhtml', -- 'inline' => false, -- 'handles' => array( -- 'application/vnd.ms-excel', 'application/msexcel', -- 'application/x-msexcel' -- ), -- 'icons' => array( -- 'default' => 'msexcel.png' -- ) --); -+//UNCOMMENTIFXL$mime_drivers['horde']['msexcel'] = array( -+//UNCOMMENTIFXL 'location' => '%%LOCALBASE%%/bin/xlhtml', -+//UNCOMMENTIFXL 'inline' => false, -+//UNCOMMENTIFXL 'handles' => array( -+//UNCOMMENTIFXL 'application/vnd.ms-excel', 'application/msexcel', -+//UNCOMMENTIFXL 'application/x-msexcel' -+//UNCOMMENTIFXL ), -+//UNCOMMENTIFXL 'icons' => array( -+//UNCOMMENTIFXL 'default' => 'msexcel.png' -+//UNCOMMENTIFXL ) -+//UNCOMMENTIFXL); - - - /** -@@ -422,16 +406,16 @@ - * This driver requires ppthtml, included with xlhtml, to be installed. - * xlhtml homepage: http://chicago.sourceforge.net/xlhtml/ - */ --$mime_drivers['horde']['mspowerpoint'] = array( -- 'location' => '/usr/local/bin/ppthtml', -- 'inline' => false, -- 'handles' => array( -- 'application/vnd.ms-powerpoint', 'application/mspowerpoint' -- ), -- 'icons' => array( -- 'default' => 'mspowerpoint.png' -- ) --); -+//UNCOMMENTIFXL$mime_drivers['horde']['mspowerpoint'] = array( -+//UNCOMMENTIFXL 'location' => '%%LOCALBASE%%/bin/ppthtml', -+//UNCOMMENTIFXL 'inline' => false, -+//UNCOMMENTIFXL 'handles' => array( -+//UNCOMMENTIFXL 'application/vnd.ms-powerpoint', 'application/mspowerpoint' -+//UNCOMMENTIFXL ), -+//UNCOMMENTIFXL 'icons' => array( -+//UNCOMMENTIFXL 'default' => 'mspowerpoint.png' -+//UNCOMMENTIFXL ) -+//UNCOMMENTIFXL); - - - /** -@@ -450,31 +434,31 @@ - /** - * RPM driver settings - */ --$mime_drivers['horde']['rpm'] = array( -- 'location' => '/usr/bin/rpm', -- 'inline' => false, -- 'handles' => array( -- 'application/x-rpm' -- ), -- 'icons' => array( -- 'default' => 'rpm.png' -- ) --); -+//UNCOMMENTIFRPM$mime_drivers['horde']['rpm'] = array( -+//UNCOMMENTIFRPM 'location' => '%%LOCALBASE%%/bin/rpm', -+//UNCOMMENTIFRPM 'inline' => false, -+//UNCOMMENTIFRPM 'handles' => array( -+//UNCOMMENTIFRPM 'application/x-rpm' -+//UNCOMMENTIFRPM ), -+//UNCOMMENTIFRPM 'icons' => array( -+//UNCOMMENTIFRPM 'default' => 'rpm.png' -+//UNCOMMENTIFRPM ) -+//UNCOMMENTIFRPM); - - - /** - * Debian package driver settings - */ --$mime_drivers['horde']['deb'] = array( -- 'location' => '/usr/bin/dpkg', -- 'inline' => false, -- 'handles' => array( -- 'application/x-deb', 'application/x-debian-package' -- ), -- 'icons' => array( -- 'default' => 'deb.png' -- ) --); -+//UNCOMMENTIFDEB$mime_drivers['horde']['deb'] = array( -+//UNCOMMENTIFDEB 'location' => '%%LOCALHOST%%/bin/dpkg', -+//UNCOMMENTIFDEB 'inline' => false, -+//UNCOMMENTIFDEB 'handles' => array( -+//UNCOMMENTIFDEB 'application/x-deb', 'application/x-debian-package' -+//UNCOMMENTIFDEB ), -+//UNCOMMENTIFDEB 'icons' => array( -+//UNCOMMENTIFDEB 'default' => 'deb.png' -+//UNCOMMENTIFDEB ) -+//UNCOMMENTIFDEB); - - - /** diff --git a/www/horde4-base/files/patch-config_registry.php.dist b/www/horde4-base/files/patch-config_registry.php.dist deleted file mode 100644 index ae787a92685a..000000000000 --- a/www/horde4-base/files/patch-config_registry.php.dist +++ /dev/null @@ -1,17 +0,0 @@ ---- config/registry.php.dist.orig Wed Aug 3 16:27:41 2005 -+++ config/registry.php.dist Wed Aug 17 22:33:03 2005 -@@ -347,6 +347,14 @@ - 'provides' => 'files', - ); - -+// r1.255.2.9 -+$this->applications['gollem-menu'] = array( -+ 'status' => 'block', -+ 'app' => 'gollem', -+ 'blockname' => 'tree_menu', -+ 'menu_parent' => 'gollem', -+); -+ - $this->applications['passwd'] = array( - 'fileroot' => dirname(__FILE__) . '/../passwd', - 'webroot' => $this->applications['horde']['webroot'] . '/passwd', diff --git a/www/horde4-base/files/patch-po_translation.php b/www/horde4-base/files/patch-po_translation.php deleted file mode 100644 index 045891903631..000000000000 --- a/www/horde4-base/files/patch-po_translation.php +++ /dev/null @@ -1,8 +0,0 @@ ---- 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 -