Ticket #24904: variants.diff

devel/ice-python/Portfile

@@ -113 +113 @@
                 file copy ${worksrcpath}/${f} ${docdir}
         }
         file copy ${build.dir}/INSTALL ${docdir}
+}
 
-        if {[variant_isset demo_source_code]} {
+variant demo_source_code description {Install demonstration Python code} {
+        post-destroot {
                 file copy ${build.dir}/demo ${docdir}
         }
 }
-
-variant demo_source_code description {Install demonstration Python code} {
-}

devel/ice-cpp/Portfile

@@ -137 +137 @@
         foreach f {CHANGES RELEASE_NOTES} {
                 file copy ${worksrcpath}/${f} ${docdir}
         }
+}
 
-        if {[variant_isset demo_source_code]} {
+variant demo_source_code description {Install demonstration C++ code} {
+        post-destroot {
                 system "cd ${build.dir}/demo && make clean"
-                file copy ${build.dir}/demo $docdir
+                file copy ${build.dir}/demo ${docdir}
         }
 }
-
-variant demo_source_code description {Install demonstration C++ code} {
-}

devel/ice-java/Portfile

@@ -84 +84 @@
                 file copy ${worksrcpath}/${f} ${docdir}
         }
         file copy ${build.dir}/INSTALL ${docdir}
-
-        if {[variant_isset demo_source_code]} {
-                file copy ${build.dir}/demo ${docdir}/
-        }
 }
 
 variant demo_source_code description {Install demonstration Java code} {
+        post-destroot {
+                file copy ${build.dir}/demo ${docdir}
+        }
 }

devel/ice-python25/Portfile

@@ -113 +113 @@
                 file copy ${worksrcpath}/${f} ${docdir}
         }
         file copy ${build.dir}/INSTALL ${docdir}
+}
 
-        if {[variant_isset demo_source_code]} {
+variant demo_source_code description {Install demonstration Python code} {
+        post-destroot {
                 file copy ${build.dir}/demo ${docdir}
         }
 }
-
-variant demo_source_code description {Install demonstration Python code} {
-}

devel/ice-python26/Portfile

@@ -117 +117 @@
                 file copy ${worksrcpath}/${f} ${docdir}
         }
         file copy ${build.dir}/INSTALL ${docdir}
+}
 
-        if {[variant_isset demo_source_code]} {
+variant demo_source_code description {Install demonstration Python code} {
+        post-destroot {
                 file copy ${build.dir}/demo ${docdir}
         }
 }
-
-variant demo_source_code description {Install demonstration Python code} {
-}