summaryrefslogtreecommitdiff
path: root/pkgtools/rpm2pkg
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2002-08-25 19:43:33 +0000
committerjlam <jlam@pkgsrc.org>2002-08-25 19:43:33 +0000
commit54b8c01927ece651f77440db5ff508dddf1857be (patch)
treef3dd80b594e158134a545b6d04e86e6bc9bb1047 /pkgtools/rpm2pkg
parenta3b55cd1caed840fcd6d7d8d37b9d2ed927d01c5 (diff)
downloadpkgsrc-54b8c01927ece651f77440db5ff508dddf1857be.tar.gz
Revert previous change now that the buildlink2.mk files have hit the main
trunk. These packages can now safely use buildlink2.mk files.
Diffstat (limited to 'pkgtools/rpm2pkg')
-rw-r--r--pkgtools/rpm2pkg/Makefile17
1 files changed, 9 insertions, 8 deletions
diff --git a/pkgtools/rpm2pkg/Makefile b/pkgtools/rpm2pkg/Makefile
index 3bd235fe95f..2ed0fbe972a 100644
--- a/pkgtools/rpm2pkg/Makefile
+++ b/pkgtools/rpm2pkg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/08/23 14:28:43 abs Exp $
+# $NetBSD: Makefile,v 1.13 2002/08/25 19:43:33 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"