[pkgsrc/trunk]: pkgsrc/mk Remove support for buildlink2, now that all package...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/62f5c472d662
branches:  trunk
changeset: 477441:62f5c472d662
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Jul 02 22:10:51 2004 +0000

description:
Remove support for buildlink2, now that all packages using this
file have been converted to buildlink3.

diffstat:

 mk/java-vm.mk |  10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diffs (31 lines):

diff -r 28f8e6d1c401 -r 62f5c472d662 mk/java-vm.mk
--- a/mk/java-vm.mk     Fri Jul 02 22:08:37 2004 +0000
+++ b/mk/java-vm.mk     Fri Jul 02 22:10:51 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.27 2004/06/09 08:20:22 tron Exp $
+# $NetBSD: java-vm.mk,v 1.28 2004/07/02 22:10:51 wiz Exp $
 #
 # This Makefile fragment handles Java dependencies and make variables,
 # and is meant to be included by packages that require Java either at
@@ -272,9 +272,7 @@
 
 # We always need a run-time dependency on the JRE.
 .if defined(_JRE_PKGSRCDIR)
-.  if defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO])
-.    include "${_JRE_PKGSRCDIR}/buildlink2.mk"
-.  elif defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[Nn][Oo])
+.  if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[Nn][Oo])
 .    if exists(${_JRE_PKGSRCDIR}/buildlink3.mk)
 .      include "${_JRE_PKGSRCDIR}/buildlink3.mk"
 .    endif
@@ -288,9 +286,7 @@
 #
 .if empty(USE_JAVA:M[rR][uU][nN])
 .  if defined(_JDK_PKGSRCDIR)
-.    if defined(USE_BUILDLINK2) && empty(USE_BUILDLINK2:M[nN][oO])
-.      include "${_JDK_PKGSRCDIR}/buildlink2.mk"
-.    elif defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[Nn][Oo])
+.    if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[Nn][Oo])
 .      if exists(${_JDK_PKGSRCDIR}/buildlink3.mk)
 .        include "${_JDK_PKGSRCDIR}/buildlink3.mk"
 .      endif