Update "pico" package to version 4.4. Changes since version 4.2:

- Pico only preserves the start-stop characters (^Q/^S) if given the -p
- New pico option -Q <quotestr>

8 files changed, 108 insertions, 56 deletions

diff --git a/editors/pico/Makefile b/editors/pico/Makefile
index 90f6e30216b..57f9fc62c06 100644
--- a/editors/pico/Makefile
+++ b/editors/pico/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.33 2002/12/14 04:34:49 hubertf Exp $
-#
+# $NetBSD: Makefile,v 1.34 2002/12/14 10:28:41 tron Exp $
 
-DISTNAME=	pine4.44
-PKGNAME=	pico-4.2
+DISTNAME=	pine4.51
+PKGNAME=	pico-4.4
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/pine/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.washington.edu/pine/
@@ -13,8 +13,8 @@ COMMENT=	Text editor (ships with Pine), and Pine's text editing lib
 
 LICENSE=	pine-license
 
-USE_BUILDLINK2=	# defined
-USE_LIBTOOL=	# defined
+USE_BUILDLINK2=	YES
+USE_LIBTOOL=	YES
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -29,21 +29,19 @@ BUILDNAME= neb
 MAKE_ENV+=	_STRIPFLAG_INSTALL=	# debug...
 
 do-build:
-	cd ${WRKSRC} && ./build ${BUILDNAME}				\
-		CC="${PKGLIBTOOL} ${BUILDLINK_CC}"			\
-		PREFIX=${PREFIX}
+	cd ${WRKSRC} && \
+	./build ${BUILDNAME} CC="${PKGLIBTOOL} ${BUILDLINK_CC}" \
+	  PREFIX=${PREFIX}
 
 do-install:
 	${PKGLIBTOOL} --mode=install ${INSTALL_DATA} \
-		${WRKSRC}/pico/libpico.la ${PREFIX}/lib/
+	  ${WRKSRC}/pico/libpico.la ${PREFIX}/lib
 	${PKGLIBTOOL} --mode=install ${INSTALL_PROGRAM} \
-		${WRKSRC}/pico/pico ${WRKSRC}/pico/pilot ${PREFIX}/bin/
-	${INSTALL_MAN}     ${WRKSRC}/doc/pico.1 ${PREFIX}/man/man1/
-	${INSTALL_MAN}     ${WRKSRC}/doc/pilot.1 ${PREFIX}/man/man1/
+	  ${WRKSRC}/pico/pico ${WRKSRC}/pico/pilot ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/doc/pico.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/pilot.1 ${PREFIX}/man/man1
 	${INSTALL_DATA_DIR} ${PREFIX}/include/pico
 	cd ${WRKSRC}/pico && \
-		${INSTALL_DATA} ebind.h edef.h efunc.h estruct.h headers.h \
-			msmenu.h os.h pico.h resource.h \
-			${PREFIX}/include/pico/
+	${INSTALL_DATA} *.h ${PREFIX}/include/pico
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/pico/PLIST b/editors/pico/PLIST
index eb75383fe40..825b8dcc05f 100644
--- a/editors/pico/PLIST
+++ b/editors/pico/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:23:19 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/12/14 10:28:42 tron Exp $
 bin/pico
 bin/pilot
 include/pico/ebind.h
@@ -13,8 +13,8 @@ include/pico/resource.h
 lib/libpico.a
 lib/libpico.la
 lib/libpico.so
-lib/libpico.so.3
-lib/libpico.so.3.1
+lib/libpico.so.4
+lib/libpico.so.4.0
 man/man1/pico.1
 man/man1/pilot.1
 @dirrm include/pico
diff --git a/editors/pico/buildlink2.mk b/editors/pico/buildlink2.mk
index b7ab17e64b3..f1656ac5cd3 100644
--- a/editors/pico/buildlink2.mk
+++ b/editors/pico/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.1 2002/10/08 23:31:02 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2002/12/14 10:28:42 tron Exp $
 
 .if !defined(PICO_BUILDLINK2_MK)
 PICO_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		pico
-BUILDLINK_DEPENDS.pico?=	pico>=4.2
+BUILDLINK_DEPENDS.pico?=	pico>=4.4
 BUILDLINK_PKGSRCDIR.pico?=	../../editors/pico
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.pico=pico
diff --git a/editors/pico/distinfo b/editors/pico/distinfo
index 2f1c6df7a3c..f388b96c9f8 100644
--- a/editors/pico/distinfo
+++ b/editors/pico/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.6 2002/07/28 05:39:41 schmonz Exp $
+$NetBSD: distinfo,v 1.7 2002/12/14 10:28:42 tron Exp $
 
-SHA1 (pine4.44.tar.gz) = 0657a5bd51cacc300260224320ee114c0b2b26e5
-Size (pine4.44.tar.gz) = 3478476 bytes
-SHA1 (patch-aa) = 066b5f538d669e5986c91b1d9b88e307c6066527
+SHA1 (pine4.51.tar.bz2) = 4ab510b03fa6c8685d6bdbb57c9247a7ee52e55f
+Size (pine4.51.tar.bz2) = 2787276 bytes
+SHA1 (patch-aa) = be8e90fd7b841b5377615008e1797ba1ff8ac455
 SHA1 (patch-ab) = 341ce106598c7bcead07fc18a2a557984339912d
-SHA1 (patch-ac) = 162250bf37092c9c24a0b18a1fca2e588cf66221
+SHA1 (patch-ac) = 5f648f4e34d78af439ed2ea4953543aab4bd232f
 SHA1 (patch-ad) = 1180abc4909f4120ec91ba14854da9445be3ac6a
-SHA1 (patch-ae) = 2e027bdc0597abcd9bb4272744887c9e54a9efe8
-SHA1 (patch-af) = 5a8f33b79f9e8feeef524c460aca5c6c230ba244
+SHA1 (patch-ae) = f228f3c7f61be31a36730b252dfa37d611e8be4b
+SHA1 (patch-af) = dd66536577d8a5b38c68e4f041e9f1bd35e79c63
diff --git a/editors/pico/patches/patch-aa b/editors/pico/patches/patch-aa
index 561609d8933..6e80c6e6500 100644
--- a/editors/pico/patches/patch-aa
+++ b/editors/pico/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.11 2001/12/15 08:31:08 martti Exp $
+$NetBSD: patch-aa,v 1.12 2002/12/14 10:28:42 tron Exp $
 
 --- pico/makefile.neb.orig	Tue Oct 23 22:19:07 2001
 +++ pico/makefile.neb	Fri Dec 14 19:07:19 2001
@@ -43,7 +43,7 @@ $NetBSD: patch-aa,v 1.11 2001/12/15 08:31:08 martti Exp $
 -		$(RANLIB) libpico.a
 +libpico.la:	$(OFILES)
 +		$(CC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \
-+			-version-info 3:1
++			-version-info 4:0
  
  clean:
  		rm -f *.a *.o *~ pico_os.c os.h pico pilot
diff --git a/editors/pico/patches/patch-ac b/editors/pico/patches/patch-ac
index 1b9fb8754c4..65438749bd7 100644
--- a/editors/pico/patches/patch-ac
+++ b/editors/pico/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.7 2001/12/15 08:31:08 martti Exp $
+$NetBSD: patch-ac,v 1.8 2002/12/14 10:28:42 tron Exp $
 
---- build.orig	Thu Nov  1 00:01:04 2001
-+++ build	Fri Dec 14 19:09:32 2001
-@@ -332,31 +332,12 @@
+--- build.orig	Mon Dec  9 18:54:38 2002
++++ build	Sat Dec 14 10:57:35 2002
+@@ -362,63 +362,6 @@
  	  echo "Including SSL functionality"
  	fi
  
@@ -10,36 +10,90 @@ $NetBSD: patch-ac,v 1.7 2001/12/15 08:31:08 martti Exp $
 -        ln -s imap/c-client c-client
 -        if [ -s mtest    ] ; then rm -f mtest    ; fi
 -        ln -s imap/mtest mtest
+-        if [ -s mailutil ] ; then rm -f mailutil ; fi
+-        ln -s imap/mailutil mailutil
 -        if [ -s imapd    ] ; then rm -f imapd    ; fi
 -        ln -s imap/imapd imapd
 -        if [ -s ipopd    ] ; then rm -f ipopd    ; fi
 -        ln -s imap/ipopd ipopd
 -        echo "Making c-client library, imapd, and ipopd"
 -	echo $S1 $S2 $S3 $S4 $K1 > imap/SPECIALS
--        cd $PHOME/imap
--        eval echo eval make "$makeargs" "$SSL" "SPECIALS=`cat SPECIALS`" "$K2" $ccltarg
--        eval make "$makeargs" "$SSL" "SPECIALS=`cat SPECIALS`" "$K2" $ccltarg
+-        cd "$PHOME/imap"
+-# This "touch" tells the IMAP make not to give any warnings about IESG compliance.
+-	if [ "$NOSSL" = "1" -o "$SSL" != "none" ] ; then touch ssl$SSL ; fi
+-	if [ "$NOSSL" != "1" -a "$SSL" = "none" -a ! -f sslnone ]
+-	then
+-	   echo "+-----------------------------------------------------------+"
+-	   echo "| It appears that you do not have OpenSSL or equivalent     |"
+-	   echo "| installed on this system.                                 |"
+-	   echo "|                                                           |"
+-	   echo "| Building PINE without SSL support will possibly introduce |"
+-	   echo "| problems when communicating with IMAP, POP3, or SMTP      |"
+-	   echo "| servers that require TLS or SSL authentication.           |"
+-	   echo "| In addition, your password may be vulnerable to a         |"
+-	   echo "| snooping attack since it may be sent over the network     |"
+-	   echo "| unencrypted.                                              |"
+-	   echo "+-----------------------------------------------------------+"
+-	   echo ""
+-	   echo "Do you want to continue this build anyway? Type y or n please:"
+-	   read ans
+-	   case "$ans" in
+-	       y)   echo "Building without SSL ..."
+-		    touch sslnone
+-		    ;;
+-
+-	       *)   echo "Terminating build"
+-		    exit 1
+-		    ;;
+-	   esac
+-	fi
+-        eval echo eval make "$makeargs" "SSLTYPE=$SSL" "SPECIALS=`cat SPECIALS`" "$K2" $ccltarg
+-        eval make "$makeargs" "SSLTYPE=$SSL" "SPECIALS=`cat SPECIALS`" "$K2" $ccltarg
+-	rc=$?
+-	if [ $rc != "0" ]
+-	then
+-	    echo "+---------------------------------------------+"
+-	    echo "| Problems building c-client                  |"
+-	    echo "|                                             |"
+-	    echo "| Please check the output above for a         |"
+-	    echo "| possible explanation for this failure       |"
+-	    echo "+---------------------------------------------+"
+-	    echo ""
+-	    exit $rc
+-	fi
 -        echo ''
 -
          echo "Making Pico and Pilot"
-         cd $PHOME/pico
+         cd "$PHOME/pico"
          eval echo make "$makeargs" -f makefile.$picotarg
-         eval make "$makeargs" -f makefile.$picotarg
+@@ -427,30 +370,8 @@
+ 	if [ $rc != "0" ] ; then exit $rc ; fi
          echo ''
  
 -        echo "Making Pine and rpload/rpdump".
--        cd $PHOME/pine
+-        cd "$PHOME/pine"
 -        eval echo make "$makeargs" "$L1" "$L2" -f makefile.$pinetarg
 -        eval make "$makeargs" "$L1" "$L2" -f makefile.$pinetarg
-         cd $PHOME
-         if [ ! -d bin ] ;  then    mkdir bin;        fi
-         cd $PHOME/bin
-@@ -372,8 +353,6 @@
-         if [ -s ../pine/rpdump ] ;    then ln ../pine/rpdump rpdump   ; fi
-         cd $PHOME
+-	rc=$?
+-	if [ $rc != "0" ] ; then exit $rc ; fi
+-        cd "$PHOME"
+-        if [ ! -d bin ] ;  then    mkdir bin;        fi
+-        cd "$PHOME/bin"
+-        rm -f pine mtest imapd mailutil pico 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
+         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/ipop2d bin/ipop3d
+-        size bin/pine bin/mtest bin/imapd bin/pico bin/pilot bin/rpdump bin/rpload bin/mailutil bin/ipop2d bin/ipop3d
  	case $maketarg in
  	    mnt)    echo "Fixing stacksizes ..."
  		    fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot
diff --git a/editors/pico/patches/patch-ae b/editors/pico/patches/patch-ae
index 3a15ff62449..99ce3114b88 100644
--- a/editors/pico/patches/patch-ae
+++ b/editors/pico/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.5 2001/12/15 08:31:08 martti Exp $
+$NetBSD: patch-ae,v 1.6 2002/12/14 10:28:42 tron Exp $
 
 --- pico/makefile.sol.orig	Tue Oct 23 22:19:09 2001
 +++ pico/makefile.sol	Fri Dec 14 19:11:59 2001
@@ -50,7 +50,7 @@ $NetBSD: patch-ae,v 1.5 2001/12/15 08:31:08 martti Exp $
 -		$(RANLIB) libpico.a
 +libpico.la:	$(OFILES)
 +		$(CC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \
-+		-version-info 3:1
++		-version-info 4:0
  
  clean:
  		rm -f *.a *.o *~ pico_os.c os.h pico pilot
diff --git a/editors/pico/patches/patch-af b/editors/pico/patches/patch-af
index 63e81d4c2b0..1e731778fcf 100644
--- a/editors/pico/patches/patch-af
+++ b/editors/pico/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2002/07/28 05:39:41 schmonz Exp $
+$NetBSD: patch-af,v 1.2 2002/12/14 10:28:43 tron Exp $
 
---- pico/makefile.osx.orig	Tue Oct 23 18:19:08 2001
-+++ pico/makefile.osx
-@@ -38,10 +38,6 @@ STDCFLAGS=	-Dbsd -DJOB_CONTROL
+--- pico/makefile.osx.orig	Fri Sep 20 20:23:15 2002
++++ pico/makefile.osx	Sat Dec 14 10:50:55 2002
+@@ -38,10 +38,6 @@
  CFLAGS=         $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(STDCFLAGS)
  
  # switches for library building
@@ -10,10 +10,10 @@ $NetBSD: patch-af,v 1.1 2002/07/28 05:39:41 schmonz Exp $
 -LIBARGS=	ru
 -RANLIB=		ranlib
 -
- LIBS=		$(EXTRALDFLAGS)
+ LIBS=		$(EXTRALDFLAGS) -lncurses
  
  OFILES=		attach.o basic.o bind.o browse.o buffer.o \
-@@ -55,17 +51,17 @@ HFILES=		headers.h estruct.h edef.h efun
+@@ -55,17 +51,17 @@
  # dependencies for the Unix versions of pico and libpico.a
  #
  all:		pico pilot
@@ -33,7 +33,7 @@ $NetBSD: patch-af,v 1.1 2002/07/28 05:39:41 schmonz Exp $
 -		$(RANLIB) libpico.a
 +libpico.la:	$(OFILES)
 +		$(CC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \
-+			-version-info 3:1
++			-version-info 4:0
  
  clean:
  		rm -f *.a *.o *~ pico_os.c os.h pico pilot