From 2fa6facfe3f1f807fdf84c97b8a8815fa378c0b5 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Wed, 15 Oct 2008 14:31:04 +0000 Subject: [PATCH] - update to alpine 2.00 (+pico 5.04) --- mail/alpine/Makefile | 14 ++--- mail/alpine/distinfo | 10 ++-- mail/alpine/patches/patch-alpine_Makefile_in | 12 ++-- mail/alpine/patches/patch-alpine_mailcmd_c | 12 ---- mail/alpine/patches/patch-configure | 12 ++-- mail/alpine/patches/patch-pico_attach_c | 12 ---- mail/alpine/patches/patch-pico_file_c | 63 -------------------- mail/alpine/patches/patch-pico_pico_h | 12 ---- mail/alpine/patches/patch-pith_pine_hlp | 12 ++-- 9 files changed, 30 insertions(+), 129 deletions(-) delete mode 100644 mail/alpine/patches/patch-alpine_mailcmd_c delete mode 100644 mail/alpine/patches/patch-pico_attach_c delete mode 100644 mail/alpine/patches/patch-pico_file_c delete mode 100644 mail/alpine/patches/patch-pico_pico_h diff --git a/mail/alpine/Makefile b/mail/alpine/Makefile index fee83a752ee..df7b2e93a24 100644 --- a/mail/alpine/Makefile +++ b/mail/alpine/Makefile @@ -1,22 +1,22 @@ -# $OpenBSD: Makefile,v 1.7 2008/06/15 00:08:44 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.8 2008/10/15 14:31:04 ajacoutot Exp $ COMMENT-main= UW e-mail client COMMENT-pico= UW text editor COMMENT-pilot= UW file system navigator -V= 1.10 +V= 2.00 DISTNAME= alpine-${V} -PICO_V= 5.01 # grep "PICO version" ${WRKSRC}/pico/pico.h +PICO_V= 5.04 # grep "PICO version" ${WRKSRC}/pico/pico.h PILOT_V= 2.99 # grep PILOT_VERSION ${WRKSRC}/pico/pilot.c CATEGORIES= mail news CATEGORIES-pico=editors CATEGORIES-pilot=sysutils -PKGNAME-main= alpine-${V}p0 -PKGNAME-pico= pico-${PICO_V}p0 -PKGNAME-pilot= pilot-${PILOT_V}p0 +PKGNAME-main= alpine-${V} +PKGNAME-pico= pico-${PICO_V} +PKGNAME-pilot= pilot-${PILOT_V}p1 MAINTAINER= Antoine Jacoutot @@ -36,7 +36,7 @@ WANTLIB-main= ${WANTLIB} asn1 com_err crypto des gssapi kafs krb5 ssl MULTI_PACKAGES= -main -pico -pilot MODULES= devel/gettext -BUILD_DEPENDS= :c-client->=2007a1-!plaintext:mail/imap-uw,-c-client \ +BUILD_DEPENDS= :c-client->=2007b-!plaintext:mail/imap-uw,-c-client \ :aspell-*:textproc/aspell/core RUN_DEPENDS= :aspell-*:textproc/aspell/core diff --git a/mail/alpine/distinfo b/mail/alpine/distinfo index 1f83c3d27e1..c31c2ae6268 100644 --- a/mail/alpine/distinfo +++ b/mail/alpine/distinfo @@ -1,5 +1,5 @@ -MD5 (alpine-1.10.tar.gz) = IC6qs8Z2kAjm6EQ3/ld4og== -RMD160 (alpine-1.10.tar.gz) = UU0JU/ZWHRkT0J0BBGv5HE4PvJI= -SHA1 (alpine-1.10.tar.gz) = +hzV3Pr1+1lcao3MJQlLAcnljEU= -SHA256 (alpine-1.10.tar.gz) = CCCck3G775+GC1iWabK1SQM2U/jSLCpztL3eM4aMmZE= -SIZE (alpine-1.10.tar.gz) = 6280732 +MD5 (alpine-2.00.tar.gz) = D0dXFnuvXHOqRPL/pIYAkw== +RMD160 (alpine-2.00.tar.gz) = E9YNtHyn5BoOlD2Gk5aZSR/2txc= +SHA1 (alpine-2.00.tar.gz) = Njs6pdPrExnhaGOfu8QrAzsW8Vs= +SHA256 (alpine-2.00.tar.gz) = W23ST94CXc3+2xGCsJirAf0BvwuhFGta8pog1yeXJjw= +SIZE (alpine-2.00.tar.gz) = 6660001 diff --git a/mail/alpine/patches/patch-alpine_Makefile_in b/mail/alpine/patches/patch-alpine_Makefile_in index 6c9a66440e6..8d99bfc9e8c 100644 --- a/mail/alpine/patches/patch-alpine_Makefile_in +++ b/mail/alpine/patches/patch-alpine_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-alpine_Makefile_in,v 1.3 2008/06/15 00:08:44 ajacoutot Exp $ ---- alpine/Makefile.in.orig Fri Jan 11 19:15:07 2008 -+++ alpine/Makefile.in Sun May 18 16:04:24 2008 -@@ -83,14 +83,14 @@ rpdump_LDADD = $(LDADD) +$OpenBSD: patch-alpine_Makefile_in,v 1.4 2008/10/15 14:31:04 ajacoutot Exp $ +--- alpine/Makefile.in.orig Tue Jun 3 17:54:15 2008 ++++ alpine/Makefile.in Sat Oct 11 18:58:57 2008 +@@ -84,14 +84,14 @@ rpdump_LDADD = $(LDADD) rpdump_DEPENDENCIES = ../pico/libpico.a ../pico/osdep/libpicoosd.a \ ../pith/libpith.a ../pith/osdep/libpithosd.a \ ../pith/charconv/libpithcc.a osdep/libpineosd.a \ @@ -18,7 +18,7 @@ $OpenBSD: patch-alpine_Makefile_in,v 1.3 2008/06/15 00:08:44 ajacoutot Exp $ DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles -@@ -122,7 +122,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) +@@ -123,7 +123,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_CFLAGS = @AM_CFLAGS@ @@ -27,7 +27,7 @@ $OpenBSD: patch-alpine_Makefile_in,v 1.3 2008/06/15 00:08:44 ajacoutot Exp $ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ -@@ -281,7 +281,7 @@ BUILT_SOURCES = date.c +@@ -282,7 +282,7 @@ BUILT_SOURCES = date.c LDADD = ../pico/libpico.a ../pico/osdep/libpicoosd.a \ ../pith/libpith.a ../pith/osdep/libpithosd.a \ ../pith/charconv/libpithcc.a \ diff --git a/mail/alpine/patches/patch-alpine_mailcmd_c b/mail/alpine/patches/patch-alpine_mailcmd_c deleted file mode 100644 index 08fea2e486d..00000000000 --- a/mail/alpine/patches/patch-alpine_mailcmd_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-alpine_mailcmd_c,v 1.1 2008/06/12 21:47:20 ajacoutot Exp $ ---- alpine/mailcmd.c.orig Fri Feb 29 19:18:49 2008 -+++ alpine/mailcmd.c Thu Jun 12 23:15:54 2008 -@@ -4468,7 +4468,7 @@ get_export_filename(struct pine *ps, char *filename, c - } - } - else{ /* File Completion */ -- if(!pico_fncomplete(dir2, sizeof(dir2), filename2, sizeof(filename2))) -+ if(!pico_fncomplete(dir2, filename2, sizeof(filename2))) - Writechar(BELL, 0); - strncat(postcolon, filename2, - sizeof(postcolon)-1-strlen(postcolon)); diff --git a/mail/alpine/patches/patch-configure b/mail/alpine/patches/patch-configure index 9645f907477..339c448519d 100644 --- a/mail/alpine/patches/patch-configure +++ b/mail/alpine/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.3 2008/05/20 07:17:16 ajacoutot Exp $ ---- configure.orig Fri Mar 14 18:15:38 2008 -+++ configure Sun May 18 16:04:24 2008 -@@ -21282,6 +21282,7 @@ fi +$OpenBSD: patch-configure,v 1.4 2008/10/15 14:31:04 ajacoutot Exp $ +--- configure.orig Fri Aug 22 03:41:04 2008 ++++ configure Sat Oct 11 18:58:57 2008 +@@ -21290,6 +21290,7 @@ fi fi @@ -9,7 +9,7 @@ $OpenBSD: patch-configure,v 1.3 2008/05/20 07:17:16 ajacoutot Exp $ -@@ -22189,6 +22190,7 @@ echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6; } +@@ -22197,6 +22198,7 @@ echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6; } INCINTL= fi @@ -17,7 +17,7 @@ $OpenBSD: patch-configure,v 1.3 2008/05/20 07:17:16 ajacoutot Exp $ if test -n "$INTL_MACOSX_LIBS"; then -@@ -34139,10 +34141,10 @@ GMSGFMT!$GMSGFMT$ac_delim +@@ -34223,10 +34225,10 @@ GMSGFMT!$GMSGFMT$ac_delim XGETTEXT!$XGETTEXT$ac_delim MSGMERGE!$MSGMERGE$ac_delim INTL_MACOSX_LIBS!$INTL_MACOSX_LIBS$ac_delim diff --git a/mail/alpine/patches/patch-pico_attach_c b/mail/alpine/patches/patch-pico_attach_c deleted file mode 100644 index dd1ebd054b5..00000000000 --- a/mail/alpine/patches/patch-pico_attach_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-pico_attach_c,v 1.1 2008/06/12 21:47:20 ajacoutot Exp $ ---- pico/attach.c.orig Wed Feb 6 00:09:15 2008 -+++ pico/attach.c Thu Jun 12 23:15:54 2008 -@@ -179,7 +179,7 @@ AskAttach(char *cmnt, size_t cmntlen, LMLIST **lm) - bfn[sizeof(bfn)-1] = '\0'; - } - -- if(!pico_fncomplete(bfn, sizeof(bfn), fname, sizeof(fn)-(fname-fn))) -+ if(!pico_fncomplete(bfn, fname, sizeof(fn)-(fname-fn))) - (*term.t_beep)(); - } - else diff --git a/mail/alpine/patches/patch-pico_file_c b/mail/alpine/patches/patch-pico_file_c deleted file mode 100644 index dfda7dae679..00000000000 --- a/mail/alpine/patches/patch-pico_file_c +++ /dev/null @@ -1,63 +0,0 @@ -$OpenBSD: patch-pico_file_c,v 1.1 2008/06/12 21:47:20 ajacoutot Exp $ ---- pico/file.c.orig Thu Dec 6 20:57:49 2007 -+++ pico/file.c Thu Jun 12 23:15:54 2008 -@@ -212,7 +212,7 @@ insfile(int f, int n) - dir[0] = '\0'; - fn = file_split(dir, sizeof(dir), fname, 0); - -- if(!pico_fncomplete(dir, sizeof(dir), fn, sizeof(fname)-(fn-fname))) -+ if(!pico_fncomplete(dir, fn, sizeof(fname)-(fn-fname))) - (*term.t_beep)(); - } - -@@ -650,7 +650,7 @@ filewrite(int f, int n) - dir[sizeof(dir)-1] = '\0'; - } - -- if(!pico_fncomplete(dir, sizeof(dir), fn, sizeof(fname)-(fn-fname))) -+ if(!pico_fncomplete(dir, fn, sizeof(fname)-(fn-fname))) - (*term.t_beep)(); - } - -@@ -1004,9 +1004,9 @@ ifile(char fname[]) - * pico_fncomplete - pico's function to complete the given file name - */ - int --pico_fncomplete(char *dir, size_t dirlen, char *fn, size_t fnlen) -+pico_fncomplete(char *dirarg, char *fn, size_t fnlen) - { -- char *p, *dlist, tmp[NLINE], dtmp[NLINE]; -+ char *p, *dlist, tmp[NLINE], dir[NLINE]; - int n, i, match = -1; - #ifdef DOS - #define FILECMP(x, y) (toupper((unsigned char)(x))\ -@@ -1015,9 +1015,9 @@ pico_fncomplete(char *dir, size_t dirlen, char *fn, si - #define FILECMP(x, y) ((x) == (y)) - #endif - -- strncpy(dtmp, dir, sizeof(dtmp)); -- dtmp[sizeof(dtmp)-1] = '\0'; -- pfnexpand(dir = dtmp, sizeof(dtmp)); -+ strncpy(dir, dirarg, sizeof(dir)); -+ dir[sizeof(dir)-1] = '\0'; -+ pfnexpand(dir, sizeof(dir)); - if(*fn && (dlist = p = getfnames(dir, fn, &n, NULL, 0))){ - memset(tmp, 0, sizeof(tmp)); - while(n--){ /* any names in it */ -@@ -1049,11 +1049,11 @@ pico_fncomplete(char *dir, size_t dirlen, char *fn, si - strncpy(fn, tmp, fnlen); - fn[fnlen-1] = '\0'; - if(match == 1){ -- if ((strlen(dir)+strlen(S_FILESEP)+strlen(fn)) < dirlen){ -- strncat(dir, S_FILESEP, dirlen-strlen(dir)-1); -- dir[dirlen-1] = '\0'; -- strncat(dir, fn, dirlen-strlen(dir)-1); -- dir[dirlen-1] = '\0'; -+ if ((strlen(dir)+strlen(S_FILESEP)+strlen(fn)) < sizeof(dir)){ -+ strncat(dir, S_FILESEP, sizeof(dir)-strlen(dir)-1); -+ dir[sizeof(dir)-1] = '\0'; -+ strncat(dir, fn, sizeof(dir)-strlen(dir)-1); -+ dir[sizeof(dir)-1] = '\0'; - if(isdir(dir, NULL, NULL)){ - strncat(fn, S_FILESEP, fnlen-strlen(fn)-1); - fn[fnlen-1] = '\0'; diff --git a/mail/alpine/patches/patch-pico_pico_h b/mail/alpine/patches/patch-pico_pico_h deleted file mode 100644 index 589a78392f3..00000000000 --- a/mail/alpine/patches/patch-pico_pico_h +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-pico_pico_h,v 1.1 2008/06/12 21:47:20 ajacoutot Exp $ ---- pico/pico.h.orig Sat Mar 15 00:53:39 2008 -+++ pico/pico.h Thu Jun 12 23:15:54 2008 -@@ -428,7 +428,7 @@ int pico_writec(void *w, int c, int flags); - int pico_puts(void *w, char *s, int flags); - int pico_seek(void *w, long offset, int orig); - int pico_replace(void *, char *); --int pico_fncomplete(char *, size_t, char *, size_t); -+int pico_fncomplete(char *, char *, size_t); - #if defined(DOS) || defined(OS2) - int pico_nfsetcolor(char *); - int pico_nbsetcolor(char *); diff --git a/mail/alpine/patches/patch-pith_pine_hlp b/mail/alpine/patches/patch-pith_pine_hlp index 83acc033107..573a77c6d63 100644 --- a/mail/alpine/patches/patch-pith_pine_hlp +++ b/mail/alpine/patches/patch-pith_pine_hlp @@ -1,7 +1,7 @@ -$OpenBSD: patch-pith_pine_hlp,v 1.3 2008/05/20 07:17:16 ajacoutot Exp $ ---- pith/pine.hlp.orig Fri Mar 14 18:34:08 2008 -+++ pith/pine.hlp Sun May 18 16:04:24 2008 -@@ -26133,7 +26133,7 @@ argument (see the "lynx" example below). +$OpenBSD: patch-pith_pine_hlp,v 1.4 2008/10/15 14:31:04 ajacoutot Exp $ +--- pith/pine.hlp.orig Sat Aug 23 02:07:05 2008 ++++ pith/pine.hlp Sat Oct 11 18:58:57 2008 +@@ -26234,7 +26234,7 @@ argument (see the "lynx" example below). So, here are some example entries: 
  url-viewers = _TEST("test -n '${DISPLAY}'")_  /usr/local/bin/netscape
@@ -10,7 +10,7 @@ $OpenBSD: patch-pith_pine_hlp,v 1.3 2008/05/20 07:17:16 ajacoutot Exp $
                C:\BIN\NETSCAPE.BAT

-@@ -26141,7 +26141,7 @@ This example shows that for the first viewer in the li +@@ -26242,7 +26242,7 @@ This example shows that for the first viewer in the li the environment variable "DISPLAY" must be defined. If it is, then the path and file "/usr/local/bin/netscape" must exist. If neither condition is met, @@ -19,7 +19,7 @@ $OpenBSD: patch-pith_pine_hlp,v 1.3 2008/05/20 07:17:16 ajacoutot Exp $ 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. -@@ -26237,7 +26237,7 @@ because of its length, but should all appear on one li +@@ -26338,7 +26338,7 @@ because of its length, but should all appear on one li url-viewers = _TEST("test -L /myhomedir/.netscape/lock")_ "/usr/local/bin/netscape -remote 'openURL(_URL_, new-window)' &"
_TEST("test -n '${DISPLAY}'")_ "/usr/local/bin/netscape &"