fix a warning when building + better handling of MIME drivers

PR:		35049
Submitted by:	maintainer

4 files changed, 34 insertions, 60 deletions

diff --git a/mail/imp-devel/Makefile b/mail/imp-devel/Makefile
index 8606ef9c125b..1330ad238463 100644
--- a/mail/imp-devel/Makefile
+++ b/mail/imp-devel/Makefile
@@ -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 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 #
 # - 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 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/xlHtml:${PORTSDIR}/textproc/xlhtml
 .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 @@ HORDEDIR=	${PREFIX}/${LHORDEDIR}
 IMPDIR=		${PREFIX}/${LIMPDIR}
 TURBADIR?=	${HORDEDIR}/turba
 CONFDIR=	${IMPDIR}/config
+HCONFDIR=	${HORDEDIR}/config
 
 HORDE_INC=	${LOCALBASE}/etc/horde
 
@@ -247,17 +253,15 @@ do-install:
 .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 @@ do-install:
 #			${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 @@ do-install:
 		${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 --git a/mail/imp-devel/files/patch-aa b/mail/imp-devel/files/patch-aa
index 815bf336e687..132794233fcc 100644
--- a/mail/imp-devel/files/patch-aa
+++ b/mail/imp-devel/files/patch-aa
@@ -1,6 +1,6 @@
---- 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' );
  
@@ -8,25 +8,6 @@
 + * 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
 + **/
diff --git a/mail/imp3/Makefile b/mail/imp3/Makefile
index 8606ef9c125b..1330ad238463 100644
--- a/mail/imp3/Makefile
+++ b/mail/imp3/Makefile
@@ -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 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 #
 # - 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 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/xlHtml:${PORTSDIR}/textproc/xlhtml
 .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 @@ HORDEDIR=	${PREFIX}/${LHORDEDIR}
 IMPDIR=		${PREFIX}/${LIMPDIR}
 TURBADIR?=	${HORDEDIR}/turba
 CONFDIR=	${IMPDIR}/config
+HCONFDIR=	${HORDEDIR}/config
 
 HORDE_INC=	${LOCALBASE}/etc/horde
 
@@ -247,17 +253,15 @@ do-install:
 .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 @@ do-install:
 #			${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 @@ do-install:
 		${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 --git a/mail/imp3/files/patch-aa b/mail/imp3/files/patch-aa
index 815bf336e687..132794233fcc 100644
--- a/mail/imp3/files/patch-aa
+++ b/mail/imp3/files/patch-aa
@@ -1,6 +1,6 @@
---- 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' );
  
@@ -8,25 +8,6 @@
 + * 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
 + **/