[64413] trunk/dports/java/derby

[blair at macports.org]

Revision: 64413
          http://trac.macports.org/changeset/64413
Author:   blair at macports.org
Date:     2010-03-04 16:22:01 -0800 (Thu, 04 Mar 2010)
Log Message:
-----------
Fix #22753 by installing the entire Derby install into
${prefix}/share/derby and then setting up symlinks.  The binaries
installed into ${prefix}/bin are wrapper shell scripts that just set
the DERBY_HOME environmental variable.

The 'doc' variant is removed because the entire Derby install is
dropped into ${prefix}/share/derby so symlinks to it are created.

Modified Paths:
--------------
    trunk/dports/java/derby/Portfile

Added Paths:
-----------
    trunk/dports/java/derby/files/
    trunk/dports/java/derby/files/dblook
    trunk/dports/java/derby/files/ij
    trunk/dports/java/derby/files/sysinfo

Modified: trunk/dports/java/derby/Portfile
===================================================================
--- trunk/dports/java/derby/Portfile	2010-03-04 22:54:11 UTC (rev 64412)
+++ trunk/dports/java/derby/Portfile	2010-03-05 00:22:01 UTC (rev 64413)
@@ -4,6 +4,7 @@
 
 name                    derby
 version                 10.5.3.0
+revision                1
 
 categories              java
 maintainers             blair
@@ -38,28 +39,27 @@
 build.cmd               true
 
 destroot {
+        set sharedir ${destroot}${prefix}/share
+        set man1dir ${sharedir}/man/man1
+        set derbydir ${sharedir}/derby
+        set docderbydir ${sharedir}/doc/derby
+
         # Ensure needed directories
-        xinstall -m 755 -d ${destroot}${prefix}/share \
-                ${destroot}${prefix}/share/doc/${name}
+        xinstall -d -m 755 ${sharedir}/java ${docderbydir}
 
-        foreach f { dblook derby_common.sh ij sysinfo } {
-                file copy ${worksrcpath}/bin/$f ${destroot}${prefix}/bin
+        file copy ${worksrcpath} ${derbydir}
+
+        foreach f { dblook ij sysinfo } {
+                xinstall -m 755 ${filesdir}/${f} ${destroot}${prefix}/bin/${f}
+                reinplace "s|@PREFIX@|${prefix}|" ${destroot}${prefix}/bin/${f}
         }
 
-        foreach f { KEYS LICENSE NOTICE RELEASE-NOTES.html } {
-                file copy ${worksrcpath}/$f \
-                        ${destroot}${prefix}/share/doc/${name}
+        foreach f { KEYS LICENSE NOTICE RELEASE-NOTES.html docs index.html javadoc } {
+                ln -s ../../derby/${f} ${docderbydir}/${f}
         }
 
-        file copy ${worksrcpath}/lib ${destroot}${prefix}/share/java
-}
-
-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}
-                }
+        foreach f [ glob -tails -directory ${derbydir}/lib *.\[jw\]ar ] {
+                ln -s ../derby/lib/${f} ${sharedir}/java/${f}
         }
 }
 

Added: trunk/dports/java/derby/files/dblook
===================================================================
--- trunk/dports/java/derby/files/dblook	                        (rev 0)
+++ trunk/dports/java/derby/files/dblook	2010-03-05 00:22:01 UTC (rev 64413)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+export DERBY_HOME=@PREFIX@/share/derby
+
+exec $DERBY_HOME/bin/dblook ${1+"$@"}


Property changes on: trunk/dports/java/derby/files/dblook
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:eol-style
   + native

Added: trunk/dports/java/derby/files/ij
===================================================================
--- trunk/dports/java/derby/files/ij	                        (rev 0)
+++ trunk/dports/java/derby/files/ij	2010-03-05 00:22:01 UTC (rev 64413)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+export DERBY_HOME=@PREFIX@/share/derby
+
+exec $DERBY_HOME/bin/ij ${1+"$@"}


Property changes on: trunk/dports/java/derby/files/ij
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:eol-style
   + native

Added: trunk/dports/java/derby/files/sysinfo
===================================================================
--- trunk/dports/java/derby/files/sysinfo	                        (rev 0)
+++ trunk/dports/java/derby/files/sysinfo	2010-03-05 00:22:01 UTC (rev 64413)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+export DERBY_HOME=@PREFIX@/share/derby
+
+exec $DERBY_HOME/bin/sysinfo ${1+"$@"}


Property changes on: trunk/dports/java/derby/files/sysinfo
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:eol-style
   + native
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100304/dbf04658/attachment.html>