From fb3920eecb712db84219366387090c1ae71ee54b Mon Sep 17 00:00:00 2001 From: tron Date: Sat, 21 Jan 2006 20:42:39 +0000 Subject: Invoke "${RANLIB}" manually after installation. This makes this package usable under Mac OS X. Bump package revision and minimal required of this package because of this fix. --- misc/rpm/Makefile | 11 +++++++++-- misc/rpm/buildlink3.mk | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'misc') diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile index bc76e8f9637..88b9bc463dd 100644 --- a/misc/rpm/Makefile +++ b/misc/rpm/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.55 2005/12/29 06:21:55 jlam Exp $ +# $NetBSD: Makefile,v 1.56 2006/01/21 20:42:39 tron Exp $ DISTNAME= rpm-2.5.4 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= misc MASTER_SITES= ftp://ftp.rpm.org/pub/rpm/dist/rpm-2.5.x/ @@ -30,12 +30,19 @@ CONFIGURE_ENV+= varprefix=${RPM_DB_PREFIX:Q} RPMDIR= ${RPM_DB_PREFIX}/lib/rpm FILES_SUBST+= RPMDIR=${RPMDIR:Q} +.include "../../mk/bsd.prefs.mk" + post-configure: cd ${WRKSRC}/po && ${MV} cz.po cs.po pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/include/rpm +.if defined(RANLIB) +post-install: + $(RANLIB) ${PREFIX}/lib/librpm.a +.endif + .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/misc/rpm/buildlink3.mk b/misc/rpm/buildlink3.mk index a50bb6de8d7..34e667fc367 100644 --- a/misc/rpm/buildlink3.mk +++ b/misc/rpm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/07/24 10:53:14 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2006/01/21 20:42:39 tron Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ RPM_BUILDLINK3_MK:= ${RPM_BUILDLINK3_MK}+ @@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrpm} BUILDLINK_PACKAGES+= rpm .if !empty(RPM_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.rpm+= rpm>=2.5.4nb1 +BUILDLINK_DEPENDS.rpm+= rpm>=2.5.4nb4 BUILDLINK_PKGSRCDIR.rpm?= ../../misc/rpm BUILDLINK_DEPMETHOD.rpm?= build -- cgit v1.2.3