* Switch to Makefile COMMENT

* Take advantage of winter's work on ispell

3 files changed, 24 insertions, 60 deletions

diff --git a/editors/pico/Makefile b/editors/pico/Makefile
index 81b1a4a2fa4e..fc68ea6170f6 100644
--- a/editors/pico/Makefile
+++ b/editors/pico/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	pico
 PORTVERSION=	4.53
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/ \
 		http://mirror.sit.wisc.edu/pub/net/mail/pine/ \
@@ -20,6 +21,9 @@ MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/ \
 DISTNAME=	pine${PORTVERSION}
 
 MAINTAINER=	DougB@FreeBSD.org
+COMMENT=	PIne's message COmposition editor
+
+RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
 
 WRKSRC=		${WRKDIR}/pine${PORTVERSION}/pico
 PATCH_WRKSRC=	${WRKSRC}/..
@@ -29,6 +33,11 @@ ALL_TARGET=	pico
 
 MAN1=		pico.1
 
+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
diff --git a/editors/pico/files/patch-an b/editors/pico/files/patch-an
index 8835c7ea1913..d458616a3b76 100644
--- a/editors/pico/files/patch-an
+++ b/editors/pico/files/patch-an
@@ -1,7 +1,7 @@
 *** pico/osdep/os-bsf.h.orig	Wed Feb  7 14:53:26 2001
---- pico/osdep/os-bsf.h	Thu Sep 27 23:56:53 2001
+--- pico/osdep/os-bsf.h	Wed Mar  5 04:24:00 2003
 ***************
-*** 153,159 ****
+*** 153,165 ****
   /*
    * Place where mail gets delivered (for pico's new mail checking)
    */
@@ -9,7 +9,13 @@
   
   /*
    * What and where the tool that checks spelling is located.  If this is
---- 153,159 ----
+   * 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)
    */
@@ -17,3 +23,9 @@
   
   /*
    * 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-aq b/editors/pico/files/patch-aq
deleted file mode 100644
index 73d73e206552..000000000000
--- a/editors/pico/files/patch-aq
+++ /dev/null
@@ -1,57 +0,0 @@
-*** pico/display.c.orig	Fri Jun 19 20:19:53 1998
---- pico/display.c	Mon Jul 13 01:36:38 1998
-***************
-*** 77,83 ****
-      {"^X", "Exit", KS_EXIT},		{"^J", "Justify", KS_JUSTIFY},
-      {"^W", "Where is", KS_WHEREIS},	{"^V", "Next Pg", KS_NEXTPAGE},
-      {"^U", NULL, KS_NONE},
-! #ifdef	SPELLER
-      {"^T", "To Spell", KS_SPELLCHK}
-  #else
-      {"^D", "Del Char", KS_NONE}
---- 77,83 ----
-      {"^X", "Exit", KS_EXIT},		{"^J", "Justify", KS_JUSTIFY},
-      {"^W", "Where is", KS_WHEREIS},	{"^V", "Next Pg", KS_NEXTPAGE},
-      {"^U", NULL, KS_NONE},
-! #if defined(SPELLER) && !defined(__FreeBSD__)
-      {"^T", "To Spell", KS_SPELLCHK}
-  #else
-      {"^D", "Del Char", KS_NONE}
-*** pico/ebind.h.orig	Sat Feb 28 02:10:31 1998
---- pico/ebind.h	Mon Jul 13 01:36:39 1998
-***************
-*** 145,151 ****
-  	{CTRL|'O',		filewrite},
-  	{CTRL|'P',		backline},
-  	{CTRL|'R',		insfile},
-! #ifdef	SPELLER
-  	{CTRL|'T',		spell},
-  #endif	/* SPELLER */
-  	{CTRL|'U',		yank},
---- 145,151 ----
-  	{CTRL|'O',		filewrite},
-  	{CTRL|'P',		backline},
-  	{CTRL|'R',		insfile},
-! #if defined(SPELLER) && !defined(__FreeBSD__)
-  	{CTRL|'T',		spell},
-  #endif	/* SPELLER */
-  	{CTRL|'U',		yank},
-*** pico/main.c.orig	Tue Apr 21 20:28:08 1998
---- pico/main.c	Mon Jul 13 01:36:39 1998
-***************
-*** 66,72 ****
-      { F9,  (CTRL|'K')},
-      { F10, (CTRL|'U')},
-      { F11, (CTRL|'C')},
-! #ifdef	SPELLER
-      { F12, (CTRL|'T')}
-  #else
-      { F12, (CTRL|'D')}
---- 66,72 ----
-      { F9,  (CTRL|'K')},
-      { F10, (CTRL|'U')},
-      { F11, (CTRL|'C')},
-! #if defined(SPELLER) && !defined(__FreeBSD__)
-      { F12, (CTRL|'T')}
-  #else
-      { F12, (CTRL|'D')}