From owner-freebsd-ports Sun Sep 2 12:40:10 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9601E37B406 for ; Sun, 2 Sep 2001 12:40:00 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.4/8.11.4) id f82Je0h85346; Sun, 2 Sep 2001 12:40:00 -0700 (PDT) (envelope-from gnats) Received: from postfix2-2.free.fr (postfix2-2.free.fr [213.228.0.140]) by hub.freebsd.org (Postfix) with ESMTP id C7C2C37B405 for ; Sun, 2 Sep 2001 12:31:49 -0700 (PDT) Received: from graf.pompo.net (unknown [213.228.34.211]) by postfix2-2.free.fr (Postfix) with ESMTP id C70155F847 for ; Sun, 2 Sep 2001 21:31:47 +0200 (CEST) Received: by graf.pompo.net (Postfix, from userid 1001) id CE79B7744; Sun, 2 Sep 2001 21:30:44 +0200 (CEST) Message-Id: <20010902193044.CE79B7744@graf.pompo.net> Date: Sun, 2 Sep 2001 21:30:44 +0200 (CEST) From: Thierry Thomas Reply-To: Thierry Thomas To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/30269: Port mail/imp - maintainer-update: add support for some utilities Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 30269 >Category: ports >Synopsis: Port mail/imp - maintainer-update: add support for some utilities >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 Sep 02 12:40:00 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Thierry Thomas >Release: FreeBSD 4.4-RC i386 >Organization: Kabbale Eros >Environment: System: FreeBSD graf.pompo.net 4.4-RC FreeBSD 4.4-RC #0: Mon Aug 27 00:28:35 CEST 2001 root@graf.pompo.net:/usr/obj/mntsrc/src/sys/GRAF010429 i386 >Description: Add a knob for OpenLDAP2, and support for some utilities (thanks to Roman Shterenzon). >How-To-Repeat: Apply the following patch to mail/imp/Makefile. >Fix: --- Makefile.orig Fri Aug 17 20:52:41 2001 +++ Makefile Sun Sep 2 19:15:26 2001 @@ -8,6 +8,7 @@ PORTNAME= imp PORTVERSION= 2.2.6 +PORTREVISION= 1 CATEGORIES= mail www MASTER_SITES= ftp://ftp.horde.org/pub/imp/tarballs/ @@ -17,9 +18,18 @@ # You may define these options: # # - WITHOUT_LDAP : if you do not need OpenLDAP; +# - WITH_LDAP2 : if you prefer OpenLDAP2. # # - WITHOUT_SUPPORTED_DB: if you run a database not in the ports tree; # +# - WITHOUT_WV : if your users never receive MS-Word docs; +# +# - WITHOUT_XL : if your users never receive MS-Excel sheets; +# +# - WITHOUT_ZIP : if not interested by zipinfo; +# +# - WITHOUT_ISPELL : for spelling bees... +# # - WITHOUT_IMAPSERVER : if your IMAP server runs on another machine; # # or you can select to work with one of these servers: @@ -39,9 +49,14 @@ LIB_DEPENDS= c-client4.8:${PORTSDIR}/mail/cclient .if !defined(WITHOUT_LDAP) +.if defined(WITH_LDAP2) +LIB_DEPENDS+= ldap.2:\${PORTSDIR}/net/openldap2 \ + lber.2:\${PORTSDIR}/net/openldap2 +.else LIB_DEPENDS+= ldap.1:${PORTSDIR}/net/openldap \ lber.1:${PORTSDIR}/net/openldap .endif +.endif RUN_DEPENDS+= ${LOCALBASE}/www/horde/:${PORTSDIR}/www/horde @@ -65,6 +80,19 @@ .endif .endif +.if !defined(WITHOUT_WV) +RUN_DEPENDS+= ${LOCALBASE}/bin/wvHtml:${PORTSDIR}/textproc/wv +.endif +.if !defined(WITHOUT_XL) +RUN_DEPENDS+= ${LOCALBASE}/bin/xlHtml:${PORTSDIR}/textproc/xlhtml +.endif +.if !defined(WITHOUT_ZIP) +RUN_DEPENDS+= ${LOCALBASE}/bin/zipinfo:${PORTSDIR}/archivers/unzip +.endif +.if !defined(WITHOUT_ISPELL) +RUN_DEPENDS+= ${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/ispell +.endif + NO_BUILD= yes DOCS= COPYING README docs/CHANGES docs/CREDITS docs/DATABASE \ docs/HELP docs/INSTALL docs/SECURITY docs/KNOWN_BUGS \ @@ -95,6 +123,14 @@ ${FALSE} ; \ fi .if !defined(WITHOUT_LDAP) +.if defined(WITH_LDAP2) + @if ! ${LDCONFIG} -r | ${GREP} -q -e "ldap.2"; then \ + ${ECHO_MSG} "" ; \ + ${ECHO_MSG} "Please configure PHP with OpenLDAP2 support." ; \ + ${ECHO_MSG} "" ; \ + ${FALSE} ; \ + fi +.else @if ! ${LDCONFIG} -r | ${GREP} -q -e "ldap.1"; then \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} "Please configure PHP with OpenLDAP support." ; \ @@ -102,6 +138,7 @@ ${FALSE} ; \ fi .endif +.endif .if !defined(WITHOUT_SUPPORTED_DB) @if ! ${LDCONFIG} -r | ${GREP} -q -e "mysqlclient.10" ; then \ if ! ${LDCONFIG} -r | ${GREP} -q -e "pq.2" ; then \ @@ -127,6 +164,15 @@ ${CP} -Rp ${WRKSRC}/config ${WRKSRC}/graphics ${WRKSRC}/lib ${IMPDIR} ${CP} -Rp ${WRKSRC}/locale ${WRKSRC}/scripts ${WRKSRC}/templates ${IMPDIR} ${CP} -p ${WRKSRC}/*.php3 ${WRKSRC}/*.css ${IMPDIR} + ${PERL} -pi -e "s:/usr/bin/ispell:${LOCALBASE}/bin/ispell:g" \ + ${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" \ + ${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" \ + ${IMPDIR}/config/defaults.php3.dist @if [ ! -f ${IMPDIR}/config/defaults.php3 ]; then \ ${CP} ${IMPDIR}/config/defaults.php3.dist ${IMPDIR}/config/defaults.php3; \ fi >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message