From 17ef713d56acab67bde3a3d5e04c99ea50c51ebf Mon Sep 17 00:00:00 2001
From: Steve Price <steve@FreeBSD.org>
Date: Tue, 8 Jun 1999 23:13:28 +0000
Subject: [PATCH] Incorporate the new patch that fixes a permissions error when
 trying to send UDP packets to the broadcast address.

Requested by:	maintainer
---
 java/jdk/Makefile   | 13 ++++++++++---
 java/jdk/distinfo   |  2 ++
 java/jdk11/Makefile | 13 ++++++++++---
 java/jdk11/distinfo |  2 ++
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/java/jdk/Makefile b/java/jdk/Makefile
index b5d7c167aef5..f80c6256eaa9 100644
--- a/java/jdk/Makefile
+++ b/java/jdk/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Feb, 8, 1998
 # Whom:			Nate Williams <nate@FreeBSD.org>
 #
-# $Id: Makefile,v 1.20 1999/06/08 16:15:19 nate Exp $
+# $Id: Makefile,v 1.21 1999/06/08 21:57:38 steve Exp $
 #
 
 DISTNAME=	jdk-${JDK_VERSION}
@@ -24,9 +24,13 @@ NO_BUILD=       yes
 .include <bsd.port.pre.mk>
 
 .if ${PORTOBJFORMAT} == "aout"
-DISTFILES=	jdk${JDK_VERSION}_AOUT.V99-6-3.tar.gz
+NETPATCH=	AOUT.netpatch.tar.gz
+DISTFILES=	jdk${JDK_VERSION}_AOUT.V99-6-3.tar.gz ${NETPATCH}
+EXTRACT_ONLY=	jdk${JDK_VERSION}_AOUT.V99-6-3.tar.gz
 .else
-DISTFILES=	jdk${JDK_VERSION}_ELF.V99-6-3.tar.gz
+NETPATCH=	ELF.netpatch.tar.gz
+DISTFILES=	jdk${JDK_VERSION}_ELF.V99-6-3.tar.gz ${NETPATCH}
+EXTRACT_ONLY=	jdk${JDK_VERSION}_ELF.V99-6-3.tar.gz
 .endif
 
 do-install:
@@ -34,4 +38,7 @@ do-install:
 	(cd ${WRKSRC} && tar -c -f - .) \
 		| (cd ${PREFIX}/jdk${JDK_VERSION} && tar fx -)
 
+post-install:
+	tar xzf ${DISTDIR}/${NETPATCH} -C ${PREFIX}
+
 .include <bsd.port.post.mk>
diff --git a/java/jdk/distinfo b/java/jdk/distinfo
index 87c215e49833..289f95532d4d 100644
--- a/java/jdk/distinfo
+++ b/java/jdk/distinfo
@@ -1,2 +1,4 @@
 MD5 (jdk1.1.8_AOUT.V99-6-3.tar.gz) = bdd14ef95067c643a8f6446f7ecb8fa8
+MD5 (AOUT.netpatch.tar.gz) = 5330a639b3253154df203f511cafb104
 MD5 (jdk1.1.8_ELF.V99-6-3.tar.gz) = c4ea26af43b4e78e75e8515a0256805e
+MD5 (ELF.netpatch.tar.gz) = 3782287930a3271f6433f70d57cf7a54
diff --git a/java/jdk11/Makefile b/java/jdk11/Makefile
index b5d7c167aef5..f80c6256eaa9 100644
--- a/java/jdk11/Makefile
+++ b/java/jdk11/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Feb, 8, 1998
 # Whom:			Nate Williams <nate@FreeBSD.org>
 #
-# $Id: Makefile,v 1.20 1999/06/08 16:15:19 nate Exp $
+# $Id: Makefile,v 1.21 1999/06/08 21:57:38 steve Exp $
 #
 
 DISTNAME=	jdk-${JDK_VERSION}
@@ -24,9 +24,13 @@ NO_BUILD=       yes
 .include <bsd.port.pre.mk>
 
 .if ${PORTOBJFORMAT} == "aout"
-DISTFILES=	jdk${JDK_VERSION}_AOUT.V99-6-3.tar.gz
+NETPATCH=	AOUT.netpatch.tar.gz
+DISTFILES=	jdk${JDK_VERSION}_AOUT.V99-6-3.tar.gz ${NETPATCH}
+EXTRACT_ONLY=	jdk${JDK_VERSION}_AOUT.V99-6-3.tar.gz
 .else
-DISTFILES=	jdk${JDK_VERSION}_ELF.V99-6-3.tar.gz
+NETPATCH=	ELF.netpatch.tar.gz
+DISTFILES=	jdk${JDK_VERSION}_ELF.V99-6-3.tar.gz ${NETPATCH}
+EXTRACT_ONLY=	jdk${JDK_VERSION}_ELF.V99-6-3.tar.gz
 .endif
 
 do-install:
@@ -34,4 +38,7 @@ do-install:
 	(cd ${WRKSRC} && tar -c -f - .) \
 		| (cd ${PREFIX}/jdk${JDK_VERSION} && tar fx -)
 
+post-install:
+	tar xzf ${DISTDIR}/${NETPATCH} -C ${PREFIX}
+
 .include <bsd.port.post.mk>
diff --git a/java/jdk11/distinfo b/java/jdk11/distinfo
index 87c215e49833..289f95532d4d 100644
--- a/java/jdk11/distinfo
+++ b/java/jdk11/distinfo
@@ -1,2 +1,4 @@
 MD5 (jdk1.1.8_AOUT.V99-6-3.tar.gz) = bdd14ef95067c643a8f6446f7ecb8fa8
+MD5 (AOUT.netpatch.tar.gz) = 5330a639b3253154df203f511cafb104
 MD5 (jdk1.1.8_ELF.V99-6-3.tar.gz) = c4ea26af43b4e78e75e8515a0256805e
+MD5 (ELF.netpatch.tar.gz) = 3782287930a3271f6433f70d57cf7a54