summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorabs <abs@pkgsrc.org>2001-08-23 16:37:27 +0000
committerabs <abs@pkgsrc.org>2001-08-23 16:37:27 +0000
commit8eee1675b756aa33ee84493b2dea6a99a0ee6144 (patch)
tree0b6f80819e98b0c968fc10d2c214fe471a6b8ad9 /mk
parent0bf397a2b42c8f61a3385fcc49f38f6484534531 (diff)
downloadpkgsrc-8eee1675b756aa33ee84493b2dea6a99a0ee6144.tar.gz
gnu patch is used under Linux as well as Solaris
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index d7ed93b5f85..b5cdfd8f182 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.800 2001/08/23 04:21:02 jlam Exp $
+# $NetBSD: bsd.pkg.mk,v 1.801 2001/08/23 16:37:27 abs Exp $
#
# This file is in the public domain.
#
@@ -78,7 +78,7 @@ JAVA_HOME?= ${LOCALBASE}/java
BUILD_DEPENDS+= sun-jdk-*:../../lang/sun-jdk13
DEPENDS+= sun-jre-*:../../lang/sun-jre13
-JAVA_HOME?= ${LOCALBASE}/java/jre
+JAVA_HOME?= ${LOCALBASE}/java
. elif ${PKG_JVM} == "blackdown-jdk13"
DEPENDS+= blackdown-jdk-*:../../lang/blackdown-jdk13
JAVA_HOME?= ${LOCALBASE}/java
@@ -378,7 +378,7 @@ PATCH_DIST_ARGS?= -d ${WRKSRC} --forward --quiet -E ${PATCH_DIST_STRIP}
PATCH_ARGS+= --batch
PATCH_DIST_ARGS+= --batch
.endif
-.if (${OPSYS} == "SunOS")
+.if (${OPSYS} == "SunOS" || ${OPSYS} == "Linux")
PATCH_ARGS+= -V simple -z .orig
.else
PATCH_ARGS+= -V simple -b .orig