Latest Update for alpine-2.22
build tested on amd64
comments, ok's?
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/alpine/Makefile,v
retrieving revision 1.46
diff -u -p -r1.46 Makefile
--- Makefile 20 Mar 2020 16:44:24 -0000 1.46
+++ Makefile 9 Apr 2020 17:05:01 -0000
@@ -10,7 +10,7 @@ COMMENT-pico= UW text editor
COMMENT-pilot= UW file system navigator
FIX_EXTRACT_PERMISSIONS = Yes
-V= 2.21
+V= 2.22
DISTNAME= alpine-${V}
EXTRACT_SUFX= .tar.xz
@@ -47,7 +47,7 @@ HOMEPAGE= http://alpine.x10host.com/
# Apache 2.0
PERMIT_PACKAGE= Yes
-MASTER_SITES= http://alpine.x10host.com/alpine/release/
+MASTER_SITES= http://alpine.x10host.com/alpine/release/src/
MULTI_PACKAGES= -main -c-client -imap -mailutil -pico -pilot
@@ -114,12 +114,6 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/c-client/${SHLIB} ${PREFIX}/lib; \
fi
# imap-uw
- ${INSTALL_PROGRAM} ${WRKBUILD}/imap/imapd/imapd ${PREFIX}/libexec
- ${INSTALL_PROGRAM} ${WRKBUILD}/imap/ipopd/ipop2d ${PREFIX}/libexec
- ${INSTALL_PROGRAM} ${WRKBUILD}/imap/ipopd/ipop3d ${PREFIX}/libexec
- ${INSTALL_PROGRAM} ${WRKBUILD}/imap/mlock/mlock ${PREFIX}/libexec
- ${INSTALL_PROGRAM} ${WRKBUILD}/imap/dmail/dmail ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKBUILD}/imap/tmail/tmail ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/imap/src/{imapd,ipopd}/*.8 \
${PREFIX}/man/man8
${INSTALL_MAN} ${WRKSRC}/imap/src/{dmail,tmail}/*.1 \
@@ -132,7 +126,6 @@ post-install:
tar -C ${PREFIX}/share/doc/imap-uw -xf -
find ${PREFIX}/share/doc/imap-uw -type f -exec chmod 0644 {} +
# mailutil
- ${INSTALL_PROGRAM} ${WRKBUILD}/imap/mailutil/mailutil ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/imap/src/mailutil/mailutil.1 ${PREFIX}/man/man1
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/alpine/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo 25 Apr 2017 09:20:53 -0000 1.8
+++ distinfo 9 Apr 2020 17:05:01 -0000
@@ -1,2 +1,2 @@
-SHA256 (alpine-2.21.tar.xz) = YDC2iBuBaFRnVqs6XkNijY1WRTmwR2V44od3VXOndDg=
-SIZE (alpine-2.21.tar.xz) = 4720856
+SHA256 (alpine-2.22.tar.xz) = hJVnwbb3H946qhyXzwV3sSpSXZ4iwOpHeXxL8c0rv9s=
+SIZE (alpine-2.22.tar.xz) = 6336604
Index: patches/patch-imap_Makefile
===================================================================
RCS file: /cvs/ports/mail/alpine/patches/patch-imap_Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 patch-imap_Makefile
--- patches/patch-imap_Makefile 24 Mar 2014 12:54:55 -0000 1.3
+++ patches/patch-imap_Makefile 9 Apr 2020 17:05:01 -0000
@@ -24,10 +24,11 @@ mtest.c calls gets()
$(TOOLS)/$@ "$(LN)" src/ipopd ipopd
$(TOOLS)/$@ "$(LN)" src/imapd imapd
$(TOOLS)/$@ "$(LN)" src/mailutil mailutil
-@@ -713,7 +713,7 @@ rebuildclean:
+@@ -716,8 +716,8 @@ rebuildclean:
bundled:
@echo Building bundled tools...
+ @echo BUNDLED=$(BUNDLED)
- $(CD) mtest;$(MAKE)
+# $(CD) mtest;$(MAKE)
$(CD) ipopd;$(MAKE)
Index: pkg/PLIST-c-client
===================================================================
RCS file: /cvs/ports/mail/alpine/pkg/PLIST-c-client,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-c-client
--- pkg/PLIST-c-client 19 Mar 2015 20:25:26 -0000 1.2
+++ pkg/PLIST-c-client 9 Apr 2020 17:05:01 -0000
@@ -33,5 +33,5 @@ include/c-client/tcp_unix.h
include/c-client/unix.h
include/c-client/utf8.h
include/c-client/utf8aux.h
-lib/libc-client.a
+@static-lib lib/libc-client.a
@lib lib/libc-client.so.${LIBc-client_VERSION}
Index: pkg/PLIST-imap
===================================================================
RCS file: /cvs/ports/mail/alpine/pkg/PLIST-imap,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-imap
--- pkg/PLIST-imap 4 Sep 2018 12:46:15 -0000 1.4
+++ pkg/PLIST-imap 9 Apr 2020 17:05:01 -0000
@@ -4,14 +4,6 @@
@pkgpath mail/imap-uw,-server,plaintext
@pkgpath mail/imap-uw,-server
@pkgpath mail/re-alpine,-imap
-@bin bin/dmail
-@bin bin/tmail
-@bin libexec/imapd
-@bin libexec/ipop2d
-@bin libexec/ipop3d
-@group _smmsp
-@bin libexec/mlock
-@group
@man man/man1/dmail.1
@man man/man1/tmail.1
@man man/man8/imapd.8
Index: pkg/PLIST-mailutil
===================================================================
RCS file: /cvs/ports/mail/alpine/pkg/PLIST-mailutil,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-mailutil
--- pkg/PLIST-mailutil 17 Oct 2013 09:08:13 -0000 1.1
+++ pkg/PLIST-mailutil 9 Apr 2020 17:05:01 -0000
@@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST-mailutil,v 1.1 2013/10/17 09:08:13 ajacoutot Exp $
@pkgpath mail/imap-uw,-mailutil,plaintext
@pkgpath mail/re-alpine,-mailutil
-@bin bin/mailutil
@man man/man1/mailutil.1