diff options
| author | sevan <sevan> | 2015-10-14 18:36:06 +0000 |
|---|---|---|
| committer | sevan <sevan> | 2015-10-14 18:36:06 +0000 |
| commit | a9d325f2053a39c3b43812cc095e8728fe22416b (patch) | |
| tree | 3a19b0e57f10284539fdc0218b3f4d5323aeea13 /lang | |
| parent | d27c5ac64298cc6277be88eb285e58c3777e1672 (diff) | |
| download | pkgsrc-a9d325f2053a39c3b43812cc095e8728fe22416b.tar.gz | |
Add pkg-config to USE_TOOLS.
Set PKG_CONFIG to empty as it removes reference to the build directory.
Add checks for the presence of SSLv3 in OpenSSL/LibreSSL - obtained from
http://www.libressl.org/patches.html
Fix typo in comment s/refrect/reference.
Set shell used during configure stage to bash on OpenBSD & Bitrig
due to pdksh incompatibility.
Reviewed by taca@ wiz@
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/ruby200-base/Makefile | 14 | ||||
| -rw-r--r-- | lang/ruby200-base/distinfo | 4 |
2 files changed, 13 insertions, 5 deletions
diff --git a/lang/ruby200-base/Makefile b/lang/ruby200-base/Makefile index 13243d48933..346709f47e0 100644 --- a/lang/ruby200-base/Makefile +++ b/lang/ruby200-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2015/08/20 15:22:16 taca Exp $ +# $NetBSD: Makefile,v 1.21 2015/10/14 18:36:06 sevan Exp $ # DISTNAME= ${RUBY_DISTNAME} @@ -14,7 +14,7 @@ LICENSE= ${RUBY_LICENSE} RUBY_VERSION_SUPPORTED= 200 USE_LANGUAGES= c -USE_TOOLS+= pax yacc +USE_TOOLS+= pax yacc pkg-config GNU_CONFIGURE= yes TEST_TARGET= test CONFIGURE_ARGS+= --enable-shared @@ -37,12 +37,14 @@ post-wrapper: .endif # -# Don't refrect pkgsrc's INSTALL macro since Ruby expect it could +# Don't reference pkgsrc's INSTALL macro since Ruby expect it could # execute by unprivileged user. # CONFIGURE_ENV+= INSTALL="${INSTALL} ${COPY}" \ INSTALL_DATA= INSTALL_PROGRAM= INSTALL_SCRIPT= +CONFIGURE_ENV+= ac_cv_prog_PKG_CONFIG="" + .include "../../mk/compiler.mk" # /usr/bin/dtrace is not DTrace. @@ -60,7 +62,6 @@ LIBS.SunOS+= -lm .if ${OPSYS} == "SunOS" CONFIGURE_ENV+= OBJCOPY=: -CONFIGURE_ENV+= ac_cv_prog_PKG_CONFIG="" .endif .if ${OPSYS} == "MirBSD" @@ -68,6 +69,11 @@ CONFIGURE_ENV+= ac_cv_prog_PKG_CONFIG="" CONFIGURE_ENV+= ac_cv_func_getgrnam_r=no .endif +.if ${OPSYS} == "OpenBSD" || ${OPSYS} == "Bitrig" +USE_TOOLS+= bash +CONFIG_SHELL= ${TOOLS_PATH.bash} +.endif + .if ${OPSYS} == "Cygwin" USE_TOOLS+= gmake MAKE_FILE= GNUmakefile diff --git a/lang/ruby200-base/distinfo b/lang/ruby200-base/distinfo index 814a6a49f45..7dc3ed8652e 100644 --- a/lang/ruby200-base/distinfo +++ b/lang/ruby200-base/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.27 2015/08/20 15:22:16 taca Exp $ +$NetBSD: distinfo,v 1.28 2015/10/14 18:36:06 sevan Exp $ SHA1 (ruby-2.0.0-p647.tar.bz2) = 537f0e212e337022f28ead8e67ffc834fcd468c6 RMD160 (ruby-2.0.0-p647.tar.bz2) = c9b520ff1e5cc2c3c55a39b7cd3ce31317f52d0e @@ -6,6 +6,8 @@ Size (ruby-2.0.0-p647.tar.bz2) = 10785285 bytes SHA1 (patch-configure) = aaa93fd2e4f130bb2cb852b15b58a1840e57dba5 SHA1 (patch-defs_default__gems) = 28a47952e27c22055bac6ad151d092572b96b1ec SHA1 (patch-ext_dbm_extconf.rb) = 7322637de769b7d01650e1ed566e891801ce3e92 +SHA1 (patch-ext_openssl_extconf.rb) = b286b3e3f31aca73ec644b42474e7cba63a4c363 +SHA1 (patch-ext_openssl_ossl_ssl.c) = e27602441729bb03e2927d0c9449a2d668af27a0 SHA1 (patch-ext_tk_extconf.rb) = b5141d995afc455e4d64b578200f01d9dc75c310 SHA1 (patch-ext_tk_lib_tk.rb) = 78034ed6fa0f24099ce06a717da2423731b276cb SHA1 (patch-ext_tk_lib_tk_autoload.rb) = e8bcb93feae90fd46531a412f6c963a6d5d2c132 |