[BACK]Return to patch-ac CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / editors / pico / patches

File: [cvs.NetBSD.org] / pkgsrc / editors / pico / patches / patch-ac (download)

Revision 1.11, Thu Jan 12 21:00:52 2006 UTC (15 years, 10 months ago) by adam
Branch: MAIN
CVS Tags: pkgsrc-2021Q3-base, pkgsrc-2021Q3, pkgsrc-2021Q2-base, pkgsrc-2021Q2, pkgsrc-2021Q1-base, pkgsrc-2021Q1, pkgsrc-2020Q4-base, pkgsrc-2020Q4, pkgsrc-2020Q3-base, pkgsrc-2020Q3, pkgsrc-2020Q2-base, pkgsrc-2020Q2, pkgsrc-2020Q1-base, pkgsrc-2020Q1, pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2, pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3, pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, pkgsrc-2016Q4-base, pkgsrc-2016Q4, pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2, pkgsrc-2016Q1-base, pkgsrc-2016Q1, pkgsrc-2015Q4-base, pkgsrc-2015Q4, pkgsrc-2015Q3-base, pkgsrc-2015Q3, pkgsrc-2015Q2-base, pkgsrc-2015Q2, pkgsrc-2015Q1-base, pkgsrc-2015Q1, pkgsrc-2014Q4-base, pkgsrc-2014Q4, pkgsrc-2014Q3-base, pkgsrc-2014Q3, pkgsrc-2014Q2-base, pkgsrc-2014Q2, pkgsrc-2014Q1-base, pkgsrc-2014Q1, pkgsrc-2013Q4-base, pkgsrc-2013Q4, pkgsrc-2013Q3-base, pkgsrc-2013Q3, pkgsrc-2013Q2-base, pkgsrc-2013Q2, pkgsrc-2013Q1-base, pkgsrc-2013Q1, pkgsrc-2012Q4-base, pkgsrc-2012Q4, pkgsrc-2012Q3-base, pkgsrc-2012Q3, pkgsrc-2012Q2-base, pkgsrc-2012Q2, pkgsrc-2012Q1-base, pkgsrc-2012Q1, pkgsrc-2011Q4-base, pkgsrc-2011Q4, pkgsrc-2011Q3-base, pkgsrc-2011Q3, pkgsrc-2011Q2-base, pkgsrc-2011Q2, pkgsrc-2011Q1-base, pkgsrc-2011Q1, pkgsrc-2010Q4-base, pkgsrc-2010Q4, pkgsrc-2010Q3-base, pkgsrc-2010Q3, pkgsrc-2010Q2-base, pkgsrc-2010Q2, pkgsrc-2010Q1-base, pkgsrc-2010Q1, pkgsrc-2009Q4-base, pkgsrc-2009Q4, pkgsrc-2009Q3-base, pkgsrc-2009Q3, pkgsrc-2009Q2-base, pkgsrc-2009Q2, pkgsrc-2009Q1-base, pkgsrc-2009Q1, pkgsrc-2008Q4-base, pkgsrc-2008Q4, pkgsrc-2008Q3-base, pkgsrc-2008Q3, pkgsrc-2008Q2-base, pkgsrc-2008Q2, pkgsrc-2008Q1-base, pkgsrc-2008Q1, pkgsrc-2007Q4-base, pkgsrc-2007Q4, pkgsrc-2007Q3-base, pkgsrc-2007Q3, pkgsrc-2007Q2-base, pkgsrc-2007Q2, pkgsrc-2007Q1-base, pkgsrc-2007Q1, pkgsrc-2006Q4-base, pkgsrc-2006Q4, pkgsrc-2006Q3-base, pkgsrc-2006Q3, pkgsrc-2006Q2-base, pkgsrc-2006Q2, pkgsrc-2006Q1-base, pkgsrc-2006Q1, cwrapper, cube-native-xorg-base, cube-native-xorg, HEAD
Changes since 1.10: +3 -3 lines

Synchronised with pine-4.64

$NetBSD: patch-ac,v 1.11 2006/01/12 21:00:52 adam Exp $

--- build.orig	2005-05-04 23:22:22.000000000 +0200
+++ build
@@ -394,63 +394,6 @@ case $maketarg in
 	  echo "Including SSL functionality"
 	fi
 
-        if [ -s c-client ] ; then rm -f c-client ; fi
-        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"
-# 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"
         eval echo make "$makeargs" -f makefile.$picotarg
@@ -459,50 +402,8 @@ case $maketarg in
 	if [ $rc != "0" ] ; then exit $rc ; fi
         echo ''
 
-        echo "Making Pine and rpload/rpdump".
-	if [ "$ALTDOCPATHS" = "1" ]
-	then
-	    cd "$PHOME"
-	    rm .pine.sedargs
-	    echo -n " -e s/\/usr\/local\/lib\/pine.conf/\/etc\/pine.conf/" > .pine.sedargs
-	    echo -n " -e s/\/usr\/local\/lib\/pine.info/\/etc\/pine.info/" >> .pine.sedargs
-	    echo -n " -e s/\/usr\/lib\/sendmail/\/usr\/sbin\/sendmail/" >> .pine.sedargs
-	    echo -n " -e s/\/usr\/spool\/news/\/var\/spool\/news/" >> .pine.sedargs
-	    echo -n " -e s/\/usr\/spool\/mail/\/var\/spool\/mail/" >> .pine.sedargs
-	    echo -n " -e s/\/bin\/passwd/\/usr\/bin\/passwd/" >> .pine.sedargs
-	    PINEEXTRAC="'LOCALPINECFLAGS=-DSYSTEM_PINERC=\\\"/etc/pine.conf\\\" -DSYSTEM_PINERC_FIXED=\\\"/etc/pine.conf.fixed\\\" -DSYSTEM_PINE_INFO_PATH=\\\"/etc/pine.info\\\"'"
-	fi
-        cd "$PHOME/pine"
-        eval echo make "$makeargs" "$L1" "$L2" "$PINEEXTRAC" -f makefile.$pinetarg
-        eval make "$makeargs" "$L1" "$L2" "$PINEEXTRAC" -f makefile.$pinetarg
-	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
-	if [ "$ALTDOCPATHS" = "1" ]
-	then
-	    echo "making local docs"
-	    echo "sed `cat ../.pine.sedargs` < ../doc/pine.1 > pine.1"
-	    sed `cat ../.pine.sedargs` < ../doc/pine.1 > pine.1
-	    echo "sed `cat ../.pine.sedargs` < ../doc/tech-notes.txt > tech-notes.txt"
-	    sed `cat ../.pine.sedargs` < ../doc/tech-notes.txt > tech-notes.txt
-	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/mailutil bin/ipop2d bin/ipop3d
 	case $maketarg in
 	    mnt)    echo "Fixing stacksizes ..."
 		    fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot