<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[114769] users/landonf/openjdk7/dports/java/openjdk7/Portfile</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/114769">114769</a></dd>
<dt>Author</dt> <dd>landonf@macports.org</dd>
<dt>Date</dt> <dd>2013-12-14 14:57:20 -0800 (Sat, 14 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Install the JDK as a standard system-accessible JVM</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#userslandonfopenjdk7dportsjavaopenjdk7Portfile">users/landonf/openjdk7/dports/java/openjdk7/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="userslandonfopenjdk7dportsjavaopenjdk7Portfile"></a>
<div class="modfile"><h4>Modified: users/landonf/openjdk7/dports/java/openjdk7/Portfile (114768 => 114769)</h4>
<pre class="diff"><span>
<span class="info">--- users/landonf/openjdk7/dports/java/openjdk7/Portfile        2013-12-14 22:44:52 UTC (rev 114768)
+++ users/landonf/openjdk7/dports/java/openjdk7/Portfile        2013-12-14 22:57:20 UTC (rev 114769)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> set jdk_build_number 43
</span><span class="cx"> set jdk_build_date 26_aug_2013
</span><span class="cx"> version ${jdk_major_version}.${jport_minor_version}.${jport_build_number}
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx">
</span><span class="cx"> categories java
</span><span class="cx"> maintainers landonf openmaintainer
</span><span class="lines">@@ -154,26 +154,33 @@
</span><span class="cx"> JDK_MICRO_VERSION="0_${jport_minor_version}" \
</span><span class="cx"> BUILD_NUMBER="b${jport_build_number}" \
</span><span class="cx"> MILESTONE=fcs \
</span><del>- BUNDLE_NAME="OpenJDK 1.${jdk_major_version}.0_${jport_minor_version} (MacPorts)" \
- BUNDLE_INFO="OpenJDK MacPorts-${version}" \
</del><ins>+ BUNDLE_NAME="OpenJDK ${jdk_major_version} (MacPorts)" \
+ BUNDLE_INFO="OpenJDK MacPorts ${name}-${version}" \
</ins><span class="cx"> BUNDLE_ID="org.macports.openjdk" \
</span><span class="cx"> BUNDLE_VENDOR="MacPorts" \
</span><span class="cx"> HOTSPOT_BUILD_JOBS="${build.jobs}"
</span><span class="cx">
</span><del>-# We violate mtree in one way:
</del><ins>+# We violate mtree in two ways:
</ins><span class="cx"> # - We install in $prefix/<name><major>. This has long been a standard path for installed JVMs
</span><span class="cx"> # and models the approach taken by the FreeBSD Java ports.
</span><ins>+# - We install a link to our JDK bundle in /Library/Java/JavaVirtualMachines. This is the only
+# path in which we can register our VMs with Mac OS X.
</ins><span class="cx"> destroot.violate_mtree yes
</span><span class="cx"> destroot {
</span><span class="cx"> # Copy in the bundle
</span><span class="cx"> set target_bundle_name "macports-jdk1.${jdk_major_version}.0_${jport_minor_version}.jdk"
</span><span class="cx"> set src_bundle_name "jdk1.${jdk_major_version}.0_${jport_minor_version}.jdk"
</span><span class="cx">
</span><del>- set path "${destroot}${prefix}/Library/Java/JavaVirtualMachines/${target_bundle_name}/"
</del><ins>+ set bundle_path "${prefix}/Library/Java/JavaVirtualMachines/${target_bundle_name}"
+ set path "${destroot}${bundle_path}/"
</ins><span class="cx"> xinstall -m 755 -d ${path}
</span><span class="cx"> system "(cd \"${worksrcpath}/build/macosx-${openjdk_build_arch}/j2sdk-bundle/${src_bundle_name}\" && tar cf - *) | (tar -C \"${path}\" -xf -)"
</span><span class="cx">
</span><span class="cx"> # Create a standard path for our Java Home; this is intended to be used by ports (and users)
</span><span class="cx"> # that don't want to reference the version-and-build-specific bundle path.
</span><span class="cx"> ln -sf "Library/Java/JavaVirtualMachines/${target_bundle_name}/Contents/Home" "${destroot}${prefix}/${name}"
</span><ins>+
+ # Add the link to /Library/Java/JavaVirtualMachines
+ xinstall -m 755 -d "${destroot}/Library/Java/JavaVirtualMachines"
+ ln -sf "${bundle_path}" "${destroot}/Library/Java/JavaVirtualMachines/"
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>