Attachment 236421 Details for Bug 266087 – mail/alpine: update to 2.26 v1

[patch] mail/alpine: update to 2.26 v1

alpine-2.26.diff (text/plain), 6.17 KB, created by Nuno Teixeira on 2022-09-07 17:28:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nuno Teixeira

Created: 2022-09-07 17:28:26 UTC

Size: 6.17 KB

patch

obsolete

>diff --git a/mail/alpine/Makefile b/mail/alpine/Makefile
>index eca0eae44dda..10962be373e1 100644
>--- a/mail/alpine/Makefile
>+++ b/mail/alpine/Makefile
>@@ -1,7 +1,7 @@
> PORTNAME?=	alpine
>-DISTVERSION=	2.25
>+DISTVERSION=	2.26
> CATEGORIES?=	mail news
>-MASTER_SITES=	https://repo.or.cz/alpine.git/snapshot/${GIT_COMMIT}${EXTRACT_SUFX}?dummy=/
>+MASTER_SITES=	https://alpineapp.email/${PORTNAME}/release/src/
> 
> MAINTAINER=	mbeis@xs4all.nl
> COMMENT?=	Mail and news client descended from Pine
>@@ -9,32 +9,29 @@ COMMENT?=	Mail and news client descended from Pine
> LICENSE=	APACHE20
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-USES+=			cpe ssl libtool ncurses gettext-runtime
>+USES=		cpe gettext-runtime libtool ncurses ssl tar:xz
>+CPE_VENDOR=	alpine_project
>+GNU_CONFIGURE=	yes
> 
>-CPE_VENDOR=		alpine_project
>-
>-GNU_CONFIGURE=		yes
>-MAKE_JOBS_UNSAFE=	yes
>-CONFIGURE_ARGS+=	--with-debug-level=2 \
>-			--enable-background-post \
>-			--without-krb5 \
>-			--without-tcl \
>-			--with-system-pinerc=${PREFIX}/etc/alpine.conf \
>-			--with-system-fixed-pinerc=${PREFIX}/etc/alpine.conf.fixed \
>+CONFIGURE_ARGS+=	--enable-background-post \
>+			--with-debug-level=2 \
> 			--with-password-prog=/usr/bin/passwd \
>-			--with-system-mail-directory=/var/mail \
>+			--with-ssl-certs-dir=${OPENSSLDIR}/certs \
> 			--with-ssl-dir=${OPENSSLDIR} \
> 			--with-ssl-include-dir=${OPENSSLINC} \
> 			--with-ssl-lib-dir=${OPENSSLLIB} \
>-			--with-ssl-certs-dir=${OPENSSLDIR}/certs
>-MAKE_ARGS+=		CC="${CC}" CXX="${CXX}" GCCCFLAGS="${CFLAGS}"
>-# When you update please double check that the commit corresponds to
>-# the actual version you've set in PORTVERSION.
>-GIT_COMMIT=		465e23b898e5a3393b9ae52fc7620002541b2e75
>-GIT_COMMIT_SHORT=	${GIT_COMMIT:C/^(.......).*/\1/}
>-WRKSRC=			${WRKDIR}/alpine-${GIT_COMMIT_SHORT}
>-
>-OPTIONS_DEFINE=		ASPELL CONS25 DOCS IPV6 LDAP MAILDIR MOUSE NLS NTLM PASSFILE THREADS
>+			--with-system-fixed-pinerc=${PREFIX}/etc/alpine.conf.fixed \
>+			--with-system-mail-directory=/var/mail \
>+			--with-system-pinerc=${PREFIX}/etc/alpine.conf \
>+			--without-krb5 \
>+			--without-tcl
>+MAKE_ARGS+=		CC="${CC}" \
>+			CXX="${CXX}" \
>+			GCCCFLAGS="${CFLAGS}"
>+MAKE_JOBS_UNSAFE=	yes
>+
>+OPTIONS_DEFINE=		ASPELL CONS25 DOCS IPV6 LDAP MAILDIR MOUSE NLS NTLM \
>+			PASSFILE THREADS
> OPTIONS_DEFAULT=	ASPELL MOUSE THREADS
> .if defined(PICO_ALPINE_SLAVE)
> OPTIONS_EXCLUDE=	CONS25 IPV6 LDAP PASSFILE
>@@ -46,53 +43,53 @@ NTLM_DESC=	Support for Windows NT Lan Manager authentication
> PASSFILE_DESC=	Support for a stored password file
> 
> # Option ASPELL
>-ASPELL_CONFIGURE_ON=		--with-interactive-spellcheck=${LOCALBASE}/bin/aspell
>-ASPELL_CONFIGURE_OFF=		--with-simple-spellcheck
>-ASPELL_BUILD_DEPENDS=		aspell:textproc/aspell
>-ASPELL_RUN_DEPENDS=		aspell:textproc/aspell
>+ASPELL_BUILD_DEPENDS=	aspell:textproc/aspell
>+ASPELL_RUN_DEPENDS=	aspell:textproc/aspell
>+ASPELL_CONFIGURE_ON=	--with-interactive-spellcheck=${LOCALBASE}/bin/aspell
>+ASPELL_CONFIGURE_OFF=	--with-simple-spellcheck
> 
> # Option CONS25
>-CONS25_EXTRA_PATCHES=		${FILESDIR}/cons25-alpine_keymenu.c
>+CONS25_EXTRA_PATCHES=	${FILESDIR}/cons25-alpine_keymenu.c
> 
> # Option IPV6
>-IPV6_CONFIGURE_WITH=		ipv6
>+IPV6_CONFIGURE_WITH=	ipv6
> 
> # Option LDAP
>-LDAP_USE=			openldap=yes
>-LDAP_CONFIGURE_WITH=		ldap
>-LDAP_CFLAGS=			-I${LOCALBASE}/include
>-LDAP_LDFLAGS=			-L${LOCALBASE}/lib
>+LDAP_USE=		OPENLDAP=yes
>+LDAP_CONFIGURE_WITH=	ldap
>+LDAP_CFLAGS=		-I${LOCALBASE}/include
>+LDAP_LDFLAGS=		-L${LOCALBASE}/lib
> 
> # Option MAILDIR
>-MAILDIR_PATCH_SITES=		http://alpine.x10host.com/alpine/patches/alpine-2.25/
>-MAILDIR_PATCHFILES+=		maildir.patch.gz:-p1
>+MAILDIR_PATCH_SITES=	https://alpineapp.email/${PORTNAME}/patches/${DISTNAME}/
>+MAILDIR_PATCHFILES+=	maildir.patch.gz:-p1
> 
> # Option MOUSE
>-MOUSE_CONFIGURE_ENABLE=		mouse
>+MOUSE_CONFIGURE_ENABLE=	mouse
> 
> # Option NLS
>-NLS_CONFIGURE_ENABLE=		nls
>+NLS_CONFIGURE_ENABLE=	nls
> 
> # Option NTLM
>-NTLM_CONFIGURE_WITH=		ntlm
>-NTLM_LIB_DEPENDS=		libntlm.so:security/libntlm
>+NTLM_LIB_DEPENDS=	libntlm.so:security/libntlm
>+NTLM_CONFIGURE_WITH=	ntlm
> 
> # Option PASSFILE
>-PASSFILE_CONFIGURE_WITH=	passfile
> PASSFILE_CONFIGURE_ON=		--with-passfile=.alpine.pwd
>+PASSFILE_CONFIGURE_WITH=	passfile
> 
> # Option THREADS
>-THREADS_CONFIGURE_WITH=		pthread
>+THREADS_CONFIGURE_WITH=	pthread
> 
> .if !defined(PICO_ALPINE_SLAVE)
>-PORTDOCSbase=		LICENSE NOTICE README
>-PORTDOCSdoc=		brochure.txt
>-PORTDOCShtml=		tech-notes/background.html tech-notes/cmd-line.html \
>-			tech-notes/config-notes.html tech-notes/config.html \
>-			tech-notes/index.html tech-notes/installation.html \
>-			tech-notes/introduction.html tech-notes/low-level.html \
>-			tech-notes/tech-notes.txt
>-PORTDOCS=		${PORTDOCSbase} ${PORTDOCSdoc} ${PORTDOCShtml}
>+PORTDOCSbase=	LICENSE NOTICE README
>+PORTDOCSdoc=	brochure.txt
>+PORTDOCShtml=	tech-notes/background.html tech-notes/cmd-line.html \
>+		tech-notes/config-notes.html tech-notes/config.html \
>+		tech-notes/index.html tech-notes/installation.html \
>+		tech-notes/introduction.html tech-notes/low-level.html \
>+		tech-notes/tech-notes.txt
>+PORTDOCS=	${PORTDOCSbase} ${PORTDOCSdoc} ${PORTDOCShtml}
> 
> post-patch:
> 	@${CP} ${WRKSRC}/imap/Makefile ${WRKSRC}/imap/Makefile.presed
>diff --git a/mail/alpine/distinfo b/mail/alpine/distinfo
>index 160e5c96470a..d847ef1d9a94 100644
>--- a/mail/alpine/distinfo
>+++ b/mail/alpine/distinfo
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1631991887
>-SHA256 (alpine-2.25.tar.gz) = ba0856bcc863b70dd0c2f06cdeda720332c2d136d49154d78450932cd9e0900a
>-SIZE (alpine-2.25.tar.gz) = 23147391
>-SHA256 (maildir.patch.gz) = 9017f8608e22a5b4c12105fc419d7cfe52d71b70b1c53076a02cf2906591c797
>-SIZE (maildir.patch.gz) = 33849
>+TIMESTAMP = 1662567964
>+SHA256 (alpine-2.26.tar.xz) = c0779c2be6c47d30554854a3e14ef5e36539502b331068851329275898a9baba
>+SIZE (alpine-2.26.tar.xz) = 7517628
>+SHA256 (maildir.patch.gz) = 01020ca0cec24793a39d5ab72c0beefc0cfbb92d11348b5bd5bf7bfbcb203f63
>+SIZE (maildir.patch.gz) = 34840
>diff --git a/mail/alpine/pkg-descr b/mail/alpine/pkg-descr
>index 534009745610..8ca17247e354 100644
>--- a/mail/alpine/pkg-descr
>+++ b/mail/alpine/pkg-descr
>@@ -18,4 +18,4 @@ Alpine's basic feature set includes:
> Alpine supports MIME (Multipurpose Internet Mail Extensions), an Internet
> Standard for representing multipart and multimedia data in email.
> 
>-WWW: https://www.washington.edu/alpine/
>+WWW: https://alpineapp.email/

Flags:

eduardo: maintainer-approval? (mbeis)

Actions: View | Diff

Attachments on bug 266087: 236183 | 236341 | 236421