svn commit: r301800 - in head/java: diablo-jdk15 diablo-jdk16 diablo-jre15 diablo-jre16

[Greg Lewis]

Author: glewis
Date: Tue Jul 31 17:07:10 2012
New Revision: 301800
URL: http://svn.freebsd.org/changeset/ports/301800

Log:
  . Fix the regular expression for PKG_IGNORE_DEPENDS.
  
  Submitted by:	des@

Modified:
  head/java/diablo-jdk15/Makefile   (contents, props changed)
  head/java/diablo-jdk16/Makefile   (contents, props changed)
  head/java/diablo-jre15/Makefile   (contents, props changed)
  head/java/diablo-jre16/Makefile   (contents, props changed)

Modified: head/java/diablo-jdk15/Makefile
==============================================================================
--- head/java/diablo-jdk15/Makefile	Tue Jul 31 16:41:20 2012	(r301799)
+++ head/java/diablo-jdk15/Makefile	Tue Jul 31 17:07:10 2012	(r301800)
@@ -39,7 +39,7 @@ OPTIONS=	TZUPDATE	"Update the time zone 
 
 SUB_FILES+=	pkg-install \
 		pkg-deinstall
-PKG_IGNORE_DEPENDS=	'^[^x|^j]'
+PKG_IGNORE_DEPENDS=	'^[^xj]'
 
 INSTALL_DIR=	${PREFIX}/${PKGNAMEPREFIX}jdk${JDK_VERSION}
 

Modified: head/java/diablo-jdk16/Makefile
==============================================================================
--- head/java/diablo-jdk16/Makefile	Tue Jul 31 16:41:20 2012	(r301799)
+++ head/java/diablo-jdk16/Makefile	Tue Jul 31 17:07:10 2012	(r301800)
@@ -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}
 

Modified: head/java/diablo-jre15/Makefile
==============================================================================
--- head/java/diablo-jre15/Makefile	Tue Jul 31 16:41:20 2012	(r301799)
+++ head/java/diablo-jre15/Makefile	Tue Jul 31 17:07:10 2012	(r301800)
@@ -39,7 +39,7 @@ OPTIONS=	TZUPDATE	"Update the time zone 
 
 SUB_FILES+=	pkg-install \
 		pkg-deinstall
-PKG_IGNORE_DEPENDS=	'^[^x|^j]'
+PKG_IGNORE_DEPENDS=	'^[^xj]'
 
 INSTALL_DIR=	${PREFIX}/${PKGNAMEPREFIX}jre${JRE_VERSION}
 

Modified: head/java/diablo-jre16/Makefile
==============================================================================
--- head/java/diablo-jre16/Makefile	Tue Jul 31 16:41:20 2012	(r301799)
+++ head/java/diablo-jre16/Makefile	Tue Jul 31 17:07:10 2012	(r301800)
@@ -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}