Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci In directory vz-cvs-3.sog:/tmp/cvs-serv10162
Modified Files: root5.info root5.patch Log Message: Fix onsolete tail command. Thanks to Hanspeter for this latest buildworld effort. Index: root5.patch =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/root5.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- root5.patch 10 May 2012 15:00:45 -0000 1.5 +++ root5.patch 14 May 2012 10:48:45 -0000 1.6 @@ -37,6 +37,19 @@ $FFTW3 ${FFTW3:+$FFTW3/lib} ${FFTW3:+$FFTW3/.libs} \ ${finkdir:+$finkdir/lib} \ /usr/local/lib /usr/lib /opt/fftw3/lib +Index: root/proof/afdsmgrd/Module.mk +=================================================================== +--- root/proof/afdsmgrd/Module.mk (revision 44212) ++++ root/proof/afdsmgrd/Module.mk (working copy) +@@ -8,7 +8,7 @@ + + AFDSMGRDDIR := $(MODDIR) + AFDSMGRDBIN := bin/afdsmgrd +-AFDSMGRDTAR := $(shell cd $(AFDSMGRDDIR) && ls -1 afdsmgrd-v*.tar.gz | tail -1) ++AFDSMGRDTAR := $(shell cd $(AFDSMGRDDIR) && ls -1 afdsmgrd-v*.tar.gz | tail -n 1) + + # This one triggers the build from ROOT + ALLEXECS += $(AFDSMGRDBIN) Index: root/cint/configure =================================================================== --- root/cint/configure (revision 44212) @@ -54,6 +67,15 @@ =================================================================== --- root/cint/ROOT/cintdlls.mk (revision 44212) +++ root/cint/ROOT/cintdlls.mk (working copy) +@@ -146,7 +146,7 @@ + else + # On macosx one should change the install_name as well. + # FIXME: not tested on 10.4, should be the same also there? +- CINTDLLSOEXTCMD += ;install_name_tool -id `otool -D $@ | tail -1 | sed -e's|:$$||;s|[.]so$$|.dll|'` $@ ++ CINTDLLSOEXTCMD += ;install_name_tool -id `otool -D $@ | tail -n 1 | sed -e's|:$$||;s|[.]so$$|.dll|'` $@ + CINTDLLSOEXTCMD += ;rm -f $(@:.dll=.so) + endif + endif # macosx @@ -163,21 +163,21 @@ $(ALLCINTDLLS): $(ORDER_) $(MAINLIBS) Index: root5.info =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/root5.info,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- root5.info 10 May 2012 15:00:45 -0000 1.9 +++ root5.info 14 May 2012 10:48:45 -0000 1.10 @@ -56,7 +56,7 @@ Source-MD5: 513bf03f76ea765a768f0f9f4540fba1 SourceDirectory: root PatchFile: %{ni}.patch -PatchFile-MD5: 749338138e24507bba89d7f820c54740 +PatchFile-MD5: 0d5a706be6c4165f5f1c81ae97f1e009 PatchScript: << patch -p1 < %{PatchFile} /usr/bin/sed -i '.bak' -e 's:python :%p/bin/python2.7 :' bindings/pyroot/Module.mk cint/cintex/Module.mk ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs