[Midnightbsd-cvs] mports: mports/mail: Drop pine4.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Apr 2 19:24:16 EDT 2009
Log Message:
-----------
Drop pine4. It's old and insecure. we've got an alpine port anyway.
Modified Files:
--------------
mports/mail:
Makefile (r1.50 -> r1.51)
mports/mail/alpine:
Makefile (r1.4 -> r1.5)
Removed Files:
-------------
mports/mail/pine4:
Makefile
distinfo
pkg-descr
pkg-install
pkg-message
pkg-plist
mports/mail/pine4/files:
patch-ac
patch-af
patch-ai
patch-ak
patch-al
patch-ax
patch-bb
patch-pico_makefile.bsf
patch-pine_pine.hlp
patch-pine_screen.c
patch-reply.c
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/mail/Makefile,v
retrieving revision 1.50
retrieving revision 1.51
diff -L mail/Makefile -L mail/Makefile -u -r1.50 -r1.51
--- mail/Makefile
+++ mail/Makefile
@@ -51,7 +51,6 @@
SUBDIR += pantomime
SUBDIR += php5-imap
SUBDIR += pine-pgp-filters
- SUBDIR += pine4
SUBDIR += popd
SUBDIR += procmail
SUBDIR += razor-agents
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/mail/alpine/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -L mail/alpine/Makefile -L mail/alpine/Makefile -u -r1.4 -r1.5
--- mail/alpine/Makefile
+++ mail/alpine/Makefile
@@ -45,8 +45,6 @@
.endif
CONFIGURE_ARGS+=--with-debug-level=2
-CONFLICTS= pico-4* pine4-4*
-
USE_OPENSSL= yes
.include <bsd.port.pre.mk>
--- mail/pine4/pkg-message
+++ /dev/null
@@ -1,5 +0,0 @@
-
-***************************************************************************
-*** To use pgp with Pine, take a look at the mail/pine-pgp-filters port ***
-***************************************************************************
-
--- mail/pine4/pkg-install
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-if [ "$2" = "POST-INSTALL" -o -n "${BATCH}" -o -n "${PACKAGE_BUILDING}" ]; then
- exit 0
-fi
-
-/usr/bin/dialog --yesno "SECURITY NOTE: The pine software has had several remote vulnerabilities discovered in the past, which allowed remote attackers to execute arbitrary code as you on your local system, by the action of sending a specially-prepared email. All such KNOWN problems have been fixed, but the pine code is written in a very insecure style and the MidnightBSD Security Officer believes there are likely to be other undiscovered vulnerabilities. Do you wish to proceed with the installation of pine anyway?" 12 70 || /usr/bin/false
--- mail/pine4/pkg-descr
+++ /dev/null
@@ -1,21 +0,0 @@
-Pine(tm) --a Program for Internet News & Email-- is a tool for reading,
-sending, and managing electronic messages. It was designed specifically
-with novice computer users in mind, but can be tailored to accommodate the
-needs of "power users" as well. Pine uses Internet message protocols
-(e.g. RFC-822, SMTP, MIME, IMAP, NNTP) and runs on Unix and PCs.
-
-The guiding principles for Pine's user-interface were: careful limitation
-of features, one-character mnemonic commands, always-present command
-menus, immediate user feedback, and high tolerance for user mistakes. It
-is intended that Pine can be learned by exploration rather than reading
-manuals.
-
-Pine's message composition editor (Pico) and its file browser (Pilot) are
-also available as separate stand-alone programs. Pico is a very simple
-and easy-to-use text editor offering paragraph justification, cut/paste,
-and a spelling checker.
-
-WWW: http://www.washington.edu/pine/
-
-- Doug Barton
-DougB at FreeBSD.org
--- mail/pine4/pkg-plist
+++ /dev/null
@@ -1,24 +0,0 @@
- at unexec %D/bin/pine -conf >%D/etc/pine.conf.tmp
- at unexec if cmp -s %D/etc/pine.conf %D/etc/pine.conf.tmp; then rm -f %D/etc/pine.conf; fi
- at unexec rm -f %D/etc/pine.conf.tmp
-bin/pilot
-bin/pine
-bin/rpdump
-bin/rpload
- at exec %D/bin/pine -P %D/etc/pine.conf -conf >%D/etc/pine.conf.tmp
- at exec /bin/mv %D/etc/pine.conf.tmp %D/etc/pine.conf
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/CPYRIGHT
-%%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%%
--- mail/pine4/Makefile
+++ /dev/null
@@ -1,138 +0,0 @@
-# New ports collection makefile for: pine
-# Date created: 09 July 1998
-# Whom: Adrian Penisoara <ady at freebsd.ady.ro>
-#
-# $MidnightBSD: mports/mail/pine4/Makefile,v 1.4 2008/06/16 21:19:43 stevan Exp $
-# $FreeBSD: ports/mail/pine4/Makefile,v 1.86 2006/08/28 06:03:13 dougb Exp $
-#
-
-PORTNAME= pine
-PORTVERSION= 4.64
-CATEGORIES= mail news ipv6
-MASTER_SITES= ftp://ftp.cac.washington.edu/pine/ \
- http://mirror.sit.wisc.edu/pub/net/mail/pine/ \
- ftp://sunsite.icm.edu.pl/pub/unix/mail/pine/ \
- ftp://ftp.uni-magdeburg.de/pub/mirror/ftp.cac.washington.edu/pine/ \
- ftp://ftp.fu-berlin.de/unix/mail/pine/ \
- ftp://ftp.ut.ee/pub/unix/mail/pine/ \
- ftp://gd.tuwien.ac.at/infosys/mail/pine/ \
- http://dougbarton.us/Downloads/
-DISTNAME= pine${PORTVERSION}
-
-MAINTAINER= ports at MidnightBSD.org
-COMMENT= PINE(tm) -- a Program for Internet News & Email
-LICENSE= other
-
-OPTIONS= PICO "Build and install pico, the default editor" on \
- PASSFILE "Support for a stored Password File (DANGEROUS)" off \
- MAILDIR "Add a patch that provides maildir support" off \
- LDAP "Add support for LDAP" off \
- IPV6 "Add support for IPv6" off \
-
-USE_OPENSSL= yes
-
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_PICO)
-RUN_DEPENDS+= pico:${PORTSDIR}/editors/pico
-.endif
-
-.if defined(WITH_LDAP)
-USE_OPENLDAP= yes
-LDAP_PREFIX?= ${LOCALBASE}
-.if defined(WANT_OPENLDAP_SASL)
-EXTRA_OPTS= LDAPLIBS="-L${LOCALBASE}/lib -lldap -llber -lsasl2"
-.else
-EXTRA_OPTS= LDAPLIBS="-L${LOCALBASE}/lib -lldap -llber"
-.endif
-.endif
-
-.if defined(WITHOUT_SSL)
-MAKE_ARGS+= SSLTYPE=none
-.else
-EXTRA_OPTS+= SSLINCLUDE=${OPENSSLINC} SSLLIB=${OPENSSLLIB}
-.if defined(WITH_SSL_AND_PLAINTEXT)
-EXTRA_OPTS+= SSLTYPE=unix
-.else
-EXTRA_OPTS+= SSLTYPE=unix.nopwd
-.endif
-.endif
-
-.if defined(WITH_IPV6)
-EXTRA_OPTS+= IP=6
-.endif
-
-.if defined(WITH_PASSFILE)
-PASSFILE?= .pine.pwd
-EXTRA_OPTS+= EXTRACFLAGS="-DWITH_PASSFILE"
-.endif
-
-MAN1= pine.1 pilot.1 rpdump.1 rpload.1
-
-pre-fetch:
-.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
- ${SH} pkg-install
-.endif
-.if defined(WITH_MAILDIR)
-PATCH_SITES= http://www.math.washington.edu/~chappa/pine/patches/pine${PORTVERSION}/ \
- http://dougbarton.us/Downloads/ \
- ${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR= dougb
-PATCHFILES= maildir.patch.gz
-PATCH_DIST_ARGS+= -E --quiet -d ${PATCH_WRKSRC} -p1
-.endif
-
-pre-patch:
- @${CHMOD} -R u+w ${WRKSRC}
-
-post-patch:
-# Do this here because the maildir patch also modifies this file
- @${CP} ${WRKSRC}/imap/src/osdep/unix/Makefile \
- ${WRKSRC}/imap/src/osdep/unix/Makefile.presed
- @${SED} -e 's:^CFLAGS=.*:CFLAGS=$$(BASECFLAGS) $$(EXTRACFLAGS):' \
- ${WRKSRC}/imap/src/osdep/unix/Makefile.presed > \
- ${WRKSRC}/imap/src/osdep/unix/Makefile
-.for f in build buildcyg
- @${CP} ${WRKSRC}/${f} ${WRKSRC}/${f}.presed
- @${SED} -e 's:CC=cc:CC=${CC}:g' ${WRKSRC}/${f}.presed > ${WRKSRC}/${f}
-.endfor
- @for i in ${WRKSRC}/README ${WRKSRC}/doc/pine.1 \
- ${WRKSRC}/doc/tech-notes.txt ${WRKSRC}/doc/tech-notes/*.html \
- ${WRKSRC}/pine/init.c ${WRKSRC}/pine/mailcap.c \
- ${WRKSRC}/pine/osdep/os-bsf.h ${WRKSRC}/pine/pine.hlp ; do \
- ${CP} $$i $$i.presed ; \
- ${SED} -e "s:/usr/local/etc/:${PREFIX}/etc/:g" \
- -e "s:/usr/local/lib/:${PREFIX}/etc/:g" \
- -e "s:@@PREFIX@@:${PREFIX}:g" \
- -e "s:@@PASSFILE@@:${PASSFILE}:g" \
- -e "s:/usr/local/pine.conf:${PREFIX}/etc/pine.conf:g" \
- $$i.presed > $$i ; \
- done
-.if defined(WITH_LDAP)
- ${MKDIR} ${WRKSRC}/ldap
- ${LN} -sf ${LDAP_PREFIX}/include ${WRKSRC}/ldap/include
- ${LN} -sf ${LDAP_PREFIX}/lib ${WRKSRC}/ldap/libraries
-.endif
-
-do-build:
- @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./build bsf ${EXTRA_OPTS})
-
-do-install:
-.for program in ${MAN1}
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/${program:R} ${PREFIX}/bin
-.endfor
-.for manpage in ${MAN1}
- ${INSTALL_MAN} ${WRKSRC}/doc/${manpage} ${PREFIX}/man/man1
-.endfor
-.if !defined(NOPORTDOCS)
- ${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} ${DOCSDIR} \
- ${DOCSDIR}/tech-notes
- ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/CPYRIGHT ${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
-.endif
-
-
-.include <bsd.port.post.mk>
--- mail/pine4/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (pine4.64.tar.gz) = 9cc68749675f1c35a2147a35d2c5b344
-SHA256 (pine4.64.tar.gz) = c200646bc2e7128370be3b6d28d26944984a0d4003982762f97ee4aa142d183d
-SIZE (pine4.64.tar.gz) = 4218629
-MD5 (maildir.patch.gz) = 2a409555cc5362c48d553a275944eab1
-SHA256 (maildir.patch.gz) = 0e4019e7078735b7835a88177bfef2e1589098e7df432d6e963fab07f61ddab2
-SIZE (maildir.patch.gz) = 31222
--- mail/pine4/files/patch-bb
+++ /dev/null
@@ -1,13 +0,0 @@
---- pine/init.c.orig Thu Jul 15 10:37:24 2004
-+++ pine/init.c Mon Aug 9 01:23:53 2004
-@@ -1547,6 +1547,10 @@
- * having a global fixedprc, since we don't need it anymore after this.
- */
- fixedprc = new_pinerc_s(SYSTEM_PINERC_FIXED);
-+#endif
-+
-+#ifdef DF_SPELLER
-+ GLO_SPELLER = cpystr(DF_SPELLER);
- #endif
-
- /*
--- mail/pine4/files/patch-af
+++ /dev/null
@@ -1,23 +0,0 @@
---- imap/src/osdep/unix/Makefile.orig Tue Jun 22 13:56:05 2004
-+++ imap/src/osdep/unix/Makefile Sun Aug 22 15:51:12 2004
-@@ -99,7 +99,7 @@
- # Commands possibly overriden by the individual port
-
- ARRC=ar rc
--CC=cc
-+#CC=cc
- LN=ln -s
- RANLIB=ranlib
-
-@@ -219,8 +219,9 @@
- SPOOLDIR=/var \
- ACTIVEFILE=/usr/local/news/lib/active \
- RSHPATH=/usr/bin/rsh \
-- BASECFLAGS="-g -O -pipe" \
-- BASELDFLAGS="-lcrypt"
-+ LOCKPGM=$(PREFIX)/libexec/mlock \
-+ BASECFLAGS="-DNFSKLUDGE" \
-+ BASELDFLAGS="-lpam -lcrypt"
-
- bsi: # BSD/i386
- $(BUILD) `$(CAT) SPECIALS` OS=$@ \
--- mail/pine4/files/patch-ai
+++ /dev/null
@@ -1,70 +0,0 @@
-*** pine/send.c.orig Fri Aug 29 15:03:08 2003
---- pine/send.c Fri Sep 5 01:44:20 2003
-***************
-*** 8251,8263 ****
- body->subtype = cpystr("octet-stream");
- }
-
-! /*
-! * Apply maximal encoding regardless of previous
-! * setting. This segment's either not text, or is
-! * unlikely to be readable with > 30% of the
-! * text encoded anyway, so we might as well save space...
-! */
-! new_encoding = ENCBINARY; /* > 30% 8 bit chars */
- }
- }
-
---- 8251,8267 ----
- body->subtype = cpystr("octet-stream");
- }
-
-! if(body->type == TYPETEXT)
-! /* Use ENC8BIT rather than ENCBINARY for TEXT */
-! new_encoding = ENC8BIT;
-! else
-! /*
-! * Apply maximal encoding regardless of previous
-! * setting. This segment's either not text, or is
-! * unlikely to be readable with > 30% of the
-! * text encoded anyway, so we might as well save space...
-! */
-! new_encoding = ENCBINARY; /* > 30% 8 bit chars */
- }
- }
-
-***************
-*** 9278,9284 ****
-
- switch (body->encoding) { /* all else needs filtering */
- case ENC8BIT: /* encode 8BIT into QUOTED-PRINTABLE */
-! gf_link_filter(gf_8bit_qp, NULL);
- break;
-
- case ENCBINARY: /* encode binary into BASE64 */
---- 9282,9289 ----
-
- switch (body->encoding) { /* all else needs filtering */
- case ENC8BIT: /* encode 8BIT into QUOTED-PRINTABLE */
-! if(F_OFF(F_ENABLE_8BIT, ps_global)) /* unless 8BIT enabled */
-! gf_link_filter(gf_8bit_qp, NULL);
- break;
-
- case ENCBINARY: /* encode binary into BASE64 */
-***************
-*** 9392,9398 ****
- && !(so_puts(so, "Content-Transfer-Encoding: ")
- && so_puts(so, body_encodings[(body->encoding==ENCBINARY)
- ? ENCBASE64
-! : (body->encoding == ENC8BIT)
- ? ENCQUOTEDPRINTABLE
- : (body->encoding <= ENCMAX)
- ? body->encoding
---- 9397,9403 ----
- && !(so_puts(so, "Content-Transfer-Encoding: ")
- && so_puts(so, body_encodings[(body->encoding==ENCBINARY)
- ? ENCBASE64
-! : (body->encoding == ENC8BIT && F_OFF(F_ENABLE_8BIT, ps_global))
- ? ENCQUOTEDPRINTABLE
- : (body->encoding <= ENCMAX)
- ? body->encoding
--- mail/pine4/files/patch-pine_pine.hlp
+++ /dev/null
@@ -1,10 +0,0 @@
---- pine/pine.hlp.orig 2007-08-09 00:17:46.000000000 -0700
-+++ pine/pine.hlp 2007-08-09 00:23:00.000000000 -0700
-@@ -996,6 +996,7 @@
- executable <Unix search path>/pine
- persnl cfg ~/.pinerc
- except cfg ~/.pinercex
-+ password ~/@@PASSFILE@@
- global cfg <!--#echo var="PINE_CONF_PATH"-->
- fixed cfg <!--#echo var="PINE_CONF_FIXED_PATH"-->
- local help <!--#echo var="PINE_INFO_PATH"-->
--- mail/pine4/files/patch-pico_makefile.bsf
+++ /dev/null
@@ -1,13 +0,0 @@
---- pico/makefile.bsf.orig Tue Oct 23 15:18:36 2001
-+++ pico/makefile.bsf Tue Oct 11 15:52:20 2005
-@@ -56,8 +56,8 @@
- #
- # dependencies for the Unix versions of pico and libpico.a
- #
--all: pico pilot
--pico pilot: libpico.a
-+all: pilot
-+pilot: libpico.a
-
- pico: main.o
- $(CC) $(CFLAGS) main.o libpico.a $(LIBS) -o pico
--- mail/pine4/files/patch-al
+++ /dev/null
@@ -1,50 +0,0 @@
---- build.orig Wed May 4 14:22:22 2005
-+++ build Tue Jan 24 14:44:41 2006
-@@ -423,8 +423,7 @@
- echo "| unencrypted. |"
- echo "+-----------------------------------------------------------+"
- echo ""
-- echo "Do you want to continue this build anyway? Type y or n please:"
-- read ans
-+ ans=y
- case "$ans" in
- y) echo "Building without SSL ..."
- touch sslnone
-@@ -451,7 +450,7 @@
- fi
- echo ''
-
-- echo "Making Pico and Pilot"
-+ echo "Making Pilot"
- cd "$PHOME/pico"
- eval echo make "$makeargs" -f makefile.$picotarg
- eval make "$makeargs" -f makefile.$picotarg
-@@ -480,14 +479,13 @@
- cd "$PHOME"
- if [ ! -d bin ] ; then mkdir bin; fi
- cd "$PHOME/bin"
-- rm -f pine mtest imapd mailutil pico pilot rpload rpdump ipop2d ipop3d
-+ rm -f pine mtest imapd mailutil pilot rpload rpdump ipop2d ipop3d
- if [ -s ../pine/pine ] ; then ln ../pine/pine pine ; fi
- if [ -s ../mtest/mtest ] ; then ln ../mtest/mtest mtest ; fi
- if [ -s ../mailutil/mailutil ] ; then ln ../mailutil/mailutil mailutil ; fi
- if [ -s ../imapd/imapd ] ; then ln ../imapd/imapd imapd ; fi
- if [ -s ../ipopd/ipop2d ] ; then ln ../ipopd/ipop2d ipop2d ; fi
- if [ -s ../ipopd/ipop3d ] ; then ln ../ipopd/ipop3d ipop3d ; fi
-- if [ -s ../pico/pico ] ; then ln ../pico/pico pico ; fi
- if [ -s ../pico/pilot ] ; then ln ../pico/pilot pilot ; fi
- if [ -s ../pine/rpload ] ; then ln ../pine/rpload rpload ; fi
- if [ -s ../pine/rpdump ] ; then ln ../pine/rpdump rpdump ; fi
-@@ -502,10 +500,10 @@
- cd "$PHOME"
- echo ''
- echo "Links to executables are in bin directory:"
-- size bin/pine bin/mtest bin/imapd bin/pico bin/pilot bin/rpdump bin/rpload bin/mailutil bin/ipop2d bin/ipop3d
-+ size bin/pine bin/pilot bin/rpdump bin/rpload
- case $maketarg in
- mnt) echo "Fixing stacksizes ..."
-- fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot
-+ fixstk 64K bin/pine bin/pilot
- esac
- if [ "$SSLWARN" = "1" ]
- then
--- mail/pine4/files/patch-ac
+++ /dev/null
@@ -1,63 +0,0 @@
-*** pine/osdep/os-bsf.h.orig Fri May 23 09:05:21 2003
---- pine/osdep/os-bsf.h Thu Aug 9 00:30:23 2007
-***************
-*** 87,93 ****
- NOTE: You'll also have to make sure the appropriate osdep/postreap.*
- file is included in the os-*.ic file for your system.
- ----*/
-! /* #define BACKGROUND_POST */
-
-
-
---- 87,93 ----
- NOTE: You'll also have to make sure the appropriate osdep/postreap.*
- file is included in the os-*.ic file for your system.
- ----*/
-! #define BACKGROUND_POST
-
-
-
-***************
-*** 209,214 ****
---- 209,216 ----
- #define DF_KBLOCK_PASSWD_COUNT "1"
- #define DF_REMOTE_ABOOK_HISTORY "3"
-
-+ #define DF_SPELLER "@@PREFIX@@/bin/ispell"
-+
- /*----------------------------------------------------------------------
- The default printer when pine starts up for the first time with no printer
- ----*/
-***************
-*** 250,255 ****
---- 252,264 ----
- #define MAX_SCREEN_COLS (170)
- #define MAX_SCREEN_ROWS (200)
-
-+ /*----------------------------------------------------------------------
-+ File name used to store the user's server/id/password triple between
-+ session. It is rooted in the same directory as the PINERC.
-+ ----*/
-+ #ifdef WITH_PASSFILE
-+ #define PASSFILE "@@PASSFILE@@"
-+ #endif
-
- /*----------------------------------------------------------------------
- Where to put the output of pine in debug mode. Files are created
-***************
-*** 280,286 ****
- 8
- 9 logs gross details of command execution
- ----*/
-! #define DEFAULT_DEBUG 2
-
-
-
---- 289,295 ----
- 8
- 9 logs gross details of command execution
- ----*/
-! #define DEFAULT_DEBUG 0
-
-
-
--- mail/pine4/files/patch-reply.c
+++ /dev/null
@@ -1,44 +0,0 @@
---- pine/reply.c.orig Fri Aug 29 14:43:38 2003
-+++ pine/reply.c Fri Sep 5 01:44:21 2003
-@@ -5183,7 +5183,10 @@
- char *
- generate_message_id()
- {
-- static short osec = 0, cnt = 0;
-+ struct timeval tp;
-+ struct timezone tzp;
-+ static short osec = 0;
-+ static char cnt;
- char *id;
- time_t now;
- struct tm *now_x;
-@@ -5191,14 +5194,11 @@
-
- now = time((time_t *)0);
- now_x = localtime(&now);
-- id = (char *)fs_get(128 * sizeof(char));
-+ id = (char *)fs_get(384 * sizeof(char));
-
-- if(now_x->tm_sec == osec)
-- cnt++;
-- else{
-- cnt = 0;
-- osec = now_x->tm_sec;
-- }
-+ cnt = 'A';
-+ if(gettimeofday(&tp, &tzp) == 0)
-+ cnt += (time_t)tp.tv_usec % ('Z' - 'A');
-
- hostpart = F_ON(F_ROT13_MESSAGE_ID, ps_global)
- ? rot13(ps_global->hostname)
-@@ -5207,8 +5207,8 @@
- if(!hostpart)
- hostpart = cpystr("huh");
-
-- sprintf(id,"<Pine.%.4s.%.20s.%02d%02d%02d%02d%02d%02d%X.%d@%.50s>",
-- SYSTYPE, pine_version, (now_x->tm_year) % 100, now_x->tm_mon + 1,
-+ sprintf(id,"<%d%02d%02d%02d%02d%02d.%c%d@%s>",
-+ (now_x->tm_year) + 1900, now_x->tm_mon + 1,
- now_x->tm_mday, now_x->tm_hour, now_x->tm_min, now_x->tm_sec,
- cnt, getpid(), hostpart);
-
--- mail/pine4/files/patch-ak
+++ /dev/null
@@ -1,37 +0,0 @@
-*** imap/Makefile.orig Mon Jul 14 18:35:29 2003
---- imap/Makefile Fri Sep 5 01:44:20 2003
-***************
-*** 453,468 ****
- $(TOOLS)/$@ "$(LN)" src/ansilib c-client
- $(TOOLS)/$@ "$(LN)" src/charset c-client
- $(TOOLS)/$@ "$(LN)" src/osdep/$(SYSTEM) c-client
-! $(TOOLS)/$@ "$(LN)" src/mtest mtest
-! $(TOOLS)/$@ "$(LN)" src/ipopd ipopd
-! $(TOOLS)/$@ "$(LN)" src/imapd imapd
- $(TOOLS)/$@ "$(LN)" src/mailutil mailutil
- $(TOOLS)/$@ "$(LN)" src/mlock mlock
- $(TOOLS)/$@ "$(LN)" src/dmail dmail
- $(TOOLS)/$@ "$(LN)" src/tmail tmail
- $(LN) $(TOOLS)/$@ .
-
-! build: OSTYPE rebuild rebuildclean bundled
-
- OSTYPE:
- @echo Building c-client for $(BUILDTYPE)...
---- 453,468 ----
- $(TOOLS)/$@ "$(LN)" src/ansilib c-client
- $(TOOLS)/$@ "$(LN)" src/charset c-client
- $(TOOLS)/$@ "$(LN)" src/osdep/$(SYSTEM) c-client
-! # $(TOOLS)/$@ "$(LN)" src/mtest mtest
-! # $(TOOLS)/$@ "$(LN)" src/ipopd ipopd
-! # $(TOOLS)/$@ "$(LN)" src/imapd imapd
- $(TOOLS)/$@ "$(LN)" src/mailutil mailutil
- $(TOOLS)/$@ "$(LN)" src/mlock mlock
- $(TOOLS)/$@ "$(LN)" src/dmail dmail
- $(TOOLS)/$@ "$(LN)" src/tmail tmail
- $(LN) $(TOOLS)/$@ .
-
-! build: OSTYPE rebuild rebuildclean # bundled
-
- OSTYPE:
- @echo Building c-client for $(BUILDTYPE)...
--- mail/pine4/files/patch-ax
+++ /dev/null
@@ -1,19 +0,0 @@
-*** pine/makefile.bsf.orig Mon Nov 24 22:47:28 2003
---- pine/makefile.bsf Sat May 22 14:31:22 2004
-***************
-*** 67,73 ****
- `cat $(CCLIENTDIR)/LDFLAGS`
-
- STDCFLAGS= -DBSDI -DSYSTYPE=\"BSF\" -DMOUSE
-! CFLAGS= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \
- $(LOCALPINECFLAGS) $(STDCFLAGS)
-
- OFILES= addrbook.o adrbkcmd.o adrbklib.o args.o bldaddr.o context.o filter.o \
---- 67,73 ----
- `cat $(CCLIENTDIR)/LDFLAGS`
-
- STDCFLAGS= -DBSDI -DSYSTYPE=\"BSF\" -DMOUSE
-! CFLAGS+= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \
- $(LOCALPINECFLAGS) $(STDCFLAGS)
-
- OFILES= addrbook.o adrbkcmd.o adrbklib.o args.o bldaddr.o context.o filter.o \
--- mail/pine4/files/patch-pine_screen.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- pine/screen.c.orig Wed Apr 7 10:35:42 2004
-+++ pine/screen.c Tue Aug 10 22:35:37 2004
-@@ -208,7 +208,12 @@
- char this_label[MAX_LABEL+1];
-
- j = 6*i - 1;
-+
-+ /*
-+ 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.
More information about the Midnightbsd-cvs
mailing list