From nobody Mon May 02 11:15:17 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id EEA4A1AC1E08; Mon, 2 May 2022 11:15:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KsL9K60cnz3BpF; Mon, 2 May 2022 11:15:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651490117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F64RXB7YUVwCe9YSxLnzwTUaD+a3JpbhF671+gja+YU=; b=sNy/G4RUVcNDCOzvF2NnBgkTuWG1uC17Wx8LipdY3raNaZ1ZaIazQlrbIs6bfwMXrZyvUH O7bI+KRc5hYNAvS6gCzuvrN+jCpvqf5ox20R1BdNg76EaHLRa9vb0nh+v2BvLG/+2rdMaA CwAVIHmwts8Hn9Bx8OteweM2mcEOdWlLOORY/w6CGXXqgqsgetHFqUgaADPmsvQbW5wo66 UZ9wDPPf6w3nFWMfSzZkuwXd3r2KmCQi7XtFgtprlfXz92E5B3VkM+HVxPO7+SBGf6Cgoz Wd9ceI1c+D70oVCA2WBvBIC6VkJAXeAsieCKfC39bpi2sm/CxspNplEAb2Cm1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A1AE99A4; Mon, 2 May 2022 11:15:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 242BFHhf006337; Mon, 2 May 2022 11:15:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 242BFHPl006336; Mon, 2 May 2022 11:15:17 GMT (envelope-from git) Date: Mon, 2 May 2022 11:15:17 GMT Message-Id: <202205021115.242BFHPl006336@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: e4a56e48d471 - main - Mk/bsd.ruby.mk: Remove RUBY_RDOC List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e4a56e48d471fef7f8a2c20fb7e4463af4e892d6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651490117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F64RXB7YUVwCe9YSxLnzwTUaD+a3JpbhF671+gja+YU=; b=sDtU+tZpk51srMnmwa++q876W7OIJBFx9JRQb3JlC2JHdL3uW7SLK8ClMISI3ahjOKMlf0 5hU1d37G7eIYU/oWRDt26xGM4KoGJKozuPZqe4D+Ef0hMrxH4YwVzk0an7bSlQ9gWAsDno DQmBBEgZYoHhyzRDQjAer69WEqVEP/Ko4WJIEnZ213JFvmyJMMUpjkK05FGqNgGW435qsO avC4sen6wW//ylPf/5YvZyXz/oX8IqhUwGkwNJfqPq0X/Wk0W5iVWCFT1TsGYuM+gbTSsp SqW/8v84J2EyPSgajMraD3V1YXZl4uK9BsXWJ0b1RZy2DsZJu8s28E6K7H3VJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651490117; a=rsa-sha256; cv=none; b=GQ8RjPgWdV3UIR4c1GYg6QTIX/jgFKwBJqHm9/WQ3DoDVnJRH919SBuioGUPzIx/NaRgIJ MjaIjpG2EFPCRiEmLBr+nQ0ffckZdon2IAbq02LOg2KO+0eEGMHKmtuucH7NSI5oB5HaPs /DQbfeDAsQRB6ZUWrvCnuFcSFZiY+XIfGsZ96mkNgqsYbjefisayxNdwmq8TRX6e6/DVdp lW0Az7d4ihhgVHJeur/paMfWN9+MJ7oe5SYh28ngxIcojSd9OydVfjNaxAWMxY4xR1rpI9 K9vi0eWnQ1hovzGwMejznxQzbxTHBOSHSZBBxMRnaBgJm2W1lq1A04R2/4XjDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=e4a56e48d471fef7f8a2c20fb7e4463af4e892d6 commit e4a56e48d471fef7f8a2c20fb7e4463af4e892d6 Author: Yasuhiro Kimura AuthorDate: 2022-04-18 06:52:16 +0000 Commit: Yasuhiro Kimura CommitDate: 2022-05-02 11:14:06 +0000 Mk/bsd.ruby.mk: Remove RUBY_RDOC After lang/ruby26 is removed the value of it is same with all supported ruby versions. So ports need not use it to specify full patch of rdoc executable. PR: 263386 Approved by: maintainer timeout --- Mk/bsd.ruby.mk | 5 ----- databases/ruby-bdb/Makefile | 1 - databases/ruby-bdb/files/patch-extconf.rb | 13 ++----------- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index 406f127ed967..6264258469a0 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -71,8 +71,6 @@ Ruby_Include_MAINTAINER= ruby@FreeBSD.org # # RUBY_MODNAME - Set to the module name (default: ${PORTNAME}). # -# RUBY_RDOC - Full path of rdoc executable. -# # RUBY_BASE_PORT - Port path of base ruby without PORTSDIR, without # suffix except version. # RUBY_PORT - Port path of ruby without PORTSDIR. @@ -242,9 +240,6 @@ RUBY_CONFIGURE_ARGS+= --program-suffix="${RUBY_SUFFIX}" RUBY_MODNAME?= ${PORTNAME} -# Commands -RUBY_RDOC?= ${LOCALBASE}/bin/rdoc - # Ports RUBY_BASE_PORT?= lang/ruby${RUBY_VER:S/.//} RUBY_PORT?= ${RUBY_BASE_PORT} diff --git a/databases/ruby-bdb/Makefile b/databases/ruby-bdb/Makefile index 3a299072e31d..e32605b7182d 100644 --- a/databases/ruby-bdb/Makefile +++ b/databases/ruby-bdb/Makefile @@ -33,7 +33,6 @@ SHEBANG_FILES= examples/basic.rb examples/cats.rb examples/cursor.rb \ CONFIGURE_ARGS= --with-db-include=${BDB_INCLUDE_DIR} \ --with-db-lib=${BDB_LIB_DIR} -MAKE_ENV= RUBY_RDOC=${LOCALBASE}/bin/rdoc ALL_TARGET= all rdoc INSTALL_TARGET= site-install diff --git a/databases/ruby-bdb/files/patch-extconf.rb b/databases/ruby-bdb/files/patch-extconf.rb index 4edd71af924f..c229cc51056e 100644 --- a/databases/ruby-bdb/files/patch-extconf.rb +++ b/databases/ruby-bdb/files/patch-extconf.rb @@ -1,15 +1,6 @@ --- extconf.rb.orig 2011-04-06 19:35:39 UTC +++ extconf.rb -@@ -50,7 +50,7 @@ - rdoc: docs/doc/index.html - - docs/doc/index.html: $(RDOC) --\t@-(cd docs; rdoc .) -+\t@-(cd docs; ${RUBY_RDOC} .) - - ri: - \t@-(rdoc -r docs/*rb) -@@ -67,7 +67,7 @@ +@@ -67,7 +67,7 @@ test: $(DLLIB) Dir.foreach('tests') do |x| next if /^\./ =~ x || /(_\.rb|~)$/ =~ x next if FileTest.directory?(x) @@ -18,7 +9,7 @@ end ensure make.close -@@ -76,7 +76,7 @@ +@@ -76,7 +76,7 @@ end subdirs.each do |subdir| STDERR.puts("#{$0}: Entering directory `#{subdir}'") Dir.chdir(subdir)