diff options
| author | grant <grant@pkgsrc.org> | 2004-07-24 04:43:10 +0000 |
|---|---|---|
| committer | grant <grant@pkgsrc.org> | 2004-07-24 04:43:10 +0000 |
| commit | b64a4ec172641e90a0b262560b4def031f78946d (patch) | |
| tree | 385cdf0d085c319232f3573d7a622e843dc1832e /misc/rpm/Makefile | |
| parent | dfe438e74bb229174f2d7bf8ef7dfb182fd05d86 (diff) | |
| download | pkgsrc-b64a4ec172641e90a0b262560b4def031f78946d.tar.gz | |
the included popt library is broken on some platforms because it assumes
alloca is available without explicitly pulling it in. use the devel/popt
pkg instead and fix PKGLOCALEDIR handling while I'm here.
fixes install on Solaris.
Diffstat (limited to 'misc/rpm/Makefile')
| -rw-r--r-- | misc/rpm/Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile index 670a2333f65..be81c533f4c 100644 --- a/misc/rpm/Makefile +++ b/misc/rpm/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.47 2004/04/25 11:46:54 wiz Exp $ +# $NetBSD: Makefile,v 1.48 2004/07/24 04:43:10 grant Exp $ DISTNAME= rpm-2.5.4 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= misc MASTER_SITES= ftp://ftp.rpm.org/pub/rpm/dist/rpm-2.5.x/ @@ -15,7 +15,6 @@ CONFLICTS+= rpm2cpio<1.0nb1 USE_BUILDLINK3= yes USE_DB185= yes -USE_PKGLOCALEDIR= yes USE_GNU_TOOLS+= make GNU_CONFIGURE= yes @@ -23,6 +22,9 @@ USE_PKGINSTALL= yes DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL +# this is needed instead of USE_PKGLOCALEDIR +CONFIGURE_ARGS+= --datadir=${PREFIX}/${PKGLOCALEDIR} + # The rpm databases are kept under ${RPM_DB_PREFIX}/lib/rpm. CONFIGURE_ENV+= varprefix="${RPM_DB_PREFIX}" @@ -38,6 +40,7 @@ pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/include/rpm .include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/popt/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../mk/bdb.buildlink3.mk" |