svn commit: r357844 - in head/mail/alpine: . files
Kurt Jaeger
pi at FreeBSD.org
Sun Jun 15 08:40:13 UTC 2014
Author: pi
Date: Sun Jun 15 08:40:09 2014
New Revision: 357844
URL: http://svnweb.freebsd.org/changeset/ports/357844
QAT: https://qat.redports.org/buildarchive/r357844/
Log:
mail/alpine: 2.00 -> 2.11, stagify'ed, portlint'ed, new master site
Big thanks to Michelle for the biggest part of the work in getting
the port to StageAge. Thanks for Marco to take over as maintainer.
PR: ports/190273
Submitted by: Michelle Sullivan <michelle at sorbs.net>
Approved by: Marco Beishuizen <mbeis at xs4all.nl> (incoming maintainer)
Added:
head/mail/alpine/files/patch-alpine__Makefile.am (contents, props changed)
head/mail/alpine/files/patch-alpine__Makefile.in (contents, props changed)
head/mail/alpine/files/patch-alpine__alpine.c (contents, props changed)
head/mail/alpine/files/patch-alpine__mailview.c (contents, props changed)
head/mail/alpine/files/patch-alpine__makefile.wnt (contents, props changed)
head/mail/alpine/files/patch-alpine__send.c (contents, props changed)
head/mail/alpine/files/patch-alpine__send.h (contents, props changed)
head/mail/alpine/files/patch-pith__filter.c (contents, props changed)
head/mail/alpine/files/patch-pith__pine.hlp (contents, props changed)
head/mail/alpine/files/patch-pith__send.c (contents, props changed)
head/mail/alpine/files/patch-pith__send.h (contents, props changed)
head/mail/alpine/files/patch-pith__state.h (contents, props changed)
head/mail/alpine/files/patch-po__POTFILES.in (contents, props changed)
Deleted:
head/mail/alpine/files/patch-configure
head/mail/alpine/files/patch-newuser
head/mail/alpine/pkg-install
Modified:
head/mail/alpine/Makefile
head/mail/alpine/distinfo
head/mail/alpine/pkg-descr
head/mail/alpine/pkg-plist
Modified: head/mail/alpine/Makefile
==============================================================================
--- head/mail/alpine/Makefile Sun Jun 15 08:39:47 2014 (r357843)
+++ head/mail/alpine/Makefile Sun Jun 15 08:40:09 2014 (r357844)
@@ -1,21 +1,26 @@
# $FreeBSD$
PORTNAME?= alpine
-PORTVERSION= 2.00
-PORTREVISION?= 4
+PORTVERSION= 2.11
+PORTREVISION?= 0
CATEGORIES?= mail news ipv6
-MASTER_SITES= ftp://ftp.cac.washington.edu/alpine/
-DIST_SUBDIR= alpine-${PORTVERSION}
+MASTER_SITES= http://patches.freeiz.com/alpine/release/src/
+EXTRACT_SUFX= .tar.xz
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= mbeis at xs4all.nl
COMMENT?= Mail and news client descended from Pine
-OPTIONS_DEFINE+= THREADS MOUSE NLS ISPELL NOSPELL
-OPTIONS_DEFAULT+= THREADS MOUSE
+LICENSE= APACHE20
+
+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_DEFINE+= PICO IPV6 LDAP PASSFILE CONS25 QUOTA MAILDIR SSL
OPTIONS_DEFAULT+= PICO SSL
PICO_DESC= Build and install pico, the default editor
@@ -25,45 +30,57 @@ QUOTA_DESC= Add a patch for disk quota c
MAILDIR_DESC= Add a patch for maildir support
.endif
-USE_BZIP2= yes
+USES= libtool
MAKE_JOBS_UNSAFE= yes
GNU_CONFIGURE= yes
.if !defined(PICO_ALPINE_SLAVE)
+
+PORTDOCSbase= LICENSE NOTICE README
+PORTDOCSdoc= brochure.txt tech-notes.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
+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 \
--enable-background-post --without-krb5 --without-tcl
-NO_STAGE= yes
+
.endif
CONFIGURE_ARGS+=--with-debug-level=2
MAKE_ARGS+= CC="${CC}" CXX="${CXX}" GCCCFLAGS="${CFLAGS}"
-USE_OPENSSL= yes
+.include <bsd.port.options.mk>
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MTHREADS}
-CONFIGURE_ARGS+= --with-pthread
-.else
-CONFIGURE_ARGS+= --without-pthread
+.if ${PORT_OPTIONS:MSSL}
+USE_OPENSSL= yes
+.if ${OSVERSION} < 1000000
+# OpenSSL is pre v1.0 in FBSD9.x so the ports version needs to be used
+WITH_OPENSSL_PORT= yes
.endif
-.if ${PORT_OPTIONS:MMOUSE}
-CONFIGURE_ARGS+= --enable-mouse
+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+= --disable-mouse
+CONFIGURE_ARGS+= --without-ssl
+USE_OPENSSL= no
.endif
-.if ${PORT_OPTIONS:MNLS}
-CONFIGURE_ARGS+= --enable-nls
-.else
-CONFIGURE_ARGS+= --disable-nls
-.endif
+.include <bsd.port.pre.mk>
+
+THREADS_CONFIGURE_WITH= pthread
+MOUSE_CONFIGURE_ENABLE= mouse
+NLS_CONFIGURE_ENABLE= nls
+IPV6_CONFIGURE_WITH= ipv6
.if ! ${PORT_OPTIONS:MNOSPELL}
.if ! ${PORT_OPTIONS:MISPELL}
@@ -84,15 +101,9 @@ CONFIGURE_ARGS+=--without-simple-spellch
RUN_DEPENDS+= pico:${PORTSDIR}/editors/pico-alpine
.endif
-.if ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+= --with-ipv6
-.else
-CONFIGURE_ARGS+= --without-ipv6
-.endif
-
.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
@@ -102,35 +113,26 @@ ALPINE_PASSFILE?= .alpine.pwd
CONFIGURE_ARGS+= --with-passfile=.alpine.pwd
.endif
-.if ${PORT_OPTIONS:MCONS25}
-EXTRA_PATCHES= ${FILESDIR}/cons25-alpine_keymenu.c
-.endif
-
.if ${PORT_OPTIONS:MQUOTA} || ${PORT_OPTIONS:MMAILDIR}
-PATCH_SITES= ${MASTER_SITE_LOCAL}
+PATCH_SITES= ftp://ftp.cac.washington.edu/alpine/
PATCH_SITE_SUBDIR= dougb/alpine-${PORTVERSION}/
PATCH_DIST_ARGS+= -E --quiet -d ${PATCH_WRKSRC} -p1
.endif
.if ${PORT_OPTIONS:MQUOTA}
+PATCH_SITES= ftp://ftp.cac.washington.edu/alpine/alpine-2.00/
PATCHFILES+= quota.patch.gz
.endif
.if ${PORT_OPTIONS:MMAILDIR}
+PATCH_SITES= ftp://ftp.cac.washington.edu/alpine/alpine-2.00/
PATCHFILES+= maildir.patch.gz
.endif
-.if ${PORT_OPTIONS:MSSL}
-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-ssl
+.if ${PORT_OPTIONS:MCONS25}
+EXTRA_PATCHES= ${FILESDIR}/cons25-alpine_keymenu.c
.endif
-MAN1= alpine.1 rpdump.1 rpload.1
-
pre-patch:
@${CHMOD} -R u+w ${WRKSRC}
@@ -163,19 +165,23 @@ post-patch:
done
post-install:
+ ${STAGEDIR}${PREFIX}/bin/alpine -conf > ${STAGEDIR}${PREFIX}/etc/alpine.conf.sample
.if ${PORT_OPTIONS:MDOCS}
- ${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
+ ${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
- PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
- @${CAT} ${PKGMESSAGE}
+# PKG_PREFIX=${STAGEDIR}${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+# @${CAT} ${PKGMESSAGE}
+
.endif # !defined(PICO_ALPINE_SLAVE)
.include <bsd.port.post.mk>
Modified: head/mail/alpine/distinfo
==============================================================================
--- head/mail/alpine/distinfo Sun Jun 15 08:39:47 2014 (r357843)
+++ head/mail/alpine/distinfo Sun Jun 15 08:40:09 2014 (r357844)
@@ -1,5 +1,5 @@
-SHA256 (alpine-2.00/alpine-2.00.tar.bz2) = c85db8405af90375ba2440c85b7952d80996154e9916b83acca558dc82e0a2a6
-SIZE (alpine-2.00/alpine-2.00.tar.bz2) = 5222673
+SHA256 (alpine-2.11.tar.xz) = fecc9ca5df03e0f368edec65cd61444325157b5635b5c92380cedf9c4ce8fbf6
+SIZE (alpine-2.11.tar.xz) = 4403188
SHA256 (alpine-2.00/quota.patch.gz) = 383717cbe36c62a6008f9d7e1ce56e755fc0ec49eef25fcf11f2cbebbbaffe12
SIZE (alpine-2.00/quota.patch.gz) = 3123
SHA256 (alpine-2.00/maildir.patch.gz) = 60d98c7dca0932316e23ccb226b4db85d1896de9a1a37259a2afcea153be4477
Added: head/mail/alpine/files/patch-alpine__Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/alpine/files/patch-alpine__Makefile.am Sun Jun 15 08:40:09 2014 (r357844)
@@ -0,0 +1,11 @@
+--- ./alpine/Makefile.am.orig 2014-05-25 19:16:59.000000000 -0500
++++ ./alpine/Makefile.am 2014-05-25 19:17:18.000000000 -0500
+@@ -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 newmail.c
+
+ alpine_LDADD = $(LDADD) $(INTLLIBS)
Added: head/mail/alpine/files/patch-alpine__Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/alpine/files/patch-alpine__Makefile.in Sun Jun 15 08:40:09 2014 (r357844)
@@ -0,0 +1,28 @@
+--- ./alpine/Makefile.in.orig 2013-08-14 23:36:01.000000000 -0500
++++ ./alpine/Makefile.in 2014-05-25 19:15:31.000000000 -0500
+@@ -78,7 +78,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) \
+@@ -319,7 +319,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 newmail.c
+
+ alpine_LDADD = $(LDADD) $(INTLLIBS)
+@@ -453,7 +453,6 @@
+ @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@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/newmail.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@
Added: head/mail/alpine/files/patch-alpine__alpine.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/alpine/files/patch-alpine__alpine.c Sun Jun 15 08:40:09 2014 (r357844)
@@ -0,0 +1,18 @@
+--- ./alpine/alpine.c.orig 2013-08-14 23:36:01.000000000 -0500
++++ ./alpine/alpine.c 2014-05-25 19:15:31.000000000 -0500
+@@ -50,7 +50,6 @@
+ #include "init.h"
+ #include "remote.h"
+ #include "pattern.h"
+-#include "newuser.h"
+ #include "setup.h"
+ #include "adrbkcmd.h"
+ #include "signal.h"
+@@ -767,7 +766,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();
+ }
+
Added: head/mail/alpine/files/patch-alpine__mailview.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/alpine/files/patch-alpine__mailview.c Sun Jun 15 08:40:09 2014 (r357844)
@@ -0,0 +1,33 @@
+--- ./alpine/mailview.c.orig 2013-08-14 23:36:01.000000000 -0500
++++ ./alpine/mailview.c 2014-05-25 19:15:31.000000000 -0500
+@@ -178,7 +178,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);
+@@ -1603,7 +1602,6 @@
+ {"x-alpine-gripe:", 15, gripe_gripe_to},
+ {"x-alpine-help:", 14, url_local_helper},
+ {"x-pine-help:", 12, 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},
+@@ -2158,14 +2156,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
Added: head/mail/alpine/files/patch-alpine__makefile.wnt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/alpine/files/patch-alpine__makefile.wnt Sun Jun 15 08:40:09 2014 (r357844)
@@ -0,0 +1,20 @@
+--- ./alpine/makefile.wnt.orig 2013-08-14 23:36:01.000000000 -0500
++++ ./alpine/makefile.wnt 2014-05-25 19:15:31.000000000 -0500
+@@ -44,7 +44,7 @@
+ 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 newmail.h newuser.h pattern.h pipe.h print.h radio.h remote.h \
++ mailview.h newmail.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
+
+@@ -52,7 +52,7 @@
+ 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 newmail.obj \
+- newuser.obj pattern.obj pipe.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
+
Added: head/mail/alpine/files/patch-alpine__send.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/alpine/files/patch-alpine__send.c Sun Jun 15 08:40:09 2014 (r357844)
@@ -0,0 +1,75 @@
+--- ./alpine/send.c.orig 2013-08-14 23:36:01.000000000 -0500
++++ ./alpine/send.c 2014-05-25 19:15:31.000000000 -0500
+@@ -71,8 +71,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
+@@ -5481,63 +5479,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().
Added: head/mail/alpine/files/patch-alpine__send.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/alpine/files/patch-alpine__send.h Sun Jun 15 08:40:09 2014 (r357844)
@@ -0,0 +1,10 @@
+--- ./alpine/send.h.orig 2013-08-14 23:36:01.000000000 -0500
++++ ./alpine/send.h 2014-05-25 19:15:32.000000000 -0500
+@@ -42,7 +42,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);
Added: head/mail/alpine/files/patch-pith__filter.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/alpine/files/patch-pith__filter.c Sun Jun 15 08:40:09 2014 (r357844)
@@ -0,0 +1,11 @@
+--- ./pith/filter.c.orig 2013-08-14 23:36:22.000000000 -0500
++++ ./pith/filter.c 2014-05-25 19:15:32.000000000 -0500
+@@ -7522,8 +7522,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;
Added: head/mail/alpine/files/patch-pith__pine.hlp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/alpine/files/patch-pith__pine.hlp Sun Jun 15 08:40:09 2014 (r357844)
@@ -0,0 +1,181 @@
+--- ./pith/pine.hlp.orig 2013-08-14 23:36:22.000000000 -0500
++++ ./pith/pine.hlp 2014-05-25 19:15:32.000000000 -0500
+@@ -881,13 +881,13 @@
+ config file from command line or provided
+ by "PINECONF" environment variable
+ <!--chtml else-->
+- pine.conf file
++ alpine.conf file
+ <!--chtml endif-->
+ <LI> personal configuration file
+ <LI> personal exceptions configuration file
+ <LI> command-line options
+ <!--chtml if pinemode="os_windows"--><!--chtml else-->
+- <LI> system-wide pine.conf.fixed file<!--chtml endif-->
++ <LI> system-wide alpine.conf.fixed file<!--chtml endif-->
+ </UL>
+ <P>
+ The values in both the personal configuration file and the
+@@ -976,8 +976,8 @@
+ postponed# ~/mail/postponed-msgs
+ sentmail# ~/mail/sent-mail
+ mailcap# ~/.mailcap + /etc/mailcap
+- + /usr/etc/mailcap + /usr/local/etc/mailcap
+- mimetypes# ~/.mime.types + /etc/mime.types + /usr/local/lib/mime.types
++ + /usr/etc/mailcap + /usr/ports/mail/alpine/work/stage/usr/local/etc/mailcap
++ mimetypes# ~/.mime.types + /etc/mime.types + /usr/ports/mail/alpine/work/stage/usr/ports/mail/alpine/work/stage/usr/local/etc/mime.types
+
+ news-spool varies across Unix flavors, e.g. /var/spool/news or /usr/spool/news
+ active-news varies across Unix flavors, e.g. /usr/lib/news/active
+@@ -1367,20 +1367,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 as a public service of the
+-University of Washington in Seattle. We are no longer actively developing
+-the software, but it is still helpful to us 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 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 ======
+@@ -1400,20 +1387,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 as a public service of the
+-University of Washington in Seattle. We are no longer actively developing
+-the software, but it is still helpful to us 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 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 ======
+@@ -1430,20 +1404,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 as a public service of the
+-University of Washington in Seattle. We are no longer actively developing
+-the software, but it is still helpful to us 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 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>
+
+@@ -2709,7 +2670,7 @@
+ system configuration file, execute
+
+ <PRE><CODE>
+- pine -P old-pine.conf -conf > <!--#echo var="PINE_CONF_PATH"-->
++ pine -P old-alpine.conf -conf > <!--#echo var="PINE_CONF_PATH"-->
+ </CODE></PRE>
+ <P>
+ A system configuration file is not required.
+@@ -16075,7 +16036,7 @@
+ the pathname of the bogofilter program.
+ For example,
+ <P>
+-<CENTER><SAMP>Command = /usr/local/bin/bogofilter</SAMP></CENTER>
++<CENTER><SAMP>Command = /usr/ports/mail/alpine/work/stage/usr/local/bin/bogofilter</SAMP></CENTER>
+ <P>
+ Exit status of zero is what you are interested in, so you'd set the
+ Exit Status Interval to
+@@ -16136,7 +16097,7 @@
+ Instead of using just plain "bogofilter" as the Categorizer Command,
+ the "-u" argument will cause bogofilter to update the database.
+ <P>
+-<CENTER><SAMP>Command = /usr/local/bin/bogofilter -u</SAMP></CENTER>
++<CENTER><SAMP>Command = /usr/ports/mail/alpine/work/stage/usr/local/bin/bogofilter -u</SAMP></CENTER>
+ <P>
+ You'd want a couple more aliases or shell scripts called something like
+ <EM>change_to_spam</EM>
+@@ -16164,7 +16125,7 @@
+ This is usually ok.
+ However, in this case it is a problem because the command
+ <P>
+-<CENTER><SAMP>Command = /usr/local/bin/bogofilter -u</SAMP></CENTER>
++<CENTER><SAMP>Command = /usr/ports/mail/alpine/work/stage/usr/local/bin/bogofilter -u</SAMP></CENTER>
+ <P>
+ has the side effect of updating the database.
+ So you run the risk of updating the database multiple times for a single
+@@ -16210,7 +16171,7 @@
+ ! Keyword pattern = Bogo
+
+ External Categorizer Commands =
+- Command = /usr/local/bin/bogofilter -u
++ Command = /usr/ports/mail/alpine/work/stage/usr/local/bin/bogofilter -u
+ Exit Status Interval = (0,0)
+ Character Limit = <No Value Set: using "-1"> (optionally set this)
+
+@@ -20763,7 +20724,7 @@
+ </PRE>
+ <!--chtml else-->
+ a colon (:) under UNIX; for example:<PRE>
+- ~/.mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap
++ ~/.mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/ports/mail/alpine/work/stage/usr/local/etc/mailcap
+ </PRE>
+ <!--chtml endif-->
+ <P><UL>
+@@ -26486,16 +26447,16 @@
+ <P>
+ So, here are some example entries:
+ <PRE>
+-url-viewers = _TEST("test -n '${DISPLAY}'")_ /usr/local/bin/netscape
+- "/usr/local/bin/lynx _URL_"
++url-viewers = _TEST("test -n '${DISPLAY}'")_ /usr/ports/mail/alpine/work/stage/usr/local/bin/netscape
++ "/usr/ports/mail/alpine/work/stage/usr/local/bin/lynx _URL_"
+ C:\BIN\NETSCAPE.BAT
+ </PRE>
+ <P>
+ This example shows that for the first viewer in the list to be used
+ the environment variable "DISPLAY" must be defined. If it
+-is, then the path and file "/usr/local/bin/netscape" must exist.
++is, then the path and file "/usr/ports/mail/alpine/work/stage/usr/local/bin/netscape" must exist.
+ If neither condition is met,
+-then the path and file "/usr/local/bin/lynx" must exist.
++then the path and file "/usr/ports/mail/alpine/work/stage/usr/local/bin/lynx" must exist.
+ If it does, then the "_URL_" token is replaced by the selected URL.
+ If the path to "lynx" is invalid,
+ then the final path and file C:\BIN\NETSCAPE.BAT must exist.
+@@ -26588,10 +26549,10 @@
+ An example using the Korn shell and the Netscape browser (first entry wrapped
+ because of its length, but should all appear on one line):
+ <P>
+-url-viewers = _TEST("test -L /myhomedir/.netscape/lock")_ "/usr/local/bin/netscape -remote 'openURL(_URL_, new-window)' &"<BR>
++url-viewers = _TEST("test -L /myhomedir/.netscape/lock")_ "/usr/ports/mail/alpine/work/stage/usr/local/bin/netscape -remote 'openURL(_URL_, new-window)' &"<BR>
+
+-_TEST("test -n '${DISPLAY}'")_ "/usr/local/bin/netscape &"<BR>
+- "/usr/local/bin/lynx '_URL_'"
++_TEST("test -n '${DISPLAY}'")_ "/usr/ports/mail/alpine/work/stage/usr/local/bin/netscape &"<BR>
++ "/usr/ports/mail/alpine/work/stage/usr/local/bin/lynx '_URL_'"
+ <P>
+ <!--chtml endif-->
+ <P>
Added: head/mail/alpine/files/patch-pith__send.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/alpine/files/patch-pith__send.c Sun Jun 15 08:40:09 2014 (r357844)
@@ -0,0 +1,65 @@
+--- ./pith/send.c.orig 2013-08-14 23:36:22.000000000 -0500
++++ ./pith/send.c 2014-05-25 19:15:32.000000000 -0500
+@@ -210,13 +210,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.
+ */
+@@ -1677,48 +1670,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
+
Added: head/mail/alpine/files/patch-pith__send.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/alpine/files/patch-pith__send.h Sun Jun 15 08:40:09 2014 (r357844)
@@ -0,0 +1,11 @@
+--- ./pith/send.h.orig 2013-08-14 23:36:50.000000000 -0500
++++ ./pith/send.h 2014-05-25 19:15:32.000000000 -0500
+@@ -225,8 +225,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 *);
Added: head/mail/alpine/files/patch-pith__state.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/alpine/files/patch-pith__state.h Sun Jun 15 08:40:09 2014 (r357844)
@@ -0,0 +1,10 @@
+--- ./pith/state.h.orig 2013-08-14 23:36:50.000000000 -0500
++++ ./pith/state.h 2014-05-25 19:15:32.000000000 -0500
+@@ -193,7 +193,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;
Added: head/mail/alpine/files/patch-po__POTFILES.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/alpine/files/patch-po__POTFILES.in Sun Jun 15 08:40:09 2014 (r357844)
@@ -0,0 +1,10 @@
+--- ./po/POTFILES.in.orig 2013-08-14 23:36:22.000000000 -0500
++++ ./po/POTFILES.in 2014-05-25 19:15:32.000000000 -0500
+@@ -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: head/mail/alpine/pkg-descr
==============================================================================
--- head/mail/alpine/pkg-descr Sun Jun 15 08:39:47 2014 (r357843)
+++ head/mail/alpine/pkg-descr Sun Jun 15 08:40:09 2014 (r357844)
@@ -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: http://www.washington.edu/alpine/
+WWW: http://patches.freeiz.com/alpine/
Modified: head/mail/alpine/pkg-plist
==============================================================================
--- head/mail/alpine/pkg-plist Sun Jun 15 08:39:47 2014 (r357843)
+++ head/mail/alpine/pkg-plist Sun Jun 15 08:40:09 2014 (r357844)
@@ -1,21 +1,8 @@
- at unexec /usr/bin/cmp -s %D/etc/alpine.conf %D/etc/alpine.conf.sample && /bin/unlink %D/etc/alpine.conf || true
bin/alpine
bin/rpdump
bin/rpload
-etc/alpine.conf.sample
-%%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
+man/man1/alpine.1.gz
+man/man1/rpdump.1.gz
+man/man1/rpload.1.gz
+ at sample etc/alpine.conf.sample
%%PORTDOCS%%@dirrm %%DOCSDIR%%/tech-notes
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
More information about the svn-ports-all
mailing list