From 9c7b396cbebc4e5f819c50a8d7455249f6d63a30 Mon Sep 17 00:00:00 2001
From: Antoine Reilles <tonio@NetBSD.org>
Date: Sun, 4 Sep 2005 17:43:32 +0000
Subject: [PATCH] remove SHLIBTOOL_OVERRIDE, this is not used merge CONF_FILES
 and SUPPORT_FILES

---
 kaffe/Makefile        | 6 +++---
 kaffe/Makefile.common | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/kaffe/Makefile b/kaffe/Makefile
index 07ebf21b13..f4b766f79b 100644
--- a/kaffe/Makefile
+++ b/kaffe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/05/13 16:33:04 jtonio Exp $
+# $NetBSD: Makefile,v 1.4 2005/09/04 17:43:32 jtonio Exp $
 #
 
 .include "Makefile.common"
@@ -8,7 +8,7 @@ CONFLICTS+=		kaffe-nox11-[0-9]*
 JAVA_WRAPPERS=		appletviewer jar java javac javadoc javah javakey \
 			javap jdb rmic rmiregistry serialver
 
-SUPPORT_FILES=		${JAVA_HOME}/jre/lib/security/java.security.default \
+CONF_FILES=		${JAVA_HOME}/jre/lib/security/java.security.default \
 			${JAVA_HOME}/jre/lib/security/java.security
 
 .include "../../mk/bsd.prefs.mk"
@@ -19,6 +19,6 @@ PRINT_PLIST_AWK+=	/^java\/kaffe\/jre\/lib\/security\/java.security$$/ \
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/license.terms ${JAVA_HOME}
 
-.include "../../devel/libltdl/buildlink3.mk"
+.include "../../devel/libltdl/convenience.mk"
 .include "../../mk/java-env.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/kaffe/Makefile.common b/kaffe/Makefile.common
index dc82ff47bc..9701d58cf4 100644
--- a/kaffe/Makefile.common
+++ b/kaffe/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2005/09/04 17:06:23 jtonio Exp $
+# $NetBSD: Makefile.common,v 1.9 2005/09/04 17:43:32 jtonio Exp $
 
 DISTNAME=     kaffe-1.1.5
 CATEGORIES=   lang java
@@ -18,7 +18,6 @@ NO_MTREE=		yes
 USE_PKGINSTALL=		yes
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 TEST_TARGET=		check
 
 ONLY_FOR_PLATFORM=	*-*-alpha *-*-arm *-*-arm32 *-*-i386 *-*-m68k *-*-mips*	\