Date: Fri, 11 Jan 2013 22:05:13 +0000 (UTC) From: Jason Helfman <jgh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310250 - in head: Mk benchmarks/rubygem-railsbench databases/rubygem-activerecord devel/rubygem-multi_json lang/ruby18 lang/ruby19 www/rubygem-rails Message-ID: <201301112205.r0BM5Eje076729@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jgh Date: Fri Jan 11 22:05:13 2013 New Revision: 310250 URL: http://svnweb.freebsd.org/changeset/ports/310250 Log: - update remaining ruby@ maintained ports to new options framework - trim historical header where applicable Reviewed by: swills@ (ruby@) Modified: head/Mk/bsd.ruby.mk head/benchmarks/rubygem-railsbench/Makefile head/databases/rubygem-activerecord/Makefile head/devel/rubygem-multi_json/Makefile head/lang/ruby18/Makefile head/lang/ruby19/Makefile head/www/rubygem-rails/Makefile Modified: head/Mk/bsd.ruby.mk ============================================================================== --- head/Mk/bsd.ruby.mk Fri Jan 11 21:52:47 2013 (r310249) +++ head/Mk/bsd.ruby.mk Fri Jan 11 22:05:13 2013 (r310250) @@ -370,7 +370,7 @@ ruby-shebang-patch: done .endif -.if defined(DEBUG) +.if ${PORT_OPTIONS:MDEBUG} RUBY_FLAGS+= -d .endif Modified: head/benchmarks/rubygem-railsbench/Makefile ============================================================================== --- head/benchmarks/rubygem-railsbench/Makefile Fri Jan 11 21:52:47 2013 (r310249) +++ head/benchmarks/rubygem-railsbench/Makefile Fri Jan 11 22:05:13 2013 (r310250) @@ -1,7 +1,4 @@ -# Ports collection makefile for: rubygem-railsbench -# Date created: 02 April 2007 -# Whom: Alexander Logvinov <ports@logvinov.com> -# +# Created by: Alexander Logvinov <ports@logvinov.com> # $FreeBSD$ PORTNAME= railsbench @@ -19,13 +16,14 @@ USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes PLIST_FILES= bin/railsbench -OPTIONS= GRUFF "Plotting of perf data support using gruff" off +OPTIONS_DEFINE= GRUFF +GRUFF_DESC= Plotting of perf data support using gruff OPTIONSFILE= ${PORT_DBDIR}/rubygem-${PORTNAME}/options -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_GRUFF) +.if ${PORT_OPTIONS:MGRUFF} RUN_DEPENDS+= rubygem-gruff>=0.2.8:${PORTSDIR}/graphics/rubygem-gruff .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/databases/rubygem-activerecord/Makefile ============================================================================== --- head/databases/rubygem-activerecord/Makefile Fri Jan 11 21:52:47 2013 (r310249) +++ head/databases/rubygem-activerecord/Makefile Fri Jan 11 22:05:13 2013 (r310250) @@ -1,7 +1,4 @@ -# Ports collection makefile for: gem-activerecord -# Date created: 27 May 2005 -# Whom: Jonathan Weiss (<jw@innerewut.de>) -# +# Created by: Jonathan Weiss (<jw@innerewut.de>) # $FreeBSD$ PORTNAME= activerecord @@ -21,23 +18,23 @@ USE_RUBY= yes USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes -OPTIONS= \ - NATIVE_MYSQL "Use native MySQL bindings" Off \ - NATIVE_POSTGRESQL "Use native PostgreSQL bindings" Off \ - NATIVE_SQLITE3 "Use native SQLite3 bindings" Off +OPTIONS_DEFINE= MYSQL PGSQL SQLITE3 +MYSQL_DESC= Use native MySQL bindings +PGSQL_DESC= Use native PostgreSQL bindings +SQLITE3_DESC= Use native SQLite3 bindings OPTIONSFILE= ${PORT_DBDIR}/rubygem-${PORTNAME}/options .include <bsd.port.options.mk> -.if defined(WITH_NATIVE_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} RUN_DEPENDS+= ${RUBY_PKGNAMEPREFIX}mysql>0:${PORTSDIR}/databases/ruby-mysql .endif -.if defined(WITH_NATIVE_POSTGRESQL) +.if ${PORT_OPTIONS:MPGSQL} RUN_DEPENDS+= rubygem-pg>=0:${PORTSDIR}/databases/rubygem-pg .endif -.if defined(WITH_NATIVE_SQLITE3) +.if ${PORT_OPTIONS:MSQLITE3} RUN_DEPENDS+= rubygem-sqlite3>=1.2.1:${PORTSDIR}/databases/rubygem-sqlite3 .endif Modified: head/devel/rubygem-multi_json/Makefile ============================================================================== --- head/devel/rubygem-multi_json/Makefile Fri Jan 11 21:52:47 2013 (r310249) +++ head/devel/rubygem-multi_json/Makefile Fri Jan 11 22:05:13 2013 (r310250) @@ -1,9 +1,5 @@ -# New ports collection makefile for: multi_json -# Date created: Mar 4, 2011 -# Whom: Cheng-Lung Sung <clsung@FreeBSD.org> -# +# Created by: Cheng-Lung Sung <clsung@FreeBSD.org> # $FreeBSD$ -# PORTNAME= multi_json PORTVERSION= 1.5.0 @@ -13,26 +9,28 @@ MASTER_SITES= RG MAINTAINER= ruby@FreeBSD.org COMMENT= Ruby library provide swappable JSON backends -OPTIONS= JSON "JSON implementation as a Ruby extension in C" off \ - JSON_PURE "JSON implementation in pure Ruby" on \ - YAJL_RUBY "Yajl JSON stream-based parser library" off +OPTIONS_DEFINE= JSON JSON_PURE YAJL_RUBY +JSON_DESC= JSON implementation as a Ruby extension in C +JSON_PURE_DESC= JSON implementation in pure Ruby +YAJL_RUBY_DESC= Yajl JSON stream-based parser library +OPTIONS_DEFAULT= JSON_PURE USE_RUBY= yes USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_JSON) +.if ${PORT_OPTIONS:MJSON} RUN_DEPENDS+= rubygem-json>=0:${PORTSDIR}/devel/rubygem-json .endif -.if defined(WITH_JSON_PURE) +.if ${PORT_OPTIONS:MJSON_PURE} RUN_DEPENDS+= rubygem-json_pure>=0:${PORTSDIR}/devel/rubygem-json_pure .endif -.if defined(WITH_YAJL_RUBY) +.if ${PORT_OPTIONS:MYAJL_RUBY} RUN_DEPENDS+= rubygem-yajl-ruby>=0:${PORTSDIR}/devel/rubygem-yajl-ruby .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/lang/ruby18/Makefile ============================================================================== --- head/lang/ruby18/Makefile Fri Jan 11 21:52:47 2013 (r310249) +++ head/lang/ruby18/Makefile Fri Jan 11 22:05:13 2013 (r310250) @@ -41,9 +41,11 @@ RUBY_NO_BUILD_DEPENDS= yes RUBY_NO_RUN_DEPENDS= yes _RUBY_SYSLIBDIR= ${PREFIX}/lib -OPTIONS= ONIGURUMA "Build with oniguruma regular expressions lib" off \ - RDOC "Build and install Rdoc indexes" on \ - DEBUG "Compile-in debug info" off +OPTIONS_DEFINE= ONIGURUMA RDOC DEBUG +ONIGURUMA_DESC= Build with oniguruma regular expressions lib +RDOC_DESC= Build and install Rdoc indexes +DEBUG_DESC= Compile-in debug info +OPTIONS_DEFAULT= RDOC .include <bsd.port.pre.mk> @@ -74,7 +76,7 @@ LDFLAGS+= ${PTHREAD_LIBS} CONFIGURE_ARGS+=--enable-pthread .endif -.if defined(WITH_ONIGURUMA) +.if ${PORT_OPTIONS:MONIGURUMA} PKGNAMESUFFIX:= ${PKGNAMESUFFIX}+oniguruma BUILD_DEPENDS+= ${NONEXISTENT}:${ONIGURUMA_PORTDIR}:patch ONIGURUMA_PORTDIR=${PORTSDIR}/devel/oniguruma @@ -87,7 +89,7 @@ PLIST_SUB+= ONIGURUMA="@comment " # # Disable doc generation if requested or docs disabled at all # -.if !defined(WITHOUT_RDOC) && !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MRDOC} && ${PORT_OPTIONS:MDOCS} CONFIGURE_ARGS+= --enable-install-doc .else CONFIGURE_ARGS+= --disable-install-doc @@ -144,7 +146,7 @@ post-patch: .endfor pre-configure: -.if defined(WITH_ONIGURUMA) +.if ${PORT_OPTIONS:MONIGURUMA} cd ${ONIGURUMA_WRKSRC}; ./configure; \ ${MAKE} -f Makefile ${RUBY_RELVERSION:S/.//g} \ RUBYDIR="${WRKSRC}" @@ -152,7 +154,7 @@ pre-configure: ${TOUCH} ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} post-configure: -.if defined(WITH_ONIGURUMA) +.if ${PORT_OPTIONS:MONIGURUMA} cd ${WRKSRC}/ && ${PATCH} -p0 < ${PATCHDIR}/extrapatch-oniguruma-reggnu.c .endif @@ -202,7 +204,7 @@ post-install: . endfor .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} # Create all dirs required (":u" isn't avaiable in STABLE yet :-() ${MKDIR} ${EXTSAMPLES:C,^([^/]+)/.*,\1,:S,^,${RUBY_EXAMPLESDIR}/,} ${MKDIR} ${EXTDOCS:C,^([^/]+)/.*,\1,:S,^,${RUBY_DOCDIR}/,} Modified: head/lang/ruby19/Makefile ============================================================================== --- head/lang/ruby19/Makefile Fri Jan 11 21:52:47 2013 (r310249) +++ head/lang/ruby19/Makefile Fri Jan 11 22:05:13 2013 (r310250) @@ -44,8 +44,9 @@ MAKE_JOBS_UNSAFE= yes NO_LATEST_LINK= yes -OPTIONS= RDOC "Build and install Rdoc indexes" off \ - DEBUG "Compile-in debug info" off +OPTIONS_DEFINE= RDOC DEBUG +RDOC_DESC= Build and install Rdoc indexes +DEBUG_DESC= Compile-in debug info .include <bsd.port.pre.mk> @@ -66,7 +67,7 @@ LDFLAGS+= ${PTHREAD_LIBS} # libraries d # # Disable doc generation if requested or docs disabled at all # -.if defined(WITH_RDOC) && !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MRDOC} && ${PORT_OPTIONS:MDOCS} CONFIGURE_ARGS+= --enable-install-doc .else CONFIGURE_ARGS+= --disable-install-doc @@ -180,7 +181,7 @@ post-install: . endfor .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} # Create all dirs required (":u" isn't avaiable in STABLE yet :-() ${MKDIR} ${EXTSAMPLES:C,^([^/]+)/.*,\1,:S,^,${RUBY_EXAMPLESDIR}/,} ${MKDIR} ${EXTDOCS:C,^([^/]+)/.*,\1,:S,^,${RUBY_DOCDIR}/,} Modified: head/www/rubygem-rails/Makefile ============================================================================== --- head/www/rubygem-rails/Makefile Fri Jan 11 21:52:47 2013 (r310249) +++ head/www/rubygem-rails/Makefile Fri Jan 11 22:05:13 2013 (r310250) @@ -1,7 +1,4 @@ -# Ports collection makefile for: rubygem-rails -# Date created: 27 May 2005 -# Whom: Jonathan Weiss (<jw@innerewut.de>) -# +# Created by: Jonathan Weiss (<jw@innerewut.de>) # $FreeBSD$ PORTNAME= rails @@ -44,33 +41,33 @@ USE_RUBY_RDOC= yes USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes -OPTIONS= \ - FCGI "FastCGI backend" Off \ - MONGREL "Mongrel backend" Off \ - MONGRELCLUSTER "Mongrel Cluster backend" Off \ - PASSENGER "Passenger backend" Off \ - MEMCACHE_CLIENT "MemCache-Client support" Off +OPTIONS_DEFINE=FCGI MONGREL MONGRELCLUSTER PASSENGER MEMCACHE_CLIENT +FCGI_DESC= FastCGI backend +MONGREL_DESC= Mongrel backend +MONGRELCLUSTER_DESC= Mongrel Cluster backend +PASSENGER_DESC= Passenger backend +MEMCACHE_CLIENT_DESC= MemCache-Client support OPTIONSFILE= ${PORT_DBDIR}/rubygem-${PORTNAME}/options .include <bsd.port.options.mk> -.if defined(WITH_FCGI) +.if ${PORT_OPTIONS:MFCGI} RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/fcgi.so:${PORTSDIR}/www/ruby-fcgi .endif -.if defined(WITH_MEMCACHE_CLIENT) +.if ${PORT_OPTIONS:MMEMCACHE_CLIENT} RUN_DEPENDS+= rubygem-memcache-client>=1.2.0:${PORTSDIR}/databases/rubygem-memcache-client .endif -.if defined(WITH_MONGREL) +.if ${PORT_OPTIONS:MMONGREL} RUN_DEPENDS+= rubygem-mongrel>=1.1.5:${PORTSDIR}/www/rubygem-mongrel .endif -.if defined(WITH_MONGRELCLUSTER) +.if ${PORT_OPTIONS:MMONGRELCLUSTER} RUN_DEPENDS+= rubygem-mongrel_cluster>=1.0.5:${PORTSDIR}/www/rubygem-mongrel_cluster .endif -.if defined(WITH_PASSENGER) +.if ${PORT_OPTIONS:MPASSENGER} RUN_DEPENDS+= rubygem-passenger>=2.2.15:${PORTSDIR}/www/rubygem-passenger .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301112205.r0BM5Eje076729>