ports/88918: Suggested updates of mail/pine4 Makefile

[Mats Dufberg]

>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 at 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 <bsd.port.pre.mk>
+
 .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 <bsd.port.mk>
+.include <bsd.port.post.mk>
+



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