<!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>[114730] users/landonf/openjdk7/dports/java/openjdk6/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/114730">114730</a></dd>
<dt>Author</dt> <dd>landonf@macports.org</dd>
<dt>Date</dt> <dd>2013-12-14 06:32:03 -0800 (Sat, 14 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update to fetch the latest openjdk7 sources.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#userslandonfopenjdk7dportsjavaopenjdk6Portfile">users/landonf/openjdk7/dports/java/openjdk6/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="userslandonfopenjdk7dportsjavaopenjdk6Portfile"></a>
<div class="modfile"><h4>Modified: users/landonf/openjdk7/dports/java/openjdk6/Portfile (114729 => 114730)</h4>
<pre class="diff"><span>
<span class="info">--- users/landonf/openjdk7/dports/java/openjdk6/Portfile        2013-12-14 14:31:46 UTC (rev 114729)
+++ users/landonf/openjdk7/dports/java/openjdk6/Portfile        2013-12-14 14:32:03 UTC (rev 114730)
</span><span class="lines">@@ -2,17 +2,22 @@
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><del>-name openjdk6
-version b20
-revision 1
-set builddate 21_jun_2010
</del><ins>+name openjdk7
</ins><span class="cx">
</span><ins>+set jport_minor_version 45
+set jport_build_number 18
+set jdk_major_version 7
+set jdk_minor_version 40
+set jdk_build_number 43
+set jdk_build_date 26_aug_2013
+version ${jdk_major_version}.${jport_minor_version}.${jport_build_number}
+
</ins><span class="cx"> categories java
</span><span class="cx"> maintainers landonf openmaintainer
</span><span class="cx"> platforms darwin
</span><span class="cx">
</span><span class="cx"> homepage http://openjdk.java.net/
</span><del>-description Oracle's Java 6 virtual machine release under the GPL v2
</del><ins>+description An open-source implementation of the Java Platform, Standard Edition.
</ins><span class="cx"> long_description \
</span><span class="cx"> OpenJDK is an open-source implementation of the Java Platform, Standard Edition. \
</span><span class="cx"> \
</span><span class="lines">@@ -20,71 +25,31 @@
</span><span class="cx"> Classpath exception. The Java Hotspot virtual machine source code is \
</span><span class="cx"> licensed under the GPL version 2 only.
</span><span class="cx">
</span><del>-distname openjdk-6-src-${version}-${builddate}
</del><ins>+# Use our own version of ant to avoid circular dependencies
+set ant_version 1.8.4
+set ant_distfile apache-ant-${ant_version}-bin
</ins><span class="cx">
</span><del>-set jaxp_build b20
-set jaxp_file jdk6-jaxp-${jaxp_build}.zip
-set jaxws_build b20
-set jaxws_file jdk6-jaxws-${jaxws_build}.zip
-set jaf_build b20
-set jaf_file jdk6-jaf-${jaf_build}.zip
-
</del><ins>+use_zip yes
+distname openjdk-${jdk_major_version}u${jdk_minor_version}-fcs-src-b${jdk_build_number}-${jdk_build_date}
</ins><span class="cx"> distfiles ${distname}${extract.suffix} \
</span><del>- ${jaxp_file}:jaxp \
- ${jaxws_file}:jaxws \
- ${jaf_file}:jaf
-extract.only ${distname}${extract.suffix}
</del><ins>+ ${ant_distfile}${extract.suffix}:ant
</ins><span class="cx">
</span><del>-master_sites http://download.java.net/openjdk/jdk6/promoted/${version}/ \
- https://jaxp.dev.java.net/files/documents/913/150648/:jaxp \
- https://jax-ws.dev.java.net/files/documents/4202/150724/:jaxws \
- https://jax-ws.dev.java.net/files/documents/4202/150725/:jaf \
- http://icedtea.classpath.org/builds/icedtea6/src/ \
- http://icedtea.classpath.org/builds/icedtea6/src/drops/:jaxp \
- http://icedtea.classpath.org/builds/icedtea6/src/drops/:jaxws \
- http://icedtea.classpath.org/builds/icedtea6/src/drops/:jaf
</del><ins>+master_sites http://download.java.net/openjdk/jdk${jdk_major_version}u${jdk_minor_version}/promoted/b${jdk_build_number}/ \
+ apache:ant/binaries:ant
</ins><span class="cx">
</span><del>-checksums ${distname}${extract.suffix} \
- md5 0b36adbf67e4f261e1b827ed4be4f447 \
- sha256 fcf8f1d614e5965e90ef1b1a6d5eecc2bcc3078eaffbb62b83dfba52da62e54b \
</del><ins>+checksums ${distname}${extract.suffix} sha256 00f8ea561876cbcad174ba3ca7a9ae10b50df46a782ac64c2ac57ac357b50596 \
</ins><span class="cx"> \
</span><del>- ${jaxp_file} \
- md5 22e95fbdb9fb7d8b6b6fc0a1d76d1fbd \
- sha256 d097627d4059d488c5a09d4e33cec275a193d4d8bc0fea8ef4f1337170904156 \
- \
- ${jaxws_file} \
- md5 91adfd41e6f001add4f92ae31216b1e3 \
- sha256 0c460583898b968a58bf88eb53f90a0e34369e2562d65fb3a143512dfcaeb3eb \
- \
- ${jaf_file} \
- md5 bc95c133620bd68c161cac9891592901 \
- sha256 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
</del><ins>+ ${ant_distfile}${extract.suffix} sha256 d49d60bc0468279125e4a0db4d9b6637cab342a4bd736c90c0b71865b26c1479
+
</ins><span class="cx">
</span><del>-patchfiles patch-set \
- patch-nio-kqueue \
- patch-compile-W-format \
- patch-jdk_src_solaris_javavm_include_typedefs__md.h \
- patch-jdk_src_share_java.c \
- patch-jdk_src_solaris_native_common_gdefs__md.h \
- patch-10.4-ucontext \
- patch-ucontext-vm.make \
- patch-disable_test_gamma \
- patch-darwin-arch \
- patch-dock-args \
- patch-solaris-timezone-md-return-typo \
- patch-cross-compile
-
</del><span class="cx"> use_configure no
</span><span class="cx"> use_parallel_build no
</span><span class="cx">
</span><span class="cx"> depends_lib port:libiconv \
</span><span class="cx"> port:freetype \
</span><del>- port:openmotif \
</del><span class="cx"> port:xorg-libX11 \
</span><span class="cx"> port:xorg-libXtst \
</span><span class="cx"> port:dejavu-fonts
</span><del>-depends_build port:icedtea6-plugs \
- port:apache-ant
</del><span class="cx">
</span><span class="cx"> # Check if the bootstrap is required
</span><span class="cx"> if {[file exists ${prefix}/share/java/openjdk6/bin/java]} {
</span><span class="lines">@@ -96,106 +61,8 @@
</span><span class="cx"> set bootstrapvm "${prefix}/share/java/openjdk6_bootstrap"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-worksrcdir "./"
</del><ins>+worksrcdir "openjdk"
</ins><span class="cx">
</span><del>-post-extract {
- set copydirs { \
- hotspot/agent/src/os/linux \
- hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux \
- hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/amd64 \
- hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/x86 \
- hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/linux \
- hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/linux_x86 \
- hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/linux_amd64 \
- hotspot/src/os/linux/launcher \
- hotspot/src/os/linux/vm \
- hotspot/src/os_cpu/linux_x86/vm \
- hotspot/make/linux \
- hotspot/make/linux/makefiles \
- jdk/src/linux/doc/man
- }
-
- set copyfiles { \
- corba/make/common/Defs-linux.gmk \
- corba/make/common/shared/Defs-linux.gmk \
- jdk/make/common/Defs-linux.gmk \
- jdk/make/common/shared/Defs-linux.gmk \
- jdk/make/java/nio/mapfile-linux \
- jdk/make/netbeans/common/architectures/name-Linux.properties \
- jdk/make/sun/awt/mapfile-vers-linux \
- jdk/make/tools/sharing/classlist.linux \
- jdk/make/com/sun/tools/attach/mapfile-linux \
- jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux \
- jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.properties \
- jdk/src/solaris/classes/sun/tools/attach/LinuxAttachProvider.java \
- jdk/src/solaris/classes/sun/tools/attach/LinuxVirtualMachine.java \
- jdk/src/solaris/hpi/include/largefile_linux.h \
- jdk/src/solaris/native/java/net/linux_close.c \
- jdk/src/solaris/native/sun/tools/attach/LinuxVirtualMachine.c
- }
-
- # Copy over original Linux sources
- foreach src ${copydirs} {
- set dest "${worksrcpath}/[strsed ${src} g/linux/bsd/]"
-
- # Create the parent directories
- file mkdir "${dest}"
-
- # Copy the contents, adjust file contents
- foreach srcfile [glob -types f "${worksrcpath}/${src}/*"] {
- set destfile [exec echo "${srcfile}" | sed "s/linux/bsd/g; s/Linux/Bsd/g"]
- copy "${srcfile}" "${destfile}"
- reinplace "s/linux/bsd/g; s/Linux/Bsd/g" "${destfile}"
- reinplace "s/linux/bsd/g; s/Linux/Bsd/g" "${destfile}"
- }
- }
-
- foreach src ${copyfiles} {
- set dest "${worksrcpath}/[exec echo ${src} | sed {s/linux/bsd/g; s/Linux/Bsd/g}]"
- copy "${worksrcpath}/${src}" "${dest}"
- reinplace "s/linux/bsd/g; s/Linux/Bsd/g" "${dest}"
- }
-
- # Copy the solaris sources
- copy "${worksrcpath}/jdk/src/solaris/hpi/native_threads/src/threads_solaris.c" \
- "${worksrcpath}/jdk/src/solaris/hpi/native_threads/src/threads_bsd.c"
- reinplace "s/solaris/bsd/g; s/Solaris/Bsd/g" \
- "${worksrcpath}/jdk/src/solaris/hpi/native_threads/src/threads_bsd.c"
-
-
- copy "${worksrcpath}/jdk/src/share/lib/security/java.security" \
- "${worksrcpath}/jdk/src/share/lib/security/java.security-openbsd"
-
- # Workaround for cross compiling
- file mkdir "${worksrcpath}/jdk/make/sun/xawt_icons"
- copy "${filespath}/sun_xawt_icons_Makefile" \
- "${worksrcpath}/jdk/make/sun/xawt_icons/Makefile"
- copy "${worksrcpath}/jdk/make/sun/xawt/ToBin.java" \
- "${worksrcpath}/jdk/make/sun/xawt_icons/ToBin.java"
-
- # Configure font paths.
-# copy "${filespath}/fontconfig.properties" \
-# "${worksrcpath}/jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties"
-# reinplace "s|@PREFIX@|${prefix}|g" \
-# "${worksrcpath}/jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties"
-}
-
-post-patch {
- reinplace "s|/lib:/usr/lib|/lib:/usr/lib:${prefix}/lib|" \
- "${worksrcpath}/hotspot/src/os/bsd/vm/os_bsd.cpp"
-
- # Enable the unlimited strength policy file
- reinplace "s|build-policy install-limited|build-policy install-unlimited|g" \
- "${worksrcpath}/jdk/make/javax/crypto/Makefile"
-}
-
-post-patch {
- # Work-around small bugs in the b20 patchset:
-
- # The agent is only supported on FreeBSD
- file delete -force "${worksrcpath}/hotspot/agent"
-}
-
</del><span class="cx"> # Override the overzealous setting of build environmental variables and settings. These
</span><span class="cx"> # assume the use of (a well-behaved) autoconf, and cause an assortment of odd build failures when
</span><span class="cx"> # used with OpenJDK's build system.
</span></span></pre>
</div>
</div>
</body>
</html>