fix assorted dependency patterns without version constraint

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: fix assorted dependency patterns without version constraint
From: Tobias Nygren <tnn%NetBSD.org@localhost>
Date: Mon, 19 Oct 2015 20:43:19 +0000
Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Mon Oct 19 22:43:19 2015 +0200
Changeset:	44e6bc0f1068453b3e1c93f1217a579f4c0d0211

Modified Files:
	editorconfig-core/options.mk
	fbsd2pkg/Makefile
	fontaine/Makefile
	milter-greylist-devel/options.mk
	nanomsgxx/Makefile
	neovim/Makefile
	neovim/options.mk
	py-neovim/Makefile
	roundcube-skin-mvision2/Makefile
	ruby-diaspora/Makefile
	stumpwm/Makefile
	tardy/options.mk
	trinity/Makefile
	tsm62/Makefile

Log Message:
fix assorted dependency patterns without version constraint

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=44e6bc0f1068453b3e1c93f1217a579f4c0d0211

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 editorconfig-core/options.mk     | 2 +-
 fbsd2pkg/Makefile                | 4 ++--
 fontaine/Makefile                | 2 +-
 milter-greylist-devel/options.mk | 4 ++--
 nanomsgxx/Makefile               | 2 +-
 neovim/Makefile                  | 4 ++--
 neovim/options.mk                | 2 +-
 py-neovim/Makefile               | 6 +++---
 roundcube-skin-mvision2/Makefile | 2 +-
 ruby-diaspora/Makefile           | 4 ++--
 stumpwm/Makefile                 | 2 +-
 tardy/options.mk                 | 2 +-
 trinity/Makefile                 | 3 +--
 tsm62/Makefile                   | 2 +-
 14 files changed, 20 insertions(+), 21 deletions(-)

diffs:
diff --git a/editorconfig-core/options.mk b/editorconfig-core/options.mk
index 99127f6..5c4cf10 100644
--- a/editorconfig-core/options.mk
+++ b/editorconfig-core/options.mk
@@ -10,7 +10,7 @@ PLIST_VARS+=		doc
 ### Build and install html documentation and man pages
 ###
 .if !empty(PKG_OPTIONS:Mdoc)
-BUILD_DEPENDS+= doxygen:../../devel/doxygen
+BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
 CMAKE_ARGS+=	-DBUILD_DOCUMENTATION=ON
 CMAKE_ARGS+=    -DINSTALL_HTML_DOC=ON
 PLIST.doc=	yes
diff --git a/fbsd2pkg/Makefile b/fbsd2pkg/Makefile
index b5854e8..c337927 100644
--- a/fbsd2pkg/Makefile
+++ b/fbsd2pkg/Makefile
@@ -23,8 +23,8 @@ SUBST_FILES.prefix=	${WRKSRC}/fbsd2pkg
 SUBST_SED.prefix=	\
 	's|fbsd2pkg.awk|${PREFIX}/libexec/fbsd2pkg/fbsd2pkg.awk|g'
 
-DEPENDS+=	createbuildlink:../../pkgtools/createbuildlink \
-		pkglint:../../pkgtools/pkglint
+DEPENDS+=	createbuildlink-[0-9]*:../../pkgtools/createbuildlink \
+		pkglint-[0-9]*:../../pkgtools/pkglint
 
 do-install:
 	${MKDIR} ${DESTDIR}${PREFIX}/bin ${DESTDIR}${PREFIX}/libexec/fbsd2pkg
diff --git a/fontaine/Makefile b/fontaine/Makefile
index bd33f85..53859b0 100644
--- a/fontaine/Makefile
+++ b/fontaine/Makefile
@@ -13,7 +13,7 @@ LICENSE=	gnu-gpl-v2
 USE_CMAKE=	yes
 USE_LANGUAGES=	c++ c
 
-BUILD_DEPENDS+=	doxygen:../../devel/doxygen
+BUILD_DEPENDS+=	doxygen-[0-9]*:../../devel/doxygen
 .include "../../graphics/freetype2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/milter-greylist-devel/options.mk b/milter-greylist-devel/options.mk
index 5211087..22cdbd3 100644
--- a/milter-greylist-devel/options.mk
+++ b/milter-greylist-devel/options.mk
@@ -76,7 +76,7 @@ CONFIGURE_ARGS+=	--with-libdkim=${PREFIX:Q}
 .if empty(PKG_OPTIONS:Mp0f)
 CONFIGURE_ARGS+=	--disable-p0f
 .else
-DEPENDS+=		p0f:../../security/p0f
+DEPENDS+=		p0f-[0-9]*:../../security/p0f
 
 CONFIGURE_ARGS+=	--with-p0f=${PREFIX:Q}
 .endif
@@ -87,7 +87,7 @@ CONFIGURE_ARGS+=	--with-p0f=${PREFIX:Q}
 .if empty(PKG_OPTIONS:Mspamassassin)
 CONFIGURE_ARGS+=	--disable-p0f
 .else
-DEPENDS+=		spamassassin:../../mail/spamassassin
+DEPENDS+=		spamassassin-[0-9]*:../../mail/spamassassin
 CONFIGURE_ARGS+=	--enable-spamassassin
 .endif
 
diff --git a/nanomsgxx/Makefile b/nanomsgxx/Makefile
index 107693c..c91156a 100644
--- a/nanomsgxx/Makefile
+++ b/nanomsgxx/Makefile
@@ -20,7 +20,7 @@ USE_LANGUAGES=	c c++
 PYTHON_FOR_BUILD_ONLY=	yes
 REPLACE_PYTHON+=	waf wscript
 MAKE_ENV+=		PYTHON=${PYTHONBIN}
-BUILD_DEPENDS+=		py${PYTHON_VERSION_DEFAULT}-expat:../../textproc/py-expat
+BUILD_DEPENDS+=		py${PYTHON_VERSION_DEFAULT}-expat-[0-9]*:../../textproc/py-expat
 
 do-configure:
 	cd ${WRKSRC} && env ${MAKE_ENV} ./waf configure
diff --git a/neovim/Makefile b/neovim/Makefile
index ed8ce81..0dce9a3 100644
--- a/neovim/Makefile
+++ b/neovim/Makefile
@@ -20,8 +20,8 @@ USE_LANGUAGES=	c c++
 USE_CMAKE=	yes
 USE_TOOLS+=	gmake
 
-DEPENDS+=       ${LUA_PKGPREFIX}-MessagePack:../../wip/lua-MessagePack
-DEPENDS+=       ${LUA_PKGPREFIX}-lpeg:../../devel/lua-lpeg
+DEPENDS+=       ${LUA_PKGPREFIX}-MessagePack-[0-9]*:../../wip/lua-MessagePack
+DEPENDS+=       ${LUA_PKGPREFIX}-lpeg-[0-9]*:../../devel/lua-lpeg
 
 .include "options.mk"
 
diff --git a/neovim/options.mk b/neovim/options.mk
index ab64c18..4c6e536 100644
--- a/neovim/options.mk
+++ b/neovim/options.mk
@@ -10,7 +10,7 @@ PKG_SUGGESTED_OPTIONS=	python
 ### Support Python (add dependency)
 ###
 .  if !empty(PKG_OPTIONS:Mpython)
-DEPENDS+=       ${PYPKGPREFIX}-neovim:../../wip/py-neovim
+DEPENDS+=       ${PYPKGPREFIX}-neovim-[0-9]*:../../wip/py-neovim
 
 .include "../../lang/python/pyversion.mk"
 .  endif
diff --git a/py-neovim/Makefile b/py-neovim/Makefile
index 650c475..366297f 100644
--- a/py-neovim/Makefile
+++ b/py-neovim/Makefile
@@ -13,9 +13,9 @@ LICENSE=	apache-2.0
 WRKSRC=		${WRKDIR}/python-client-${PKGVERSION_NOREV}
 EGG_NAME=	neovim-${PKGVERSION_NOREV}
 
-DEPENDS+=       ${PYPKGPREFIX}-msgpack:../../devel/py-msgpack
-DEPENDS+=       ${PYPKGPREFIX}-greenlet:../../devel/py-greenlet
-DEPENDS+=       ${PYPKGPREFIX}-trollius:../../wip/py-trollius
+DEPENDS+=       ${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack
+DEPENDS+=       ${PYPKGPREFIX}-greenlet-[0-9]*:../../devel/py-greenlet
+DEPENDS+=       ${PYPKGPREFIX}-trollius-[0-9]*:../../wip/py-trollius
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/roundcube-skin-mvision2/Makefile b/roundcube-skin-mvision2/Makefile
index 5dd5067..9a63780 100644
--- a/roundcube-skin-mvision2/Makefile
+++ b/roundcube-skin-mvision2/Makefile
@@ -10,7 +10,7 @@ MAINTAINER=	pettai%nordu.net@localhost
 HOMEPAGE=	http://roundcubethemes.net/
 COMMENT=	Hotmail/MSN-stylish skin for roundcube webmail
 
-DEPENDS+=	roundcube>=0.2-stable:../../mail/roundcube
+DEPENDS+=	roundcube>=0.2:../../mail/roundcube
 WRKSRC=		${WRKDIR}/mvision2_en
 USE_LANGUAGES=	# none
 
diff --git a/ruby-diaspora/Makefile b/ruby-diaspora/Makefile
index 7896c43..1ec48ef 100644
--- a/ruby-diaspora/Makefile
+++ b/ruby-diaspora/Makefile
@@ -47,8 +47,8 @@ LICENSE=        gnu-agpl-v3
 # rails hints
 # http://guides.rubyonrails.org/getting_started.html
 
-DEPENDS+=	${RUBY_PKGPREFIX}-rubygems:../../misc/rubygems
-DEPENDS+=	${RUBY_PKGPREFIX}-bundler:../../misc/ruby-bundler
+DEPENDS+=	${RUBY_PKGPREFIX}-rubygems-[0-9]*:../../misc/rubygems
+DEPENDS+=	${RUBY_PKGPREFIX}-bundler-[0-9]*:../../misc/ruby-bundler
 
 # TODO: package and depend on all required gems:
 # http://wiki.diaspora-project.org/wiki/Required_Gems_Overview
diff --git a/stumpwm/Makefile b/stumpwm/Makefile
index 48be2f1..6da4fac 100644
--- a/stumpwm/Makefile
+++ b/stumpwm/Makefile
@@ -34,7 +34,7 @@ DEPENDS+=		clisp-new-clx>=2.42:../../x11/clisp-new-clx
 .endif
 .if !empty(PKG_OPTIONS:Msbcl)
 LISP_CENTRAL_REGISTRY=	${SBCL_CENTRAL_REGISTRY}
-DEPENDS+=		sbcl-portable-clx:../../wip/cl-portable-clx
+DEPENDS+=		sbcl-portable-clx-[0-9]*:../../wip/cl-portable-clx
 .endif
 # From README: "by default stumpwm elects sbcl"
 .if !empty(PKG_OPTIONS:Mclisp)
diff --git a/tardy/options.mk b/tardy/options.mk
index ae79b84..2c1b764 100644
--- a/tardy/options.mk
+++ b/tardy/options.mk
@@ -14,5 +14,5 @@ PKG_SUGGESTED_OPTIONS=
 ### testing support
 ###
 .if !empty(PKG_OPTIONS:Mtesting)
-DEPENDS+=	gcpio:../../archivers/gcpio
+DEPENDS+=	gcpio-[0-9]*:../../archivers/gcpio
 .endif
diff --git a/trinity/Makefile b/trinity/Makefile
index cbd09a6..b3d0268 100644
--- a/trinity/Makefile
+++ b/trinity/Makefile
@@ -36,7 +36,7 @@ MAKE_JOBS_SAFE=	no
 
 # Just assuming C and C++: Adjust this!
 USE_LANGUAGES=	c c++
-USE_TOOLS+=	gmake pax perl
+USE_TOOLS+=	gmake pax perl bash:run
 REPLACE_SH=	trinity-plugins/collectl/make_data_files.sh \
 		trinity-plugins/collectl/plot.sh \
 		trinity-plugins/collectl/timetable.sh \
@@ -102,7 +102,6 @@ DATADIR=	${PREFIX}/share/trinity
 DOCSDIR=	${PREFIX}/share/doc/trinity
 
 # Add p4-sys-cpu for CPU_MAX?
-DEPENDS+=	bash:../../shells/bash
 
 LIBEXEC_DIR=	${PREFIX}/libexec/trinity
 PLUGINS_DIR=	${LIBEXEC_DIR}/trinity-plugins
diff --git a/tsm62/Makefile b/tsm62/Makefile
index 021d6c8..ebf6bf1 100644
--- a/tsm62/Makefile
+++ b/tsm62/Makefile
@@ -60,7 +60,7 @@ RPMFILES+=		${WRKDIR}/TIVsm-API64.i386.rpm \
 			${WRKDIR}/gskssl64-8.0.14.6.linux.x86_64.rpm
 
 # Make sure suse pkg version equals the above
-DEPENDS+=               suse32_base:../../emulators/suse121_32_base
+DEPENDS+=               suse32_base-[0-9]*:../../emulators/suse121_32_base
 
 EMUL32DIR=		${PREFIX}${_OPSYS_EMULDIR.linux32}
 PLIST_SUBST+=		EMUL32DIR=${EMUL32DIR:Q}
Prev by Date: blasr_libcpp: bash:run instead of DEPENDS on bash
Next by Date: ruby-ronn: add RUBY_VERSION_SUPPORTED
Previous by Thread: blasr_libcpp: bash:run instead of DEPENDS on bash
Next by Thread: ruby-ronn: add RUBY_VERSION_SUPPORTED
Indexes:
Home | Main Index | Thread Index | Old Index