Attachment 19761 Details for Bug 35047 – file.diff

[patch] file.diff

file.diff (text/plain), 8.69 KB, created by Thierry Thomas on 2002-02-17 15:40:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Thomas

Created: 2002-02-17 15:40:02 UTC

Size: 8.69 KB

patch

obsolete

>diff -urN /usr/ports/www/horde-devel.orig/Makefile /usr/ports/www/horde-devel/Makefile
>--- /usr/ports/www/horde-devel.orig/Makefile	Tue Jan 29 22:13:15 2002
>+++ /usr/ports/www/horde-devel/Makefile	Sat Feb 16 19:53:22 2002
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	horde
> PORTVERSION=	2.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www
> MASTER_SITES=	ftp://ftp.horde.org/pub/horde/tarballs/
> PKGNAMESUFFIX=	-devel
>@@ -101,6 +101,7 @@
> 	  ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
> 	fi
> .endfor
>+	@${PERL} -pi -e "s:%%LOCALBASE%%:${LOCALBASE}:" ${CONFDIR}/mime_drivers.php
> 	@${CP} ${WRKSRC}/scripts/set_perms.sh ${HORDESBIN}/horde_set_perms.sh
> 	@${PERL} -pi -e "s:UPDATED_BY_THE_PORT:${HORDEDIR}/:g" \
> 		${HORDESBIN}/horde_set_perms.sh
>diff -urN /usr/ports/www/horde-devel.orig/files/patch-mime_drivers.php.dist /usr/ports/www/horde-devel/files/patch-mime_drivers.php.dist
>--- /usr/ports/www/horde-devel.orig/files/patch-mime_drivers.php.dist	Thu Jan  1 01:00:00 1970
>+++ /usr/ports/www/horde-devel/files/patch-mime_drivers.php.dist	Sun Feb 17 10:41:18 2002
>@@ -0,0 +1,170 @@
>+--- config/mime_drivers.php.dist.orig	Sun Dec 23 22:36:27 2001
>++++ config/mime_drivers.php.dist	Sun Feb 17 10:11:21 2002
>+@@ -20,8 +20,12 @@
>+ 
>+ $mime_drivers_map['horde']['registered'] = array(
>+     'php', 'tgz', 'vcard'
>+-    // ,'msword', 'msexcel', 'mspowerpoint',
>+-    // ,'enscript', 'rar', 'zip', 'rpm', 'deb'
>++    //UNCOMMENTIFWV ,'msword'
>++    //UNCOMMENTIFXL , 'msexcel', 'mspowerpoint'
>++    //UNCOMMENTWHENINSTCHORA ,'enscript'
>++    //UNCOMMENTIFRAR , 'rar'
>++    //UNCOMMENTIFZIP , 'zip'
>++    // , 'rpm', 'deb'
>+     );
>+ 
>+ 
>+@@ -101,19 +105,19 @@
>+  */
>+ 
>+ /* Location of the enscript binary. */
>+-// $mime_drivers['horde']['enscript']['location'] = '/usr/bin/enscript';
>+-// $mime_drivers['horde']['enscript']['inline'] = false;
>+-// $mime_drivers['horde']['enscript']['handles'] = array(
>+-//     'text/html', 'x-extension/pl', 'x-extension/c',
>+-//     'text/xml', 'application/x-sh', 'application/x-javascript',
>+-//     'x-extension/java', 'x-extension/h', 'x-extension/cpp');
>+-// $mime_drivers['horde']['enscript']['icons'] = array(
>+-//     'default'          => 'text.gif',
>+-//     'text/html'        => 'html.gif',
>+-//     'text/xml'         => 'xml.gif',
>+-//     'x-extension/c'    => 'source-c.gif',
>+-//     'x-extension/h'    => 'source-h.gif',
>+-//     'x-extension/java' => 'source-java.gif');
>++//UNCOMMENTWHENINSTCHORA $mime_drivers['horde']['enscript']['location'] = '%%LOCALBASE%%/bin/enscript';
>++//UNCOMMENTWHENINSTCHORA $mime_drivers['horde']['enscript']['inline'] = false;
>++//UNCOMMENTWHENINSTCHORA $mime_drivers['horde']['enscript']['handles'] = array(
>++//UNCOMMENTWHENINSTCHORA     'text/html', 'x-extension/pl', 'x-extension/c',
>++//UNCOMMENTWHENINSTCHORA     'text/xml', 'application/x-sh', 'application/x-javascript',
>++//UNCOMMENTWHENINSTCHORA     'x-extension/java', 'x-extension/h', 'x-extension/cpp');
>++//UNCOMMENTWHENINSTCHORA $mime_drivers['horde']['enscript']['icons'] = array(
>++//UNCOMMENTWHENINSTCHORA     'default'          => 'text.gif',
>++//UNCOMMENTWHENINSTCHORA     'text/html'        => 'html.gif',
>++//UNCOMMENTWHENINSTCHORA     'text/xml'         => 'xml.gif',
>++//UNCOMMENTWHENINSTCHORA     'x-extension/c'    => 'source-c.gif',
>++//UNCOMMENTWHENINSTCHORA     'x-extension/h'    => 'source-h.gif',
>++//UNCOMMENTWHENINSTCHORA     'x-extension/java' => 'source-java.gif');
>+ 
>+ 
>+ /**
>+@@ -121,7 +125,7 @@
>+  */
>+ 
>+ /* Location of the tar binary. */
>+-$mime_drivers['horde']['tgz']['location'] = '/bin/tar';
>++$mime_drivers['horde']['tgz']['location'] = '/usr/bin/tar';
>+ $mime_drivers['horde']['tgz']['inline'] = true;
>+ $mime_drivers['horde']['tgz']['handles'] = array(
>+     'x-extension/tgz',
>+@@ -138,13 +142,13 @@
>+  */
>+ 
>+ /* Location of the zipinfo binary. */
>+-// $mime_drivers['horde']['zip']['location'] = '/usr/bin/zipinfo';
>+-// $mime_drivers['horde']['zip']['inline'] = true;
>+-// $mime_drivers['horde']['zip']['handles'] = array(
>+-//     'x-extension/zip',
>+-//     'application/x-zip-compressed');
>+-// $mime_drivers['horde']['zip']['icons'] = array(
>+-//     'default' => 'compressed.gif');
>++//UNCOMMENTIFZIP $mime_drivers['horde']['zip']['location'] = '%%LOCALBASE%%/bin/zipinfo';
>++//UNCOMMENTIFZIP $mime_drivers['horde']['zip']['inline'] = true;
>++//UNCOMMENTIFZIP $mime_drivers['horde']['zip']['handles'] = array(
>++//UNCOMMENTIFZIP     'x-extension/zip',
>++//UNCOMMENTIFZIP     'application/x-zip-compressed');
>++//UNCOMMENTIFZIP $mime_drivers['horde']['zip']['icons'] = array(
>++//UNCOMMENTIFZIP     'default' => 'compressed.gif');
>+ 
>+ 
>+ /**
>+@@ -153,12 +157,12 @@
>+  */
>+ 
>+ /* Location of the rar binary. */
>+-// $mime_drivers['horde']['rar']['location'] = '/usr/bin/rar';
>+-// $mime_drivers['horde']['rar']['inline'] = true;
>+-// $mime_drivers['horde']['rar']['handles'] = array(
>+-//     'x-extension/rar');
>+-// $mime_drivers['horde']['rar']['icons'] = array(
>+-//     'default' => 'compressed.gif');
>++//UNCOMMENTIFRAR $mime_drivers['horde']['rar']['location'] = '%%LOCALBASE%%/bin/rar';
>++//UNCOMMENTIFRAR $mime_drivers['horde']['rar']['inline'] = true;
>++//UNCOMMENTIFRAR $mime_drivers['horde']['rar']['handles'] = array(
>++//UNCOMMENTIFRAR     'x-extension/rar');
>++//UNCOMMENTIFRAR $mime_drivers['horde']['rar']['icons'] = array(
>++//UNCOMMENTIFRAR     'default' => 'compressed.gif');
>+ 
>+ 
>+ /**
>+@@ -168,15 +172,15 @@
>+  */
>+ 
>+ /* Location of the wvHtml binary. */
>+-// $mime_drivers['horde']['msword']['location'] = '/usr/bin/wvHtml';
>+-// $mime_drivers['horde']['msword']['inline'] = true;
>+-// $mime_drivers['horde']['msword']['handles'] = array(
>+-//     'application/msword',
>+-//     'text/rtf',
>+-//     'x-extension/doc',
>+-//     'x-extension/rtf');
>+-// $mime_drivers['horde']['msword']['icons'] = array(
>+-//     'default' => 'msword.gif');
>++//UNCOMMENTIFWV $mime_drivers['horde']['msword']['location'] = '%%LOCALBASE%%/bin/wvHtml';
>++//UNCOMMENTIFWV $mime_drivers['horde']['msword']['inline'] = true;
>++//UNCOMMENTIFWV $mime_drivers['horde']['msword']['handles'] = array(
>++//UNCOMMENTIFWV     'application/msword',
>++//UNCOMMENTIFWV     'text/rtf',
>++//UNCOMMENTIFWV     'x-extension/doc',
>++//UNCOMMENTIFWV     'x-extension/rtf');
>++//UNCOMMENTIFWV $mime_drivers['horde']['msword']['icons'] = array(
>++//UNCOMMENTIFWV     'default' => 'msword.gif');
>+ 
>+ 
>+ /**
>+@@ -186,14 +190,14 @@
>+  */
>+ 
>+ /* Location of the xlhtml binary. */
>+-// $mime_drivers['horde']['msexcel']['location'] = '/usr/local/bin/xlhtml';
>+-// $mime_drivers['horde']['msexcel']['inline'] = false;
>+-// $mime_drivers['horde']['msexcel']['handles'] = array(
>+-//     'application/vnd.ms-excel',
>+-//     'application/msexcel',
>+-//     'x-extension/xls');
>+-// $mime_drivers['horde']['msexcel']['icons'] = array(
>+-//     'default' => 'msexcel.gif');
>++//UNCOMMENTIFXL $mime_drivers['horde']['msexcel']['location'] = '%%LOCALBASE%%/bin/xlHtml';
>++//UNCOMMENTIFXL $mime_drivers['horde']['msexcel']['inline'] = false;
>++//UNCOMMENTIFXL $mime_drivers['horde']['msexcel']['handles'] = array(
>++//UNCOMMENTIFXL     'application/vnd.ms-excel',
>++//UNCOMMENTIFXL     'application/msexcel',
>++//UNCOMMENTIFXL     'x-extension/xls');
>++//UNCOMMENTIFXL $mime_drivers['horde']['msexcel']['icons'] = array(
>++//UNCOMMENTIFXL     'default' => 'msexcel.gif');
>+ 
>+ 
>+ /**
>+@@ -204,14 +208,14 @@
>+  */
>+ 
>+ /* Location of the ppthtml binary. */
>+-// $mime_drivers['horde']['mspowerpoint']['location'] = '/usr/local/bin/ppthtml';
>+-// $mime_drivers['horde']['mspowerpoint']['inline'] = false;
>+-// $mime_drivers['horde']['mspowerpoint']['handles'] = array(
>+-//     'application/vnd.ms-powerpoint',
>+-//     'application/mspowerpoint',
>+-//     'x-extension/ppt');
>+-// $mime_drivers['horde']['mspowerpoint']['icons'] = array(
>+-//     'default' => 'mspowerpoint.gif');
>++//UNCOMMENTIFXL $mime_drivers['horde']['mspowerpoint']['location'] = '%%LOCALBASE%%/bin/pptHtml';
>++//UNCOMMENTIFXL $mime_drivers['horde']['mspowerpoint']['inline'] = false;
>++//UNCOMMENTIFXL $mime_drivers['horde']['mspowerpoint']['handles'] = array(
>++//UNCOMMENTIFXL     'application/vnd.ms-powerpoint',
>++//UNCOMMENTIFXL     'application/mspowerpoint',
>++//UNCOMMENTIFXL     'x-extension/ppt');
>++//UNCOMMENTIFXL $mime_drivers['horde']['mspowerpoint']['icons'] = array(
>++//UNCOMMENTIFXL     'default' => 'mspowerpoint.gif');
>+ 
>+ 
>+ /**
>diff -urN /usr/ports/www/horde-devel.orig/pkg-plist /usr/ports/www/horde-devel/pkg-plist
>--- /usr/ports/www/horde-devel.orig/pkg-plist	Sat Jan 19 21:09:56 2002
>+++ /usr/ports/www/horde-devel/pkg-plist	Sat Feb 16 17:57:07 2002
>@@ -41,6 +41,7 @@
> %%HORDEDIR%%/config/lang.php.dist
> %%HORDEDIR%%/config/mime_drivers.php
> %%HORDEDIR%%/config/mime_drivers.php.dist
>+%%HORDEDIR%%/config/mime_drivers.php.dist.orig
> %%HORDEDIR%%/config/mime_mapping.php
> %%HORDEDIR%%/config/mime_mapping.php.dist
> %%HORDEDIR%%/config/motd.php

Actions: View | Diff

Attachments on bug 35047: 19761