pkg/37805: mail/alpine: add options.mk and options ldap, patch lpinesearchheader

[Christian Gall <cg%cgall.de@localhost>]

>Number:         37805
>Category:       pkg
>Synopsis:       pkgsrc/mail/alpine: add options.mk and options ldap, patch 
>alpinesearchheader
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Jan 19 00:45:00 +0000 2008
>Originator:     cg%cgall.de@localhost
>Release:        NetBSD 4.0_STABLE
>Organization:
private
>Environment:
System: NetBSD hades.cgall.de 4.0_STABLE NetBSD 4.0_STABLE 
(WORKSTATION-$Revision: 1.10.2.11 $) #0: Tue Dec 18 10:51:28 CET 2007 
cg%cg.intra@localhost:/home/cg/netbsd/netbsd-4/obj/sys/arch/i386/compile/WORKSTATION
 i386
Architecture: i386
Machine: i386
>Description:
- move options into options.mk
- add option for LDAP support
- add option for patch searchheader.patch.gz
>How-To-Repeat:
>Fix:

Here's a cvs diff:
-------------------------------------------------------------------------------
$ cvs diff
? options.mk
cvs diff: Diffing .
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/alpine/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile    18 Jan 2008 05:08:20 -0000      1.12
+++ Makefile    19 Jan 2008 00:36:57 -0000
@@ -12,6 +12,8 @@
 HOMEPAGE=      http://www.washington.edu/alpine/
 COMMENT=       Program for Internet News and E-mail
 
+.include "options.mk"
+
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 GNU_CONFIGURE= yes
@@ -23,26 +25,10 @@
 
 INSTALLATION_DIRS=     bin ${PKMANDIR}/man1
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.alpine
-PKG_SUPPORTED_OPTIONS= pinepwd fancythreads
-PKG_SUGGESTED_OPTIONS= pinepwd
-
-.include "../../mk/bsd.options.mk"
-
 .if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M4.99.*) && 
empty(OS_VERSION:M[5-9]*)
 CONFIGURE_ARGS+= --without-pthread
 .endif
 
-.if !empty(PKG_OPTIONS:Mpinepwd)
-CONFIGURE_ARGS+= --with-passfile=.pinepwd
-.endif
-
-.if !empty(PKG_OPTIONS:Mfancythreads)
-PATCH_SITES+=          
http://staff.washington.edu/chappa/alpine/patches/alpine-1.00/
-PATCHFILES+=           fancy.patch.gz
-PATCH_DIST_STRIP=      -p1
-.endif
-
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/alpine/alpine 
${DESTDIR}${PREFIX}/bin/alpine
        ${INSTALL_MAN} ${WRKSRC}/doc/alpine.1 
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/alpine.1
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/mail/alpine/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo    14 Jan 2008 15:09:14 -0000      1.7
+++ distinfo    19 Jan 2008 00:36:57 -0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2008/01/14 15:09:14 jwise Exp $
+$NetBSD$
 
 SHA1 (alpine/alpine-1.00.tar.bz2) = 1eae937d385f5a844fd52096fe428471928439fc
 RMD160 (alpine/alpine-1.00.tar.bz2) = d1ff2f90388e0107d5e4039fa35939b1def52ccf
@@ -6,3 +6,6 @@
 SHA1 (alpine/fancy.patch.gz) = b7260d0ce00c8f79cefc942a0de2e1f04ca3f7b5
 RMD160 (alpine/fancy.patch.gz) = 85416c9cc500b1e4d7258269db8a59e50cee6230
 Size (alpine/fancy.patch.gz) = 24900 bytes
+SHA1 (alpine/searchheader.patch.gz) = af02f356c05f44f01fc9bd729b1bd44e847b498f
+RMD160 (alpine/searchheader.patch.gz) = 
ec835e08913915d930260eecb999ba7dca4bbc44
+Size (alpine/searchheader.patch.gz) = 1714 bytes
-------------------------------------------------------------------------------


And the file options.mk:

-------------------------------------------------------------------------------
# $NetBSD$
#
#

PKG_OPTIONS_VAR=        PKG_OPTIONS.alpine
PKG_SUPPORTED_OPTIONS=  fancythreads ldap pinepwd alpinesearchheader
PKG_SUGGESTED_OPTIONS=  pinepwd

.include "../../mk/bsd.options.mk"

.if !empty(PKG_OPTIONS:Mfancythreads)
PATCH_SITES+=           
http://staff.washington.edu/chappa/alpine/patches/alpine-1.00/
PATCHFILES+=            fancy.patch.gz
PATCH_DIST_STRIP=       -p1
.endif

# not tested
#.if !empty(PKG_OPTIONS:Mkerberos)
#CONFIGURE_ARGS+=       --with-krb5
#.include "../../mk/krb5.buildlink3.mk"
#.endif

.if !empty(PKG_OPTIONS:Mldap)
CONFIGURE_ARGS+=        --with-ldap
.include "../../databases/openldap-client/buildlink3.mk"
.endif

.if !empty(PKG_OPTIONS:Mpinepwd)
CONFIGURE_ARGS+= --with-passfile=.pinepwd
.endif

.if !empty(PKG_OPTIONS:Malpinesearchheader)
PATCH_SITES+=           
http://staff.washington.edu/chappa/alpine/patches/alpine-1.00/
PATCHFILES+=            searchheader.patch.gz
PATCH_DIST_STRIP=       -p1
.endif
-------------------------------------------------------------------------------



Kind regards,

Christian Gall