[Midnightbsd-cvs] mports [22460] trunk/mail/alpine: update alpine
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun May 14 17:25:22 EDT 2017
Revision: 22460
http://svnweb.midnightbsd.org/mports/?rev=22460
Author: laffer1
Date: 2017-05-14 17:25:22 -0400 (Sun, 14 May 2017)
Log Message:
-----------
update alpine
Modified Paths:
--------------
trunk/mail/alpine/Makefile
trunk/mail/alpine/distinfo
trunk/mail/alpine/files/cons25-alpine_keymenu.c
trunk/mail/alpine/pkg-descr
trunk/mail/alpine/pkg-message
trunk/mail/alpine/pkg-plist
Removed Paths:
-------------
trunk/mail/alpine/files/patch-configure
trunk/mail/alpine/files/patch-newuser
Modified: trunk/mail/alpine/Makefile
===================================================================
--- trunk/mail/alpine/Makefile 2017-05-14 20:55:11 UTC (rev 22459)
+++ trunk/mail/alpine/Makefile 2017-05-14 21:25:22 UTC (rev 22460)
@@ -6,11 +6,10 @@
#
PORTNAME?= alpine
-PORTVERSION= 2.00
+PORTVERSION= 2.20
PORTREVISION?= 1
CATEGORIES?= mail news ipv6
-MASTER_SITES= ftp://ftp.cac.washington.edu/alpine/ \
- http://dougbarton.us/Downloads/alpine-${PORTVERSION}/
+MASTER_SITES= http://patches.freeiz.com/alpine/release/src/
DIST_SUBDIR= alpine-${PORTVERSION}
MAINTAINER= ports at MidnightBSD.org
@@ -18,66 +17,80 @@
LICENSE= apache2
-OPTIONS+= THREADS "Compile with thread support" on \
- MOUSE "Enable mouse support for xterm" on \
- NLS "National Language Support" off \
- ISPELL "Use ispell instead of aspell as default speller" off \
- NOSPELL "Use no default speller (overrides both)" off
+OPTIONS_DEFINE= DOCS SSL THREADS MOUSE NLS ISPELL NOSPELL
+OPTIONS_DEFAULT+= DOCS SSL THREADS MOUSE
+SSL_DESC= Build with SSL (installs: security/openssl if pre 10.x)
+MOUSE_DESC= Enable mouse support for xterm
+ISPELL_DESC= Use ispell instead of aspell as default speller
+NOSPELL_DESC= Use no default speller (overrides both)
+
.if !defined(PICO_ALPINE_SLAVE)
-OPTIONS+= PICO "Build and install pico, the default editor" on \
- IPV6 "Add support for IPv6" on \
- LDAP "Add support for LDAP" off \
- PASSFILE "Support for a stored password file (DANGEROUS)" off \
- CONS25 "Add a patch to support color for default console" off \
- QUOTA "Add a patch for disk quota checking on IMAP" off \
- MAILDIR "Add a patch for maildir support" off
+
+OPTIONS_DEFINE+= PICO IPV6 LDAP PASSFILE CONS25 MAILDIR SSL
+OPTIONS_DEFAULT+= PICO SSL
+PICO_DESC= Build and install pico, the default editor
+PASSFILE_DESC= Support for a stored password file (DANGEROUS)
+CONS25_DESC= Add a patch to support color for default console
+MAILDIR_DESC= Add a patch for maildir support
.endif
-USES= tar:bzip2
+USES= libtool ncurses tar:xz
+
MAKE_JOBS_UNSAFE= yes
GNU_CONFIGURE= yes
+THREADS_CONFIGURE_WITH= pthread
+MOUSE_CONFIGURE_ENABLE= mouse
+NLS_CONFIGURE_ENABLE= nls
+IPV6_CONFIGURE_WITH= ipv6
+SSL_USES= openssl
+
.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}
+
CONFIGURE_ARGS+=--with-system-pinerc=${PREFIX}/etc/alpine.conf \
--with-system-fixed-pinerc=${PREFIX}/etc/alpine.conf.fixed \
--with-password-prog=/usr/bin/passwd \
- --with-system-mail-directory=/var/mail \
+ --with-system-mail-directory=/var/mail
+
+.endif
+CONFIGURE_ARGS+=--with-debug-level=2 \
--enable-background-post --without-krb5 --without-tcl
-.endif
-CONFIGURE_ARGS+=--with-debug-level=2
-USE_OPENSSL= yes
+MAKE_ARGS+= CC="${CC}" CXX="${CXX}" GCCCFLAGS="${CFLAGS}"
-.include <bsd.port.pre.mk>
+.include <bsd.mport.options.mk>
-.if !defined(WITHOUT_THREADS)
-CONFIGURE_ARGS+= --with-pthread
+.if ${PORT_OPTIONS:MSSL}
+USE_OPENSSL= yes
+CONFIGURE_ARGS+= --with-ssl-dir=${OPENSSLDIR} \
+ --with-ssl-include-dir=${OPENSSLINC} \
+ --with-ssl-lib-dir=${OPENSSLLIB} \
+ --with-ssl-certs-dir=${OPENSSLDIR}/certs
.else
-CONFIGURE_ARGS+= --without-pthread
+CONFIGURE_ARGS+= --without-ssl
.endif
-.if !defined(WITHOUT_MOUSE)
-CONFIGURE_ARGS+= --enable-mouse
-.else
-CONFIGURE_ARGS+= --disable-mouse
-.endif
+.include <bsd.port.pre.mk>
-.if defined(WITH_NLS)
-CONFIGURE_ARGS+= --enable-nls
-.else
-CONFIGURE_ARGS+= --disable-nls
-.endif
-
-.if !defined(WITH_NOSPELL)
-.if !defined(WITH_ISPELL)
+.if ! ${PORT_OPTIONS:MNOSPELL}
+.if ! ${PORT_OPTIONS:MISPELL}
CONFIGURE_ARGS+=--with-interactive-spellcheck=${LOCALBASE}/bin/aspell
-BUILD_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell
-RUN_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell
+BUILD_DEPENDS+= aspell:textproc/aspell
+RUN_DEPENDS+= aspell:textproc/aspell
.else
CONFIGURE_ARGS+= --with-interactive-spellcheck=${LOCALBASE}/bin/ispell
-BUILD_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
-RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
+BUILD_DEPENDS+= ispell:textproc/aspell-ispell
+RUN_DEPENDS+= ispell:textproc/aspell-ispell
.endif
.else
CONFIGURE_ARGS+=--without-simple-spellcheck --without-interactive-spellcheck
@@ -84,61 +97,31 @@
.endif
.if !defined(PICO_ALPINE_SLAVE)
-.if !defined(WITHOUT_PICO)
-RUN_DEPENDS+= pico:${PORTSDIR}/editors/pico-alpine
+.if ${PORT_OPTIONS:MPICO}
+RUN_DEPENDS+= pico:editors/pico-alpine
.endif
-.if !defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+= --with-ipv6
-.else
-CONFIGURE_ARGS+= --without-ipv6
-.endif
-
-.if defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
USE_OPENLDAP= yes
-CONFIGURE_ARGS+= --with-ldap --with-ldap-dir=${LOCALBASE}
+CONFIGURE_ARGS+= --with-ldap-dir=${LOCALBASE}
.else
CONFIGURE_ARGS+= --without-ldap
.endif
-.if defined(WITH_PASSFILE)
+.if ${PORT_OPTIONS:MPASSFILE}
ALPINE_PASSFILE?= .alpine.pwd
CONFIGURE_ARGS+= --with-passfile=.alpine.pwd
.endif
-.if defined(WITH_CONS25)
-EXTRA_PATCHES= ${FILESDIR}/cons25-alpine_keymenu.c
+.if ${PORT_OPTIONS:MMAILDIR}
+PATCH_SITES= http://patches.freeiz.com/alpine/patches/alpine-${PORTVERSION}/
+PATCHFILES+= maildir.patch.gz:-p1
.endif
-.if defined(WITH_QUOTA) || defined(WITH_MAILDIR)
-PATCH_SITES= http://staff.washington.edu/chappa/alpine/patches/alpine-${PORTVERSION}/ \
- http://dougbarton.us/Downloads/alpine-${PORTVERSION}/ \
- ${MASTER_SITE_FREEBSD_LOCAL}
-PATCH_SITE_SUBDIR= dougb/alpine-${PORTVERSION}/
-PATCH_DIST_ARGS+= -E --quiet -d ${PATCH_WRKSRC} -p1
+.if ${PORT_OPTIONS:MCONS25}
+EXTRA_PATCHES= ${FILESDIR}/cons25-alpine_keymenu.c
.endif
-.if defined(WITH_QUOTA)
-PATCHFILES+= quota.patch.gz
-.endif
-
-.if defined(WITH_MAILDIR)
-PATCHFILES+= maildir.patch.gz
-.endif
-
-.if !defined(WITHOUT_SSL)
-MAKE_ARGS+= SSLINCLUDE=${OPENSSLINC} SSLLIB=${OPENSSLLIB}
-CONFIGURE_ARGS+= --with-ssl-dir=${OPENSSLDIR} \
- --with-ssl-certs-dir=${OPENSSLDIR}/certs
-.else
-CONFIGURE_ARGS+= --without-ssl
-.endif
-
-MAN1= alpine.1 rpdump.1 rpload.1
-
-pre-patch:
- @${CHMOD} -R u+w ${WRKSRC}
-
post-patch:
@${CP} ${WRKSRC}/imap/Makefile ${WRKSRC}/imap/Makefile.presed
@${SED} -e "s#^\(all:.*\) bundled\$$#\1#" \
@@ -156,30 +139,37 @@
${WRKSRC}/imap/src/osdep/unix/Makefile.presed \
> ${WRKSRC}/imap/src/osdep/unix/Makefile
@for i in ${WRKSRC}/README ${WRKSRC}/doc/alpine.1 \
- ${WRKSRC}/doc/tech-notes.txt ${WRKSRC}/doc/tech-notes/*.html \
+ ${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/etc/:${PREFIX}/etc/:g" \
- -e "s:/usr/local/lib/:${PREFIX}/etc/:g" \
+ ${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" \
- -e "s:/usr/local/pine.conf:${PREFIX}/etc/alpine.conf:g" \
$$i.presed > $$i ; \
done
post-install:
-.if !defined(NOPORTDOCS)
- ${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} ${DOCSDIR} \
- ${DOCSDIR}/tech-notes
- ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/NOTICE ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/doc/brochure.txt ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/doc/tech-notes.txt ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/doc/tech-notes/*.html ${DOCSDIR}/tech-notes
+ ${STAGEDIR}${PREFIX}/bin/alpine -conf > ${STAGEDIR}${PREFIX}/etc/alpine.conf.sample
+.if ${PORT_OPTIONS:MDOCS}
+ ${INSTALL} -d ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR}/tech-notes
+.for f in ${PORTDOCSbase}
+ ${INSTALL_MAN} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}
+.endfor
+.for f in ${PORTDOCSdoc}
+ ${INSTALL_MAN} ${WRKSRC}/doc/$f ${STAGEDIR}${DOCSDIR}
+.endfor
+.for f in ${PORTDOCShtml}
+ ${INSTALL_MAN} ${WRKSRC}/doc/$f ${STAGEDIR}${DOCSDIR}/tech-notes
+.endfor
.endif
- ${PREFIX}/bin/alpine -P ${PREFIX}/etc/alpine.conf -conf >${WRKSRC}/alpine.conf
- ${INSTALL_DATA} ${WRKSRC}/alpine.conf ${PREFIX}/etc/alpine.conf
+# PKG_PREFIX=${STAGEDIR}${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+# @${CAT} ${PKGMESSAGE}
+
.endif # !defined(PICO_ALPINE_SLAVE)
.include <bsd.port.post.mk>
Modified: trunk/mail/alpine/distinfo
===================================================================
--- trunk/mail/alpine/distinfo 2017-05-14 20:55:11 UTC (rev 22459)
+++ trunk/mail/alpine/distinfo 2017-05-14 21:25:22 UTC (rev 22460)
@@ -1,2 +1,4 @@
-SHA256 (alpine-2.00/alpine-2.00.tar.bz2) = c85db8405af90375ba2440c85b7952d80996154e9916b83acca558dc82e0a2a6
-SIZE (alpine-2.00/alpine-2.00.tar.bz2) = 5222673
+SHA256 (alpine-2.20/alpine-2.20.tar.xz) = ed639b6e5bb97e6b0645c85262ca6a784316195d461ce8d8411999bf80449227
+SIZE (alpine-2.20/alpine-2.20.tar.xz) = 4841816
+SHA256 (alpine-2.20/maildir.patch.gz) = 1ef0932b80d7f790ce6577a521a7b613b5ce277bb13cbaf0116bb5de1499caaa
+SIZE (alpine-2.20/maildir.patch.gz) = 38374
Modified: trunk/mail/alpine/files/cons25-alpine_keymenu.c
===================================================================
--- trunk/mail/alpine/files/cons25-alpine_keymenu.c 2017-05-14 20:55:11 UTC (rev 22459)
+++ trunk/mail/alpine/files/cons25-alpine_keymenu.c 2017-05-14 21:25:22 UTC (rev 22460)
@@ -1,15 +1,15 @@
---- alpine/keymenu.c.orig 2007-12-21 01:53:12.000000000 -0800
-+++ alpine/keymenu.c 2007-12-21 01:53:12.000000000 -0800
-@@ -2601,7 +2601,12 @@
- char this_label[6*MAX_LABEL+1];
+--- alpine/keymenu.c.orig 2013-08-15 04:36:01.000000000 +0000
++++ alpine/keymenu.c
+@@ -2774,7 +2774,11 @@ output_keymenu(struct key_menu *km, unsi
j = 6*i - 1;
-+
+ #ifndef __CYGWIN__
+- if(i == 1 && !label_color)
+ /*
-+ Change this line so that color works on cons25 terminals
- if(i == 1 && !label_color)
-+ */
-+ if(i == 1)
- max_column--; /* Some terminals scroll if you write in the
- lower right hand corner. If user has a
- label_color set we'll take our chances.
++ * Change this line so that color works on cons25 terminals
++ * if(i == 1 && !label_color)
++ */
++ if (i == 1)
+ #else
+ if(i == 1 && (!label_color || !struncmp(term_name,"cygwin", 6)))
+ #endif
Deleted: trunk/mail/alpine/files/patch-configure
===================================================================
--- trunk/mail/alpine/files/patch-configure 2017-05-14 20:55:11 UTC (rev 22459)
+++ trunk/mail/alpine/files/patch-configure 2017-05-14 21:25:22 UTC (rev 22460)
@@ -1,29 +0,0 @@
---- configure.orig 2008-08-21 18:41:04.000000000 -0700
-+++ configure 2008-09-05 22:36:00.000000000 -0700
-@@ -23041,7 +23041,7 @@
- case "$SPELLPROG" in
- no)
- ;;
-- yes)
-+ yes|*aspell|*ispell)
- # Extract the first word of "aspell", so it can be a program name with args.
- set dummy aspell; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
-@@ -23233,7 +23233,7 @@
- case "$ISPELLPROG" in
- no)
- ;;
-- yes)
-+ yes|*aspell|*ispell)
- # Extract the first word of "aspell", so it can be a program name with args.
- set dummy aspell; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
-@@ -33251,7 +33251,7 @@
- c_client_specials="${c_client_specials}SSLTYPE=none "
- else
-
-- if test -n "$alpine_SSLCERTS" -a -d "$alpine_SSLCERTS" ; then
-+ if test -n "$alpine_SSLCERTS" ; then
- certdir="$alpine_SSLCERTS"
- elif test -n "$alpine_SSLDIR" -a -d "${alpine_SSLDIR}/certs" ; then
- certdir="${alpine_SSLDIR}/certs"
Deleted: trunk/mail/alpine/files/patch-newuser
===================================================================
--- trunk/mail/alpine/files/patch-newuser 2017-05-14 20:55:11 UTC (rev 22459)
+++ trunk/mail/alpine/files/patch-newuser 2017-05-14 21:25:22 UTC (rev 22460)
@@ -1,381 +0,0 @@
-diff -ur /home/dougb-f/alpine-2.00/alpine/Makefile.am ./alpine/Makefile.am
---- /home/dougb-f/alpine-2.00/alpine/Makefile.am 2008-06-03 08:54:15.000000000 -0700
-+++ ./alpine/Makefile.am 2011-05-22 14:43:01.000000000 -0700
-@@ -19,7 +19,7 @@
- alpine_SOURCES = addrbook.c adrbkcmd.c after.c alpine.c arg.c busy.c colorconf.c \
- confscroll.c context.c dispfilt.c flagmaint.c folder.c help.c imap.c \
- init.c kblock.c keymenu.c ldapconf.c listsel.c mailcmd.c mailindx.c \
-- mailpart.c mailview.c newuser.c pattern.c pipe.c print.c radio.c remote.c reply.c \
-+ mailpart.c mailview.c pattern.c pipe.c print.c radio.c remote.c reply.c \
- roleconf.c send.c setup.c signal.c status.c takeaddr.c titlebar.c smime.c
-
- alpine_LDADD = $(LDADD) $(INTLLIBS)
-diff -ur /home/dougb-f/alpine-2.00/alpine/Makefile.in ./alpine/Makefile.in
---- /home/dougb-f/alpine-2.00/alpine/Makefile.in 2008-06-03 08:54:15.000000000 -0700
-+++ ./alpine/Makefile.in 2011-05-22 14:43:14.000000000 -0700
-@@ -68,7 +68,7 @@
- help.$(OBJEXT) imap.$(OBJEXT) init.$(OBJEXT) kblock.$(OBJEXT) \
- keymenu.$(OBJEXT) ldapconf.$(OBJEXT) listsel.$(OBJEXT) \
- mailcmd.$(OBJEXT) mailindx.$(OBJEXT) mailpart.$(OBJEXT) \
-- mailview.$(OBJEXT) newuser.$(OBJEXT) pattern.$(OBJEXT) \
-+ mailview.$(OBJEXT) pattern.$(OBJEXT) \
- pipe.$(OBJEXT) print.$(OBJEXT) radio.$(OBJEXT) \
- remote.$(OBJEXT) reply.$(OBJEXT) roleconf.$(OBJEXT) \
- send.$(OBJEXT) setup.$(OBJEXT) signal.$(OBJEXT) \
-@@ -271,7 +271,7 @@
- alpine_SOURCES = addrbook.c adrbkcmd.c after.c alpine.c arg.c busy.c colorconf.c \
- confscroll.c context.c dispfilt.c flagmaint.c folder.c help.c imap.c \
- init.c kblock.c keymenu.c ldapconf.c listsel.c mailcmd.c mailindx.c \
-- mailpart.c mailview.c newuser.c pattern.c pipe.c print.c radio.c remote.c reply.c \
-+ mailpart.c mailview.c pattern.c pipe.c print.c radio.c remote.c reply.c \
- roleconf.c send.c setup.c signal.c status.c takeaddr.c titlebar.c smime.c
-
- alpine_LDADD = $(LDADD) $(INTLLIBS)
-@@ -388,7 +388,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mailindx.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mailpart.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mailview.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/newuser.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pattern.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pipe.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/print.Po at am__quote@
-diff -ur /home/dougb-f/alpine-2.00/alpine/alpine.c ./alpine/alpine.c
---- /home/dougb-f/alpine-2.00/alpine/alpine.c 2008-06-03 15:31:05.000000000 -0700
-+++ ./alpine/alpine.c 2011-05-22 14:42:15.000000000 -0700
-@@ -49,7 +49,6 @@
- #include "init.h"
- #include "remote.h"
- #include "pattern.h"
--#include "newuser.h"
- #include "setup.h"
- #include "adrbkcmd.h"
- #include "signal.h"
-@@ -762,7 +761,6 @@
- pine_state->mangled_header = 1;
- show_main_screen(pine_state, 0, FirstMenu, &main_keymenu, 0,
- (Pos *) NULL);
-- new_user_or_version(pine_state);
- ClearScreen();
- }
-
-diff -ur /home/dougb-f/alpine-2.00/alpine/mailview.c ./alpine/mailview.c
---- /home/dougb-f/alpine-2.00/alpine/mailview.c 2008-08-01 17:32:26.000000000 -0700
-+++ ./alpine/mailview.c 2011-05-22 14:42:15.000000000 -0700
-@@ -177,7 +177,6 @@
- int url_local_nntp(char *);
- int url_local_news(char *);
- int url_local_file(char *);
--int url_local_phone_home(char *);
- static int print_to_printer(SCROLL_S *);
- int search_text(int, long, int, char **, Pos *, int *);
- void update_scroll_titlebar(long, int);
-@@ -1697,7 +1696,6 @@
- {"news:", 5, url_local_news},
- {"x-alpine-gripe:", 15, gripe_gripe_to},
- {"x-alpine-help:", 14, url_local_helper},
-- {"x-alpine-phone-home:", 20, url_local_phone_home},
- {"x-alpine-config:", 16, url_local_config},
- {"x-alpine-cert:", 14, url_local_certdetails},
- {"#", 1, url_local_fragment},
-@@ -2252,14 +2250,6 @@
- }
-
-
--int
--url_local_phone_home(char *url)
--{
-- phone_home(url + strlen("x-alpine-phone-home:"));
-- return(2);
--}
--
--
- /*
- * Format editorial comment referencing screen offering
- * List-* header supplied commands
-diff -ur /home/dougb-f/alpine-2.00/alpine/makefile.wnt ./alpine/makefile.wnt
---- /home/dougb-f/alpine-2.00/alpine/makefile.wnt 2007-10-24 14:58:00.000000000 -0700
-+++ ./alpine/makefile.wnt 2011-05-22 14:42:15.000000000 -0700
-@@ -44,13 +44,13 @@
- addrbook.h adrbkcmd.h after.h alpine.h arg.h busy.h colorconf.h confscroll.h \
- conftype.h context.h dispfilt.h flagmaint.h folder.h headers.h help.h imap.h \
- init.h kblock.h keymenu.h ldapconf.h listsel.h mailcmd.h mailindx.h mailpart.h \
-- mailview.h newuser.h pattern.h pipe.h print.h radio.h remote.h reply.h roleconf.h \
-+ mailview.h pattern.h pipe.h print.h radio.h remote.h reply.h roleconf.h \
- send.h setup.h signal.h status.h takeaddr.h talk.h titlebar.h
-
- OFILES= addrbook.obj adrbkcmd.obj after.obj alpine.obj arg.obj busy.obj colorconf.obj \
- confscroll.obj context.obj dispfilt.obj flagmaint.obj folder.obj help.obj \
- imap.obj init.obj kblock.obj keymenu.obj ldapconf.obj listsel.obj mailcmd.obj \
-- mailindx.obj mailpart.obj mailview.obj newuser.obj pattern.obj pipe.obj \
-+ mailindx.obj mailpart.obj mailview.obj pattern.obj pipe.obj \
- print.obj radio.obj remote.obj reply.obj roleconf.obj \
- send.obj setup.obj signal.obj status.obj takeaddr.obj titlebar.obj
-
-diff -ur /home/dougb-f/alpine-2.00/alpine/send.c ./alpine/send.c
---- /home/dougb-f/alpine-2.00/alpine/send.c 2008-06-30 15:03:35.000000000 -0700
-+++ ./alpine/send.c 2011-05-22 14:42:15.000000000 -0700
-@@ -70,8 +70,6 @@
- PARAMETER *parameter;
- } BODY_PARTICULARS_S;
-
--#define PHONE_HOME_VERSION "-count"
--#define PHONE_HOME_HOST "docserver.cac.washington.edu"
-
- /*
- * macro to bind pico's headerentry pointer to PINEFIELD "extdata" hook
-@@ -5462,63 +5460,6 @@
-
-
- /*----------------------------------------------------------------------
-- Generate and send a message back to the pine development team
--
--Args: none
--
--Returns: none
------*/
--void
--phone_home(char *addr)
--{
-- char tmp[MAX_ADDRESS];
-- ENVELOPE *outgoing;
-- BODY *body;
--
-- outgoing = mail_newenvelope();
-- if(!addr || !strindex(addr, '@')){
-- snprintf(addr = tmp, sizeof(tmp), "alpine%s@%s", PHONE_HOME_VERSION, PHONE_HOME_HOST);
-- tmp[sizeof(tmp)-1] = '\0';
-- }
--
-- rfc822_parse_adrlist(&outgoing->to, addr, ps_global->maildomain);
--
-- outgoing->message_id = generate_message_id();
-- outgoing->subject = cpystr("Document Request");
-- outgoing->from = phone_home_from();
--
-- body = mail_newbody();
-- body->type = TYPETEXT;
--
-- if((body->contents.text.data = (void *)so_get(PicoText,NULL,EDIT_ACCESS)) != NULL){
-- so_puts((STORE_S *)body->contents.text.data, "Document request: ");
-- so_puts((STORE_S *)body->contents.text.data, "Alpine-");
-- so_puts((STORE_S *)body->contents.text.data, ALPINE_VERSION);
-- if(ps_global->first_time_user)
-- so_puts((STORE_S *)body->contents.text.data, " for New Users");
--
-- if(ps_global->VAR_INBOX_PATH && ps_global->VAR_INBOX_PATH[0] == '{')
-- so_puts((STORE_S *)body->contents.text.data, " and IMAP");
--
-- if(ps_global->VAR_NNTP_SERVER && ps_global->VAR_NNTP_SERVER[0]
-- && ps_global->VAR_NNTP_SERVER[0][0])
-- so_puts((STORE_S *)body->contents.text.data, " and NNTP");
--
-- (void)pine_simple_send(outgoing, &body, NULL,NULL,NULL,NULL, SS_NULLRP);
--
-- q_status_message(SM_ORDER, 1, 3, "Thanks for being counted!");
-- }
-- else
-- q_status_message(SM_ORDER | SM_DING, 3, 4,
-- "Problem creating space for message text.");
--
-- mail_free_envelope(&outgoing);
-- pine_free_body(&body);
--
--}
--
--
--/*----------------------------------------------------------------------
- Set up fields for passing to pico. Assumes first text part is
- intended to be passed along for editing, and is in the form of
- of a storage object brought into existence sometime before pico_send().
-diff -ur /home/dougb-f/alpine-2.00/alpine/send.h ./alpine/send.h
---- /home/dougb-f/alpine-2.00/alpine/send.h 2007-08-16 15:25:10.000000000 -0700
-+++ ./alpine/send.h 2011-05-22 14:42:15.000000000 -0700
-@@ -41,7 +41,6 @@
- void pine_send(ENVELOPE *, BODY **, char *, ACTION_S *, char *, REPLY_S *,
- REDRAFT_POS_S *, char *, PINEFIELD *, int);
- int upload_msg_to_pico(char *, size_t, long *);
--void phone_home(char *);
- void create_message_body(BODY **, PATMT *, int);
- char *pine_send_status(int, char *, char *, size_t, int *);
- int confirm_daemon_send(void);
-diff -ur /home/dougb-f/alpine-2.00/pith/filter.c ./pith/filter.c
---- /home/dougb-f/alpine-2.00/pith/filter.c 2008-08-21 16:50:47.000000000 -0700
-+++ ./pith/filter.c 2011-05-22 14:42:15.000000000 -0700
-@@ -7510,8 +7510,6 @@
- HD(f)->bitbucket = 0;
- else if(!strucmp(s, "running"))
- HD(f)->bitbucket = 0;
-- else if(!strucmp(s, "phone_home") && ps_global->phone_home)
-- HD(f)->bitbucket = 0;
- #ifdef _WINDOWS
- else if(!strucmp(s, "os_windows"))
- HD(f)->bitbucket = 0;
-diff -ur /home/dougb-f/alpine-2.00/pith/pine.hlp ./pith/pine.hlp
---- /home/dougb-f/alpine-2.00/pith/pine.hlp 2008-08-22 17:07:05.000000000 -0700
-+++ ./pith/pine.hlp 2011-05-22 14:42:15.000000000 -0700
-@@ -1204,21 +1204,7 @@
- We hope you will explore Alpine's many capabilities. From the MAIN MENU,
- select Setup/Config to see many of the options available to you. Also note
- that all screens have context-sensitive help text available.<P>
--<!--chtml if pinemode="phone_home"-->
--SPECIAL REQUEST:
--This software is made available world-wide as a public service of the
--University of Washington in Seattle. In order to justify continuing
--development, it is helpful to have an idea of how many people are using
--Alpine. Are you willing to be counted as an Alpine user? Pressing
--<A HREF="X-Alpine-Phone-Home:">Return</A>
--will send an anonymous (meaning, your real email address will not be revealed)
--message to the Alpine development team at the University of Washington for
--purposes of tallying.
--<P>
--<!--To Exit this screen and continue your Alpine session press "E".-->
--<!--chtml else-->
- To Exit this screen and continue your Alpine session press "Return".
--<!--chtml endif-->
- </BODY>
- </HTML>
- ===== new_alpine_user_greeting ======
-@@ -1238,21 +1224,7 @@
- The Release Notes may be viewed by pressing
- "R" now or while in the MAIN MENU.
- <P>
--<!--chtml if pinemode="phone_home"-->
--SPECIAL REQUEST:
--This software is made available world-wide as a public service of the
--University of Washington in Seattle. In order to justify continuing
--development, it is helpful to have an idea of how many people are using
--Alpine. Are you willing to be counted as an Alpine user? Pressing
--<A HREF="X-Alpine-Phone-Home:">Return</A>
--will send an anonymous (meaning, your real email address will not be revealed)
--message to the Alpine development team at the University of Washington for
--purposes of tallying.
--<P>
--<!--To Exit this screen and continue your Alpine session press "E".-->
--<!--chtml else-->
- To Exit this screen and continue your Alpine session press "Return".
--<!--chtml endif-->
- </BODY>
- </HTML>
- ===== new_version_greeting ======
-@@ -1269,21 +1241,7 @@
- documented in the Release Notes, which may be viewed by pressing
- "R" now or while in the MAIN MENU.
- <P>
--<!--chtml if pinemode="phone_home"-->
--SPECIAL REQUEST:
--This software is made available world-wide as a public service of the
--University of Washington in Seattle. In order to justify continuing
--development, it is helpful to have an idea of how many people are using
--Alpine. Are you willing to be counted as an Alpine user? Pressing
--<A HREF="X-Alpine-Phone-Home:">Return</A>
--will send an anonymous (meaning, your real email address will not be revealed)
--message to the Alpine development team at the University of Washington for
--purposes of tallying.
--
--<!--To Exit this screen and continue your Alpine session press "E".-->
--<!--chtml else-->
- To Exit this screen and continue your Alpine session press "Return".
--<!--chtml endif-->
- </BODY>
- </HTML>
-
-diff -ur /home/dougb-f/alpine-2.00/pith/send.c ./pith/send.c
---- /home/dougb-f/alpine-2.00/pith/send.c 2008-08-06 11:25:58.000000000 -0700
-+++ ./pith/send.c 2011-05-22 14:42:15.000000000 -0700
-@@ -209,13 +209,6 @@
-
-
- /*
-- * Phone home hash controls
-- */
--#define PH_HASHBITS 24
--#define PH_MAXHASH (1<<(PH_HASHBITS))
--
--
--/*
- * postponed_stream - return stream associated with postponed messages
- * in argument.
- */
-@@ -1676,48 +1669,6 @@
- }
-
-
--/*
-- * phone_home_from - make phone home request's from address IMpersonal.
-- * Doesn't include user's personal name.
-- */
--ADDRESS *
--phone_home_from(void)
--{
-- ADDRESS *addr = mail_newaddr();
-- char tmp[32];
--
-- /* garble up mailbox name */
-- snprintf(tmp, sizeof(tmp), "hash_%08u", phone_home_hash(ps_global->VAR_USER_ID));
-- tmp[sizeof(tmp)-1] = '\0';
-- addr->mailbox = cpystr(tmp);
-- addr->host = cpystr(ps_global->maildomain);
-- return(addr);
--}
--
--
--/*
-- * one-way-hash a username into an 8-digit decimal number
-- *
-- * Corey Satten, corey at cac.washington.edu, 7/15/98
-- */
--unsigned int
--phone_home_hash(char *s)
--{
-- unsigned int h;
--
-- for (h=0; *s; ++s) {
-- if (h & 1)
-- h = (h>>1) | (PH_MAXHASH/2);
-- else
-- h = (h>>1);
--
-- h = ((h+1) * ((unsigned char) *s)) & (PH_MAXHASH - 1);
-- }
--
-- return (h);
--}
--
--
- /*----------------------------------------------------------------------
- Call the mailer, SMTP, sendmail or whatever
-
-diff -ur /home/dougb-f/alpine-2.00/pith/send.h ./pith/send.h
---- /home/dougb-f/alpine-2.00/pith/send.h 2008-06-30 15:03:35.000000000 -0700
-+++ ./pith/send.h 2011-05-22 14:42:15.000000000 -0700
-@@ -224,8 +224,6 @@
- void pine_free_env(METAENV **);
- int check_addresses(METAENV *);
- void update_answered_flags(REPLY_S *);
--ADDRESS *phone_home_from(void);
--unsigned int phone_home_hash(char *);
- int call_mailer(METAENV *, BODY *, char **, int, void (*)(char *, int),
- void (*)(PIPE_S *, int, void *));
- int write_postponed(METAENV *, BODY *);
-diff -ur /home/dougb-f/alpine-2.00/pith/state.h ./pith/state.h
---- /home/dougb-f/alpine-2.00/pith/state.h 2008-06-03 08:54:15.000000000 -0700
-+++ ./pith/state.h 2011-05-22 14:42:15.000000000 -0700
-@@ -187,7 +187,6 @@
- unsigned force_prefer_plain:1;
- unsigned force_no_prefer_plain:1;
-
-- unsigned phone_home:1;
- unsigned painted_body_on_startup:1;
- unsigned painted_footer_on_startup:1;
- unsigned open_readonly_on_startup:1;
-diff -ur /home/dougb-f/alpine-2.00/po/POTFILES.in ./po/POTFILES.in
---- /home/dougb-f/alpine-2.00/po/POTFILES.in 2008-06-03 12:27:23.000000000 -0700
-+++ ./po/POTFILES.in 2011-05-22 14:42:15.000000000 -0700
-@@ -50,7 +50,6 @@
- alpine/context.c
- alpine/pine-use.c
- alpine/imap.c
--alpine/newuser.c
- alpine/help.c
- alpine/print.c
- alpine/smime.c
Modified: trunk/mail/alpine/pkg-descr
===================================================================
--- trunk/mail/alpine/pkg-descr 2017-05-14 20:55:11 UTC (rev 22459)
+++ trunk/mail/alpine/pkg-descr 2017-05-14 21:25:22 UTC (rev 22460)
@@ -18,4 +18,4 @@
Alpine supports MIME (Multipurpose Internet Mail Extensions), an Internet
Standard for representing multipart and multimedia data in email.
-WWW: http://www.washington.edu/alpine/
+WWW: http://patches.freeiz.com/alpine/
Modified: trunk/mail/alpine/pkg-message
===================================================================
--- trunk/mail/alpine/pkg-message 2017-05-14 20:55:11 UTC (rev 22459)
+++ trunk/mail/alpine/pkg-message 2017-05-14 21:25:22 UTC (rev 22460)
@@ -1 +1,4 @@
-To use GnuPG with Alpine, take a look at the mail/pine-pgp-filters port
+
+*******************************************************************************
+*** To use GnuPG with Alpine, take a look at the mail/pine-pgp-filters port ***
+*******************************************************************************
Modified: trunk/mail/alpine/pkg-plist
===================================================================
--- trunk/mail/alpine/pkg-plist 2017-05-14 20:55:11 UTC (rev 22459)
+++ trunk/mail/alpine/pkg-plist 2017-05-14 21:25:22 UTC (rev 22460)
@@ -1,24 +1,7 @@
- at unexec %D/bin/alpine -conf >%D/etc/alpine.conf.tmp
- at unexec if cmp -s %D/etc/alpine.conf %D/etc/alpine.conf.tmp; then rm -f %D/etc/alpine.conf; fi
- at unexec rm -f %D/etc/alpine.conf.tmp
bin/alpine
bin/rpdump
bin/rpload
- at exec %D/bin/alpine -P %D/etc/alpine.conf -conf >%D/etc/alpine.conf.tmp
- at exec /bin/mv %D/etc/alpine.conf.tmp %D/etc/alpine.conf
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/NOTICE
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/brochure.txt
-%%PORTDOCS%%%%DOCSDIR%%/tech-notes.txt
-%%PORTDOCS%%%%DOCSDIR%%/tech-notes/background.html
-%%PORTDOCS%%%%DOCSDIR%%/tech-notes/cmd-line.html
-%%PORTDOCS%%%%DOCSDIR%%/tech-notes/config-notes.html
-%%PORTDOCS%%%%DOCSDIR%%/tech-notes/config.html
-%%PORTDOCS%%%%DOCSDIR%%/tech-notes/index.html
-%%PORTDOCS%%%%DOCSDIR%%/tech-notes/installation.html
-%%PORTDOCS%%%%DOCSDIR%%/tech-notes/introduction.html
-%%PORTDOCS%%%%DOCSDIR%%/tech-notes/low-level.html
-%%PORTDOCS%%%%DOCSDIR%%/tech-notes/porting.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/tech-notes
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%ETCDIR%%.conf.sample
+man/man1/alpine.1.gz
+man/man1/rpdump.1.gz
+man/man1/rpload.1.gz
More information about the Midnightbsd-cvs
mailing list