CVS commit: pkgsrc/mail/alpine

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Mon Feb 27 20:08:37 UTC 2023

Modified Files:
        pkgsrc/mail/alpine: Makefile distinfo options.mk

Log Message:
mail/alpine: package revision.

* Add kerberos and pam build options (enabled by default).
* Add inet6 and pthread build options (enabled by default if supported).
* Remove tcl support from options.mk until an install target for web alpine
  files isn't implemented.
* Pull upstream patch providing additional compose subcommands.
* Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/mail/alpine/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/mail/alpine/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/mail/alpine/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/alpine/Makefile
diff -u pkgsrc/mail/alpine/Makefile:1.53 pkgsrc/mail/alpine/Makefile:1.54
--- pkgsrc/mail/alpine/Makefile:1.53    Sun Feb 26 20:39:49 2023
+++ pkgsrc/mail/alpine/Makefile Mon Feb 27 20:08:37 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2023/02/26 20:39:49 vins Exp $
+# $NetBSD: Makefile,v 1.54 2023/02/27 20:08:37 vins Exp $
 
 DISTNAME=      alpine-2.26
+PKGREVISION=   1
 CATEGORIES=    mail
 # repo at https://repo.or.cz/alpine.git
 MASTER_SITES=  https://alpineapp.email/alpine/release/src/
@@ -16,8 +17,10 @@ PATCHFILES+=         fancy.patch.gz
 PATCHFILES+=           fillpara.patch.gz
 # Send e-mail from the command line
 PATCHFILES+=           outgoing.patch.gz
-# Accents in pico
+# Support accents in pico
 PATCHFILES+=           WrtAcc.patch.gz
+# Additional compose subcommands
+PATCHFILES+=           compose.patch.gz
 PATCH_DIST_STRIP=      -p1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -49,6 +52,11 @@ CONFIGURE_ARGS+=     --with-libintl-prefix=$
 CONFIGURE_ARGS+=       --with-system-mail-directory=${VARBASE}/spool/mail
 .else
 CONFIGURE_ARGS+=       --with-system-mail-directory=${VARBASE}/mail
+CONFIGURE_ARGS+=       --with-debug-level=2
+CONFIGURE_ARGS+=       --without-ntlm
+CONFIGURE_ARGS+=       --without-npa
+# disabled, for Web Alpine Support
+CONFIGURE_ARGS+=       --without-tcl
 .endif
 
 .include "options.mk"
@@ -110,9 +118,6 @@ post-install:
 .include "../../devel/gettext-tools/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/terminfo.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/krb5.buildlink3.mk"
-.include "../../mk/pam.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/mail/alpine/distinfo
diff -u pkgsrc/mail/alpine/distinfo:1.30 pkgsrc/mail/alpine/distinfo:1.31
--- pkgsrc/mail/alpine/distinfo:1.30    Sun Feb 26 20:39:49 2023
+++ pkgsrc/mail/alpine/distinfo Mon Feb 27 20:08:37 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2023/02/26 20:39:49 vins Exp $
+$NetBSD: distinfo,v 1.31 2023/02/27 20:08:37 vins Exp $
 
 BLAKE2s (alpine-2.26/WrtAcc.patch.gz) = 0ac2c946dea8f432bdfc1f847f2f31b9ef70d1634244fed1ec252c5baf812747
 SHA512 (alpine-2.26/WrtAcc.patch.gz) = 494d798775a384e8e42639437b14ee09bc174520f705e8830636f2039668cbe0f441011de753cb98f5a4d89059c285ef0fc205249a3a079bb0a88c4389cbd595
@@ -6,6 +6,9 @@ Size (alpine-2.26/WrtAcc.patch.gz) = 218
 BLAKE2s (alpine-2.26/alpine-2.26.tar.xz) = 4bd671ac3626ad65512971856c9d59121afdd7e2d2e9b5c9fd47de3881af8eaa
 SHA512 (alpine-2.26/alpine-2.26.tar.xz) = 359b5cb30be78a341b76c0475a2d5268b643788f14c9b5b9457af6748034e1d2e70fd7ddf59e5c59ad596a36d8a10afa9c41cbd74241c780b8575d8186168fd2
 Size (alpine-2.26/alpine-2.26.tar.xz) = 7517628 bytes
+BLAKE2s (alpine-2.26/compose.patch.gz) = 9ec96ea48856d6ca5c39415195bbd34ac4de34e06074ff9b97e375ff180c93ab
+SHA512 (alpine-2.26/compose.patch.gz) = ca9941f51f36f97d64ca9db9a02ead11af8accf68067786a19d504d5f3b41b054938e65a9f607f134885f856767d52e4c7f33e8640f3669a9de4d07178285d3d
+Size (alpine-2.26/compose.patch.gz) = 2410 bytes
 BLAKE2s (alpine-2.26/fancy.patch.gz) = 8d5bd515ef996488786de30a84082ed3e37e803d552c5de31cddfa29392b71c2
 SHA512 (alpine-2.26/fancy.patch.gz) = 0840d319dc36715c091c65feff4fd3d7010bec8302b7df6e7ddd505f7590dc684729ce9983214c297efd23eb7b076c932ef15310194bea66ff0ed8b8c5c65796
 Size (alpine-2.26/fancy.patch.gz) = 25055 bytes

Index: pkgsrc/mail/alpine/options.mk
diff -u pkgsrc/mail/alpine/options.mk:1.6 pkgsrc/mail/alpine/options.mk:1.7
--- pkgsrc/mail/alpine/options.mk:1.6   Sun Feb 26 20:39:49 2023
+++ pkgsrc/mail/alpine/options.mk       Mon Feb 27 20:08:37 2023
@@ -1,9 +1,20 @@
-# $NetBSD: options.mk,v 1.6 2023/02/26 20:39:49 vins Exp $
+# $NetBSD: options.mk,v 1.7 2023/02/27 20:08:37 vins Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.alpine
 
-PKG_SUPPORTED_OPTIONS+=        aspell ldap tcl
-PKG_SUGGESTED_OPTIONS=
+PKG_SUPPORTED_OPTIONS+=        aspell kerberos inet6 ldap pam threads
+PKG_SUGGESTED_OPTIONS= kerberos pam
+
+CHECK_BUILTIN.pthread:= yes
+.include "../../mk/pthread.builtin.mk"
+CHECK_BUILTIN.pthread:= no
+.if ${BUILTIN_LIB_FOUND.pthread:U:tl} == yes
+PKG_SUGGESTED_OPTIONS+=        threads
+.endif
+
+.if ${IPV6_READY:tl} == "yes"
+PKG_SUGGESTED_OPTIONS+=        inet6
+.endif
 
 .include "../../mk/bsd.options.mk"
 
@@ -19,6 +30,36 @@ CONFIGURE_ENV+=              ac_cv_path_alpine_inter
 .endif
 
 ###
+### IPv6 support
+###
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=       --with-ipv6
+.else
+CONFIGURE_ARGS+=       --without-ipv6
+.endif
+
+###
+### Support POSIX threads
+###
+.if !empty(PKG_OPTIONS:Mthreads)
+.  include "../../mk/pthread.buildlink3.mk"
+CONFIGURE_ARGS+=       --with-pthread
+.else
+CONFIGURE_ARGS+=       --without-pthread
+.endif
+
+###
+### Support GSSAPI authentication via Kerberos 5.
+###
+.if !empty(PKG_OPTIONS:Mkerberos)
+.  include "../../mk/krb5.buildlink3.mk"
+CONFIGURE_ARGS+=       --with-krb5-dir=${KRB5BASE:Q}
+CONFIGURE_ENV+=        alpine_GSSTYPE=${KRB5_TYPE}
+.else
+CONFIGURE_ARGS+=        --without-krb5
+.endif
+
+###
 ### LDAP server support
 ###
 .if !empty(PKG_OPTIONS:Mldap)
@@ -29,11 +70,11 @@ CONFIGURE_ARGS+=            --without-ldap
 .endif
 
 ###
-###  Web Alpine browser
+### PAM support
 ###
-.if !empty(PKG_OPTIONS:Mtcl)
-.include "../../lang/tcl/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-tcl-lib-dir=${BUILDLINK_PREFIX.tcl}/lib
+.if !empty(PKG_OPTIONS:Mpam)
+.  include "../../mk/pam.buildlink3.mk"
+CONFIGURE_ENV+=                ac_cv_lib_pam_pam_start=yes
 .else
-CONFIGURE_ARGS+=       --without-tcl
+CONFIGURE_ENV+=                ac_cv_lib_pam_pam_start=no
 .endif