diff options
| author | jlam <jlam> | 2002-08-25 18:38:05 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-08-25 18:38:05 +0000 |
| commit | f22b8c42a61ccfbb462bf2b94c3486b7baec18bd (patch) | |
| tree | d2b31bb9a6a069ebfb63079b9dddde1e6688bc4b /misc | |
| parent | 71eaa77968f19e23d72fdc88e5f38259b8f7cdf3 (diff) | |
| download | pkgsrc-f22b8c42a61ccfbb462bf2b94c3486b7baec18bd.tar.gz | |
Merge changes in packages from the buildlink2 branch that have
buildlink2.mk files back into the main trunk. This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/rpm/Makefile | 10 | ||||
| -rw-r--r-- | misc/rpm/buildlink2.mk | 24 |
2 files changed, 29 insertions, 5 deletions
diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile index 73735b4ccf4..668e45e1aba 100644 --- a/misc/rpm/Makefile +++ b/misc/rpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2002/04/04 19:56:37 jdolecek Exp $ +# $NetBSD: Makefile,v 1.34 2002/08/25 18:39:29 jlam Exp $ # DISTNAME= rpm-2.5.4 @@ -16,7 +16,7 @@ CONFLICTS+= rpm2cpio<1.0nb1 GNU_CONFIGURE= yes USE_GMAKE= yes -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes DEINSTALL_FILE= ${WRKDIR}/DEINSTALL INSTALL_FILE= ${WRKDIR}/INSTALL @@ -26,7 +26,7 @@ FILES_SUBST+= MKDIR=${MKDIR:Q} FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} post-configure: - cd ${WRKSRC}/po && ( mv cz.mo cs.mo; mv cz.po cs.po ) + cd ${WRKSRC}/po && ( ${MV} cz.mo cs.mo; ${MV} cz.po cs.po ) pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/include/rpm @@ -36,6 +36,6 @@ pre-install: post-install: PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../devel/zlib/buildlink.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/zlib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/rpm/buildlink2.mk b/misc/rpm/buildlink2.mk new file mode 100644 index 00000000000..4bf6cf66d3c --- /dev/null +++ b/misc/rpm/buildlink2.mk @@ -0,0 +1,24 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:29 jlam Exp $ + +.if !defined(RPM_BUILDLINK2_MK) +RPM_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= rpm +BUILDLINK_DEPENDS.rpm?= rpm>=2.4.3 +BUILDLINK_PKGSRCDIR.rpm?= ../../misc/rpm + +# This adds a build-dependency as rpm only has a static library. +BUILDLINK_DEPMETHOD.rpm?= build + +EVAL_PREFIX+= BUILDLINK_PREFIX.rpm=rpm +BUILDLINK_PREFIX.rpm_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.rpm= include/rpm/* +BUILDLINK_FILES.rpm+= lib/librpm.a + +.include "../../devel/gettext-lib/buildlink2.mk" + +BUILDLINK_TARGETS+= rpm-buildlink + +rpm-buildlink: _BUILDLINK_USE + +.endif # RPM_BUILDLINK2_MK |