Hi.
These diffs update the following packages to their latest stable version
(they all need to be in sync, that's why it is part of the same mail).
imap-uw-2007b
mailutil-uw-2007b
c-client-2007b
alpine-2.00
pico-5.04
pilot-2.99p1
Testing, comments and OKs appreciated ;-)
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/imap-uw/Makefile,v
retrieving revision 1.59
diff -u -r1.59 Makefile
--- Makefile 20 May 2008 07:16:15 -0000 1.59
+++ Makefile 11 Oct 2008 16:43:48 -0000
@@ -4,13 +4,15 @@
COMMENT-mailutil=University of Washington IMAP4rev1/POP2/POP3 mail utility
COMMENT-c-client=University of Washington's c-client mail access routines
-V= 2007a1
+V= 2007b
DISTNAME= imap-${V}
PKGNAME-server= imap-uw-${V}
PKGNAME-mailutil=mailutil-uw-${V}
PKGNAME-c-client=c-client-${V}
+#WRKDIST= ${WRKDIR}/imap-2007b
+
CATEGORIES= mail
CATEGORIES-c-client=mail devel
@@ -61,8 +63,6 @@
rfc822.h smtp.h sslio.h tcp.h tcp_unix.h unix.h utf8.h \
utf8aux.h
-WRKDIST= ${WRKDIR}/imap-2007a
-
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/imapd/imapd ${PREFIX}/libexec
${INSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop2d ${PREFIX}/libexec
@@ -77,8 +77,7 @@
${INSTALL_MAN} ${WRKSRC}/src/mailutil/mailutil.1 ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/src/tmail/tmail.1 ${PREFIX}/man/man1
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/imap-uw
- ${INSTALL_DATA} ${FILESDIR}/README.OpenBSD ${PREFIX}/share/doc/imap-uw
- @perl -pi -e 's,!!TRUEPREFIX!!,${TRUEPREFIX},' \
+ ${SUBST_CMD} -c ${FILESDIR}/README.OpenBSD \
${PREFIX}/share/doc/imap-uw/README.OpenBSD
tar -C ${WRKSRC}/docs -cf - . | \
tar -C ${PREFIX}/share/doc/imap-uw -xf -
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/imap-uw/distinfo,v
retrieving revision 1.28
diff -u -r1.28 distinfo
--- distinfo 20 May 2008 07:16:15 -0000 1.28
+++ distinfo 11 Oct 2008 16:43:48 -0000
@@ -1,5 +1,5 @@
-MD5 (imap-2007a1.tar.Z) = goqExk75M7/MgFuDhXandA==
-RMD160 (imap-2007a1.tar.Z) = 2siditc+V0VeNIjzIYp8DRoW3wY=
-SHA1 (imap-2007a1.tar.Z) = y2LavnKXtwhNftdg5h8nry2+3pA=
-SHA256 (imap-2007a1.tar.Z) = i6DtoxVxk2Q+s8XM1GwMqAYNcC8mDfYPiWVsuJHL7rg=
-SIZE (imap-2007a1.tar.Z) = 2781669
+MD5 (imap-2007b.tar.Z) = TVnOYwPPjvk/9RNBsc4t9w==
+RMD160 (imap-2007b.tar.Z) = jQ6IuqWcDLeNxUayKoUN7VcRfJQ=
+SHA1 (imap-2007b.tar.Z) = CLSFgzT0X/sZil0nM75O8WDd1Gc=
+SHA256 (imap-2007b.tar.Z) = sxcL71n0Fr4fcQvlgzP5sMLIsP4TcGKszU9fE6N4XNA=
+SIZE (imap-2007b.tar.Z) = 2789484
Index: files/README.OpenBSD
===================================================================
RCS file: /cvs/ports/mail/imap-uw/files/README.OpenBSD,v
retrieving revision 1.1
diff -u -r1.1 README.OpenBSD
--- files/README.OpenBSD 31 Oct 2007 13:53:56 -0000 1.1
+++ files/README.OpenBSD 11 Oct 2008 16:43:48 -0000
@@ -3,23 +3,23 @@
The ipop2d, ipop3d, and imapd daemons should be invoked by your
/etc/inetd.conf file with lines such as:
- pop2 stream tcp nowait root !!TRUEPREFIX!!/libexec/ipop2d
ipop2d
- pop2 stream tcp6 nowait root !!TRUEPREFIX!!/libexec/ipop2d
ipop2d
- pop3 stream tcp nowait root !!TRUEPREFIX!!/libexec/ipop3d
ipop3d
- pop3 stream tcp6 nowait root !!TRUEPREFIX!!/libexec/ipop3d
ipop3d
- imap stream tcp nowait root !!TRUEPREFIX!!/libexec/imapd imapd
- imap stream tcp6 nowait root !!TRUEPREFIX!!/libexec/imapd imapd
+ pop2 stream tcp nowait root ${TRUEPREFIX}/libexec/ipop2d ipop2d
+ pop2 stream tcp6 nowait root ${TRUEPREFIX}/libexec/ipop2d ipop2d
+ pop3 stream tcp nowait root ${TRUEPREFIX}/libexec/ipop3d ipop3d
+ pop3 stream tcp6 nowait root ${TRUEPREFIX}/libexec/ipop3d ipop3d
+ imap stream tcp nowait root ${TRUEPREFIX}/libexec/imapd imapd
+ imap stream tcp6 nowait root ${TRUEPREFIX}/libexec/imapd imapd
To use SSL as default transport you need to add the lines below to
/etc/inetd.conf.
- pop3s stream tcp nowait root !!TRUEPREFIX!!/libexec/ipop3d
ipop3d
- pop3s stream tcp6 nowait root !!TRUEPREFIX!!/libexec/ipop3d
ipop3d
- imaps stream tcp nowait root !!TRUEPREFIX!!/libexec/imapd imapd
- imaps stream tcp6 nowait root !!TRUEPREFIX!!/libexec/imapd imapd
+ pop3s stream tcp nowait root ${TRUEPREFIX}/libexec/ipop3d ipop3d
+ pop3s stream tcp6 nowait root ${TRUEPREFIX}/libexec/ipop3d ipop3d
+ imaps stream tcp nowait root ${TRUEPREFIX}/libexec/imapd imapd
+ imaps stream tcp6 nowait root ${TRUEPREFIX}/libexec/imapd imapd
-You also need to install files containing RSA certificates to
+You also need to install your certificates to
/etc/ssl/{imapd,ipop3d}.pem and files containing the corresponding private
keys to /etc/ssl/private/{imapd,ipop3d}.pem. See ssl(8) for how to do this.
@@ -27,7 +27,7 @@
If you want to use the included mailbox lock program, you need to enable
the setgid bit on the mlock binary, then give the "smmsp" group write
permission on the /var/mail directory. As root:
- chmod 2555 !!TRUEPREFIX!!/libexec/mlock
+ chmod 2555 ${TRUEPREFIX}/libexec/mlock
chgrp smmsp /var/mail
chmod 775 /var/mail
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/mail/imap-uw/patches/patch-Makefile,v
retrieving revision 1.12
diff -u -r1.12 patch-Makefile
--- patches/patch-Makefile 3 Jan 2008 10:52:25 -0000 1.12
+++ patches/patch-Makefile 11 Oct 2008 16:43:48 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.12 2008/01/03 10:52:25 ajacoutot Exp $
---- Makefile.orig Thu Dec 20 23:11:10 2007
-+++ Makefile Thu Jan 3 10:59:40 2008
-@@ -334,7 +334,7 @@ bsf: an
+--- Makefile.orig Mon May 12 21:43:44 2008
++++ Makefile Sat Oct 11 18:33:06 2008
+@@ -332,7 +332,7 @@ bsf: an
bso: an
$(TOUCH) ip6
$(BUILD) BUILDTYPE=$@ IP=$(IP6) \
@@ -10,7 +10,7 @@
# Info from Joel Reicher about NetBSD SSL paths. I assume it has PAM because
pam is in NetBSD sources...
-@@ -571,8 +571,8 @@ sslunix sslsco:
+@@ -578,8 +578,8 @@ sslunix sslsco:
@echo ++ SSLTYPE=$(SSLTYPE).nopwd
@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@echo
Index: patches/patch-src_osdep_unix_env_unix.c
===================================================================
RCS file: /cvs/ports/mail/imap-uw/patches/patch-src_osdep_unix_env_unix.c,v
retrieving revision 1.11
diff -u -r1.11 patch-src_osdep_unix_env_unix.c
--- patches/patch-src_osdep_unix_env_unix.c 20 May 2008 07:16:16 -0000
1.11
+++ patches/patch-src_osdep_unix_env_unix.c 11 Oct 2008 16:43:48 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-src_osdep_unix_env_unix.c,v 1.11 2008/05/20 07:16:16 ajacoutot
Exp $
---- src/osdep/unix/env_unix.c.orig Fri Feb 15 17:26:44 2008
-+++ src/osdep/unix/env_unix.c Sun May 18 16:23:38 2008
-@@ -957,15 +957,12 @@ char *myhomedir ()
+--- src/osdep/unix/env_unix.c.orig Tue May 13 03:17:54 2008
++++ src/osdep/unix/env_unix.c Sat Oct 11 18:33:06 2008
+@@ -963,15 +963,12 @@ char *myhomedir ()
static char *mymailboxdir ()
{
char *home = myhomedir ();
Index: pkg/PLIST-mailutil
===================================================================
RCS file: /cvs/ports/mail/imap-uw/pkg/PLIST-mailutil,v
retrieving revision 1.4
diff -u -r1.4 PLIST-mailutil
--- pkg/PLIST-mailutil 10 Apr 2005 18:21:27 -0000 1.4
+++ pkg/PLIST-mailutil 11 Oct 2008 16:43:48 -0000
@@ -1,3 +1,3 @@
@comment $OpenBSD: PLIST-mailutil,v 1.4 2005/04/10 18:21:27 jakob Exp $
-bin/mailutil
[EMAIL PROTECTED] bin/mailutil
@man man/man1/mailutil.1
Index: pkg/PLIST-server
===================================================================
RCS file: /cvs/ports/mail/imap-uw/pkg/PLIST-server,v
retrieving revision 1.6
diff -u -r1.6 PLIST-server
--- pkg/PLIST-server 20 May 2008 07:16:16 -0000 1.6
+++ pkg/PLIST-server 11 Oct 2008 16:43:48 -0000
@@ -2,13 +2,13 @@
@conflict courier-imap-*
@conflict courier-pop3-*
@pkgpath ${BASE_PKGPATH}
-bin/dmail
-bin/tmail
-libexec/imapd
-libexec/ipop2d
-libexec/ipop3d
[EMAIL PROTECTED] bin/dmail
[EMAIL PROTECTED] bin/tmail
[EMAIL PROTECTED] libexec/imapd
[EMAIL PROTECTED] libexec/ipop2d
[EMAIL PROTECTED] libexec/ipop3d
@group smmsp
-libexec/mlock
[EMAIL PROTECTED] libexec/mlock
@group
@man man/man1/dmail.1
@man man/man1/tmail.1
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/alpine/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile 15 Jun 2008 00:08:44 -0000 1.7
+++ Makefile 11 Oct 2008 17:07:10 -0000
@@ -4,19 +4,19 @@
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 <[EMAIL PROTECTED]>
@@ -36,7 +36,7 @@
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
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/alpine/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo 20 May 2008 07:17:16 -0000 1.3
+++ distinfo 11 Oct 2008 17:07:10 -0000
@@ -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
Index: patches/patch-alpine_Makefile_in
===================================================================
RCS file: /cvs/ports/mail/alpine/patches/patch-alpine_Makefile_in,v
retrieving revision 1.3
diff -u -r1.3 patch-alpine_Makefile_in
--- patches/patch-alpine_Makefile_in 15 Jun 2008 00:08:44 -0000 1.3
+++ patches/patch-alpine_Makefile_in 11 Oct 2008 17:07:10 -0000
@@ -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)
+--- 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 @@
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 @@
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 \
Index: patches/patch-alpine_mailcmd_c
===================================================================
RCS file: patches/patch-alpine_mailcmd_c
diff -N patches/patch-alpine_mailcmd_c
--- patches/patch-alpine_mailcmd_c 12 Jun 2008 21:47:20 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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));
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/mail/alpine/patches/patch-configure,v
retrieving revision 1.3
diff -u -r1.3 patch-configure
--- patches/patch-configure 20 May 2008 07:17:16 -0000 1.3
+++ patches/patch-configure 11 Oct 2008 17:07:10 -0000
@@ -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
+--- 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 @@
-@@ -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 @@
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
Index: patches/patch-pico_attach_c
===================================================================
RCS file: patches/patch-pico_attach_c
diff -N patches/patch-pico_attach_c
--- patches/patch-pico_attach_c 12 Jun 2008 21:47:20 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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
Index: patches/patch-pico_file_c
===================================================================
RCS file: patches/patch-pico_file_c
diff -N patches/patch-pico_file_c
--- patches/patch-pico_file_c 12 Jun 2008 21:47:20 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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';
Index: patches/patch-pico_pico_h
===================================================================
RCS file: patches/patch-pico_pico_h
diff -N patches/patch-pico_pico_h
--- patches/patch-pico_pico_h 12 Jun 2008 21:47:20 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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 *);
Index: patches/patch-pith_pine_hlp
===================================================================
RCS file: /cvs/ports/mail/alpine/patches/patch-pith_pine_hlp,v
retrieving revision 1.3
diff -u -r1.3 patch-pith_pine_hlp
--- patches/patch-pith_pine_hlp 20 May 2008 07:17:16 -0000 1.3
+++ patches/patch-pith_pine_hlp 11 Oct 2008 17:07:10 -0000
@@ -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).
+--- 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:
<PRE>
url-viewers = _TEST("test -n '${DISPLAY}'")_
/usr/local/bin/netscape
@@ -10,7 +10,7 @@
C:\BIN\NETSCAPE.BAT
</PRE>
<P>
-@@ -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 @@
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)'
&"<BR>
_TEST("test -n '${DISPLAY}'")_ "/usr/local/bin/netscape
&"<BR>
--
Antoine
