summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorabs <abs>2009-03-06 16:22:55 +0000
committerabs <abs>2009-03-06 16:22:55 +0000
commit32c6e000ab92eabeee44cf5a3613ca1761f9d092 (patch)
tree79355cf079e08ac4901da1719c7d5b9641937816 /lang
parentdcfc6b5f0aef69f88b3a751a9a6f9a0c1129ae33 (diff)
downloadpkgsrc-32c6e000ab92eabeee44cf5a3613ca1761f9d092.tar.gz
More pkglint
Diffstat (limited to 'lang')
-rw-r--r--lang/sun-jdk6/Makefile3
-rw-r--r--lang/sun-jdk6/builtin.mk4
-rw-r--r--lang/sun-jre6/Makefile.common3
3 files changed, 5 insertions, 5 deletions
diff --git a/lang/sun-jdk6/Makefile b/lang/sun-jdk6/Makefile
index 0b6fb1595ca..94313fd6702 100644
--- a/lang/sun-jdk6/Makefile
+++ b/lang/sun-jdk6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/03/03 11:08:40 abs Exp $
+# $NetBSD: Makefile,v 1.14 2009/03/06 16:22:55 abs Exp $
DISTNAME= jdk-6u12-linux-${DIST_ARCH}
#PKGREVISION= 1
@@ -6,7 +6,6 @@ PKGNAME= sun-jdk6-6.0.12
MASTER_SITES= # empty
DOWNLOAD_NAME= JDK 6u12
-SHORT_NAME= JDK
DEPENDS+= ${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre6
diff --git a/lang/sun-jdk6/builtin.mk b/lang/sun-jdk6/builtin.mk
index b87f7e70d9c..4cc00249306 100644
--- a/lang/sun-jdk6/builtin.mk
+++ b/lang/sun-jdk6/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2008/10/25 18:06:31 adrianp Exp $
+# $NetBSD: builtin.mk,v 1.3 2009/03/06 16:22:55 abs Exp $
BUILTIN_PKG:= sun-jdk6
@@ -30,7 +30,7 @@ MAKEVARS+= IS_BUILTIN.sun-jdk6
!empty(IS_BUILTIN.sun-jdk6:M[yY][eE][sS]) && \
empty(JDK6:M__nonexistent__)
-BUILTIN_VERSION.sun-jdk6!= ${JDK6} -version 2>&1 | ${HEAD} -1 | \
+BUILTIN_VERSION.sun-jdk6!= ${JDK6} -version 2>&1 | ${HEAD} -1 | \
${AWK} '{print $$2}'
BUILTIN_PKG.sun-jdk6= sun-jdk6-${BUILTIN_VERSION.sun-jdk6}
diff --git a/lang/sun-jre6/Makefile.common b/lang/sun-jre6/Makefile.common
index 297c7ad761b..a7d8f5b4510 100644
--- a/lang/sun-jre6/Makefile.common
+++ b/lang/sun-jre6/Makefile.common
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile.common,v 1.11 2009/03/06 16:18:04 abs Exp $
+# $NetBSD: Makefile.common,v 1.12 2009/03/06 16:22:55 abs Exp $
# used by lang/sun-jre6/Makefile
+# used by lang/sun-jdk6/Makefile
CATEGORIES= lang java
COMMENT= Sun's Java(tm) 2 Standard Edition, ${DOWNLOAD_NAME}