Update alpine to 1.00nb3 - PR#37805 from Christian Gall

- Add ldap and alpinesearchheader options and move options to options.mk

3 files changed, 44 insertions, 18 deletions

diff --git a/mail/alpine/Makefile b/mail/alpine/Makefile
index 23195373937..1929ca91664 100644
--- a/mail/alpine/Makefile
+++ b/mail/alpine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/01/18 05:08:20 tnn Exp $
+# $NetBSD: Makefile,v 1.13 2008/01/20 15:18:55 abs Exp $
 #
 
 DISTNAME=	alpine-1.00
@@ -12,6 +12,8 @@ MAINTAINER=	abs@NetBSD.org
 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 @@ USE_LIBTOOL=	yes
 
 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
diff --git a/mail/alpine/distinfo b/mail/alpine/distinfo
index a4dd1251c20..4f78428226f 100644
--- a/mail/alpine/distinfo
+++ b/mail/alpine/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2008/01/14 15:09:14 jwise Exp $
+$NetBSD: distinfo,v 1.8 2008/01/20 15:18:55 abs Exp $
 
 SHA1 (alpine/alpine-1.00.tar.bz2) = 1eae937d385f5a844fd52096fe428471928439fc
 RMD160 (alpine/alpine-1.00.tar.bz2) = d1ff2f90388e0107d5e4039fa35939b1def52ccf
@@ -6,3 +6,6 @@ Size (alpine/alpine-1.00.tar.bz2) = 4792104 bytes
 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
diff --git a/mail/alpine/options.mk b/mail/alpine/options.mk
new file mode 100644
index 00000000000..d6ad5c2bc71
--- /dev/null
+++ b/mail/alpine/options.mk
@@ -0,0 +1,37 @@
+# $NetBSD: options.mk,v 1.1 2008/01/20 15:18:55 abs Exp $
+#
+
+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