revert buildlink2.mk merge until Johnny has a chance to look at the issues

3 files changed, 16 insertions, 20 deletions

diff --git a/pkgtools/pkgdiff/Makefile b/pkgtools/pkgdiff/Makefile
index 6d0c109aecc..c8220834ea5 100644
--- a/pkgtools/pkgdiff/Makefile
+++ b/pkgtools/pkgdiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2002/08/23 05:22:56 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2002/08/23 14:32:13 abs Exp $
 #
 
 DISTNAME=	pkgdiff-0.106
@@ -11,6 +11,7 @@ HOMEPAGE=	ftp://ftp.netbsd.org/pub/NetBSD/packages/pkgsrc/Packages.txt
 COMMENT=	Tools to ease creating and maintaining patches for pkgsrc
 
 PERL5_REQD=	5.6.0
+USE_PERL5=	YES
 
 EXTRACT_ONLY=	# empty
 WRKSRC=		${WRKDIR}
@@ -18,8 +19,6 @@ NO_CHECKSUM=	yes
 NO_PATCH=	yes
 NO_CONFIGURE=	yes
 
-USE_BUILDLINK2=	yes
-
 MAKE_ENV=	PKGSRCDIR=${_PKGSRCDIR}
 
 .include "../../mk/bsd.prefs.mk"
@@ -59,5 +58,4 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/${FILE}.1 ${PREFIX}/man/man1
 .endfor
 
-.include "../../lang/perl5/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/rpm2pkg/Makefile b/pkgtools/rpm2pkg/Makefile
index 3578ebd465e..3bd235fe95f 100644
--- a/pkgtools/rpm2pkg/Makefile
+++ b/pkgtools/rpm2pkg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/08/23 05:22:56 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2002/08/23 14:28:43 abs Exp $
 
 DISTNAME=	rpm2pkg-1.2
 CATEGORIES=	pkgtools
@@ -11,9 +11,9 @@ COMMENT=	Convert RPM archives to NetBSD packages
 
 CONFLICTS+=	suse-base<=6.4
 
-USE_BUILDLINK2=	YES
-NO_CHECKSUM=	YES
-WRKSRC=		${WRKDIR}
+USE_BUILDLINK_ONLY=	YES
+NO_CHECKSUM=		YES
+WRKSRC=			${WRKDIR}
 
 RPMLIB=		${BUILDLINK_DIR}/lib/librpm.a
 
@@ -21,14 +21,13 @@ CFLAGS+=	-I${BUILDLINK_DIR}/include/rpm
 LIBS=		${RPMLIB} -lintl -lz
 
 do-build:
-	${BUILDLINK_CC} ${FILESDIR}/rpm2pkg.c \
-		${CFLAGS} ${LDFLAGS} ${LIBS} -o ${WRKSRC}/rpm2pkg
+	${CC} ${FILESDIR}/rpm2pkg.c ${CFLAGS} ${LDFLAGS} ${LIBS}	\
+		-o ${WRKSRC}/rpm2pkg
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/rpm2pkg ${PREFIX}/sbin
 	${INSTALL_MAN} ${FILESDIR}/rpm2pkg.8 ${PREFIX}/man/man8
 
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../misc/rpm/buildlink2.mk"
-
+.include "../../devel/zlib/buildlink.mk"
+.include "../../misc/rpm/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index 4df2e22a771..83d04b3e28c 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/08/23 05:22:57 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2002/08/23 14:27:14 abs Exp $
 #
 # NOTE:	If you update this package, then you'll likely need to also update
 #	the x11-links dependency in x11.buildlink.mk to the correct version,
@@ -23,13 +23,12 @@ USE_X11=	# defined
 PLIST_SRC=		${WRKDIR}/.PLIST_SRC
 BUILDLINK_X11_SUBDIR=	share/x11-links
 
-USE_BUILDLINK2=	# defined
-_FOR_X11_LINKS_ONLY=	# needed to use x11-links/*.buildlink2.mk
+_FOR_X11_LINKS_ONLY=-	# needed to use x11-links/buildlink.mk
 
 .include "../../mk/bsd.prefs.mk"
-
+   
 .if !exists(${X11BASE}/include/X11/X.h)
-IGNORE=		"${PKGNAME} requires X headers to be installed"
+IGNORE=         "x11-links requires X headers to be installed"
 .endif
 
 do-install:
@@ -43,8 +42,8 @@ do-install:
 	${ECHO} "@unexec ${RM} -rf %D/${BUILDLINK_X11_SUBDIR}" >> ${PLIST_SRC}
 
 .if !empty(X11BASE:M*openwin)
-.  include "openwin.buildlink2.mk"
+.  include "openwin.buildlink.mk"
 .else
-.  include "xfree.buildlink2.mk"
+.  include "xfree.buildlink.mk"
 .endif
 .include "../../mk/bsd.pkg.mk"