summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorGreg Lewis <glewis@FreeBSD.org>2012-07-31 17:07:10 +0000
committerGreg Lewis <glewis@FreeBSD.org>2012-07-31 17:07:10 +0000
commit8810445e30722a9129fc01ab1145662b75a5df7b (patch)
treedd2836e4df204c44c9ffe4d054b9a032c1402112 /java
parent- update to 0.9.4 (diff)
. Fix the regular expression for PKG_IGNORE_DEPENDS.
Submitted by: des@
Notes
Notes: svn path=/head/; revision=301800
Diffstat (limited to 'java')
-rw-r--r--java/diablo-jdk15/Makefile2
-rw-r--r--java/diablo-jdk16/Makefile2
-rw-r--r--java/diablo-jre15/Makefile2
-rw-r--r--java/diablo-jre16/Makefile2
4 files changed, 4 insertions, 4 deletions
diff --git a/java/diablo-jdk15/Makefile b/java/diablo-jdk15/Makefile
index ad3df51a91eb..70416f5ea562 100644
--- a/java/diablo-jdk15/Makefile
+++ b/java/diablo-jdk15/Makefile
@@ -39,7 +39,7 @@ OPTIONS= TZUPDATE "Update the time zone data" on
SUB_FILES+= pkg-install \
pkg-deinstall
-PKG_IGNORE_DEPENDS= '^[^x|^j]'
+PKG_IGNORE_DEPENDS= '^[^xj]'
INSTALL_DIR= ${PREFIX}/${PKGNAMEPREFIX}jdk${JDK_VERSION}
diff --git a/java/diablo-jdk16/Makefile b/java/diablo-jdk16/Makefile
index cb6a027debc5..8e63e4ac55ac 100644
--- a/java/diablo-jdk16/Makefile
+++ b/java/diablo-jdk16/Makefile
@@ -44,7 +44,7 @@ SUB_FILES+= pkg-install \
SUB_LIST+= ARCH="${ARCH}" \
JDK_VERSION="${JDK_VERSION}"
-PKG_IGNORE_DEPENDS= '^[^x|^j]'
+PKG_IGNORE_DEPENDS= '^[^xj]'
INSTALL_DIR= ${PREFIX}/${PKGNAMEPREFIX}jdk${JDK_VERSION}
diff --git a/java/diablo-jre15/Makefile b/java/diablo-jre15/Makefile
index 57c831027f23..8c0f382b83ee 100644
--- a/java/diablo-jre15/Makefile
+++ b/java/diablo-jre15/Makefile
@@ -39,7 +39,7 @@ OPTIONS= TZUPDATE "Update the time zone data" on
SUB_FILES+= pkg-install \
pkg-deinstall
-PKG_IGNORE_DEPENDS= '^[^x|^j]'
+PKG_IGNORE_DEPENDS= '^[^xj]'
INSTALL_DIR= ${PREFIX}/${PKGNAMEPREFIX}jre${JRE_VERSION}
diff --git a/java/diablo-jre16/Makefile b/java/diablo-jre16/Makefile
index 9b8a3b97c815..be05fc559f67 100644
--- a/java/diablo-jre16/Makefile
+++ b/java/diablo-jre16/Makefile
@@ -45,7 +45,7 @@ SUB_FILES+= pkg-install \
SUB_LIST+= ARCH="${ARCH}" \
JRE_VERSION="${JRE_VERSION}"
-PKG_IGNORE_DEPENDS= '^[^x|^j]'
+PKG_IGNORE_DEPENDS= '^[^xj]'
INSTALL_DIR= ${PREFIX}/${PKGNAMEPREFIX}jre${JRE_VERSION}