From 7996e577a253931ca3a6eb5ec8826b885bac322a Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Fri, 23 Aug 2002 05:22:54 +0000
Subject: Merge pkgsrc/pkgtools from the buildlink2 branch back to the main
 trunk.

---
 pkgtools/rpm2pkg/Makefile | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'pkgtools/rpm2pkg')

diff --git a/pkgtools/rpm2pkg/Makefile b/pkgtools/rpm2pkg/Makefile
index f710cc29f55..3578ebd465e 100644
--- a/pkgtools/rpm2pkg/Makefile
+++ b/pkgtools/rpm2pkg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/07/14 07:38:29 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/08/23 05:22:56 jlam Exp $
 
 DISTNAME=	rpm2pkg-1.2
 CATEGORIES=	pkgtools
@@ -11,9 +11,9 @@ COMMENT=	Convert RPM archives to NetBSD packages
 
 CONFLICTS+=	suse-base<=6.4
 
-USE_BUILDLINK_ONLY=	YES
-NO_CHECKSUM=		YES
-WRKSRC=			${WRKDIR}
+USE_BUILDLINK2=	YES
+NO_CHECKSUM=	YES
+WRKSRC=		${WRKDIR}
 
 RPMLIB=		${BUILDLINK_DIR}/lib/librpm.a
 
@@ -21,13 +21,14 @@ CFLAGS+=	-I${BUILDLINK_DIR}/include/rpm
 LIBS=		${RPMLIB} -lintl -lz
 
 do-build:
-	${CC} ${FILESDIR}/rpm2pkg.c ${CFLAGS} ${LDFLAGS} ${LIBS}	\
-		-o ${WRKSRC}/rpm2pkg
+	${BUILDLINK_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/buildlink.mk"
-.include "../../misc/rpm/buildlink.mk"
+.include "../../devel/zlib/buildlink2.mk"
+.include "../../misc/rpm/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3