diff options
| author | tron <tron> | 2010-09-07 17:33:40 +0000 |
|---|---|---|
| committer | tron <tron> | 2010-09-07 17:33:40 +0000 |
| commit | aa449673b364bf7ecfabb3d33a1cb15b0a4f10a3 (patch) | |
| tree | eca989165950ff2fa8c30af5ebacee21e33cac55 | |
| parent | ebb3fecfcc59280134ced8a5bf81f1ae1080b66e (diff) | |
| download | pkgsrc-aa449673b364bf7ecfabb3d33a1cb15b0a4f10a3.tar.gz | |
Require at least version 3.1.4 of "rpm2pkg".
| -rw-r--r-- | mk/emulator/pkg-rpm.mk | 4 | ||||
| -rw-r--r-- | mk/tools/replace.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mk/emulator/pkg-rpm.mk b/mk/emulator/pkg-rpm.mk index 556a3c52f50..ae004620b9a 100644 --- a/mk/emulator/pkg-rpm.mk +++ b/mk/emulator/pkg-rpm.mk @@ -1,4 +1,4 @@ -# $NetBSD: pkg-rpm.mk,v 1.3 2010/09/05 16:13:41 tron Exp $ +# $NetBSD: pkg-rpm.mk,v 1.4 2010/09/07 17:33:40 tron Exp $ # # RPM package format # @@ -56,7 +56,7 @@ # files listed in RPMFILES. # -BUILD_DEPENDS+= rpm2pkg>=3.1.3:../../pkgtools/rpm2pkg +BUILD_DEPENDS+= rpm2pkg>=3.1.4:../../pkgtools/rpm2pkg EVAL_PREFIX+= _RPM2PKG_PREFIX=rpm2pkg RPM2PKG= ${_RPM2PKG_PREFIX}/sbin/rpm2pkg diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index 89a1a2a1125..ac99caaa9ba 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.228 2010/09/05 16:13:41 tron Exp $ +# $NetBSD: replace.mk,v 1.229 2010/09/07 17:33:40 tron Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -701,7 +701,7 @@ TOOLS_PATH.pod2man= ${TOOLS_PREFIX.pod2man}/bin/pod2man . if !empty(PKGPATH:Mpkgtools/rpm2pkg) MAKEFLAGS+= TOOLS_IGNORE.rpm2pkg= . elif !empty(_TOOLS_USE_PKGSRC.rpm2pkg:M[yY][eE][sS]) -TOOLS_DEPENDS.rpm2pkg?= rpm2pkg>=3.1.3:../../pkgtools/rpm2pkg +TOOLS_DEPENDS.rpm2pkg?= rpm2pkg>=3.1.4:../../pkgtools/rpm2pkg TOOLS_CREATE+= rpm2pkg TOOLS_FIND_PREFIX+= TOOLS_PREFIX.rpm2pkg=rpm2pkg TOOLS_PATH.rpm2pkg= ${TOOLS_PREFIX.rpm2pkg}/sbin/rpm2pkg |