diff options
| author | abs <abs@pkgsrc.org> | 2009-03-06 16:22:55 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2009-03-06 16:22:55 +0000 |
| commit | fafa4ffc5596ef4c2ed98894d64a378b2f835a91 (patch) | |
| tree | 79355cf079e08ac4901da1719c7d5b9641937816 /lang/sun-jdk6 | |
| parent | e3ed8eb8c198394b2c9c0327fab8335bf5dbc562 (diff) | |
| download | pkgsrc-fafa4ffc5596ef4c2ed98894d64a378b2f835a91.tar.gz | |
More pkglint
Diffstat (limited to 'lang/sun-jdk6')
| -rw-r--r-- | lang/sun-jdk6/Makefile | 3 | ||||
| -rw-r--r-- | lang/sun-jdk6/builtin.mk | 4 |
2 files changed, 3 insertions, 4 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} |