Ticket #15925: Portfile.diff

1c1
< # $Id: Portfile,v 1.1 2008/05/20 04:13:07 davidh Exp $
---
> # $Id: Portfile,v 1.7 2008/07/03 22:01:14 davidh Exp $
31c31
< depends_lib                   lib:libpng:libpng lib:libz:zlib bin:g77-dp-3.4:gcc34
---
> depends_lib                   lib:libpng:libpng lib:libz:zlib
34c34
<                                       patch-pgdispd_proccom.c
---
>                                       patch-pgdispd_proccom.c patch-sys_darwin_aaaread.me
74,76c74,78
< platform darwin {
<       global ppMakeMakeTarget ppCompilerSpec
<       set ppMakeMakeTarget    darwin
---
> set ppMakeMakeTarget  darwin
> set ppCompilerSpec            nocompiler      
> 
> variant g77 description {compiles with g77 compiler} conflicts  gcc42   {
>       depends_lib-append          bin:g77-dp-3.4:gcc34
78,85c80
<       patchfiles-append               patch-sys_darwin_aaaread.me \
<                                                       patch-sys_darwin_g77_gcc.conf
<       post-patch {
<               reinplace "s|@@PREFIX@@|${prefix}|g" \
<                       ${worksrcpath}/../sys_darwin/${ppCompilerSpec}.conf
<               reinplace "s|@@X11PREFIX@@|${x11prefix}|g" \
<                       ${worksrcpath}/../sys_darwin/${ppCompilerSpec}.conf
<       }
---
>       patchfiles-append               patch-sys_darwin_g77_gcc.conf
88,89c83
< platform darwin i386 {
<       depends_lib-delete      bin:g77-dp-3.4:gcc34
---
> variant gcc42 description {compiles with gcc42 compiler}  conflicts  g77  {
91d84
< 
93,94d85
< 
<       patchfiles-delete       patch-sys_darwin_g77_gcc.conf
98c89,94
< default_variants +x11 +aqt
---
> post-patch {
>               reinplace "s|@@PREFIX@@|${prefix}|g" \
>                       ${worksrcpath}/../sys_darwin/${ppCompilerSpec}.conf
>               reinplace "s|@@X11PREFIX@@|${x11prefix}|g" \
>                       ${worksrcpath}/../sys_darwin/${ppCompilerSpec}.conf
> }
135a132,133
> 
> default_variants +x11 +aqt +gcc42