Help save net neutrality! Learn more.
Close

#4371 grass64-mac/-x11-6.4.3-1

Added_to_Fink
closed-accepted
5
2013-11-26
2013-11-23
No

The attached packaging updates the grass64[-x11/-mac] packages to the 6.4.3 release and patches it to build on Mavericks. The original patch is adjusted to apply to 6.4.3. The additional changes for 10.9 include…

1) renaming the is_void call in raster/r.terraflow/[nodata.cc|nodata.h|direction.cc] to grass_is_void as the std namespace in libc++ has a namespace clash over that call.

2) change the inline void chrncpy to a static inline void chrncpy so that symbol is found.

3) perl edit out wxpython from the SUBDIRS in gui/Makefile to prevent a bogus make failure in that unbuilt directory in 6.4.3.


--- /sw/fink/10.7/stable/main/finkinfo/sci/grass64.info 2013-08-01 10:05:22.000000000 -0400
+++ grass64.info 2013-11-22 21:53:35.000000000 -0500
@@ -1,8 +1,8 @@
Info2: <<
Package: grass64%type_pkg[gui]
Type: gui (-mac -x11)
-Version: 6.4.2
-Revision: 5
+Version: 6.4.3
+Revision: 1
Conflicts: grass64, grass64-mac, grass64-x11
Replaces: grass64, grass64-mac, grass64-x11

@@ -55,12 +55,15 @@
# (%type_raw[gui] = -mac) wxmac28

Source: http://grass.osgeo.org/grass64/source/grass-%v.tar.gz
-Source-MD5: d3398d6b1e3a2ef19cfb6e39a5ae9919
+Source-MD5: d82d11b96e1ca1e23078b7657293bf22

# Patch Phase.
PatchFile: grass64.patch
-PatchFile-MD5: ae85a18e92088167b0df657240617946
-PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
+PatchFile-MD5: 43a2451895c8dc51877af4da151ab98c
+PatchScript: <<
+ sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
+ perl -pi -e 's|SUBDIRS = icons images scripts xml tcltk wxpython|SUBDIRS = icons images scripts xml tcltk|g' gui/Makefile
+<<

# Compile Phase.
SetCFLAGS: -I%p/include
@@ -72,7 +75,7 @@

CompileScript: <<
#!/bin/bash -xe
-
+
PGSQLPARAM=" --with-postgres --with-postgres-includes=%p/opt/postgresql-9.0/include --with-postgres-libs=%p/opt/postgresql-9.0/lib "

if [ "%type_raw[gui]" == "-mac" ]; then
@@ -288,4 +291,4 @@
<<

# End of Info2
-<<
\ No newline at end of file
+<<


Tested on 10.9 with 'fink -m' for grass64-x11 and grass-mac.

Discussion

  • Jack Howarth

    Jack Howarth - 2013-11-23

    Info file for grass64[-mac/-x11]-6.4.3-1.

     
  • Jack Howarth

    Jack Howarth - 2013-11-23

    Patch file for grass64[-mac/-x11]-6.4.3-1.

     
  • Hanspeter Niederstrasser

    • labels: --> Updated Version of Existing
    • status: open --> closed-accepted
    • Group: Undergoing_Validation --> Added_to_Fink
     
  • Hanspeter Niederstrasser

    Please remember to close tracker items when you have comitted the changes to CVS.

     
    • BABA Yoshihiko

      BABA Yoshihiko - 2013-11-29

      Oops!

       

Log in to post a comment.