[prev in list] [next in list] [prev in thread] [next in thread]
List: fink-commits
Subject: [cvs] dists/10.4/stable/main/finkinfo/sci grass64.info, 1.1, 1.2 grass64.patch, 1.1, 1.2
From: Daniel Macks <dmacks () users ! sourceforge ! net>
Date: 2012-05-31 19:13:32
Message-ID: E1SaAoS-0003C1-CD () sfs-ml-3 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv13711
Modified Files:
grass64.info grass64.patch
Log Message:
fix breakage caused by new version of make; also clean up some deps and fix .pyc \
paths
Index: grass64.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/grass64.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- grass64.info 22 Feb 2012 20:18:18 -0000 1.1
+++ grass64.info 31 May 2012 19:13:30 -0000 1.2
@@ -3,7 +3,7 @@
Type: gui (-mac -x11)
Distribution: (%type_raw[gui] = -x11) 10.4, (%type_raw[gui] = -x11) 10.5, \
(%type_raw[gui] = -x11) 10.6, (%type_raw[gui] = -mac) 10.6 Version: 6.4.1
-Revision: 3
+Revision: 4
Conflicts: grass64, grass64-mac, grass64-x11
Replaces: grass64, grass64-mac, grass64-x11
@@ -27,32 +27,45 @@
Just type double click GRASS-6.4.app in %p/Applications.
<<
+DescPackaging: <<
+ dmacks added fix for building with make-3.82. See:
+ http://lists.osgeo.org/pipermail/grass-dev/2012-May/058634.html
+<<
+
# Dependencies.
Depends: <<
%n-shlibs (=%v-%r)
<<
BuildDepends: <<
fink (>= 0.28),
+ freetype219,
libncurses5-dev,
libiconv-dev, readline5, libgettext8-dev, gettext-tools,
fftw3,
gdal-dev,
- libjpeg, libpng14, libtiff,
+ libjpeg8, libpng14, libtiff,
unixodbc2 | unixodbc2-nox,
szip, xerces-c31-dev, libogdi3,
postgresql90-dev,
python27,
- sqlite3-dev
+ sqlite3-dev,
+ (%type_pkg[gui] = -x11) tcltk-dev
<<
# hdf5-18-bin | hdf5-bin,
# (%type_raw[gui] = -mac) wxmac28
+# avoid seeing older pg*-dev exposed in %p (newer desired ones buried
+# in %p/opt/)
+BuildConflicts: <<
+ postgresql80-dev, postgresql80-ssl-dev, postgresql81-dev, postgresql82-dev, \
postgresql83-dev +<<
+
Source: http://grass.osgeo.org/grass64/source/grass-%v.tar.gz
Source-MD5: d8ca83d416b5b0cf2aa9d36c81a77b23
# Patch Phase.
PatchFile: grass64.patch
-PatchFile-MD5: e3bf9a0a35baea73d3eca03af93321b7
+PatchFile-MD5: b0f289618650359eaca1fa33577b3e05
PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
# Compile Phase.
@@ -86,12 +99,14 @@
if [ "%type_raw[gui]" == "-mac" ]; then
perl -pi -e "s|MACORX11|/usr|g" \
%b/Applications/GRASS-6.4.app/Contents/MacOS/grass.sh
- # Recompile python scripts to fix path
- %p/bin/python2.7 %p/lib/python2.7/compileall.py -f -d \
%p/Applications/GRASS-6.4.app/Contents/MacOS/etc/wxpython \
%b/Applications/GRASS-6.4.app/Contents/MacOS/etc/wxpython/
- %p/bin/python2.7 -O %p/lib/python2.7/compileall.py -f -d \
%p/Applications/GRASS-6.4.app/Contents/MacOS/etc/wxpython \
%b//Applications/GRASS-6.4.app/Contents/MacOS/etc/wxpython/ else
perl -pi -e "s|MACORX11|%p|g" \
%b/Applications/GRASS-6.4.app/Contents/MacOS/grass.sh fi
+
+ # Recompile python scripts to fix path (because 'make install' is
+ # called with path to staging directory that masks runtime location)
+ %p/bin/python2.7 %p/lib/python2.7/compileall.py -f -d \
%p/Applications/GRASS-6.4.app/Contents/MacOS/etc/wxpython \
%b/Applications/GRASS-6.4.app/Contents/MacOS/etc/wxpython/ + %p/bin/python2.7 -O \
%p/lib/python2.7/compileall.py -f -d \
%p/Applications/GRASS-6.4.app/Contents/MacOS/etc/wxpython \
%b/Applications/GRASS-6.4.app/Contents/MacOS/etc/wxpython/ <<
@@ -135,15 +150,18 @@
Conflicts: grass64-shlibs, grass64-mac-shlibs, grass64-x11-shlibs
Replaces: grass64-shlibs, grass64-mac-shlibs, grass64-x11-shlibs
Depends: <<
+ freetype219-shlibs,
libncurses5-shlibs,
+ libiconv,
fftw3-shlibs,
gdal-shlibs,
- libgettext8-shlibs, libjpeg-shlibs, libpng14-shlibs, libtiff-shlibs,
+ libgettext8-shlibs, libjpeg8-shlibs, libpng14-shlibs, libtiff-shlibs,
xerces-c31-shlibs,
xerces-c31-shlibs,libjpeg8-shlibs, libpng14-shlibs, \
libtiff-shlibs,GRASS-6.4.app/Contents/MacOS/etc/wxpython \
%b/Applications/GRASS-6.4.app/Contents/MacOS/etc/wxpython//++ +x \
+3(: +~3(|3(+6 ! !3(3(x4
+3("++3(+ψ3(/|
++ |
+$|
+)|
++x4
+3(}3(+!!3(3( +3("++3(+ψ3(3( \
3( +p3(++3(~3(+GHIJKMNOP3(3(H +3("++3(0/|
++@
+ + |
+$|
+)|
++H +3(3(+8 +3(3(+( +3(03(+ +3(`3(+ .|
++)|
+z3(8 ++$|
+3(y8 ++ |
+03(Z8 ++ +@
+ + |
+D
+$|
+)|
++ + w +3(p{ +3(3(+5678:<=>?@BD3(3(t +3(+ +`3(w ++ +_@f S \
Ql C +3(t +3(3(+u] 4Q \
U^Qʉu*ēvR} +@3(FP +FP
+?z +3(3( 3(ψ3(3(3(3(BP
+P3(D
+ I
++BP
+3( postgresql90-shlibs,
python27-shlibs,
sqlite3-shlibs,
- unixodbc2-shlibs | unixodbc2-nox-shlibs
+ unixodbc2-shlibs | unixodbc2-nox-shlibs,
+ (%type_pkg[gui] = -x11) tcltk-shlibs
<<
# (%type_raw[gui] = -mac) wxmac28-shlibs
Index: grass64.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/grass64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- grass64.patch 22 Feb 2012 20:18:18 -0000 1.1
+++ grass64.patch 31 May 2012 19:13:30 -0000 1.2
@@ -344,9 +344,20 @@
mkdir -p $(ARCH_DISTDIR)/modbuild/module
mkdir -p $(ARCH_DISTDIR)/modbuild/include/Make
-cp $(MODULE_TOPDIR)/include/Make/Dir.make $(ARCH_DISTDIR)/modbuild/include/Make/
-@@ -44,7 +44,7 @@
- @#GISBASE = $(INST_DIR_MACOSX)\
- @#endif#g'
+@@ -38,13 +38,13 @@
+ $(MODULE_TOPDIR)/include/Make/Grass.make.in > \
$(ARCH_DISTDIR)/modbuild/include/Make/Grass.make + @# until I figure out how to get \
sed to replace with multiple lines in a + @# makefile, GRASS_APP required for \
modbuild, ie no default to /Applications +- @#-e 's#^GISBASE.*#ifdef GRASS_APP\
+- @#GISBASE = $$(GRASS_APP)/Contents/MacOS\
+- @#else\
+- @#GISBASE = $(INST_DIR_MACOSX)\
+- @#endif#g'
++# -e 's#^GISBASE.*#ifdef GRASS_APP\
++# GISBASE = $$(GRASS_APP)/Contents/MacOS\
++# else\
++# GISBASE = $(INST_DIR_MACOSX)\
++# endif#g'
@# html.make needs a little change
- sed -e 's,GISRC=$$(RUN_GISBASE),GISRC=/Library/GRASS/$(GRASS_VERSION_MAJOR).$(GRASS_VERSION_MINOR)/modbuild/dist.$$(ARCH),g' \
$(MODULE_TOPDIR)/include/Make/Html.make > \
$(ARCH_DISTDIR)/modbuild/include/Make/Html.make + sed -e \
's,GISRC=$$(RUN_GISBASE),GISRC=@PREFIX@/lib/GRASS/$(GRASS_VERSION_MAJOR).$(GRASS_VERSION_MINOR)/modbuild/dist.$$(ARCH),g' \
$(MODULE_TOPDIR)/include/Make/Html.make > \
$(ARCH_DISTDIR)/modbuild/include/Make/Html.make
------------------------------------------------------------------------------
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
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic