From 9bf2c464e23502fd51a8fc9c673359a824b8821a Mon Sep 17 00:00:00 2001 From: Mitchell Blank Jr Date: Sun, 27 Dec 2020 21:17:52 +0000 Subject: [PATCH 1/4] feedgnuplot: install correctly on Big Sur As discussed with https://github.com/Homebrew/homebrew-core/pull/66370#issuecomment-740856994 Big Sur's system perl changed how "PREFIX=" is treated as an install destination. The more explicit way to control MakeMaker is to set INSTALL_BASE instead, which should result in consistent behavior between different OS/X versions. --- Formula/feedgnuplot.rb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Formula/feedgnuplot.rb b/Formula/feedgnuplot.rb index ae3c3bac278302..f1e25071e8ff69 100644 --- a/Formula/feedgnuplot.rb +++ b/Formula/feedgnuplot.rb @@ -3,8 +3,14 @@ class Feedgnuplot < Formula homepage "https://github.com/dkogan/feedgnuplot" url "https://github.com/dkogan/feedgnuplot/archive/v1.55.tar.gz" sha256 "1205afedf8ce79d8531e0d0f8f9565df365a568a0ee6a8e17738602682095303" - # licensed under either "GPL-3.0" or "Artistic-1.0" - license "GPL-3.0" + license any_of: ["GPL-3.0-only", "Artistic-1.0"] + revision 1 + head "https://github.com/dkogan/feedgnuplot.git" + + livecheck do + url :head + regex(/^v?(\d+(?:\.\d+)+)$/i) + end bottle do cellar :any_skip_relocation @@ -16,7 +22,7 @@ class Feedgnuplot < Formula depends_on "gnuplot" def install - system "perl", "Makefile.PL", "prefix=#{prefix}" + system "perl", "Makefile.PL", "INSTALL_BASE=#{prefix}", "INSTALLSITEMAN1DIR=#{man1}", "INSTALLSITEMAN3DIR=#{man3}" system "make" system "make", "install" From 009c44af92007f7f51f2a6b8d9bef443a988937a Mon Sep 17 00:00:00 2001 From: chenrui Date: Sun, 27 Dec 2020 23:04:52 -0500 Subject: [PATCH 2/4] update license --- Formula/feedgnuplot.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/feedgnuplot.rb b/Formula/feedgnuplot.rb index f1e25071e8ff69..ccbd3b97436709 100644 --- a/Formula/feedgnuplot.rb +++ b/Formula/feedgnuplot.rb @@ -3,7 +3,7 @@ class Feedgnuplot < Formula homepage "https://github.com/dkogan/feedgnuplot" url "https://github.com/dkogan/feedgnuplot/archive/v1.55.tar.gz" sha256 "1205afedf8ce79d8531e0d0f8f9565df365a568a0ee6a8e17738602682095303" - license any_of: ["GPL-3.0-only", "Artistic-1.0"] + license any_of: ["Artistic-1.0-Perl", "GPL-1.0-or-later"] revision 1 head "https://github.com/dkogan/feedgnuplot.git" From ee4f4efa3ffb6b16653305d49beac91e5c5b7fb2 Mon Sep 17 00:00:00 2001 From: chenrui Date: Sun, 27 Dec 2020 23:06:05 -0500 Subject: [PATCH 3/4] remove livecheck (as it is not needed) --- Formula/feedgnuplot.rb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Formula/feedgnuplot.rb b/Formula/feedgnuplot.rb index ccbd3b97436709..e8d437a0fb98ab 100644 --- a/Formula/feedgnuplot.rb +++ b/Formula/feedgnuplot.rb @@ -7,11 +7,6 @@ class Feedgnuplot < Formula revision 1 head "https://github.com/dkogan/feedgnuplot.git" - livecheck do - url :head - regex(/^v?(\d+(?:\.\d+)+)$/i) - end - bottle do cellar :any_skip_relocation sha256 "7d394a581a614dcc5130eac02310e58f994067b94a8dbd413c983157e3d37cc2" => :catalina From 3a560ef3383e520d3f459a3ad43f470fa8dbb374 Mon Sep 17 00:00:00 2001 From: Mitchell Blank Jr Date: Mon, 28 Dec 2020 04:09:13 +0000 Subject: [PATCH 4/4] Update Formula/feedgnuplot.rb Co-authored-by: chenrui --- Formula/feedgnuplot.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/feedgnuplot.rb b/Formula/feedgnuplot.rb index e8d437a0fb98ab..b2a8f49e1eaff0 100644 --- a/Formula/feedgnuplot.rb +++ b/Formula/feedgnuplot.rb @@ -17,7 +17,7 @@ class Feedgnuplot < Formula depends_on "gnuplot" def install - system "perl", "Makefile.PL", "INSTALL_BASE=#{prefix}", "INSTALLSITEMAN1DIR=#{man1}", "INSTALLSITEMAN3DIR=#{man3}" + system "perl", "Makefile.PL", "INSTALL_BASE=#{prefix}", "INSTALLSITEMAN1DIR=#{man1}" system "make" system "make", "install"