Changeset 127794 for trunk/dports/gis


Ignore:
Timestamp:
Nov 4, 2014, 10:05:58 AM (5 years ago)
Author:
vince@…
Message:

port gdal: Correct various bugs. Bump to revision 1.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/gis/gdal/Portfile

    r127771 r127794  
    66name                gdal
    77version             1.11.1
     8revision            1
    89categories          gis
    910license             MIT BSD
     
    105106# local cpl_port.h is masked by ${prefix} one
    106107
    107 # Fix disabled: does not work for case-insensitive filesystems, see #45755
    108 # Issue regarding including the wrong header files version, needs other solution
    109 #
    110 #post-extract {
    111 #    file copy ${worksrcpath}/port/cpl_port.h ${worksrcpath}/port/Cpl_port.h
    112 #    set files_to_patch [exec find ${worksrcpath} -type f -exec grep -l "cpl_port.h" \{\} \;]
    113 #    foreach file ${files_to_patch} {
    114 #        puts ${file}
    115 #        reinplace -locale C "s|cpl_port.h|Cpl_port.h|" ${file}
    116 #    }
    117 #}
    118 
    119 #post-build {
    120 #    file delete ${worksrcpath}/port/Cpl_port.h
    121 #}
     108post-extract {
     109    file copy -force ${worksrcpath}/port/cpl_port.h ${worksrcpath}/port/lcpl_port.h
     110    set files_to_patch [exec find ${worksrcpath} -type f -exec grep -l "cpl_port.h" \{\} \;]
     111    foreach file ${files_to_patch} {
     112        reinplace -locale C "s|cpl_port.h|lcpl_port.h|" ${file}
     113    }
     114}
     115
     116# Undo after build (otherwise the headers files installed are corrupt)
     117
     118post-build {
     119    file delete ${worksrcpath}/port/lcpl_port.h
     120    set files_to_patch [exec find ${worksrcpath} -name "*.h" -exec grep -l "lcpl_port.h" \{\} \;]
     121    foreach file ${files_to_patch} {
     122        reinplace -locale C "s|lcpl_port.h|cpl_port.h|" ${file}
     123    }
     124}
    122125
    123126# Patches for universal build
     
    345348   
    346349    reinplace -E "s|(GEOS_CFLAGS.*=).*|\\1|" ${worksrcpath}/GDALmake.opt
    347     reinplace -E "s|^CPPFLAGS.*|CPPFLAGS = -I\$(GDAL_ROOT)/port -I/opt/local -I/opt/local/include|" ${worksrcpath}/GDALmake.opt
     350    reinplace -E "s|^CPPFLAGS.*|CPPFLAGS = -I\$(GDAL_ROOT)/port -I${prefix} -I${prefix}/include|" ${worksrcpath}/GDALmake.opt
    348351}
    349352
Note: See TracChangeset for help on using the changeset viewer.