summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjmmv <jmmv>2009-12-20 12:32:55 +0000
committerjmmv <jmmv>2009-12-20 12:32:55 +0000
commitbb5bdfe813b65d0995fd16cb34f329f0d3536320 (patch)
tree077626e184415dc302cf816e162c5c8307ee58e3 /mk
parentc0ff165a0ba1c4fd33155c80cb571b22009c2235 (diff)
downloadpkgsrc-bb5bdfe813b65d0995fd16cb34f329f0d3536320.tar.gz
Fix libtool under OS X: require a fixed version of f2c, and thus bump
PKGREVISION of libtool to 3 and require it as a dependency.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.use.mk4
-rw-r--r--mk/compiler/f2c.mk4
2 files changed, 4 insertions, 4 deletions
diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk
index 42598742edf..9ed82b98d50 100644
--- a/mk/bsd.pkg.use.mk
+++ b/mk/bsd.pkg.use.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.use.mk,v 1.49 2009/12/16 19:48:09 joerg Exp $
+# $NetBSD: bsd.pkg.use.mk,v 1.50 2009/12/20 12:32:55 jmmv Exp $
#
# Turn USE_* macros into proper depedency logic. Included near the top of
# bsd.pkg.mk, after bsd.prefs.mk.
@@ -97,7 +97,7 @@ _SHLIBTOOL?= ${PKG_SHLIBTOOL}
LIBTOOL?= ${PKG_LIBTOOL}
SHLIBTOOL?= ${PKG_SHLIBTOOL}
.if defined(USE_LIBTOOL)
-LIBTOOL_REQD?= 2.2.6bnb1
+LIBTOOL_REQD?= 2.2.6bnb3
BUILD_DEPENDS+= libtool-base>=${_OPSYS_LIBTOOL_REQD:U${LIBTOOL_REQD}}:../../devel/libtool-base
CONFIGURE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}"
MAKE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}"
diff --git a/mk/compiler/f2c.mk b/mk/compiler/f2c.mk
index d288ba6eadb..9f88d1715cc 100644
--- a/mk/compiler/f2c.mk
+++ b/mk/compiler/f2c.mk
@@ -1,4 +1,4 @@
-# $NetBSD: f2c.mk,v 1.13 2009/12/15 17:35:36 joerg Exp $
+# $NetBSD: f2c.mk,v 1.14 2009/12/20 12:32:55 jmmv Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -88,7 +88,7 @@ PREPEND_PATH+= ${_F2C_DIR}/bin
. endif
# Dependencies:
-BUILD_DEPENDS+= f2c>20090411:../../lang/f2c # translator
+BUILD_DEPENDS+= f2c>=20090411nb2:../../lang/f2c # translator
.if empty(PKGPATH:Mdevel/libtool-base) # See below
. include "../../devel/libf2c/buildlink3.mk" # library