These packages are no longer needed to bootstrap buildlink2. Simplify the

building of these packages by using buildlink2.

1 files changed, 4 insertions, 31 deletions

diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile
index df234247742..1daf2ce11a9 100644
--- a/devel/libtool-base/Makefile
+++ b/devel/libtool-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/11/21 00:50:03 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2002/12/22 19:04:08 jlam Exp $
 #
 
 .include "../libtool/Makefile.common"
@@ -10,8 +10,6 @@ COMMENT=	Generic shared library support script (the script itself)
 
 CONFLICTS+=	libtool<=1.3.5nb11
 
-USE_BUILDLINK2=	no	# needed for bootstrapping buildlink2
-
 test: build
 	cd ${WRKSRC} && ${MAKE} check
 
@@ -23,40 +21,15 @@ DEPENDS+=	c++rt0>=1.0:../../sysutils/c++rt0
 .endif
 
 .if ${OPSYS} == "NetBSD"
-.if !exists(/usr/libexec/ld.so) && !exists(/usr/libexec/ld.elf_so)
+.  if !exists(/usr/libexec/ld.so) && !exists(/usr/libexec/ld.elf_so)
 CONFIGURE_ARGS=	--disable-shared
-.endif
+.  endif
 .else
 CONFIGURE_ARGS=	--enable-ltdl-install
 .endif
 
 .if !empty(MACHINE_PLATFORM:MDarwin-*-*)
-DLCOMPATDIR=			${WRKDIR}/.dlcompat
-DEPENDS+=			dlcompat>=20020606:../../devel/dlcompat
-EVAL_PREFIX+=			DLCOMPAT_PREFIX=dlcompat
-DLCOMPAT_PREFIX_DEFAULT=	${LOCALBASE}
-
-pre-configure: dlcompat-buildlink
-dlcompat-buildlink:
-	cd ${DLCOMPAT_PREFIX};						\
-	for file in include/dlfcn.h lib/libdl.*; do			\
-		if [ -f "$${file}" ]; then				\
-			${MKDIR} ${DLCOMPATDIR}/`${DIRNAME} $${file}`;	\
-			${LN} -sf ${DLCOMPAT_PREFIX}/$${file}		\
-				${DLCOMPATDIR}/$${file};		\
-		fi;							\
-	done
+.  include "../../devel/dlcompat/buildlink2.mk"
 .endif
 
 .include "../../mk/bsd.pkg.mk"
-
-.if !empty(MACHINE_PLATFORM:MDarwin-*-*)
-CPPFLAGS:=	-I${DLCOMPATDIR}/include ${CPPFLAGS}
-CFLAGS:=	-I${DLCOMPATDIR}/include ${CFLAGS}
-LDFLAGS=	-L${DLCOMPATDIR}/lib
-.  if ${_USE_RPATH} == "yes"
-LDFLAGS+=	-Wl,-R${DLCOMPAT_PREFIX}/lib
-.  endif
-.else
-LDFLAGS=	# empty
-.endif