diff options
author | tron <tron@pkgsrc.org> | 2002-12-14 10:28:41 +0000 |
---|---|---|
committer | tron <tron@pkgsrc.org> | 2002-12-14 10:28:41 +0000 |
commit | 0c9230096e6266a44508229acc11385dd10a9aa4 (patch) | |
tree | 844321f2369af91a8096836ddbcfaff09bc47f39 /editors/pico/patches | |
parent | 911443dd8659187f736ed7e1d8c7282b92c8644b (diff) | |
download | pkgsrc-0c9230096e6266a44508229acc11385dd10a9aa4.tar.gz |
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>
Diffstat (limited to 'editors/pico/patches')
-rw-r--r-- | editors/pico/patches/patch-aa | 4 | ||||
-rw-r--r-- | editors/pico/patches/patch-ac | 88 | ||||
-rw-r--r-- | editors/pico/patches/patch-ae | 4 | ||||
-rw-r--r-- | editors/pico/patches/patch-af | 14 |
4 files changed, 82 insertions, 28 deletions
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 |