diff options
| author | hubertf <hubertf@pkgsrc.org> | 1999-02-20 22:48:24 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 1999-02-20 22:48:24 +0000 |
| commit | 2a95ad9c6be52511880e6ee241b087af70706624 (patch) | |
| tree | f0ac98b899382f539e1e39385f1316edd18626bd /lang/jdk | |
| parent | 2821cb11104fb7319e84b4cd1808cf56f3604a54 (diff) | |
| download | pkgsrc-2a95ad9c6be52511880e6ee241b087af70706624.tar.gz | |
Fix CONFLICTS (remove redundancy, mostly)
Diffstat (limited to 'lang/jdk')
| -rw-r--r-- | lang/jdk/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lang/jdk/Makefile b/lang/jdk/Makefile index 1363fea765c..feeaee2da0c 100644 --- a/lang/jdk/Makefile +++ b/lang/jdk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1999/02/05 16:33:34 frueauf Exp $ +# $NetBSD: Makefile,v 1.7 1999/02/20 22:48:32 hubertf Exp $ DISTNAME= jdk1.1.6 PKGNAME= jdk-1.1.6 @@ -19,8 +19,6 @@ ONLY_FOR_ARCHS= i386 NO_CONFIGURE= yes NO_BUILD= yes -CONFLICTS= jdk-* - do-install: ${RM} ${WRKSRC}/README.NetBSD.orig -${MKDIR} ${PREFIX}/java |