svn commit: r396294 - in head: Mk lang/ruby22 lang/ruby22/files
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Mon Sep 7 17:47:51 UTC 2015
Author: sunpoet
Date: Mon Sep 7 17:47:48 2015
New Revision: 396294
URL: https://svnweb.freebsd.org/changeset/ports/396294
Log:
- Move *_DEPENDS together
- Add GMP option: libgmp.so is linked if present
- Sort CONFIGURE_ARGS
- Remove duplicate WRKSRC
- Sort USES
- Use pre-install: instead of pre-su-install:
- Convert to new options helper
- Convert to new options target helper
- Add regression-test:
- Fix typo
- Cosmetic change
- Pet portlint: fix diff header of patch files
- Bump PORTREVISION for dependency and package change
Modified:
head/Mk/bsd.ruby.mk
head/lang/ruby22/Makefile
head/lang/ruby22/files/patch-Makefile.in
head/lang/ruby22/files/patch-configure.in
head/lang/ruby22/files/patch-lib_mkmf.rb
head/lang/ruby22/files/patch-tool_mkconfig.rb
head/lang/ruby22/files/patch-tool_rbinstall.rb
Modified: head/Mk/bsd.ruby.mk
==============================================================================
--- head/Mk/bsd.ruby.mk Mon Sep 7 17:46:52 2015 (r396293)
+++ head/Mk/bsd.ruby.mk Mon Sep 7 17:47:48 2015 (r396294)
@@ -192,7 +192,7 @@ RUBY21= "" # PLIST_SUB helpers
# Ruby 2.2
#
RUBY_RELVERSION= 2.2.2
-RUBY_PORTREVISION= 0
+RUBY_PORTREVISION= 1
RUBY_PORTEPOCH= 1
RUBY_PATCHLEVEL= 0
RUBY22= "" # PLIST_SUB helpers
Modified: head/lang/ruby22/Makefile
==============================================================================
--- head/lang/ruby22/Makefile Mon Sep 7 17:46:52 2015 (r396293)
+++ head/lang/ruby22/Makefile Mon Sep 7 17:47:48 2015 (r396294)
@@ -6,7 +6,7 @@ PORTVERSION= ${RUBY_PORTVERSION}
PORTREVISION= ${RUBY_PORTREVISION}
PORTEPOCH= ${RUBY_PORTEPOCH}
CATEGORIES= lang ruby ipv6
-MASTER_SITES= RUBY/${MASTER_SITE_SUBDIR_RUBY}
+MASTER_SITES= RUBY/${MASTER_SITE_SUBDIR_RUBY}
DISTNAME= ${RUBY_DISTNAME}
DIST_SUBDIR= ruby
@@ -16,41 +16,42 @@ COMMENT?= Object-oriented interpreted sc
LICENSE= BSD2CLAUSE RUBY
LICENSE_COMB= dual
-LIB_DEPENDS= libyaml.so:${PORTSDIR}/textproc/libyaml
-
# Using LIB_DEPENDS finds the libffi from gcc which causes problems
BUILD_DEPENDS= libffi>=0:${PORTSDIR}/devel/libffi
+LIB_DEPENDS= libyaml.so:${PORTSDIR}/textproc/libyaml
RUN_DEPENDS= libffi>=0:${PORTSDIR}/devel/libffi
-GNU_CONFIGURE= yes
-WRKSRC= ${RUBY_WRKSRC}
CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \
- --enable-shared \
- --enable-pthread \
--disable-rpath \
+ --enable-pthread \
+ --enable-shared \
--with-ruby-version=minor \
--with-sitedir="${PREFIX}/lib/ruby/site_ruby" \
--with-vendordir="${PREFIX}/lib/ruby/vendor_ruby"
-USE_OPENSSL= yes
-USE_LDCONFIG= yes
+CONFIGURE_ENV= LC_ALL=C debugflags=
+CPPFLAGS+= -I${LOCALBASE}/include
+GNU_CONFIGURE= yes
+# Keep this, else ruby will fail to load libraries dependent of libpthread.
+LIBS+= -lpthread -L${LOCALBASE}/lib
+MAKE_ENV= LC_ALL=C
USE_AUTOTOOLS= autoconf
-
-CONFIGURE_ENV+= LC_ALL=C
-MAKE_ENV+= LC_ALL=C
-
-WRKSRC= ${WRKDIR}/${PORTNAME}-${RUBY_DISTVERSION}
+USE_LDCONFIG= yes
+USE_OPENSSL= yes
+USES= cpe execinfo tar:xz
+WRKSRC= ${RUBY_WRKSRC}
RUBY_VER= 2.2
USE_RUBY= yes
RUBY_NO_BUILD_DEPENDS= yes
RUBY_NO_RUN_DEPENDS= yes
-OPTIONS_DEFINE= CAPIDOCS DEBUG DOCS EXAMPLES RDOC
+OPTIONS_DEFINE= CAPIDOCS DEBUG DOCS EXAMPLES GMP RDOC
OPTIONS_DEFAULT= RDOC LIBEDIT
OPTIONS_SINGLE= EDIT
OPTIONS_SINGLE_EDIT= LIBEDIT READLINE
OPTIONS_SUB= yes
CAPIDOCS_DESC= Build and install C API documents
+GMP_DESC= Use GMP to accelerate Bignum operations
RDOC_DESC= Build and install Rdoc indexes
EDIT_DESC= Which line editing lib to use
LIBEDIT_DESC= Use libedit
@@ -58,9 +59,15 @@ READLINE_DESC= Use libreadline
CAPIDOCS_BUILD_DEPENDS= doxygen>0:${PORTSDIR}/devel/doxygen \
dot:${PORTSDIR}/graphics/graphviz
CAPIDOCS_CONFIGURE_ENABLE= install-capi
+GMP_CONFIGURE_WITH= gmp
+GMP_LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp
+LIBEDIT_BUILD_DEPENDS= libedit>=0:${PORTSDIR}/devel/libedit
+LIBEDIT_CONFIGURE_ON= --enable-libedit --with-libedit-prefix=${LOCALBASE}
+LIBEDIT_RUN_DEPENDS= libedit>=0:${PORTSDIR}/devel/libedit
RDOC_CONFIGURE_ENABLE= install-rdoc
-
-USES= execinfo cpe tar:xz
+READLINE_BUILD_DEPENDS= readline>=0:${PORTSDIR}/devel/readline
+READLINE_CONFIGURE_ON= --disable-libedit --with-readline-prefix=${LOCALBASE}
+READLINE_RUN_DEPENDS= readline>=0:${PORTSDIR}/devel/readline
CPE_VENDOR= ruby-lang
CPE_VERSION= ${RUBY_RELVERSION}
@@ -78,10 +85,6 @@ _SUF2= ,${PORTEPOCH}
_SUF1= _${PORTREVISION}
.endif
-CPPFLAGS+= -I${LOCALBASE}/include
-# Keep this, else ruby will fail to load libraries dependent op libpthread.
-LIBS+= -lpthread -L${LOCALBASE}/lib
-
.if ${OPSYS} == "FreeBSD"
.if exists(/usr/sbin/dtrace) && (${OSVERSION} > 1100032) && (${ARCH} == "amd64" || ${ARCH} == "i386")
CONFIGURE_ARGS+= --enable-dtrace
@@ -94,24 +97,10 @@ CONFIGURE_ARGS+= --disable-dtrace
CONFIGURE_ARGS+= --with-setjmp-type=_setjmp
.endif
-CONFIGURE_ENV= debugflags=
-
.if ${PORT_OPTIONS:MCAPIDOCS}
MAKE_JOBS_UNSAFE= yes
.endif
-.if ${PORT_OPTIONS:MLIBEDIT}
-BUILD_DEPENDS+= libedit>=0:${PORTSDIR}/devel/libedit
-RUN_DEPENDS+= libedit>=0:${PORTSDIR}/devel/libedit
-CONFIGURE_ARGS+= --enable-libedit --with-libedit-prefix=${LOCALBASE}
-.endif
-
-.if ${PORT_OPTIONS:MREADLINE}
-BUILD_DEPENDS+= readline>=0:${PORTSDIR}/devel/readline
-RUN_DEPENDS+= readline>=0:${PORTSDIR}/devel/readline
-CONFIGURE_ARGS+= --disable-libedit --with-readline-prefix=${LOCALBASE}
-.endif
-
.if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
MLINKS= ${RUBY_NAME}.1 ruby.1
PLIST_SUB+= IF_DEFAULT=""
@@ -175,36 +164,26 @@ post-build:
@${RB_SET_CONF_VAR} "INSTALL_PROGRAM" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} ${STRIP} -m ${BINMODE}' : '${INSTALL_PROGRAM}'"
@${RB_SET_CONF_VAR} "INSTALL_SCRIPT" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} -m ${BINMODE}' : '${INSTALL_SCRIPT}'"
@${RB_SET_CONF_VAR} "INSTALL_DATA" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} -m ${SHAREMODE}' : '${INSTALL_DATA}'"
-.if ${PORT_OPTIONS:MCAPIDOCS}
+
+post-build-CAPIDOCS-on:
${FIND} ${WRKSRC}/doc -type d -empty -delete
-.endif
-pre-su-install:
+pre-install:
${MKDIR} ${STAGEDIR}${RUBY_SITEARCHLIBDIR}
${MKDIR} ${STAGEDIR}${RUBY_VENDORARCHLIBDIR}
-.if ${PORT_OPTIONS:MDOCS}
+
+pre-install-DOCS-on:
${MKDIR} ${STAGEDIR}${RUBY_DOCDIR}
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+
+pre-install-EXAMPLES-on:
${MKDIR} ${STAGEDIR}${RUBY_EXAMPLESDIR}
-.endif
-.if ${PORT_OPTIONS:MRDOC}
+
+pre-install-RDOC-on:
${MKDIR} ${STAGEDIR}${RUBY_RIDIR}
${MKDIR} ${STAGEDIR}${RUBY_SITERIDIR}
-.endif
post-install:
#
-# XXX: hack to strip ruby binary. Ruby uses its own install script that seems
-# bogus to hack.
-#
-.if defined(STRIP) && ${STRIP} == -s && ! ${PORT_OPTIONS:MDEBUG}
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${RUBY_NAME}
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libruby${RUBY_SHLIBVER}.so.${RUBY_SHLIBVER}
- ${FIND} ${STAGEDIR}${RUBY_ARCHLIBDIR} -type f -name '*\.so' -exec ${STRIP_CMD} {} \;
-.endif
-
-#
# Link just installed "ruby" to "ruby22", etc.
#
.if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
@@ -213,18 +192,24 @@ post-install:
. endfor
.endif
+post-install-DEBUG-off:
+#
+# XXX: hack to strip ruby binary. Ruby uses its own install script that seems
+# bogus to hack.
+#
+.if defined(STRIP) && ${STRIP} == -s
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${RUBY_NAME}
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libruby${RUBY_SHLIBVER}.so.${RUBY_SHLIBVER}
+ ${FIND} ${STAGEDIR}${RUBY_ARCHLIBDIR} -type f -name '*\.so' -exec ${STRIP_CMD} {} \;
+.endif
+
+post-install-DOCS-on:
# Create all dirs required (":u" isn't avaiable in STABLE yet :-()
- ${MKDIR} ${EXTSAMPLES:C,^([^/]+)/.*,\1,:S,^,${STAGEDIR}${RUBY_EXAMPLESDIR}/,}
${MKDIR} ${EXTDOCS:C,^([^/]+)/.*,\1,:S,^,${STAGEDIR}${RUBY_DOCDIR}/,}
-.for FILE in ${EXTSAMPLES}
- ${INSTALL_DATA} ${WRKSRC}/ext/${FILE} \
- ${STAGEDIR}${RUBY_EXAMPLESDIR}/${FILE:C,^([^/]+)/.*,\1,}/
-.endfor
.for FILE in ${EXTDOCS}
${INSTALL_DATA} ${WRKSRC}/ext/${FILE} \
${STAGEDIR}${RUBY_DOCDIR}/${FILE:C,^([^/]+)/.*,\1,}/
.endfor
- @(cd ${WRKSRC}/sample/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_EXAMPLESDIR}/)
@(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_DOCDIR}/)
${INSTALL_DATA} ${WRKSRC}/COPYING* \
${WRKSRC}/ChangeLog \
@@ -232,7 +217,16 @@ post-install:
${WRKSRC}/README* \
${STAGEDIR}${RUBY_DOCDIR}/
-test:
+post-install-EXAMPLES-on:
+ # Create all dirs required (":u" isn't avaiable in STABLE yet :-()
+ ${MKDIR} ${EXTSAMPLES:C,^([^/]+)/.*,\1,:S,^,${STAGEDIR}${RUBY_EXAMPLESDIR}/,}
+.for FILE in ${EXTSAMPLES}
+ ${INSTALL_DATA} ${WRKSRC}/ext/${FILE} \
+ ${STAGEDIR}${RUBY_EXAMPLESDIR}/${FILE:C,^([^/]+)/.*,\1,}/
+.endfor
+ @(cd ${WRKSRC}/sample/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_EXAMPLESDIR}/)
+
+regression-test test:
@(cd ${WRKSRC}; ${MAKE} test)
validate:
Modified: head/lang/ruby22/files/patch-Makefile.in
==============================================================================
--- head/lang/ruby22/files/patch-Makefile.in Mon Sep 7 17:46:52 2015 (r396293)
+++ head/lang/ruby22/files/patch-Makefile.in Mon Sep 7 17:47:48 2015 (r396294)
@@ -1,5 +1,5 @@
---- Makefile.in.orig 2015-02-22 17:12:34.000000000 +0900
-+++ Makefile.in 2015-03-06 07:19:45.957608168 +0900
+--- Makefile.in.orig 2015-02-22 08:12:34 UTC
++++ Makefile.in
@@ -376,7 +376,7 @@
.d.h:
Modified: head/lang/ruby22/files/patch-configure.in
==============================================================================
--- head/lang/ruby22/files/patch-configure.in Mon Sep 7 17:46:52 2015 (r396293)
+++ head/lang/ruby22/files/patch-configure.in Mon Sep 7 17:47:48 2015 (r396294)
@@ -1,5 +1,5 @@
---- configure.in.orig 2015-02-22 17:12:34.000000000 +0900
-+++ configure.in 2015-03-06 07:24:47.938830390 +0900
+--- configure.in.orig 2015-02-22 08:12:34 UTC
++++ configure.in
@@ -616,7 +616,7 @@
[AC_CACHE_CHECK(whether dtrace USDT is available, rb_cv_dtrace_available,
[
Modified: head/lang/ruby22/files/patch-lib_mkmf.rb
==============================================================================
--- head/lang/ruby22/files/patch-lib_mkmf.rb Mon Sep 7 17:46:52 2015 (r396293)
+++ head/lang/ruby22/files/patch-lib_mkmf.rb Mon Sep 7 17:47:48 2015 (r396294)
@@ -1,5 +1,5 @@
---- lib/mkmf.rb.orig 2013-06-26 07:03:38.000000000 -0700
-+++ lib/mkmf.rb 2013-07-03 17:43:05.000000000 -0700
+--- lib/mkmf.rb.orig 2013-06-26 14:03:38 UTC
++++ lib/mkmf.rb
@@ -226,7 +226,7 @@
end
$extmk ||= false
Modified: head/lang/ruby22/files/patch-tool_mkconfig.rb
==============================================================================
--- head/lang/ruby22/files/patch-tool_mkconfig.rb Mon Sep 7 17:46:52 2015 (r396293)
+++ head/lang/ruby22/files/patch-tool_mkconfig.rb Mon Sep 7 17:47:48 2015 (r396294)
@@ -1,5 +1,5 @@
---- tool/mkconfig.rb.orig 2014-07-07 10:07:01.000000000 +0800
-+++ tool/mkconfig.rb 2014-12-28 03:22:15.377490192 +0800
+--- tool/mkconfig.rb.orig 2014-07-07 02:07:01 UTC
++++ tool/mkconfig.rb
@@ -167,8 +167,9 @@
val.replace(newval) unless newval == val
val
Modified: head/lang/ruby22/files/patch-tool_rbinstall.rb
==============================================================================
--- head/lang/ruby22/files/patch-tool_rbinstall.rb Mon Sep 7 17:46:52 2015 (r396293)
+++ head/lang/ruby22/files/patch-tool_rbinstall.rb Mon Sep 7 17:47:48 2015 (r396294)
@@ -1,5 +1,5 @@
---- tool/rbinstall.rb.orig 2015-03-25 03:33:14.000000000 +0000
-+++ tool/rbinstall.rb 2015-04-13 18:16:00.160952000 +0000
+--- tool/rbinstall.rb.orig 2015-03-25 03:33:14 UTC
++++ tool/rbinstall.rb
@@ -311,6 +311,7 @@
libdir = CONFIG[CONFIG.fetch("libdirname", "libdir"), true]
rubyhdrdir = CONFIG["rubyhdrdir", true]
More information about the svn-ports-all
mailing list