 @@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.38 2014/01/08 13:09:38 jperkin Exp $
+$NetBSD: distinfo,v 1.39 2014/01/14 17:24:42 abs Exp $
 SHA1 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253
 RMD160 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f
 Size (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7426 bytes
 SHA1 (openjdk7/apache-ant-1.8.4-bin.tar.bz2) = d9e3e83dd9664cfe1dcd4841c082db3f559af922
 RMD160 (openjdk7/apache-ant-1.8.4-bin.tar.bz2) = a23e122b76b3dfed5be7bef3388041649df0b346
 Size (openjdk7/apache-ant-1.8.4-bin.tar.bz2) = 4257152 bytes
 SHA1 (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 6b3d887dfe3283a28f950bc3f87482200cfe78e2
 RMD160 (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 7c6c2067322a4909c306f9a5049fe75f9244bab7
 Size (openjdk7/bootstrap-jdk7-bin-common-20110811.tar.bz2) = 22390959 bytes
 SHA1 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = fa383b2c7d5060a689dcbc5fcdd9f08908270ea4
 RMD160 (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = a914780d3c1c0a53f68c07d39a5af36535282efe
 Size (openjdk7/bootstrap-jdk7-bin-dragonfly-2.13-amd64-20110811A.tar.xz) = 3208572 bytes
 @@ -54,27 +54,27 @@ Size (openjdk7/jaxp145_01.zip) = 6389175
 SHA1 (openjdk7/jdk7-jaf-2010_08_19.zip) = 63ea970dcf129fbbba39a132d8f71add19fbf1f0
 RMD160 (openjdk7/jdk7-jaf-2010_08_19.zip) = fbadfbb781dc2aa8cfa384b8d5cd618522e55128
 Size (openjdk7/jdk7-jaf-2010_08_19.zip) = 70613 bytes
 SHA1 (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 539bcf80b9a86c97406a3c79e7d10684b213a4be
 RMD160 (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 49273489651c1950376966955f28e4069165e818
 Size (openjdk7/jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 6046353 bytes
 SHA1 (openjdk7/openjdk-1.7.45-20140101.tar.bz2) = 8c1bb4ce614210eaaa3ec46309cd2533c64e1ce4
 RMD160 (openjdk7/openjdk-1.7.45-20140101.tar.bz2) = e4ecfabe920ba796d8f07a9a42899fe6b8bd09ed
 Size (openjdk7/openjdk-1.7.45-20140101.tar.bz2) = 51817743 bytes
 SHA1 (openjdk7/rhino1_7R3.zip) = 81f39d6e24529d62b23a6a92a1a09af95495d7c1
 RMD160 (openjdk7/rhino1_7R3.zip) = 3fdc3e1540d0fa35ba7dec1bf34a70b0d41cedd0
 Size (openjdk7/rhino1_7R3.zip) = 4651597 bytes
 SHA1 (patch-Makefile) = a9e415d19c2a8edb96a60ffdf81c804476a8e2f6
-SHA1 (patch-aa) = 656265823146be3fd6efee470fccff5fdc4b2a59
+SHA1 (patch-aa) = 69da3f571d37bb461f1d3edb342a56e63a2872af
 SHA1 (patch-ab) = 35d5a4a4aa32f8b92ba82f583a2d31f2b7af7998
 SHA1 (patch-ac) = 7a7853d8d0fd451e64a6fc39c28bd2bd8173adc6
 SHA1 (patch-ae) = 0bc7f2cf43835ce7d1e30e09a570e46a952a03e8
 SHA1 (patch-ag) = 83ec8015b8e0f2657f4289cea84bdc9b6d0c5e88
 SHA1 (patch-ah) = 2d358879d2851fb2fb8161c5a1ac5a93aa7a69c2
 SHA1 (patch-ai) = bee1b592401d15a91e7d926c9011bcd0d83fb5ec
 SHA1 (patch-ak) = 45beaba484a74fb47f74bec786c418781dc478e2
 SHA1 (patch-al) = d174343a5baa8a73d18ff1020cb0cc19e6714175
 SHA1 (patch-am) = d9b30616a7803d1f10751a2c6950317c167c5703
 SHA1 (patch-an) = da6a3a2451504a71faed11789fa7b015867a89cd
 SHA1 (patch-ao) = 6bfc842ceb0d7e03f9288e80fe762bd1d54cf503
 SHA1 (patch-ap) = 0ef305622c8d1ee1d5d6361b5af352251d52929a
 SHA1 (patch-aq) = 97303ebcdcf0251406eef816ae56c82c703dab9d

 @@ -1,38 +1,38 @@
-# $NetBSD: options.mk,v 1.3 2011/08/21 22:57:54 tnn Exp $
+# $NetBSD: options.mk,v 1.4 2014/01/14 17:24:42 abs Exp $
 PKG_OPTIONS_VAR=		PKG_OPTIONS.openjdk7
 PKG_SUPPORTED_OPTIONS=		sun-jre-jce # jdk-zero-vm
 PKG_SUGGESTED_OPTIONS=		#
 .include "../../mk/bsd.options.mk"
 ###
 ### Java(TM) Cryptography Extension (JCE)
 ###
 .if !empty(PKG_OPTIONS:Msun-jre-jce)
 JCE_DISTFILE=	UnlimitedJCEPolicyJDK7.zip
 DISTFILES+=	${JCE_DISTFILE}
 EXTRACT_ONLY+=	${JCE_DISTFILE}
 PLIST.jce=	yes
 USE_TOOLS+=	pax
+#
-.if !exists(${DISTDIR}/${DIST_SUBDIR}/${JCE_DISTFILE})
+.  if !exists(${DISTDIR}/${DIST_SUBDIR}/${JCE_DISTFILE})
 FETCH_MESSAGE+= "Please download the Java(TM) Cryptography Extension (JCE) Unlimited"
 FETCH_MESSAGE+= "Strength Jurisdiction Policy Files 7 '${JCE_DISTFILE}' from:"
 FETCH_MESSAGE+= "	http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
 FETCH_MESSAGE+= " and place it in:"
 FETCH_MESSAGE+= "       ${DISTDIR}/${DIST_SUBDIR}/${JCE_DISTFILE}"
 FETCH_MESSAGE+= ""
 FETCH_MESSAGE+= " Then resume this build by running '"${MAKE:Q}"' again."
-.endif
+.  endif
+#
 post-install:
 	cd ${WRKDIR}/UnlimitedJCEPolicy && pax -rw -pp . ${DESTDIR}${JAVA_HOME}/jre/lib/security
 .endif
 # this option builds a JVM without assembly optimisation. Useful for porting.
 # NOTE: This is work in progress.
 .if !empty(PKG_OPTIONS:Mjdk-zero-vm)
 MAKE_ENV+=	ZERO_BUILD=true
 .include "../../devel/libffi/buildlink3.mk"
 .endif

 @@ -1,16 +1,17 @@
-$NetBSD: patch-aa,v 1.10 2014/01/02 01:16:35 ryoon Exp $
+$NetBSD: patch-aa,v 1.11 2014/01/14 17:24:42 abs Exp $
 DragonFly support.
 Add workaround for missing  sem_timedwait() in NetBSD < 6.99.4
 --- hotspot/src/os/bsd/vm/os_bsd.cpp.orig	2014-01-01 05:50:05.000000000 +0000
 +++ hotspot/src/os/bsd/vm/os_bsd.cpp
 @@ -126,8 +126,11 @@
  # include <inttypes.h>
  # include <sys/ioctl.h>
 -#if defined(__FreeBSD__) || defined(__NetBSD__)
 +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
  # include <elf.h>
 +#if !defined(EM_ALPHA)
 +#define EM_ALPHA 0x9026
 +#endif
 @@ -45,31 +46,65 @@ DragonFly support.
  #endif
+ }
  #else
 @@ -2222,7 +2223,9 @@ void * os::dll_load(const char *filename
      {EM_PPC,         EM_PPC,     ELFCLASS32, ELFDATA2MSB, (char*)"Power PC 32"},
      {EM_PPC64,       EM_PPC64,   ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"},
      {EM_ARM,         EM_ARM,     ELFCLASS32,   ELFDATA2LSB, (char*)"ARM"},
 +#if 0
      {EM_S390,        EM_S390,    ELFCLASSNONE, ELFDATA2MSB, (char*)"IBM System/390"},
 +#endif
      {EM_ALPHA,       EM_ALPHA,   ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"},
      {EM_MIPS_RS3_LE, EM_MIPS_RS3_LE, ELFCLASS32, ELFDATA2LSB, (char*)"MIPSel"},
      {EM_MIPS,        EM_MIPS,    ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"},
-@@ -3880,7 +3883,7 @@ OSReturn os::set_native_priority(Thread*
+@@ -2818,6 +2821,33 @@ bool Semaphore::timedwait(unsigned int s
  #else
 +#if defined(__NetBSD__) && (__NetBSD_Version__ < 699000400)
 +static inline int sem_timedwait(sem_t *sem, struct timespec *ts) {
 +  struct timespec onems = { 0, 1000000 };
 +  struct timespec total = { 0, 0 };
 +  struct timespec unslept;
 +  struct timespec elapsed;
 +  struct timespec tmp;
++
 +  while (timespeccmp(ts, &total, >)) {
 +    if (sem_trywait(sem) == 0)
 +      return 0;
++
 +    if (errno != EAGAIN)
 +      return -1;
++
 +    (void)nanosleep(&onems, &unslept);
++
 +    timespecsub(&onems, &unslept, &elapsed);
 +    timespecadd(&total, &elapsed, &tmp);
 +    total.tv_sec = tmp.tv_sec;
 +    total.tv_nsec = tmp.tv_nsec;
 +  }
 +  errno = ETIMEDOUT;
 +  return -1;
 +}
 +#endif /* __NetBSD__ */
++
  bool Semaphore::trywait() {
    return sem_trywait(&_semaphore) == 0;
+ }
@@ -3880,7 +3910,7 @@ OSReturn os::set_native_priority(Thread*
  #ifdef __OpenBSD__
    // OpenBSD pthread_setprio starves low priority threads
    return OS_OK;
 -#elif defined(__FreeBSD__)
 +#elif defined(__FreeBSD__) || defined(__DragonFly__)
    int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri);
    return (ret == 0) ? OS_OK : OS_ERR;
  #elif defined(__APPLE__) || defined(__NetBSD__)
-@@ -3909,7 +3912,7 @@ OSReturn os::get_native_priority(const T
+@@ -3909,7 +3939,7 @@ OSReturn os::get_native_priority(const T
+   }
    errno = 0;
 -#if defined(__OpenBSD__) || defined(__FreeBSD__)
 +#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
    *priority_ptr = pthread_getprio(thread->osthread()->pthread_id());
  #elif defined(__APPLE__) || defined(__NetBSD__)
    int policy;