From cb26f6235945fcb8f0858515afaf732eed0ebcd4 Mon Sep 17 00:00:00 2001
From: SADA Kenji <sada@FreeBSD.org>
Date: Thu, 16 May 2002 07:25:55 +0000
Subject: - Follow xlhtml's rename. - Cope with the change of wvHtml's
 commandline use. - Upgrade to version 2.2.8, preventing some CSS attacks. PR:
 ports/35740, ports/36820 Submitted by:	maintainer

---
 mail/horde-imp/Makefile                      |  4 ++--
 mail/horde-imp/distinfo                      |  2 +-
 mail/horde-imp/files/patch-lib_mimetypes.lib | 11 +++++++++++
 mail/horde-imp/pkg-plist                     |  1 +
 4 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 mail/horde-imp/files/patch-lib_mimetypes.lib

(limited to 'mail/horde-imp')

diff --git a/mail/horde-imp/Makefile b/mail/horde-imp/Makefile
index 1427988c53a0..95eeb9411f60 100644
--- a/mail/horde-imp/Makefile
+++ b/mail/horde-imp/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	imp
-PORTVERSION=	2.2.7
+PORTVERSION=	2.2.8
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.horde.org/pub/imp/tarballs/
 
@@ -177,7 +177,7 @@ do-install:
 			${IMPDIR}/config/defaults.php3.dist
 	${PERL} -pi -e "s:/usr/bin/wvHtml:${LOCALBASE}/bin/wvHtml:g" \
 			${IMPDIR}/config/defaults.php3.dist
-	${PERL} -pi -e "s:/usr/bin/xlHtml:${LOCALBASE}/bin/xlHtml:g" \
+	${PERL} -pi -e "s:/usr/bin/xlHtml:${LOCALBASE}/bin/xlhtml:g" \
 			${IMPDIR}/config/defaults.php3.dist
 	${PERL} -pi -e "s:/bin/tar:/usr/bin/tar:g" ${IMPDIR}/config/defaults.php3.dist
 	${PERL} -pi -e "s:/usr/bin/zipinfo:${LOCALBASE}/bin/zipinfo:g" \
diff --git a/mail/horde-imp/distinfo b/mail/horde-imp/distinfo
index 6934dd245690..c610ad00a6ef 100644
--- a/mail/horde-imp/distinfo
+++ b/mail/horde-imp/distinfo
@@ -1 +1 @@
-MD5 (imp-2.2.7.tar.gz) = b5c683e1dc862fd185c9be0ce7188894
+MD5 (imp-2.2.8.tar.gz) = 9f0e442f61ce542b945016bee2736d2f
diff --git a/mail/horde-imp/files/patch-lib_mimetypes.lib b/mail/horde-imp/files/patch-lib_mimetypes.lib
new file mode 100644
index 000000000000..4b87c5512d65
--- /dev/null
+++ b/mail/horde-imp/files/patch-lib_mimetypes.lib
@@ -0,0 +1,11 @@
+--- lib/mimetypes.lib.orig	Wed Jul 18 16:23:58 2001
++++ lib/mimetypes.lib	Sun Mar 10 16:26:33 2002
+@@ -449,7 +449,7 @@
+     fwrite( $fh, imap_base64($contents));
+     fclose( $fh );
+     
+-    $pipe = popen("$default->path_to_mswordview $word_name 2>&1","r");
++    $pipe = popen("$default->path_to_mswordview $word_name - 2>&1","r");
+     $data = "<b><u>MS Word Viewer</u></b><br><table><tr><td align=left>";
+     while( ($rc=fgets($pipe,8192)) )
+       $data.=$rc;
diff --git a/mail/horde-imp/pkg-plist b/mail/horde-imp/pkg-plist
index 1d59e0d71dda..4c26c83ec949 100644
--- a/mail/horde-imp/pkg-plist
+++ b/mail/horde-imp/pkg-plist
@@ -101,6 +101,7 @@
 %%IMPDIR%%/lib/js/open_compose_win.js
 %%IMPDIR%%/lib/js/open_contacts.js
 %%IMPDIR%%/lib/mimetypes.lib
+%%IMPDIR%%/lib/mimetypes.lib.orig
 %%IMPDIR%%/lib/postconf.php3
 %%IMPDIR%%/lib/version.php
 %%IMPDIR%%/locale/ca/compose.help
-- 
cgit v1.2.3