sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

lang/ruby2*: disable dtrace on OS versions without the dtrace fixes from r271413

Browse source 
While here, fix plist issues
This commit is contained in:
Steve Wills 2014-11-11 17:47:06 +00:00
parent 0269206b25
commit 96bf534838
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=372456
5 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mk/bsd.ruby.mk
View file

@ -193,7 +193,7 @@ RUBY21= "@comment "
# Ruby 2.0 # Ruby 2.0
# #
RUBY_RELVERSION= 2.0.0 RUBY_RELVERSION= 2.0.0
RUBY_PORTREVISION= 2 RUBY_PORTREVISION= 3
RUBY_PORTEPOCH= 1 RUBY_PORTEPOCH= 1
RUBY_PATCHLEVEL= 576 RUBY_PATCHLEVEL= 576
@ -209,7 +209,7 @@ RUBY21= "@comment "
# Ruby 2.1 # Ruby 2.1
# #
RUBY_RELVERSION= 2.1.3 RUBY_RELVERSION= 2.1.3
RUBY_PORTREVISION= 2 RUBY_PORTREVISION= 3
RUBY_PORTEPOCH= 1 RUBY_PORTEPOCH= 1
RUBY_PATCHLEVEL= 0 RUBY_PATCHLEVEL= 0

4
lang/ruby20/Makefile
View file

@ -86,9 +86,7 @@ CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} LIBS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.if ${OPSYS} == "FreeBSD" .if ${OPSYS} == "FreeBSD"
.if exists(/usr/sbin/dtrace) && \ .if exists(/usr/sbin/dtrace) && (${OSVERSION} > 1100032)
((${ARCH} == "i386" && ${OSVERSION} > 1010000) || \
(${ARCH} == "amd64" && ${OSVERSION} > 903000))
CONFIGURE_ARGS+= --enable-dtrace CONFIGURE_ARGS+= --enable-dtrace
.else .else
CONFIGURE_ARGS+= --disable-dtrace CONFIGURE_ARGS+= --disable-dtrace

4
lang/ruby20/pkg-plist
View file

@ -17128,3 +17128,7 @@ man/man1/%%RUBY_NAME%%.1.gz
%%RDOC%%%%RUBY_RIDIR%%/syntax/page-modules_and_classes_rdoc.ri %%RDOC%%%%RUBY_RIDIR%%/syntax/page-modules_and_classes_rdoc.ri
%%RDOC%%%%RUBY_RIDIR%%/syntax/page-precedence_rdoc.ri %%RDOC%%%%RUBY_RIDIR%%/syntax/page-precedence_rdoc.ri
%%RDOC%%%%RUBY_RIDIR%%/syntax/page-refinements_rdoc.ri %%RDOC%%%%RUBY_RIDIR%%/syntax/page-refinements_rdoc.ri
@dir %%RUBY_LIBDIR%%/racc/rdoc
@dir %%RUBY_SITEARCHLIBDIR%%
@dir %%RUBY_VENDORARCHLIBDIR%%
@dir %%RUBY_SITERIDIR%%

2
lang/ruby21/Makefile
View file

@ -85,7 +85,7 @@ CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} LIBS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.if ${OPSYS} == "FreeBSD" .if ${OPSYS} == "FreeBSD"
.if (${ARCH} == "i386" && ${OSVERSION} > 1010000) || (${ARCH} == "amd64" && ${OSVERSION} > 903000) .if exists(/usr/sbin/dtrace) && (${OSVERSION} > 1100032)
CONFIGURE_ARGS+= --enable-dtrace CONFIGURE_ARGS+= --enable-dtrace
.else .else
CONFIGURE_ARGS+= --disable-dtrace CONFIGURE_ARGS+= --disable-dtrace

5
lang/ruby21/pkg-plist
View file

@ -16907,3 +16907,8 @@ man/man1/%%RUBY_NAME%%.1.gz
%%RDOC%%%%RUBY_RIDIR%%/syntax/page-precedence_rdoc.ri %%RDOC%%%%RUBY_RIDIR%%/syntax/page-precedence_rdoc.ri
%%RDOC%%%%RUBY_RIDIR%%/syntax/page-refinements_rdoc.ri %%RDOC%%%%RUBY_RIDIR%%/syntax/page-refinements_rdoc.ri
%%RDOC%%%%RUBY_RIDIR%%/unknown/cdesc-unknown.ri %%RDOC%%%%RUBY_RIDIR%%/unknown/cdesc-unknown.ri
@dir %%RUBY_LIBDIR%%/racc/rdoc
@dir %%RUBY_SITEARCHLIBDIR%%
@dir %%RUBY_VENDORARCHLIBDIR%%
@dir %%RUBY_EXAMPLESDIR%%/curses
@dir %%RUBY_SITERIDIR%%