git: a74030e08ae6 - main - mail/alpine: fix maildir patch checksum
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 07 Aug 2024 04:55:11 UTC
The branch main has been updated by uzsolt:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a74030e08ae667979ef21cf9a1b5c8c771458492
commit a74030e08ae667979ef21cf9a1b5c8c771458492
Author: Marco Beishuizen <mbeis@xs4all.nl>
AuthorDate: 2024-08-07 04:52:49 +0000
Commit: Zsolt Udvari <uzsolt@FreeBSD.org>
CommitDate: 2024-08-07 04:54:47 +0000
mail/alpine: fix maildir patch checksum
Convert cp&SED commands to REINPLACE_CMD.
Pet portlint, portfmt.
PR: 277320
Approved by: Submitter is maintainer
---
mail/alpine/Makefile | 120 +++++++++++++++++++++++----------------------------
mail/alpine/distinfo | 6 +--
2 files changed, 58 insertions(+), 68 deletions(-)
diff --git a/mail/alpine/Makefile b/mail/alpine/Makefile
index 33b017048a65..e707e9b12284 100644
--- a/mail/alpine/Makefile
+++ b/mail/alpine/Makefile
@@ -1,6 +1,6 @@
PORTNAME?= alpine
DISTVERSION= 2.26
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES?= mail news
MASTER_SITES= https://repo.or.cz/alpine.git/snapshot/${GIT_COMMIT}${EXTRACT_SUFX}?dummy=/
@@ -11,33 +11,35 @@ WWW?= https://alpineapp.email/
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES+= cpe ssl libtool ncurses gettext-runtime
+USES+= cpe gettext-runtime libtool ncurses ssl
-CPE_VENDOR= alpine_project
+CPE_VENDOR= alpine_project
GNU_CONFIGURE= yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
-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}"
+ --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
# When you update please double check that the commit corresponds to
# the actual version you've set in PORTVERSION.
GIT_COMMIT= 9726c098a739edfdca6218bc5dee104c310957e9
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
+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
@@ -49,83 +51,71 @@ 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_USES= ldap
-LDAP_CONFIGURE_WITH= ldap
-LDAP_CFLAGS= -I${LOCALBASE}/include
-LDAP_LDFLAGS= -L${LOCALBASE}/lib
+LDAP_USES= ldap
+LDAP_CONFIGURE_WITH= ldap
+LDAP_CFLAGS= -I${LOCALBASE}/include
+LDAP_LDFLAGS= -L${LOCALBASE}/lib
# Option MAILDIR
-MAILDIR_PATCH_SITES= https://alpineapp.email/alpine/patches/alpine-2.26/
-MAILDIR_PATCHFILES+= maildir.patch.gz:-p1
+MAILDIR_PATCH_SITES= https://alpineapp.email/alpine/patches/alpine-2.26/
+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
# 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
- @${SED} -e "s#^\(all:.*\) bundled\$$#\1#" \
- ${WRKSRC}/imap/Makefile.presed > ${WRKSRC}/imap/Makefile
- @${CP} ${WRKSRC}/pico/Makefile.in ${WRKSRC}/pico/Makefile.in.presed
- @${SED} -e "s#^bin_PROGRAMS = pico.*#bin_PROGRAMS =#" \
- -e "s#\$$(pico_SOURCES) \$$(pilot_SOURCES)##" \
- ${WRKSRC}/pico/Makefile.in.presed > ${WRKSRC}/pico/Makefile.in
- @${CP} ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in.presed
- @${SED} -e "s#doc/man1/pico.1 doc/man1/pilot.1 ##" \
- ${WRKSRC}/Makefile.in.presed > ${WRKSRC}/Makefile.in
- @${CP} ${WRKSRC}/imap/src/osdep/unix/Makefile \
- ${WRKSRC}/imap/src/osdep/unix/Makefile.presed
- @${SED} -e "s#^LOCKPGM=.*#LOCKPGM= ${PREFIX}/libexec/mlock#" \
- ${WRKSRC}/imap/src/osdep/unix/Makefile.presed \
- > ${WRKSRC}/imap/src/osdep/unix/Makefile
- @for i in ${WRKSRC}/README ${WRKSRC}/doc/man1/alpine.1 \
+ @${REINPLACE_CMD} -e "s#^\(all:.*\) bundled\$$#\1#" ${WRKSRC}/imap/Makefile
+ @${REINPLACE_CMD} -e "s#^bin_PROGRAMS = pico.*#bin_PROGRAMS =#" \
+ -e "s#\$$(pico_SOURCES) \$$(pilot_SOURCES)##" ${WRKSRC}/pico/Makefile.in
+ @${REINPLACE_CMD} -e "s#doc/man1/pico.1 doc/man1/pilot.1 ##" ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e "s#^LOCKPGM=.*#LOCKPGM= ${PREFIX}/libexec/mlock#" \
+ ${WRKSRC}/imap/src/osdep/unix/Makefile
+ @${REINPLACE_CMD} -e "s:/usr/local/lib/:${PREFIX}/etc/:g" \
+ -e "s:/usr/local/pine.conf:${PREFIX}/etc/pine.conf:g" \
+ -e "s:pine\.conf:alpine.conf:g" \
+ -e "s:/usr/local:${PREFIX}:g" \
+ -e "s:@@PREFIX@@:${PREFIX}:g" \
+ ${WRKSRC}/README ${WRKSRC}/doc/man1/alpine.1 \
${WRKSRC}/doc/*.txt \
${WRKSRC}/doc/tech-notes/*.txt \
${WRKSRC}/doc/tech-notes/*.html \
- ${WRKSRC}/pith/pine.hlp ; do \
- ${CP} $$i $$i.presed ; \
- ${SED} -e "s:/usr/local/lib/:${PREFIX}/etc/:g" \
- -e "s:/usr/local/pine.conf:${PREFIX}/etc/pine.conf:g" \
- -e "s:pine\.conf:alpine.conf:g" \
- -e "s:/usr/local:${PREFIX}:g" \
- -e "s:@@PREFIX@@:${PREFIX}:g" \
- $$i.presed > $$i ; \
- done
+ ${WRKSRC}/pith/pine.hlp
post-install:
${STAGEDIR}${PREFIX}/bin/alpine -conf > ${STAGEDIR}${PREFIX}/etc/alpine.conf.sample
diff --git a/mail/alpine/distinfo b/mail/alpine/distinfo
index eff102f55913..278ceb454706 100644
--- a/mail/alpine/distinfo
+++ b/mail/alpine/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1662718324
+TIMESTAMP = 1719761083
SHA256 (alpine-2.26.tar.gz) = c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
SIZE (alpine-2.26.tar.gz) = 23202244
-SHA256 (maildir.patch.gz) = 01020ca0cec24793a39d5ab72c0beefc0cfbb92d11348b5bd5bf7bfbcb203f63
-SIZE (maildir.patch.gz) = 34840
+SHA256 (maildir.patch.gz) = 57808418b02a0e1cb826940068aa10eaed827b2b23609f05fd2015ec92043d37
+SIZE (maildir.patch.gz) = 35559