buildlink1 -> buildlink2

3 files changed, 15 insertions, 26 deletions

diff --git a/databases/jdb/Makefile b/databases/jdb/Makefile
index bf852abc183..d60199e1ebe 100644
--- a/databases/jdb/Makefile
+++ b/databases/jdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/11/28 05:20:44 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/11/15 00:35:20 jlam Exp $
 
 DISTNAME=	jdb-1.7
 CATEGORIES=	databases
@@ -6,13 +6,13 @@ MASTER_SITES=	http://www.isi.edu/~johnh/SOFTWARE/JDB/
 
 MAINTAINER=	bad@netbsd.org
 HOMEPAGE=	http://www.isi.edu/~johnh/SOFTWARE/JDB/index.html
-COMMENT=	Package of commands for manipulating flat-ASCII databases
+COMMENT=	commands for manipulating flat-ASCII databases
 
-USE_BUILDLINK_ONLY=	YES
-GNU_CONFIGURE=		YES
+USE_BUILDLINK2=		# defined
+GNU_CONFIGURE=		# defined
 
 CONFIGURE_ARGS+=	--with-perl=${LOCALBASE}/bin
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/jdb
 
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/cim/Makefile b/lang/cim/Makefile
index 11e360f9953..9700117eb77 100644
--- a/lang/cim/Makefile
+++ b/lang/cim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/02/18 15:14:23 seb Exp $
+# $NetBSD: Makefile,v 1.12 2002/11/15 00:26:44 jlam Exp $
 
 DISTNAME=		cim-3.30
 CATEGORIES=		lang
@@ -8,21 +8,13 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.gnu.org/software/cim/cim.html
 COMMENT=		Simula compiler based on the C programming language
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 INFO_FILES=		cim.info
 
-# Cim works by outputting C code, then executing the C compiler with
-# hard-coded flags.  We need to purge these flags of any buildlink
-# references.
-#
-SCFLAGS=	${CFLAGS:S/${BUILDLINK_DIR}/${LOCALBASE}/g}
-SLDFLAGS=	${LDFLAGS:S/${BUILDLINK_DIR}/${LOCALBASE}/g}
-MAKE_ENV+=	AM_MAKEFLAGS='SCFLAGS="${SCFLAGS}" SLDFLAGS="${SLDFLAGS}"'
-
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/buildlink2.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/libperl/Makefile b/lang/libperl/Makefile
index 86a49e145ad..250f5122e3d 100644
--- a/lang/libperl/Makefile
+++ b/lang/libperl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2002/07/22 22:03:34 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2002/11/15 00:33:04 jlam Exp $
 
 .include "../../lang/perl5/Makefile.common"
 
@@ -10,29 +10,26 @@ MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://language.perl.com/index.html
 COMMENT=	Perl DynaLoader as a shared object
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		# defined
 EXTRACT_ELEMENTS=	${DISTNAME}/ext/DynaLoader
 WRKSRC=			${WRKDIR}/${EXTRACT_ELEMENTS}
 
-BUILDLINK_DEPENDS.perl=	perl-${PERL5_DIST_VERS}*
+#BUILDLINK_DEPENDS.perl=	perl-${PERL5_DIST_VERS}*
 
 .include "../../mk/bsd.prefs.mk"
 
 MKPIC?=		yes
 
 .if ${OPSYS} == "NetBSD"
-.if !exists(/usr/libexec/ld.elf_so) && !exists(/usr/libexec/ld.so)
+.  if !exists(/usr/libexec/ld.elf_so) && !exists(/usr/libexec/ld.so)
 MKPIC=		no
-.endif
+.  endif
 .endif
 
 .if ${MKPIC} == "no"
-IGNORE=		${PKGNAME} needs shared objects
+IGNORE=		${PKGNAME} needs shared objects.
 .endif
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
 do-build:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV}				\
 		${MAKE_PROGRAM} -f ${MAKEFILE} DynaLoader.o
@@ -40,5 +37,5 @@ do-build:
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/DynaLoader.o ${PERL5_ARCHLIB}/DynaLoader_pic.o
 
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"