From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Nov 13 11:40:24 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8193016A41F for ; Sun, 13 Nov 2005 11:40:24 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 12C9E43D53 for ; Sun, 13 Nov 2005 11:40:23 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id jADBeMA3058903 for ; Sun, 13 Nov 2005 11:40:22 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id jADBeMPY058902; Sun, 13 Nov 2005 11:40:22 GMT (envelope-from gnats) Resent-Date: Sun, 13 Nov 2005 11:40:22 GMT Resent-Message-Id: <200511131140.jADBeMPY058902@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Mats Dufberg Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1B94916A41F for ; Sun, 13 Nov 2005 11:40:08 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id D51A243D45 for ; Sun, 13 Nov 2005 11:40:07 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id jADBe7Ym039167 for ; Sun, 13 Nov 2005 11:40:07 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id jADBe7GF039161; Sun, 13 Nov 2005 11:40:07 GMT (envelope-from nobody) Message-Id: <200511131140.jADBe7GF039161@www.freebsd.org> Date: Sun, 13 Nov 2005 11:40:07 GMT From: Mats Dufberg To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Cc: Subject: ports/88918: Suggested updates of mail/pine4 Makefile X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Nov 2005 11:40:24 -0000 >Number: 88918 >Category: ports >Synopsis: Suggested updates of mail/pine4 Makefile >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Nov 13 11:40:22 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Mats Dufberg >Release: 5.3 >Organization: private >Environment: N/A >Description: 1. By default pine uses the old-fashioned unix type of mail folder format. Included in pine there is an alternative, MBX format, which is recommended by the Pine development team as a more effecient format, which it really is. The mail/pine4 port does not offer any convinient way of using that as the default folder format. I suggest that there is an options to patch the source to get MBX as the default mailbox format. 2. The mail/pine4 port has serveral options. Today they are handled in the old-fashioned way which requires that the user includes those as options one the command line when upgrading, which makes upgrades more cumbersome. I suggets that the mail/pine4 port uses settings with OPTIONS to achieve a simpler handling. >How-To-Repeat: N/A >Fix: The patch below will update the mail/pine4 Makefile to support the two suggested changes. I have locally tested the patch, and found no problems with it. --- Makefile.orig Sat Nov 5 19:32:35 2005 +++ Makefile Sun Nov 13 12:09:00 2005 @@ -21,6 +21,18 @@ MAINTAINER= DougB@FreeBSD.org COMMENT= PINE(tm) -- a Program for Internet News & Email +OPTIONS= ISPELL "Require Ispell, spelling checker" on \ + PICO "Include Pico, and easy-to-use text editor" on \ + LDAP "Include LDAP functionality" off \ + OPENLDAP_SASL "Use OpenLDAP SASL with LDAP" off \ + SSL "Compile with SSL support" on \ + SSL_AND_PLAINTEXT "Accept plain text passwords with SSL" off \ + IPV6 "Support IPv6" off \ + MAILDIR "Support maildir format" off \ + MBX_DEFAULT "Use MBX as default mailbox format" off + +.include + .if !defined(WITHOUT_ISPELL) RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell .endif @@ -32,7 +44,7 @@ .if defined(WITH_LDAP) USE_OPENLDAP= yes LDAP_PREFIX?= ${LOCALBASE} -.if defined(WANT_OPENLDAP_SASL) +.if defined(WITH_OPENLDAP_SASL) EXTRA_OPTS= LDAPLIBS="-L${LOCALBASE}/lib -lldap -llber -lsasl2" .else EXTRA_OPTS= LDAPLIBS="-L${LOCALBASE}/lib -lldap -llber" @@ -77,6 +89,15 @@ @${SED} -e 's:^CFLAGS=.*:CFLAGS=$$(BASECFLAGS) $$(EXTRACFLAGS):' \ ${WRKSRC}/imap/src/osdep/unix/Makefile.presed > \ ${WRKSRC}/imap/src/osdep/unix/Makefile +# Do this here because other patches also modifies this file +.if defined(WITH_MBX_DEFAULT) + @${CP} ${WRKSRC}/imap/src/osdep/unix/Makefile \ + ${WRKSRC}/imap/src/osdep/unix/Makefile.presed2 + @${SED} -e 's:^CREATEPROTO=unixproto:CREATEPROTO=mbxproto:' \ + ${WRKSRC}/imap/src/osdep/unix/Makefile.presed2 > \ + ${WRKSRC}/imap/src/osdep/unix/Makefile +.endif +# .for f in build buildcyg @${CP} ${WRKSRC}/${f} ${WRKSRC}/${f}.presed @${SED} -e 's:CC=cc:CC=${CC}:g' ${WRKSRC}/${f}.presed > ${WRKSRC}/${f} @@ -124,4 +145,5 @@ @${CAT} ${PKGMESSAGE} -.include +.include + >Release-Note: >Audit-Trail: >Unformatted: