Ticket #34838: Portfile.rej

File Portfile.rej, 3.8 KB (added by andi.dhroso@…, 12 years ago)

file produced during patch

Line 
1***************
2*** 1,10 ****
3  # $Id$
4 
5  PortSystem 1.0
6 
7  name             vxl
8  version          1.14.0
9- revision         1
10  set branch       [join [lrange [split ${version} .] 0 1] .]
11  categories       devel
12  maintainers      maeth.com:wiking
13--- 1,11 ----
14  # $Id$
15 
16  PortSystem 1.0
17+ PortGroup  cmake 1.0
18 
19  name             vxl
20  version          1.14.0
21+ revision         2
22  set branch       [join [lrange [split ${version} .] 0 1] .]
23  categories       devel
24  maintainers      maeth.com:wiking
25***************
26*** 27,34 ****
27  # error: integer constant is too large for 'long' type
28  universal_variant no
29 
30- patchfiles       patch-v3p__mpeg2__libmpeg2__idct_altivec.c \
31-                  patch-v3p__mpeg2__libmpeg2__motion_comp_altivec.c
32  post-patch {
33        file delete ${worksrcpath}/contrib/mul/vil3d/Templates/vil3d_tricub_interp+uint-.cxx
34  }
35--- 28,48 ----
36  # error: integer constant is too large for 'long' type
37  universal_variant no
38 
39+ patchfiles      patch-contrib__gel__mrc__vpgl__txx-clang-compatibility.diff \
40+                 patch-contrib__prip__vmap__vmap_2_map.txx.diff \
41+                 patch-contrib__prip__vmap__vmap_ptr_sequences.h-clang-compatibility.diff \
42+                 patch-contrib__prip__vpyr__vpyr_2_pyramid_level_elts.h-clang-compatibility.diff \
43+                 patch-contrib__prip__vpyr__vpyr_2_tpyramid_level_elts.h-clang-compatibility.diff \
44+                 patch-contrib__rpl__rgrl__rgrl_est_proj_rad_func.txx-clang-compatibility.diff \
45+                 patch-contrib__tbl__vipl__filter__vipl_filter_2d.txx-clang-compatibility.diff \
46+                 patch-contrib__tbl__vipl__txx-clang-compatibility.diff \
47+                 patch-core__examples__vnl_calc__vnl_calc.cxx-clang-compatibility.diff \
48+                 patch-core__vil__tests__test_image_resource.cxx-clang-compatibility.diff \
49+                 patch-core__vil__tests__test_image_view.cxx-clang-compatibility.diff \
50+                 patch-core__vnl__vnl_matrix_fixed_ref.h-clang-compatibility.diff \
51+                 patch-v3p__mpeg2__libmpeg2__idct_altivec.c \
52+                 patch-v3p__mpeg2__libmpeg2__motion_comp_altivec.c
53+
54  post-patch {
55        file delete ${worksrcpath}/contrib/mul/vil3d/Templates/vil3d_tricub_interp+uint-.cxx
56  }
57***************
58*** 39,58 ****
59                   port:libgeotiff \
60                   port:libpng
61 
62- configure.cmd      ${prefix}/bin/cmake
63- configure.pre_args -DCMAKE_INSTALL_PREFIX=${prefix}
64- configure.args     -DBUILD_SHARED_LIBS=YES \
65                     -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib/${name} \
66-                    -DBUILD_BRL=NO \
67-                    ${worksrcpath}
68-
69- use_parallel_build no
70 
71  # shuffle directories around to turn ${prefix}/lib into ${prefix}/lib/${name}
72  post-destroot {
73        file rename ${destroot}${prefix}/lib ${destroot}${prefix}/tmp
74        file mkdir ${destroot}${prefix}/lib
75        file rename ${destroot}${prefix}/tmp ${destroot}${prefix}/lib/${name}
76  }
77 
78  livecheck.regex     /${name}-(\[0-9.\]+)${extract.suffix}
79--- 53,73 ----
80                   port:libgeotiff \
81                   port:libpng
82 
83+ if {${configure.compiler} == "clang"} {
84+       configure.cxxflags-append -Werror=gnu -Wno-error=vla
85+ }
86+ configure.args-append -DBUILD_SHARED_LIBS=YES \
87                     -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib/${name} \
88+                    -DBUILD_BRL=NO
89 
90  # shuffle directories around to turn ${prefix}/lib into ${prefix}/lib/${name}
91  post-destroot {
92        file rename ${destroot}${prefix}/lib ${destroot}${prefix}/tmp
93        file mkdir ${destroot}${prefix}/lib
94        file rename ${destroot}${prefix}/tmp ${destroot}${prefix}/lib/${name}
95+
96+       # for some reason this file doesn't get installed, making rev-upgrade complain
97+       xinstall -m 755 ${worksrcpath}/lib/libvpgl.dylib ${destroot}${prefix}/lib/${name}
98  }
99 
100  livecheck.regex     /${name}-(\[0-9.\]+)${extract.suffix}