Ticket #22753: Portfile.diff

Portfile

@@ -4 +4 @@
 
 name                    derby
 version                 10.5.3.0
+revision                1
 
 categories              java
 maintainers             blair
@@ -37 +38 @@
 
 build.cmd               true
 
-destroot {
-        # Ensure needed directories
-        xinstall -m 755 -d ${destroot}${prefix}/share \
-                ${destroot}${prefix}/share/doc/${name}
-
-        foreach f { dblook derby_common.sh ij sysinfo } {
-                file copy ${worksrcpath}/bin/$f ${destroot}${prefix}/bin
-        }
-
-        foreach f { KEYS LICENSE NOTICE RELEASE-NOTES.html } {
-                file copy ${worksrcpath}/$f \
-                        ${destroot}${prefix}/share/doc/${name}
-        }
-
-        file copy ${worksrcpath}/lib ${destroot}${prefix}/share/java
+pre-destroot {
+    foreach f [glob -directory ${worksrcpath}/bin *.bat] {
+        file delete $f
+    }
 }
 
-variant doc description {Install HTML and PDF documentation and javadocs} {
-        post-destroot {
-                foreach f { docs javadoc } {
-                        file copy ${worksrcpath}/$f \
-                                ${destroot}${prefix}/share/doc/${name}
-                }
-        }
+destroot        {
+    xinstall -m 755 -d ${destroot}${prefix}/share/java
+    file copy ${worksrcpath} ${destroot}${prefix}/share/java/${name}
+    # Fix permissions on shell scripts
+    foreach f { NetworkServerControl dblook derby_common.sh ij setEmbeddedCP setNetworkClientCP setNetworkServerCP startNetworkServer stopNetworkServer sysinfo } {
+        system "ln -fs ${prefix}/share/java/${name}/bin/$f ${destroot}${prefix}/bin/$f"
+    }
 }
 
 livecheck.type          regex