From owner-svn-ports-branches@freebsd.org Thu Dec 24 13:00:18 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3358DA51BF2; Thu, 24 Dec 2015 13:00:18 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EAD7D118C; Thu, 24 Dec 2015 13:00:17 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBOD0HT3053877; Thu, 24 Dec 2015 13:00:17 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBOD0GR8053874; Thu, 24 Dec 2015 13:00:16 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201512241300.tBOD0GR8053874@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Thu, 24 Dec 2015 13:00:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404355 - in branches/2015Q4: Mk lang/ruby20 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Dec 2015 13:00:18 -0000 Author: sunpoet Date: Thu Dec 24 13:00:16 2015 New Revision: 404355 URL: https://svnweb.freebsd.org/changeset/ports/404355 Log: MFH: r404314 - Update to 2.0.0p648 - Add LICENSE_FILE - Use USES=autoreconf instead of USE_AUTOTOOLS=autoconf - Use USES=libedit - Use USES=tar:xz - Silence patch and build messages Changes: https://www.ruby-lang.org/en/news/2015/12/16/ruby-2-0-0-p648-released/ http://svn.ruby-lang.org/repos/ruby/tags/v2_0_0_648/ChangeLog Security: 3b50881d-1860-4721-aab1-503290e23f6c Differential Revision: https://reviews.freebsd.org/D4668 PR: 205487 Exp-run by: antoine Approved by: ports-secteam (feld) Modified: branches/2015Q4/Mk/bsd.ruby.mk branches/2015Q4/lang/ruby20/Makefile branches/2015Q4/lang/ruby20/distinfo Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/Mk/bsd.ruby.mk ============================================================================== --- branches/2015Q4/Mk/bsd.ruby.mk Thu Dec 24 12:59:38 2015 (r404354) +++ branches/2015Q4/Mk/bsd.ruby.mk Thu Dec 24 13:00:16 2015 (r404355) @@ -174,7 +174,7 @@ RUBY?= ${LOCALBASE}/bin/${RUBY_NAME} RUBY_RELVERSION= 2.0.0 RUBY_PORTREVISION= 0 RUBY_PORTEPOCH= 1 -RUBY_PATCHLEVEL= 647 +RUBY_PATCHLEVEL= 648 RUBY20= "" # PLIST_SUB helpers . elif ${RUBY_VER} == 2.1 Modified: branches/2015Q4/lang/ruby20/Makefile ============================================================================== --- branches/2015Q4/lang/ruby20/Makefile Thu Dec 24 12:59:38 2015 (r404354) +++ branches/2015Q4/lang/ruby20/Makefile Thu Dec 24 13:00:16 2015 (r404355) @@ -15,6 +15,8 @@ COMMENT?= Object-oriented interpreted sc LICENSE= BSD2CLAUSE RUBY LICENSE_COMB= dual +LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/BSDL +LICENSE_FILE_RUBY= ${WRKSRC}/COPYING # Using LIB_DEPENDS finds the libffi from gcc which causes problems BUILD_DEPENDS= libffi>=0:${PORTSDIR}/devel/libffi @@ -34,10 +36,9 @@ 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 USE_LDCONFIG= yes USE_OPENSSL= yes -USES= cpe execinfo tar:bzip2 +USES= autoreconf cpe execinfo tar:xz WRKSRC= ${RUBY_WRKSRC} RUBY_VER= 2.0 @@ -45,6 +46,9 @@ USE_RUBY= yes RUBY_NO_BUILD_DEPENDS= yes RUBY_NO_RUN_DEPENDS= yes +NOT_FOR_ARCHS= ia64 +NOT_FOR_ARCHS_REASON_ia64= does not build + OPTIONS_DEFINE= CAPIDOCS DEBUG DOCS EXAMPLES RDOC OPTIONS_DEFAULT= RDOC LIBEDIT OPTIONS_SINGLE= EDIT @@ -58,9 +62,8 @@ READLINE_DESC= Use libreadline CAPIDOCS_BUILD_DEPENDS= doxygen>0:${PORTSDIR}/devel/doxygen \ dot:${PORTSDIR}/graphics/graphviz CAPIDOCS_CONFIGURE_ENABLE= install-capi -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 +LIBEDIT_USES= libedit RDOC_CONFIGURE_ENABLE= install-rdoc READLINE_BUILD_DEPENDS= readline>=0:${PORTSDIR}/devel/readline READLINE_CONFIGURE_ON= --disable-libedit --with-readline-prefix=${LOCALBASE} @@ -139,20 +142,20 @@ post-patch: # Remove modules we don't want # .for d in win32ole - ${RM} -rf ${BUILD_WRKSRC}/ext/${d} + @${RM} -rf ${BUILD_WRKSRC}/ext/${d} .endfor # We get rake from ports. .for d in bin/rake doc/rake lib/rake test/rake man/rake.1 lib/rake.rb - ${RM} -rf ${BUILD_WRKSRC}/${d} + @${RM} -rf ${BUILD_WRKSRC}/${d} .endfor # We get the gem executable from ports. - ${RM} ${BUILD_WRKSRC}/bin/gem + @${RM} ${BUILD_WRKSRC}/bin/gem # # Prepare modules we are wanting to build via external ports # .for d in gdbm tk - ${MV} ${BUILD_WRKSRC}/ext/${d} ${WRKDIR}/ + @${MV} ${BUILD_WRKSRC}/ext/${d} ${WRKDIR}/ .endfor post-build: @@ -167,7 +170,7 @@ post-build: @${RB_SET_CONF_VAR} "INSTALL_DATA" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} -m ${SHAREMODE}' : '${INSTALL_DATA}'" post-build-CAPIDOCS-on: - ${FIND} ${WRKSRC}/doc -type d -empty -delete + @${FIND} ${WRKSRC}/doc -type d -empty -delete pre-install: ${MKDIR} ${STAGEDIR}${RUBY_SITEARCHLIBDIR} Modified: branches/2015Q4/lang/ruby20/distinfo ============================================================================== --- branches/2015Q4/lang/ruby20/distinfo Thu Dec 24 12:59:38 2015 (r404354) +++ branches/2015Q4/lang/ruby20/distinfo Thu Dec 24 13:00:16 2015 (r404355) @@ -1,2 +1,2 @@ -SHA256 (ruby/ruby-2.0.0-p647.tar.bz2) = 3c3782e313d1ec3ed06c104eafd133cc54ff5183b991786ece9e957fd6cf1cb9 -SIZE (ruby/ruby-2.0.0-p647.tar.bz2) = 10785285 +SHA256 (ruby/ruby-2.0.0-p648.tar.xz) = 22fe97739110ba9171b13fc4dcd1a92e767f16769de3593ee41ef1283d218402 +SIZE (ruby/ruby-2.0.0-p648.tar.xz) = 8303584