Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8381
Modified Files:
geant4.8.info geant4.9.info geant4.9.patch
Log Message:
Use latest patch release and reformat sed command to make it more readable.
Index: geant4.9.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/geant4.9.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- geant4.9.info 22 Jan 2010 21:18:55 -0000 1.10
+++ geant4.9.info 25 Jan 2010 14:11:56 -0000 1.11
@@ -1,7 +1,7 @@
Info3: <<
Package: geant4.9%type_pkg[cernlib]
Version: 4.9.2
-Revision: 22
+Revision: 23
Type: cernlib (. -cernlib-gfortran -cernlib-g77)
Architecture: ('%type_pkg[cernlib]' = '-cernlib-g77') powerpc,
('%type_pkg[cernlib]' = '-cernlib-gfortran') powerpc, ('%type_pkg[cernlib]' =
'-cernlib-gfortran') i386
Description: Simulation of particle-matter interaction
@@ -69,10 +69,10 @@
Provides: geant4
Suggests: geant4.9-data
GCC: 4.0
-Source: http://geant4.cern.ch/support/source/geant%v.p01.tar.gz
-Source-MD5: e8dc2413bd7b9d01027066d90e6a0ff4
+Source: http://geant4.cern.ch/support/source/geant%v.p02.tar.gz
+Source-MD5: d5935ca6ee0805fccca7c82c3167d65b
PatchFile: geant4.9.patch
-PatchFile-MD5: 5396def29debd6aae7c7a0e5e1bd8db5
+PatchFile-MD5: 4194acca26c7b1cb01d44ba05aa75a26
PatchScript: <<
#!/bin/sh -ev
if [[ '%type_pkg[cernlib]' == -cernlib-g77 ]]; then
@@ -88,12 +88,18 @@
FORTRAN='echo'
FORTRAN_LIBS=''
fi
- sed 's|@PREFIX@|%p|g' < %{PatchFile} | sed 's|@BUILDDIR@|%b|g' | sed
's|@VERSION@|%v|g' | \
- sed "s|@BUILDCERN@|$BUILDCERN|g" | sed "s|@FORTRAN@|$FORTRAN|g" | \
- sed "s|@FORTRAN_LIBS@|$FORTRAN_LIBS|g" | patch -p1
- mv Configure Configure.old
- sed "s|/sw|%p|g" < Configure.old > Configure
- chmod 755 Configure
+ cat %{PatchFile} | \
+ /usr/bin/sed -e '{
+ s|@PREFIX@|%p|g ;
+ s|@BUILDDIR@|%b|g ;
+ s|@VERSION@|%v|g ;
+ s|@BUILDCERN@|$BUILDCERN|g ;
+ s|@FORTRAN@|$FORTRAN|g ;
+ s|@FORTRAN_LIBS@|$FORTRAN_LIBS|g
+ }' | \
+ patch -p1
+ /usr/bin/sed -i".bak" "s|/sw/|%p/|g" Configure
+ /bin/rm -f Configure.bak
<<
CompileScript: <<
#!/bin/sh -ev
Index: geant4.8.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/geant4.8.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- geant4.8.info 22 Jan 2010 21:18:54 -0000 1.13
+++ geant4.8.info 25 Jan 2010 14:11:56 -0000 1.14
@@ -89,12 +89,18 @@
FORTRAN='echo'
FORTRAN_LIBS=''
fi
- sed 's|@PREFIX@|%p|g' < %{PatchFile} | sed 's|@BUILDDIR@|%b|g' | sed
's|@VERSION@|%v|g' | \
- sed "s|@BUILDCERN@|$BUILDCERN|g" | sed "s|@FORTRAN@|$FORTRAN|g" | \
- sed "s|@FORTRAN_LIBS@|$FORTRAN_LIBS|g" | patch -p1
- mv Configure Configure.old
- sed "s|/sw|%p|g" < Configure.old > Configure
- chmod 755 Configure
+ cat %{PatchFile} | \
+ /usr/bin/sed -e '{
+ s|@PREFIX@|%p|g ;
+ s|@BUILDDIR@|%b|g ;
+ s|@VERSION@|%v|g ;
+ s|@BUILDCERN@|$BUILDCERN|g ;
+ s|@FORTRAN@|$FORTRAN|g ;
+ s|@FORTRAN_LIBS@|$FORTRAN_LIBS|g
+ }' | \
+ patch -p1
+ /usr/bin/sed -i".bak" "s|/sw/|%p/|g" Configure
+ /bin/rm -f Configure.bak
<<
CompileScript: <<
#!/bin/sh -ev
Index: geant4.9.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/geant4.9.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- geant4.9.patch 6 Jan 2009 13:00:53 -0000 1.6
+++ geant4.9.patch 25 Jan 2010 14:11:57 -0000 1.7
@@ -69,14 +69,14 @@
+g4wlib_build_g3tog4='@BUILDCERN@'
--- geant4.9.orig/config/sys/Darwin-g++.gmk 2006-12-15 05:16:27.000000000
-0600
+++ geant4.9.new/config/sys/Darwin-g++.gmk 2006-12-22 10:26:22.000000000
-0600
-@@ -29,27 +29,27 @@
+@@ -30,27 +30,27 @@
FCFLAGS += -pg
CCFLAGS += -pg
endif
- FC := gfortran
+ FC := @FORTRAN@
FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
- LDFLAGS += -bind_at_load
+ LDFLAGS += -bind_at_load -arch_multiple
- FCLIBS := -lg2c -lnsl
+ FCLIBS := @FORTRAN_LIBS@
SHEXT := dylib
@@ -103,7 +103,7 @@
# XAWFLAGS := -I/usr/X11R6/include ##### some installations.
endif
ifndef XAWLIBS
-@@ -73,7 +73,7 @@
+@@ -74,7 +74,7 @@
# ---- QT Setup block -------------------------------------------------------
ifndef QTHOME
@@ -112,7 +112,7 @@
endif
ifndef QTMOC
ifeq ($(QTHOME),/Library/Frameworks)
-@@ -128,15 +128,32 @@
+@@ -129,15 +129,32 @@
define build-granular-shared-lib
@libdir=`(cd $(@D);/bin/pwd)`; \
@@ -149,7 +149,7 @@
endif
--- geant4.9.orig/Configure 2006-12-23 11:40:51.000000000 -0600
+++ geant4.9.new/Configure 2006-12-23 11:41:25.000000000 -0600
-@@ -3803,8 +3803,8 @@
+@@ -3887,8 +3887,8 @@
Do you want to build 'static' (.a) libraries too?
EOM`
------------------------------------------------------------------------------
Throughout its 18-year history, RSA Conference consistently attracts the
world's best and brightest in the field, creating opportunities for Conference
attendees to learn about information security's most important issues through
interactions with peers, luminaries and emerging and established companies.
http://p.sf.net/sfu/rsaconf-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
