aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordougb <dougb@FreeBSD.org>2008-09-02 04:21:47 +0800
committerdougb <dougb@FreeBSD.org>2008-09-02 04:21:47 +0800
commitb75eb3c9ba6a4612ba9b373296fd9dcd62bc5cda (patch)
tree7c0a1c15129eaf58a8c0a3aada983b28a3446f22
parent0629d0f6d12e514c88051c2e07d0f41a09cbeb5d (diff)
downloadfreebsd-ports-gnome-b75eb3c9ba6a4612ba9b373296fd9dcd62bc5cda.tar.gz
freebsd-ports-gnome-b75eb3c9ba6a4612ba9b373296fd9dcd62bc5cda.tar.zst
freebsd-ports-gnome-b75eb3c9ba6a4612ba9b373296fd9dcd62bc5cda.zip
Remove the port for Pine, and the slave port for Pico. UW has discontinued
development on the Pine branch, and is instead focusing its efforts on the successor, Alpine. http://www.washington.edu/alpine/ Alpine has more features, much better localization, better organized (and largely rewritten) code, is BSD licensed, and should be a drop-in replacement in terms of configuration files. Alpine version 1.00 was released on March 17, 2008 after over a year of development and community testing, and has since had 2 releases for bugfixes and new features, so it's safe to say that this is a mature replacement.
-rw-r--r--MOVED2
-rw-r--r--editors/pico/Makefile54
-rw-r--r--editors/pico/distinfo3
-rw-r--r--editors/pico/files/patch-aa31
-rw-r--r--editors/pico/files/patch-an31
-rw-r--r--editors/pico/files/patch-ap20
-rw-r--r--editors/pico/files/patch-as57
-rw-r--r--editors/pico/files/patch-bd11
-rw-r--r--editors/pico/pkg-descr4
-rw-r--r--mail/pine4/Makefile141
-rw-r--r--mail/pine4/distinfo6
-rw-r--r--mail/pine4/files/patch-ac63
-rw-r--r--mail/pine4/files/patch-af23
-rw-r--r--mail/pine4/files/patch-ai70
-rw-r--r--mail/pine4/files/patch-ak37
-rw-r--r--mail/pine4/files/patch-al50
-rw-r--r--mail/pine4/files/patch-ax19
-rw-r--r--mail/pine4/files/patch-bb13
-rw-r--r--mail/pine4/files/patch-pico_makefile.bsf13
-rw-r--r--mail/pine4/files/patch-pine_pine.hlp10
-rw-r--r--mail/pine4/files/patch-pine_screen.c15
-rw-r--r--mail/pine4/files/patch-reply.c44
-rw-r--r--mail/pine4/pkg-descr21
-rw-r--r--mail/pine4/pkg-install7
-rw-r--r--mail/pine4/pkg-message5
-rw-r--r--mail/pine4/pkg-plist24
26 files changed, 2 insertions, 772 deletions
diff --git a/MOVED b/MOVED
index f4ff0d304bbe..b6540394d8b6 100644
--- a/MOVED
+++ b/MOVED
@@ -3589,3 +3589,5 @@ x11-toolkits/gtkdatabox2||2008-08-29|Removed, use x11-toolkits/gtkdatabox instea
chinese/BBMan||2008-0830|Removed, abandonware by upstream maintainer
games/q3base||2008-09-01|Project gone, website defaced
editors/ooo-build||2008-09-01|Has expired: Has been broken for more than 6 months
+mail/pine4|mail/alpine|2008-09-01|No further development for pine, alpine has more features and is config-compatible
+editors/pico|editors/pico-alpine|2008-09-01|No further development for pine, alpine has more features and is config-compatible
diff --git a/editors/pico/Makefile b/editors/pico/Makefile
deleted file mode 100644
index 16a9fc4eee70..000000000000
--- a/editors/pico/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# New ports collection makefile for: pico
-# Date created: 16 December 2000
-# Whom: Jeremy Shaffner <jeremy@external.org>
-#
-# $FreeBSD$
-#
-# All patch files have been taken from mail/pine4
-
-PORTNAME= pico
-PORTVERSION= 4.64
-CATEGORIES= editors
-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= DougB@FreeBSD.org
-COMMENT= PIne's message COmposition editor
-
-OPTIONS= ISPELL "Use ispell as the spell checker" on \
- NO_SPELLER "Do not use a spell checker" off
-
-.include <bsd.port.pre.mk>
-
-.if !defined(WITH_NO_SPELLER)
-.if !defined(WITHOUT_ISPELL)
-RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell
-.endif
-.endif
-
-WRKSRC= ${WRKDIR}/pine${PORTVERSION}/pico
-PATCH_WRKSRC= ${WRKSRC}/..
-
-MAKEFILE= makefile.bsf
-ALL_TARGET= pico
-
-MAN1= pico.1
-PLIST_FILES= bin/pico
-
-post-patch:
- ${CP} ${WRKSRC}/osdep/os-bsf.h ${WRKSRC}/osdep/os-bsf.h.presed
- ${SED} -e "s:@@PREFIX@@:${PREFIX}:g" \
- ${WRKSRC}/osdep/os-bsf.h.presed > ${WRKSRC}/osdep/os-bsf.h
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/pico ${PREFIX}/bin/pico
- ${INSTALL_MAN} ${WRKSRC}/../doc/pico.1 ${PREFIX}/man/man1/pico.1
-
-.include <bsd.port.post.mk>
diff --git a/editors/pico/distinfo b/editors/pico/distinfo
deleted file mode 100644
index cdbdbb143c2a..000000000000
--- a/editors/pico/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (pine4.64.tar.gz) = 9cc68749675f1c35a2147a35d2c5b344
-SHA256 (pine4.64.tar.gz) = c200646bc2e7128370be3b6d28d26944984a0d4003982762f97ee4aa142d183d
-SIZE (pine4.64.tar.gz) = 4218629
diff --git a/editors/pico/files/patch-aa b/editors/pico/files/patch-aa
deleted file mode 100644
index b6de406f8fc8..000000000000
--- a/editors/pico/files/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
---- pico/search.c.orig Thu Jun 21 10:50:05 2001
-+++ pico/search.c Fri Sep 28 00:08:23 2001
-@@ -98,12 +98,15 @@
- int bc;
- int pc;
- {
-+ bc = (unsigned char)bc;
-+ pc = (unsigned char)pc;
-+
- if ((curwp->w_bufp->b_mode & MDEXACT) == 0){
-- if (bc>='a' && bc<='z')
-- bc -= 0x20;
-+ if (islower(bc))
-+ bc = toupper(bc);
-
-- if (pc>='a' && pc<='z')
-- pc -= 0x20;
-+ if (islower(pc))
-+ pc = toupper(pc);
- }
-
- return(bc == pc);
-@@ -805,7 +808,7 @@
- int maxlength; /* maximum chars in destination */
-
- {
-- char c; /* current char to translate */
-+ unsigned char c; /* current char to translate */
-
- /* scan through the string */
- while ((c = *srcstr++) != 0) {
diff --git a/editors/pico/files/patch-an b/editors/pico/files/patch-an
deleted file mode 100644
index d458616a3b76..000000000000
--- a/editors/pico/files/patch-an
+++ /dev/null
@@ -1,31 +0,0 @@
-*** pico/osdep/os-bsf.h.orig Wed Feb 7 14:53:26 2001
---- pico/osdep/os-bsf.h Wed Mar 5 04:24:00 2003
-***************
-*** 153,165 ****
- /*
- * Place where mail gets delivered (for pico's new mail checking)
- */
-! #define MAILDIR "/usr/spool/mail"
-
- /*
- * What and where the tool that checks spelling is located. If this is
- * undefined, then the spelling checker is not compiled into pico.
- */
-! #define SPELLER "/usr/bin/spell"
-
- #ifdef MOUSE
- #define XTERM_MOUSE_ON "\033[?1000h" /* DECSET with parm 1000 */
---- 153,165 ----
- /*
- * Place where mail gets delivered (for pico's new mail checking)
- */
-! #define MAILDIR "/var/mail"
-
- /*
- * What and where the tool that checks spelling is located. If this is
- * undefined, then the spelling checker is not compiled into pico.
- */
-! #define SPELLER "@@PREFIX@@/bin/spell"
-
- #ifdef MOUSE
- #define XTERM_MOUSE_ON "\033[?1000h" /* DECSET with parm 1000 */
diff --git a/editors/pico/files/patch-ap b/editors/pico/files/patch-ap
deleted file mode 100644
index f41ce128e49e..000000000000
--- a/editors/pico/files/patch-ap
+++ /dev/null
@@ -1,20 +0,0 @@
-*** pico/osdep/term.cap.orig Thu Nov 14 09:27:17 2002
---- pico/osdep/term.cap Fri Sep 5 01:44:21 2003
-***************
-*** 288,294 ****
- _kppu = tgetstr("kP", &p);
- _kppd = tgetstr("kN", &p);
- _kphome = tgetstr("kh", &p);
-! _kpend = tgetstr("kH", &p);
- _kpdel = tgetstr("kD", &p);
- _kf1 = tgetstr("k1", &p);
- _kf2 = tgetstr("k2", &p);
---- 288,295 ----
- _kppu = tgetstr("kP", &p);
- _kppd = tgetstr("kN", &p);
- _kphome = tgetstr("kh", &p);
-! if((_kpend = tgetstr("@7", &p)) == NULL)
-! _kpend = tgetstr("kH",&p);
- _kpdel = tgetstr("kD", &p);
- _kf1 = tgetstr("k1", &p);
- _kf2 = tgetstr("k2", &p);
diff --git a/editors/pico/files/patch-as b/editors/pico/files/patch-as
deleted file mode 100644
index 0a5cc4d1d2e2..000000000000
--- a/editors/pico/files/patch-as
+++ /dev/null
@@ -1,57 +0,0 @@
-*** pico/edef.h.orig Thu Apr 23 02:53:44 1998
---- pico/edef.h Tue Feb 9 22:14:08 1999
-***************
-*** 59,65 ****
- int ComposerEditing = FALSE; /* TRUE if message line is open */
- int revexist = FALSE; /* does reverse video exist? */
- char modecode[] = "WCSEVO"; /* letters to represent modes */
-! long gmode = MDWRAP; /* global editor mode */
- int sgarbf = TRUE; /* TRUE if screen is garbage */
- int mpresf = FALSE; /* TRUE if message in last line */
- int clexec = FALSE; /* command line execution flag */
---- 59,65 ----
- int ComposerEditing = FALSE; /* TRUE if message line is open */
- int revexist = FALSE; /* does reverse video exist? */
- char modecode[] = "WCSEVO"; /* letters to represent modes */
-! long gmode = MDWRAP | MDTCAPWINS; /* global editor mode */
- int sgarbf = TRUE; /* TRUE if screen is garbage */
- int mpresf = FALSE; /* TRUE if message in last line */
- int clexec = FALSE; /* command line execution flag */
-*** pico/main.c.orig Tue Feb 9 21:46:54 1999
---- pico/main.c Tue Feb 9 22:14:08 1999
-***************
-*** 443,449 ****
- gmode ^= MDSSPD;
- break;
- case 'q': /* -q for termcap takes precedence */
-! gmode ^= MDTCAPWINS;
- break;
- case 'w': /* -w turn off word wrap */
- gmode ^= MDWRAP;
---- 443,449 ----
- gmode ^= MDSSPD;
- break;
- case 'q': /* -q for termcap takes precedence */
-! gmode |= MDTCAPWINS;
- break;
- case 'w': /* -w turn off word wrap */
- gmode ^= MDWRAP;
-*** pico/pilot.c.orig Mon Aug 24 20:37:39 1998
---- pico/pilot.c Tue Feb 9 22:14:09 1999
-***************
-*** 222,228 ****
- sup_keyhelp = !sup_keyhelp;
- break;
- case 'q': /* -q for termcap takes precedence */
-! gmode ^= MDTCAPWINS;
- break;
- case 'z': /* -z to suspend */
- gmode ^= MDSSPD;
---- 222,228 ----
- sup_keyhelp = !sup_keyhelp;
- break;
- case 'q': /* -q for termcap takes precedence */
-! gmode |= MDTCAPWINS;
- break;
- case 'z': /* -z to suspend */
- gmode ^= MDSSPD;
diff --git a/editors/pico/files/patch-bd b/editors/pico/files/patch-bd
deleted file mode 100644
index 9e760bc21447..000000000000
--- a/editors/pico/files/patch-bd
+++ /dev/null
@@ -1,11 +0,0 @@
---- pico/makefile.bsf.orig Sun Feb 11 20:15:44 2001
-+++ pico/makefile.bsf Sun Feb 11 20:15:18 2001
-@@ -37,7 +37,7 @@
- DEBUG= -DDEBUG # -g
-
- STDCFLAGS= -DBSDI -DBSDI2 -DPOSIX -DJOB_CONTROL -DMOUSE
--CFLAGS= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(STDCFLAGS)
-+CFLAGS+= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(STDCFLAGS)
-
- # switches for library building
- LIBCMD= ar
diff --git a/editors/pico/pkg-descr b/editors/pico/pkg-descr
deleted file mode 100644
index 1daa99f43458..000000000000
--- a/editors/pico/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-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/
diff --git a/mail/pine4/Makefile b/mail/pine4/Makefile
deleted file mode 100644
index 0dde99075791..000000000000
--- a/mail/pine4/Makefile
+++ /dev/null
@@ -1,141 +0,0 @@
-# New ports collection makefile for: pine
-# Date created: 09 July 1998
-# Whom: Adrian Penisoara <ady@freebsd.ady.ro>
-#
-# $FreeBSD$
-#
-
-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= DougB@FreeBSD.org
-COMMENT= PINE(tm) -- a Program for Internet News & Email
-
-OPTIONS= PICO "Build and install pico, the default editor" on \
- MAILDIR "Add a patch that provides maildir support" off \
- PASSFILE "Support for a stored Password File (DANGEROUS)" 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
-
-post-install:
- ${PREFIX}/bin/pine -P ${PREFIX}/etc/pine.conf -conf >${WRKSRC}/pine.conf
- ${INSTALL_DATA} ${WRKSRC}/pine.conf ${PREFIX}/etc/pine.conf
-
- @${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/mail/pine4/distinfo b/mail/pine4/distinfo
deleted file mode 100644
index 704f679950d8..000000000000
--- a/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
diff --git a/mail/pine4/files/patch-ac b/mail/pine4/files/patch-ac
deleted file mode 100644
index 08aa8b1ffc6c..000000000000
--- a/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
-
-
-
diff --git a/mail/pine4/files/patch-af b/mail/pine4/files/patch-af
deleted file mode 100644
index 35b7ad38cb51..000000000000
--- a/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=$@ \
diff --git a/mail/pine4/files/patch-ai b/mail/pine4/files/patch-ai
deleted file mode 100644
index 5687a2ae77a4..000000000000
--- a/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
diff --git a/mail/pine4/files/patch-ak b/mail/pine4/files/patch-ak
deleted file mode 100644
index 27702ef00648..000000000000
--- a/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)...
diff --git a/mail/pine4/files/patch-al b/mail/pine4/files/patch-al
deleted file mode 100644
index e9d00ac969ce..000000000000
--- a/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
diff --git a/mail/pine4/files/patch-ax b/mail/pine4/files/patch-ax
deleted file mode 100644
index 5e8c3ca662c8..000000000000
--- a/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 \
diff --git a/mail/pine4/files/patch-bb b/mail/pine4/files/patch-bb
deleted file mode 100644
index 622e72d41a04..000000000000
--- a/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
-
- /*
diff --git a/mail/pine4/files/patch-pico_makefile.bsf b/mail/pine4/files/patch-pico_makefile.bsf
deleted file mode 100644
index e650ceb714d5..000000000000
--- a/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
diff --git a/mail/pine4/files/patch-pine_pine.hlp b/mail/pine4/files/patch-pine_pine.hlp
deleted file mode 100644
index 4c255da5fa53..000000000000
--- a/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 &lt;Unix search path&gt;/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"-->
diff --git a/mail/pine4/files/patch-pine_screen.c b/mail/pine4/files/patch-pine_screen.c
deleted file mode 100644
index af76a22c9c59..000000000000
--- a/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.
diff --git a/mail/pine4/files/patch-reply.c b/mail/pine4/files/patch-reply.c
deleted file mode 100644
index e3548a46b3cb..000000000000
--- a/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);
-
diff --git a/mail/pine4/pkg-descr b/mail/pine4/pkg-descr
deleted file mode 100644
index 16bd44f6bcf1..000000000000
--- a/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@FreeBSD.org
diff --git a/mail/pine4/pkg-install b/mail/pine4/pkg-install
deleted file mode 100644
index ccc3a68c7b13..000000000000
--- a/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 FreeBSD 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
diff --git a/mail/pine4/pkg-message b/mail/pine4/pkg-message
deleted file mode 100644
index ee02729a0743..000000000000
--- a/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 ***
-***************************************************************************
-
diff --git a/mail/pine4/pkg-plist b/mail/pine4/pkg-plist
deleted file mode 100644
index f042a96a05eb..000000000000
--- a/mail/pine4/pkg-plist
+++ /dev/null
@@ -1,24 +0,0 @@
-@unexec %D/bin/pine -conf >%D/etc/pine.conf.tmp
-@unexec if cmp -s %D/etc/pine.conf %D/etc/pine.conf.tmp; then rm -f %D/etc/pine.conf; fi
-@unexec rm -f %D/etc/pine.conf.tmp
-bin/pilot
-bin/pine
-bin/rpdump
-bin/rpload
-@exec %D/bin/pine -P %D/etc/pine.conf -conf >%D/etc/pine.conf.tmp
-@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%%