From e117f17f0c947e8df9504d9f90802a0c88a56684 Mon Sep 17 00:00:00 2001
From: abs <abs>
Date: Mon, 11 Jun 2001 21:58:03 +0000
Subject: Skip the patches and suse_x11 on Linux

---
 lang/sun-jdk13/Makefile | 12 ++++++++++--
 lang/sun-jre13/Makefile | 11 +++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

(limited to 'lang')

diff --git a/lang/sun-jdk13/Makefile b/lang/sun-jdk13/Makefile
index 460ef999c4a..034ff149198 100644
--- a/lang/sun-jdk13/Makefile
+++ b/lang/sun-jdk13/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/05/19 03:56:37 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/11 21:58:03 abs Exp $
 #
 
 # MASTER_SITES is very special, and must end in "=":
@@ -58,5 +58,13 @@ do-install:
 
 .include "../../mk/bsd.pkg.mk"
 
-# This needs to be after bsd.pkg.mk 
+# These need to be after bsd.pkg.mk 
+
+.if ${OPSYS} == "Linux"
+# No patches on linux
+PATCHDIR=	${WRKDIR}/.patches
+pre-patch:
+	${MKDIR} ${PATCHDIR}
+.endif
+
 PREFIX:=	${JDK_HOME}
diff --git a/lang/sun-jre13/Makefile b/lang/sun-jre13/Makefile
index 21ff987b71a..b656430d87c 100644
--- a/lang/sun-jre13/Makefile
+++ b/lang/sun-jre13/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/05/19 03:56:37 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/06/11 21:58:03 abs Exp $
 #
 
 # MASTER_SITES is very special, and must end in "=":
@@ -55,8 +55,15 @@ do-install:
 
 # These need to be after bsd.pkg.mk 
 
-.if ${OPSYS} != "Linux"
+.if ${OPSYS} == "Linux"
+# No patches on linux
+PATCHDIR=	${WRKDIR}/.patches
+pre-patch:
+	${MKDIR} ${PATCHDIR}
+
+.else
 DEPENDS=	suse_x11-*:../../emulators/suse_x11
+
 .endif
 
 PREFIX:=	${JDK_HOME}
-- 
cgit v1.2.3