Ticket #15925: Portfile.unified.diff

(a) Portfile vs. (b) Portfile_new

@@ -1 @@
-# $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 $
 
 PortSystem                      1.0
 name                            pgplot
@@ -28 +28 @@
 
 checksums                       ${name}5.2.tar.gz md5 e8a6e8d0d5ef9d1709dfb567724525ae
 
-depends_lib                     lib:libpng:libpng lib:libz:zlib bin:g77-dp-3.4:gcc34
+depends_lib                     lib:libpng:libpng lib:libz:zlib
 
 patchfiles                      patch-makemake patch-src_grgfil.f patch-drivers.list \
-                                        patch-pgdispd_proccom.c
+                                        patch-pgdispd_proccom.c patch-sys_darwin_aaaread.me
 
 post-extract {
         file mkdir ${worksrcpath}
@@ -71 +71 @@
                 ${destroot}${prefix}/share/doc/${name}
 }
 
-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
         set ppCompilerSpec              g77_gcc
-        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
 }
 
-platform darwin i386 {
-        depends_lib-delete      bin:g77-dp-3.4:gcc34
+variant gcc42 description {compiles with gcc42 compiler}  conflicts  g77  {
         depends_lib-append      port:gcc42
-
         set ppCompilerSpec      gfortran_gcc_42
-
-        patchfiles-delete       patch-sys_darwin_g77_gcc.conf
         patchfiles-append       patch-sys_darwin_gfortran_gcc_42.conf
 }
 
-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
+}
 
 variant x11 {
         depends_lib-append      lib:libX11:XFree86
@@ -133 +129 @@
                 }
         }
 }
+
+default_variants +x11 +aqt +gcc42