Update of /cvsroot/fink/fink In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv12569
Modified Files: ChangeLog setup.sh Log Message: don't mention crypto trees in fink.conf.5 for 10.6 or later Index: setup.sh =================================================================== RCS file: /cvsroot/fink/fink/setup.sh,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- setup.sh 2 Jul 2010 21:08:06 -0000 1.40 +++ setup.sh 2 Jul 2010 21:47:48 -0000 1.41 @@ -68,6 +68,15 @@ | perl -MTime::Local -MPOSIX=strftime -p -e '$d="Date:";if (s/(\.Dd \$$d) (\d+)\/(\d+)\/(\d+) (\d+):(\d+):(\d+) \$/\1/) {$epochtime = timegm($7,$6,$5,$4,$3-1,$2-1900);$datestr = strftime "%B %e, %Y", localtime($epochtime); s/(\.Dd )\$$d/$1$datestr/;}' \ >fink.8 echo "Distribution $distribution..." +# Note: we edit out obsolete information from fink.conf.5 regarding the +# crypto trees, for distributions earlier than 10.6. In the future, when +# those distributions are no longer supported, we can just edit fink.conf.5 +# to reflect these changes, and dispense with the lines below. +if [ $distribution != "10.4" ] && [ $distribution != "10.5" ]; then + echo "Editing fink.conf.5..." + mv fink.conf.5.in fink.conf.5.in.orig + sed -e "/crypto/d" -e "s/other stable/stable/" -e "s/other unstable/unstable/" < fink.conf.5.in.orig > fink.conf.5.in +fi sed "s|@PREFIX@|$basepath|g" <fink.conf.5.in \ | perl -MTime::Local -MPOSIX=strftime -p -e '$d="Date:";if (s/(\.Dd \$$d) (\d+)\/(\d+)\/(\d+) (\d+):(\d+):(\d+) \$/\1/) {$epochtime = timegm($7,$6,$5,$4,$3-1,$2-1900);$datestr = strftime "%B %e, %Y", localtime($epochtime); s/(\.Dd )\$$d/$1$datestr/;}' \ >fink.conf.5 Index: ChangeLog =================================================================== RCS file: /cvsroot/fink/fink/ChangeLog,v retrieving revision 1.529 retrieving revision 1.530 diff -u -d -r1.529 -r1.530 --- ChangeLog 2 Jul 2010 21:33:59 -0000 1.529 +++ ChangeLog 2 Jul 2010 21:47:48 -0000 1.530 @@ -2,6 +2,8 @@ * fink.info.in, Makefile, setup.sh: feed $Distribution to setup.sh * fink.conf.5.in: clarify description of Trees + * setup.sh: don't mention crypto trees in fink.conf.5 for 10.6 or + later 2010-06-25 Daniel Macks <dma...@netspace.org> ------------------------------------------------------------------------------ This SF.net email is sponsored by Sprint What will you do first with EVO, the first 4G phone? Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs