Update of /cvsroot/fink/fink In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv15595
Modified Files: Tag: branch_0_29 ChangeLog Makefile fink.conf.5.in fink.info.in setup.sh Log Message: backport Index: fink.conf.5.in =================================================================== RCS file: /cvsroot/fink/fink/fink.conf.5.in,v retrieving revision 1.45.2.4 retrieving revision 1.45.2.5 diff -u -d -r1.45.2.4 -r1.45.2.5 --- fink.conf.5.in 16 May 2010 06:37:12 -0000 1.45.2.4 +++ fink.conf.5.in 2 Jul 2010 22:03:18 -0000 1.45.2.5 @@ -83,10 +83,10 @@ .Bl -tag -width flag -offset indent -compact .It local/main - any local packages you want to install .It local/bootstrap - packages used in the installation of fink -.It stable/crypto - stable cryptographic packages -.It stable/main - other stable packages -.It unstable/crypto - unstable cryptographic packages -.It unstable/main - other unstable packages +.It stable/crypto - stable cryptographic packages from fink +.It stable/main - other stable packages from fink +.It unstable/crypto - unstable cryptographic packages from fink +.It unstable/main - other unstable packages from fink .El You may also add your own trees in the .Pa @PREFIX@/fink/dists Index: fink.info.in =================================================================== RCS file: /cvsroot/fink/fink/fink.info.in,v retrieving revision 1.38.2.1 retrieving revision 1.38.2.2 diff -u -d -r1.38.2.1 -r1.38.2.2 --- fink.info.in 2 May 2009 17:40:24 -0000 1.38.2.1 +++ fink.info.in 2 Jul 2010 22:03:18 -0000 1.38.2.2 @@ -17,8 +17,8 @@ Source-MD5: @MD5@ NoSetPATH: true CompileScript: << - make test PREFIX=%p ARCHITECTURE=%m - ./setup.sh %p %m + make test PREFIX=%p ARCHITECTURE=%m distributi...@distribution@ + ./setup.sh %p %m @DISTRIBUTION@ << InstallScript: << ./install.sh %i %m Index: Makefile =================================================================== RCS file: /cvsroot/fink/fink/Makefile,v retrieving revision 1.34 retrieving revision 1.34.2.1 diff -u -d -r1.34 -r1.34.2.1 --- Makefile 21 Mar 2009 14:52:55 -0000 1.34 +++ Makefile 2 Jul 2010 22:03:14 -0000 1.34.2.1 @@ -1,5 +1,6 @@ PREFIX=/sw ARCHITECTURE=i386 +DISTRIBUTION=10.6 VERSION=`cat VERSION` TEST_BASEPATH=$(PWD)/t/basepath TESTS=. @@ -11,6 +12,7 @@ @echo -e "\tbootstrap install a fresh fink installation" @echo -e "\t PREFIX can be set, defaults to /sw" @echo -e " ARCHITECTURE can also be set, defaults to i386" + @echo -e " DISTRIBUTION can also be set, defaults to 10.6" @echo -e "\tinstall install to an existing fink installation" @echo -e "\ttest perform tests on the fink code" @echo -e "\tclean remove all extraneous files" @@ -26,7 +28,7 @@ ./inject.pl $(PREFIX) test_setup: - ./setup.sh $(TEST_BASEPATH) $(ARCHITECTURE) + ./setup.sh $(TEST_BASEPATH) $(ARCHITECTURE) $(DISTRIBUTION) manifest_check: perl -MExtUtils::Manifest=fullcheck -e 'my($$missing, $$extra) = fullcheck;exit (@$$missing || @$$extra)' Index: setup.sh =================================================================== RCS file: /cvsroot/fink/fink/setup.sh,v retrieving revision 1.36.2.3 retrieving revision 1.36.2.4 diff -u -d -r1.36.2.3 -r1.36.2.4 --- setup.sh 7 Jan 2010 02:08:41 -0000 1.36.2.3 +++ setup.sh 2 Jul 2010 22:03:21 -0000 1.36.2.4 @@ -21,14 +21,15 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA. # -if [ $# -ne 2 ]; then +if [ $# -ne 3 ]; then echo "Usage: ./setup.sh <prefix> <architecture>" - echo " Example: ./setup.sh /sw i386" + echo " Example: ./setup.sh /sw i386 10.6" exit 1 fi basepath=$1 architecture=$2 +distribution=$3 version=`cat VERSION` perlexe="/usr/bin/perl" @@ -66,6 +67,16 @@ sed "s|@PREFIX@|$basepath|g" <fink.8.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.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.503.2.31 retrieving revision 1.503.2.32 diff -u -d -r1.503.2.31 -r1.503.2.32 --- ChangeLog 1 Jul 2010 14:27:58 -0000 1.503.2.31 +++ ChangeLog 2 Jul 2010 22:03:14 -0000 1.503.2.32 @@ -1,3 +1,10 @@ +2010-07-02 Dave Morrison <d...@finkproject.org> + + * 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-07-01 Dave Morrison <d...@finkproject.org> * VERSION: Bumped package manager version to 0.29.13, a release ------------------------------------------------------------------------------ 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