Ticket #34838: Portfile.2.rej

***************
*** 1,10 ****
  # $Id$
  
  PortSystem 1.0
  
  name             vxl
  version          1.14.0
- revision         1
  set branch       [join [lrange [split ${version} .] 0 1] .]
  categories       devel
  maintainers      maeth.com:wiking
--- 1,11 ----
  # $Id$
  
  PortSystem 1.0
+ PortGroup  cmake 1.0
  
  name             vxl
  version          1.14.0
+ revision         2
  set branch       [join [lrange [split ${version} .] 0 1] .]
  categories       devel
  maintainers      maeth.com:wiking
***************
*** 27,34 ****
  # error: integer constant is too large for 'long' type
  universal_variant no
  
- patchfiles       patch-v3p__mpeg2__libmpeg2__idct_altivec.c \
-                  patch-v3p__mpeg2__libmpeg2__motion_comp_altivec.c
  post-patch {
        file delete ${worksrcpath}/contrib/mul/vil3d/Templates/vil3d_tricub_interp+uint-.cxx
  }
--- 28,48 ----
  # error: integer constant is too large for 'long' type
  universal_variant no
  
+ patchfiles      patch-contrib__gel__mrc__vpgl__txx-clang-compatibility.diff \
+                 patch-contrib__prip__vmap__vmap_2_map.txx.diff \
+                 patch-contrib__prip__vmap__vmap_ptr_sequences.h-clang-compatibility.diff \
+                 patch-contrib__prip__vpyr__vpyr_2_pyramid_level_elts.h-clang-compatibility.diff \
+                 patch-contrib__prip__vpyr__vpyr_2_tpyramid_level_elts.h-clang-compatibility.diff \
+                 patch-contrib__rpl__rgrl__rgrl_est_proj_rad_func.txx-clang-compatibility.diff \
+                 patch-contrib__tbl__vipl__filter__vipl_filter_2d.txx-clang-compatibility.diff \
+                 patch-contrib__tbl__vipl__txx-clang-compatibility.diff \
+                 patch-core__examples__vnl_calc__vnl_calc.cxx-clang-compatibility.diff \
+                 patch-core__vil__tests__test_image_resource.cxx-clang-compatibility.diff \
+                 patch-core__vil__tests__test_image_view.cxx-clang-compatibility.diff \
+                 patch-core__vnl__vnl_matrix_fixed_ref.h-clang-compatibility.diff \
+                 patch-v3p__mpeg2__libmpeg2__idct_altivec.c \
+                 patch-v3p__mpeg2__libmpeg2__motion_comp_altivec.c
+ 
  post-patch {
        file delete ${worksrcpath}/contrib/mul/vil3d/Templates/vil3d_tricub_interp+uint-.cxx
  }
***************
*** 39,58 ****
                   port:libgeotiff \
                   port:libpng
  
- configure.cmd      ${prefix}/bin/cmake
- configure.pre_args -DCMAKE_INSTALL_PREFIX=${prefix}
- configure.args     -DBUILD_SHARED_LIBS=YES \
                     -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib/${name} \
-                    -DBUILD_BRL=NO \
-                    ${worksrcpath}
- 
- use_parallel_build no
  
  # shuffle directories around to turn ${prefix}/lib into ${prefix}/lib/${name}
  post-destroot {
        file rename ${destroot}${prefix}/lib ${destroot}${prefix}/tmp
        file mkdir ${destroot}${prefix}/lib
        file rename ${destroot}${prefix}/tmp ${destroot}${prefix}/lib/${name}
  }
  
  livecheck.regex     /${name}-(\[0-9.\]+)${extract.suffix}
--- 53,73 ----
                   port:libgeotiff \
                   port:libpng
  
+ if {${configure.compiler} == "clang"} {
+       configure.cxxflags-append -Werror=gnu -Wno-error=vla
+ }
+ configure.args-append -DBUILD_SHARED_LIBS=YES \
                     -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib/${name} \
+                    -DBUILD_BRL=NO
  
  # shuffle directories around to turn ${prefix}/lib into ${prefix}/lib/${name}
  post-destroot {
        file rename ${destroot}${prefix}/lib ${destroot}${prefix}/tmp
        file mkdir ${destroot}${prefix}/lib
        file rename ${destroot}${prefix}/tmp ${destroot}${prefix}/lib/${name}
+ 
+       # for some reason this file doesn't get installed, making rev-upgrade complain
+       xinstall -m 755 ${worksrcpath}/lib/libvpgl.dylib ${destroot}${prefix}/lib/${name}
  }
  
  livecheck.regex     /${name}-(\[0-9.\]+)${extract.suffix}