Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 17 Feb 2002 16:40:21 +0100 (CET)
From:      Thierry Thomas <thierry@pompo.net>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/35049: mail/imp-devel: fix a warning when building + better handling of MIME drivers
Message-ID:  <20020217154021.03013752B@graf.pompo.net>

next in thread | raw e-mail | index | archive | help

>Number:         35049
>Category:       ports
>Synopsis:       mail/imp-devel: fix a warning when building + better handling of MIME drivers
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 17 07:50:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Thierry Thomas
>Release:        FreeBSD 4.5-STABLE i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD graf.pompo.net 4.5-STABLE FreeBSD 4.5-STABLE #0: Sun Feb 3 16:21:08 CET 2002 root@graf.pompo.net:/usr/obj/mntsrc/src/sys/GRAF010429 i386


	
>Description:
	1) do-install: tries to update the document SECURITY, which has been removed
	=> perl is complaining.

	2) automatizing the configuration od MIME drivers (e.g. word & excel viewers)
	and adding support for rar archives.

>How-To-Repeat:
	Just make install.

>Fix:

	Pre-requisite: please commit PR ports/35047 on www/horde-devel before this one.

        Then apply the following patch:

diff -urN /usr/ports/mail/imp-devel.orig/Makefile /usr/ports/mail/imp-devel/Makefile
--- /usr/ports/mail/imp-devel.orig/Makefile	Sun Jan 20 23:32:43 2002
+++ /usr/ports/mail/imp-devel/Makefile	Sun Feb 17 11:45:30 2002
@@ -7,7 +7,7 @@
 
 PORTNAME=	imp
 PORTVERSION=	3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.horde.org/pub/imp/tarballs/
 PKGNAMESUFFIX=	-devel
@@ -31,6 +31,8 @@
 #
 # - WITHOUT_ZIP		: if not interested by zipinfo;
 #
+# - WITH_RAR		: if interested by rar (shareware archiver);
+#
 # - WITHOUT_ASPELL	: for spelling bees...
 #
 # - NOCRYPT		: if crypto is restricted in your country;
@@ -109,6 +111,9 @@
 .if !defined(WITHOUT_ZIP)
 RUN_DEPENDS+=	${LOCALBASE}/bin/zipinfo:${PORTSDIR}/archivers/unzip
 .endif
+.if defined(WITH_RAR)
+RUN_DEPENDS+=	${LOCALBASE}/bin/rar:${PORTSDIR}/archivers/rar
+.endif
 .if !defined(WITHOUT_ASPELL)
 RUN_DEPENDS+=	${LOCALBASE}/bin/aspell:${PORTSDIR}/textproc/aspell
 .endif
@@ -130,6 +135,7 @@
 IMPDIR=		${PREFIX}/${LIMPDIR}
 TURBADIR?=	${HORDEDIR}/turba
 CONFDIR=	${IMPDIR}/config
+HCONFDIR=	${HORDEDIR}/config
 
 HORDE_INC=	${LOCALBASE}/etc/horde
 
@@ -247,17 +253,15 @@
 .endif
 .endif
 .if !defined(WITHOUT_ASPELL)
-	@${PERL} -pi -e "s:\/\* BEGBSDASPELL::;s:ENDBSDASPELL \*\/::" \
-			${CONFDIR}/mime_drivers.php
 	@${PERL} -pi -e "s:spellchecker'] = '':spellchecker'] = '${LOCALBASE}/bin/aspell':" \
 		${CONFDIR}/conf.php
 .endif
 .if !defined(WITHOUT_X11)
 .if !defined(WITHOUT_WV)
-	@${PERL} -pi -e "s:\/\* BEGBSDWV::;s:ENDBSDWV \*\/::" ${CONFDIR}/mime_drivers.php
+	@${PERL} -pi -e "s://UNCOMMENTIFWV ::" ${HCONFDIR}/mime_drivers.php
 .endif
 .if !defined(WITHOUT_XL)
-	@${PERL} -pi -e "s:\/\* BEGBSDXL::;s:ENDBSDXL \*\/::g" ${CONFDIR}/mime_drivers.php
+	@${PERL} -pi -e "s://UNCOMMENTIFXL ::" ${HCONFDIR}/mime_drivers.php
 .endif
 .endif
 #.if !defined(NOCRYPT)
@@ -270,14 +274,17 @@
 #			${CONFDIR}/conf.php
 #.endif
 .if !defined(WITHOUT_ZIP)
-	@${PERL} -pi -e "s:\/\* BEGBSDZIP::;s:ENDBSDZIP \*\/::" ${CONFDIR}/mime_drivers.php
+	@${PERL} -pi -e "s://UNCOMMENTIFZIP ::" ${HCONFDIR}/mime_drivers.php
+.endif
+.if defined(WITH_RAR)
+	@${PERL} -pi -e "s://UNCOMMENTIFRAR ::" ${HCONFDIR}/mime_drivers.php
 .endif
 	@${CHOWN} -R www:www ${IMPDIR}
 	@${CHMOD} -R o-rwx ${CONFDIR}
 	@${CP} -p ${FILESDIR}/httpd.conf.imp ${HORDE_INC}/httpd.conf.imp
 	@${PERL} -pi -e "s:/home/httpd/html/horde/imp:${IMPDIR}:g" ${HORDE_INC}/httpd.conf.imp
 # Let's Horde use IMP for auth
-	@${PERL} -pi -e "s://UNCOMMENTWHENINSTIMP::" ${HORDEDIR}/config/registry.php
+	@${PERL} -pi -e "s://UNCOMMENTWHENINSTIMP::" ${HCONFDIR}/registry.php
 # Provide a link to IMP from Turba
 .if !defined(WITHOUT_TURBA)
 	@${PERL} -pi -e "s://UNCOMMENTWHENINSTIMP::" ${TURBADIR}/config/conf.php
@@ -285,7 +292,6 @@
 		${CONFDIR}/conf.php
 .endif
 .if !defined(NOPORTDOCS)
-	@${PERL} -pi -e "s:/home/httpd/html/horde/imp:${IMPDIR}:g" ${WRKSRC}/docs/SECURITY
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
diff -urN /usr/ports/mail/imp-devel.orig/files/patch-aa /usr/ports/mail/imp-devel/files/patch-aa
--- /usr/ports/mail/imp-devel.orig/files/patch-aa	Wed Dec 12 21:11:20 2001
+++ /usr/ports/mail/imp-devel/files/patch-aa	Sun Feb 17 11:47:53 2002
@@ -1,31 +1,12 @@
---- config/mime_drivers.php.dist.orig	Sat Jul 14 15:30:14 2001
-+++ config/mime_drivers.php.dist	Thu Nov 15 00:08:34 2001
-@@ -59,4 +59,47 @@
+--- config/mime_drivers.php.dist.orig	Mon Dec 24 04:51:49 2001
++++ config/mime_drivers.php.dist	Sun Feb 17 11:47:19 2002
+@@ -61,4 +61,28 @@
  $mime_drivers['imp']['html']['handles'] = array(
          'text/html', 'text/richtext' );
  
 +/**
 + * Misc utilities
 + */
-+
-+/* Spell checker */
-+/* BEGBSDASPELL$conf['utils']['spellchecker'] = '%%LOCALBASE%%/bin/aspell';ENDBSDASPELL */
-+
-+/* MS-Word viewer */
-+/* BEGBSDWV$conf['utils']['wordviewer'] = '%%LOCALBASE%%/bin/wvHtml';ENDBSDWV */
-+
-+/* MS-Excel viewer */
-+/* BEGBSDXL$conf['utils']['excelviewer'] = '%%LOCALBASE%%/bin/xlHtml';ENDBSDXL */
-+
-+/* MS-Powerpoint viewer */
-+/* BEGBSDXL$conf['utils']['powerpointviewer'] = '%%LOCALBASE%%/bin/pptHtml';ENDBSDXL */
-+
-+/* tar archive files
-+   Remark: you might prefer GNU tar, from the port archivers/gtar */
-+$conf['utils']['tar'] = '/usr/bin/tar';
-+
-+/* Zip file viewer */
-+/* BEGBSDZIP$conf['utils']['unzip'] = '%%LOCALBASE%%/bin/zipinfo';ENDBSDZIP */
 +
 +/**
 + ** PGP/GnuPG Configuration


>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020217154021.03013752B>