From 64ee1a44ec858b042fe8f9ce285f3dad3173d36c Mon Sep 17 00:00:00 2001 From: msf Date: Mon, 10 Aug 2009 16:48:27 +0000 Subject: [PATCH] respect MODRUBY_LIB_DEPENDS, no plist change ok bernd@ --- textproc/eruby/Makefile | 4 ++-- textproc/ruby-hpricot/Makefile | 4 ++-- textproc/ruby-hyperestraier/Makefile | 4 ++-- www/mod_ruby/Makefile | 6 +++--- www/ruby-fcgi/Makefile | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/textproc/eruby/Makefile b/textproc/eruby/Makefile index 1fbf57ec1fe..5119509532c 100644 --- a/textproc/eruby/Makefile +++ b/textproc/eruby/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2009/06/22 17:00:24 naddy Exp $ +# $OpenBSD: Makefile,v 1.10 2009/08/10 16:48:27 msf Exp $ SHARED_ONLY= Yes @@ -23,7 +23,7 @@ MASTER_SITES= ${HOMEPAGE}archive/ MODULES= lang/ruby -LIB_DEPENDS= ruby::lang/ruby +LIB_DEPENDS= ${MODRUBY_LIB_DEPENDS} CONFIGURE_STYLE= simple CONFIGURE_SCRIPT= configure.rb diff --git a/textproc/ruby-hpricot/Makefile b/textproc/ruby-hpricot/Makefile index d71f6098720..f2057a5dead 100644 --- a/textproc/ruby-hpricot/Makefile +++ b/textproc/ruby-hpricot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2009/05/19 22:22:18 bernd Exp $ +# $OpenBSD: Makefile,v 1.5 2009/08/10 16:48:28 msf Exp $ SHARED_ONLY= Yes @@ -20,7 +20,7 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_RUBYFORGE:=hobix/} WANTLIB= c m -LIB_DEPENDS= ruby::lang/ruby +LIB_DEPENDS= ${MODRUBY_LIB_DEPENDS} BUILD_DEPENDS= ::devel/ruby-rake diff --git a/textproc/ruby-hyperestraier/Makefile b/textproc/ruby-hyperestraier/Makefile index 127b5e29ebc..fe615139fca 100644 --- a/textproc/ruby-hyperestraier/Makefile +++ b/textproc/ruby-hyperestraier/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2009/06/22 17:00:24 naddy Exp $ +# $OpenBSD: Makefile,v 1.14 2009/08/10 16:48:28 msf Exp $ SHARED_ONLY= Yes @@ -23,7 +23,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hyperestraier/} WANTLIB= c m MODULES= lang/ruby -LIB_DEPENDS= ruby.>=1::lang/ruby \ +LIB_DEPENDS= ${MODRUBY_LIB_DEPENDS} \ estraier.>=8::textproc/hyperestraier CONFIGURE_STYLE= gnu diff --git a/www/mod_ruby/Makefile b/www/mod_ruby/Makefile index ff3873550ad..d1ef2366538 100644 --- a/www/mod_ruby/Makefile +++ b/www/mod_ruby/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2009/06/03 00:48:51 pyr Exp $ +# $OpenBSD: Makefile,v 1.9 2009/08/10 16:51:38 msf Exp $ COMMENT= module that embeds Ruby into Apache @@ -10,7 +10,7 @@ HOMEPAGE= http://modruby.net/ MAINTAINER= Adam Montague -MODULES= apache-module +MODULES= apache-module lang/ruby # BSD PERMIT_PACKAGE_CDROM= Yes @@ -23,7 +23,7 @@ MODAPACHE_NAME= ruby MASTER_SITES= http://modruby.net/archive/ -LIB_DEPENDS= ruby::lang/ruby +LIB_DEPENDS= ${MODRUBY_LIB_DEPENDS} CONFIGURE_STYLE= simple CONFIGURE_SCRIPT= configure.rb diff --git a/www/ruby-fcgi/Makefile b/www/ruby-fcgi/Makefile index 8de832328d8..1f45619dcbf 100644 --- a/www/ruby-fcgi/Makefile +++ b/www/ruby-fcgi/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2008/06/15 00:01:25 landry Exp $ +# $OpenBSD: Makefile,v 1.6 2009/08/10 16:51:38 msf Exp $ COMMENT= ruby FastCGI library @@ -18,8 +18,8 @@ MODULES= lang/ruby WANTLIB= c m -LIB_DEPENDS= fcgi:fcgi->=2.4.0:www/fcgi \ - ruby.>=1::lang/ruby +LIB_DEPENDS= ${MODRUBY_LIB_DEPENDS} \ + fcgi:fcgi->=2.4.0:www/fcgi CONFIGURE_STYLE=ruby gem CONFIGURE_ARGS= --with-fcgi-include=${LOCALBASE}/include \