Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci In directory vz-cvs-3.sog:/tmp/cvs-serv28116
Modified Files: cernlib2006.info Removed Files: cernlib2006.patch Log Message: First version which also works on 64-bit! Move huge patch to a separate 'source'. --- cernlib2006.patch DELETED --- Index: cernlib2006.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/cernlib2006.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- cernlib2006.info 23 Jun 2011 13:54:33 -0000 1.3 +++ cernlib2006.info 27 Jul 2011 11:28:58 -0000 1.4 @@ -1,9 +1,8 @@ Info3: << Package: cernlib2006 Version: 2006b -Revision: 10 +Revision: 11 Description: Paw and other basic executables -Architecture: i386 Distribution: 10.6 Depends: x11 BuildDepends: << @@ -37,20 +36,25 @@ Source: mirror:custom:%v_source/tar/2006_src.tar.gz SourceRename: cernlib-%v.tar.gz Source-MD5: 750c4804a2366ccd8e80c45a055f8ac5 +Source2: http://cern.ch/~mommsen/fink/%f.patch.gz +Source2-MD5: 553647eb8d47c7ccf00a0fdd53e60117 SourceDirectory: 2006/src -PatchFile: %n.patch -PatchFile-MD5: 2c886f7b9f6d2cd49fbf2945faaa3d53 PatchScript: << - /usr/bin/sed "s|@PREFIX@|%p|g" < %{PatchFile} | patch -p1 - /usr/bin/sed -i".bak" "s| mgr||g" Imakefile - /usr/bin/sed -i".bak" "s|gmake|make|g" config/site.def - # Upstream hardcodes /sw, replace that by the active prefix. - /usr/bin/sed -i".bak" "s|/sw|%p|g" config/MacOSX.cf + #!/bin/sh -ev + case "%m" in + "i386") ARCH="I386" ;; + "x86_64") ARCH="QMLXIA64" ;; + esac + gunzip -c ../../%f.patch.gz | \ + /usr/bin/sed -e "{ + s|@PREFIX@|%p|g ; + s|@ARCH@|${ARCH}|g + }" | patch -p1 << CompileScript: << #!/bin/sh -ev - mkdir lib - mkdir bin + ln -s cernlib/%v/lib . + ln -s cernlib/%v/bin . export CERN=%b/cernlib export CERN_LEVEL=%v export CERN_ROOT=${CERN}/${CERN_LEVEL} @@ -115,14 +119,15 @@ ( make test 2>&1 | /usr/bin/tee -a %b/test.log ) || exit 2 cd ../geant321 ( make test 2>&1 | /usr/bin/tee -a %b/test.log ) || exit 2 + cd ../graflib/higz/examples + ( make higzex 2>&1 | /usr/bin/tee -a %b/test.log ) || exit 2 #The following tests need user interaction (and a runnng X11) - #cd ../graflib/higz; make examples/Makefile - #cd examples; make higzex #./higzex - #cd ../../../pawlib/paw/demo + cd ../../../pawlib/paw/demo ; rm -f higz_windows.dat #paw all.kumac if [ `grep -c "make: \*\*\*" %b/test.log` -ne 0 ] ; then exit 2 ; fi if [ `grep -c "\*\*\* failed" %b/test.log` -ne 0 ] ; then exit 2 ; fi + if [ `grep "Test result = " %b/test.log | grep -cv 0` -ne 0 ] ; then exit 2 ; fi << << SplitOff: << @@ -322,9 +327,9 @@ echo echo "**********************************************" echo "* WARNING *" - echo "* The test cases for cojets and isajet fail. *" - echo "* Please take care when you use them. *" - echo "* They might produce wrong results! *" + echo "* The test case for cojets fails. *" + echo "* Please take care when you use it. *" + echo "* It might produce wrong results! *" echo "**********************************************" echo << @@ -386,7 +391,11 @@ (http://www-jlc.kek.jp/~fujiik/macosx/10.4.X/HEPonX/memo/CERNLIBonX.html). Some of the patches needed for gfortran and 64bit were obtained from Harald Vogt (http://www-zeuthen.desy.de/linear_collider/cernlib/new/cernlib_2005.html). -This port is not officially supported by CERN. +Additional patches were taken from the Fedora project +(http://fedoraproject.org/wiki/EPEL). Thanks to Chris Walter for pointing out +this additional resource. The final touches for 64-bit compliance on Mac OS X +were done by myself. +This port is not officially supported by CERN. Use it at your own risk. << DescPackaging: << The CERNLIB is by default installed in a completely separate directory ------------------------------------------------------------------------------ Got Input? Slashdot Needs You. Take our quick survey online. Come on, we don't ask for help often. Plus, you'll get a chance to win $100 to spend on ThinkGeek. http://p.sf.net/sfu/slashdot-survey _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs