adjust ncurses (#2291)

* adjust ncurses

* Update ncurses.rb

packages/aspell.rb

@@ -21,7 +21,7 @@ class Aspell < Package
   })
 
   depends_on 'ruby' unless File.exists? "#{CREW_PREFIX}/bin/ruby"
-  depends_on 'ncursesw'
+  depends_on 'ncurses'
 
   def self.build
     system "./configure --prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX}"

packages/finch.rb

@@ -21,7 +21,7 @@ class Finch < Package
   })
 
   depends_on 'glib'
-  depends_on 'ncursesw'
+  depends_on 'ncurses'
   depends_on 'tcl'
   depends_on 'perl'
   depends_on 'gnutls'

packages/multitail.rb

@@ -20,7 +20,7 @@ class Multitail < Package
      x86_64: '52a90a8a16d8b471aa369a62191e766082e70a88eed84e1eb1afbf267a351d0d',
   })
 
-  depends_on 'ncursesw'
+  depends_on 'ncurses'
 
   def self.build
     system 'make'

packages/ncdc.rb

@@ -20,7 +20,7 @@ class Ncdc < Package
      x86_64: '7d72e59960fa27fef99a6f45c0fc9fc86b62931851c811d192e60d1376829452',
   })
 
-  depends_on 'ncursesw'
+  depends_on 'ncurses'
   depends_on 'zlibpkg'
   depends_on 'bz2'
   depends_on 'sqlite'

packages/ncurses.rb

@@ -3,38 +3,66 @@ require 'package'
 class Ncurses < Package
   description 'The ncurses (new curses) library is a free software emulation of curses in System V Release 4.0 (SVr4), and more.'
   homepage 'https://www.gnu.org/software/ncurses/'
-  version '6.1'
+  version '6.1-0'
   source_url 'https://ftpmirror.gnu.org/ncurses/ncurses-6.1.tar.gz'
   source_sha256 'aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17'
 
   binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/ncurses-6.1-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/ncurses-6.1-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/ncurses-6.1-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/ncurses-6.1-chromeos-x86_64.tar.xz',
+    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/ncurses-6.1-0-chromeos-armv7l.tar.xz',
+     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/ncurses-6.1-0-chromeos-armv7l.tar.xz',
+       i686: 'https://dl.bintray.com/chromebrew/chromebrew/ncurses-6.1-0-chromeos-i686.tar.xz',
+     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/ncurses-6.1-0-chromeos-x86_64.tar.xz',
   })
   binary_sha256 ({
-    aarch64: '4e33d4fc68ea5b47bae07aa710b1f801fd80ba85a02c0060c6f157100acadaf4',
-     armv7l: '4e33d4fc68ea5b47bae07aa710b1f801fd80ba85a02c0060c6f157100acadaf4',
-       i686: '16a5f5c03a4e9591146dc56a1ed4b017c09ad9d72da38d104ce282a3d25ef9fd',
-     x86_64: '1eab39eee49e16799ad61def29e69c50a7ea39b04a8da2ff4f4ada033e81273c',
+    aarch64: 'a12e70f779b2375912a5373b5f320c7b4bef8ddcba5144709e2aed67f8011afe',
+     armv7l: 'a12e70f779b2375912a5373b5f320c7b4bef8ddcba5144709e2aed67f8011afe',
+       i686: 'a89d5d79d91c8717cfecf7ebbebae6479f8cded2884798643d061605e449c1df',
+     x86_64: 'fcaf728604029920a14f27f64f498dfc8a3586bc0426ca6a890adf925e39e204',
   })
 
-  depends_on 'diffutils' => :build
-  depends_on 'ncursesw'
-
   def self.build
-    system './configure',
-           "--prefix=#{CREW_PREFIX}",
-           "--libdir=#{CREW_LIB_PREFIX}",
-           '--without-normal',
-           '--with-shared',
-           '--with-cxx-shared',
-           '--without-debug'
-    system 'make'
+    # build libncursesw
+    system "mkdir -p ncursesw_build"
+    Dir.chdir("ncursesw_build") do
+      system "../configure",
+             "--prefix=#{CREW_PREFIX}",
+             "--libdir=#{CREW_LIB_PREFIX}",
+             "--without-normal",
+             "--with-shared",
+             "--with-cxx-shared",
+             "--without-debug",
+             "--enable-pc-files",
+             "--with-pkg-config-libdir=#{CREW_LIB_PREFIX}/pkgconfig",
+             "--enable-widec"
+      system "make"
+    end
+
+    # build libncurses
+    system "mkdir -p ncurses_build"
+    Dir.chdir("ncurses_build") do
+      system "../configure",
+             "--prefix=#{CREW_PREFIX}",
+             "--libdir=#{CREW_LIB_PREFIX}",
+             "--without-normal",
+             "--with-shared",
+             "--with-cxx-shared",
+             "--without-debug",
+             "--enable-pc-files",
+             "--with-pkg-config-libdir=#{CREW_LIB_PREFIX}/pkgconfig",
+             "--disable-db-install",
+             "--without-manpages",
+             "--without-progs",
+             "--without-tack"
+      system "make"
+    end
   end
 
   def self.install
-    system "make", "DESTDIR=#{CREW_DEST_DIR}", "install"
+    Dir.chdir("ncursesw_build") do
+      system "make", "DESTDIR=#{CREW_DEST_DIR}", "install"
+    end
+    Dir.chdir("ncurses_build") do
+      system "make", "DESTDIR=#{CREW_DEST_DIR}", "install"
+    end
   end
 end

packages/ncursesw.rb

-require 'package'
-
-class Ncursesw < Package
-  description 'ncurses wide-character libraries.'
-  homepage 'http://www.gnu.org/software/ncurses/'
-  version '6.1'
-  source_url 'https://ftpmirror.gnu.org/ncurses/ncurses-6.1.tar.gz'
-  source_sha256 'aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17'
-
-  binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/ncursesw-6.1-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/ncursesw-6.1-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/ncursesw-6.1-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/ncursesw-6.1-chromeos-x86_64.tar.xz',
-  })
-  binary_sha256 ({
-    aarch64: '78f2dd654bfe65e29b43109d4ba4551337af6546e8a0b3d74cb5f4dfe93d0a38',
-     armv7l: '78f2dd654bfe65e29b43109d4ba4551337af6546e8a0b3d74cb5f4dfe93d0a38',
-       i686: '2287e7bab7b63649624132265cb2f33477703ae8ee754a866f13e4bf66b71ea5',
-     x86_64: 'a2542e59a79bd82178b29ac96af4dc53cabc73bad7faca3ea8f5bb2afc99f5aa',
-  })
-
-  depends_on 'diffutils' => :build
-
-  def self.build
-    # Check ncurses doesn't conflict with ncrusesw
-    if File.exist? CREW_CONFIG_PATH + "meta/ncurses.filelist"
-      if `grep include/ncursesw #{CREW_CONFIG_PATH}meta/ncurses.filelist` != ''
-        puts
-        puts "PLEASE PERFORM `crew upgrade ncurses` OR `crew remove ncurses` FIRST"
-        puts
-        exit 1
-      end
-    end
-    # Build ncursesw
-    system './configure',
-           "--prefix=#{CREW_PREFIX}",
-           "--libdir=#{CREW_LIB_PREFIX}",
-           '--without-normal',
-           '--with-shared',
-           '--with-cxx-shared',
-           '--without-debug',
-           '--enable-widec'
-    system 'make'
-  end
-
-  def self.install
-    system "make", "DESTDIR=#{CREW_DEST_DIR}", "install"
-
-    # remove binary files which are installed by ncurses also
-    system "rm", "#{CREW_DEST_DIR}/usr/local/bin/clear"
-    system "rm", "#{CREW_DEST_DIR}/usr/local/bin/infocmp"
-    system "rm", "#{CREW_DEST_DIR}/usr/local/bin/tabs"
-    system "rm", "#{CREW_DEST_DIR}/usr/local/bin/tic"
-    system "rm", "#{CREW_DEST_DIR}/usr/local/bin/tput"
-    system "rm", "#{CREW_DEST_DIR}/usr/local/bin/tset"
-    system "rm", "#{CREW_DEST_DIR}/usr/local/bin/toe"
-  end
-end