Merge pull request #2438 from uberhacker/fix-wrong-libdir-location

Fix wrong libdir locations

packages/chicken.rb

@@ -3,28 +3,30 @@ require 'package'
 class Chicken < Package
   description 'CHICKEN is practical and portable scheme system.'
   homepage 'https://code.call-cc.org/'
-  version '4.13.0'
+  version '4.13.0-1'
   source_url 'https://code.call-cc.org/releases/4.13.0/chicken-4.13.0.tar.gz'
   source_sha256 'add549619a31363d6608b39e0cf0e68b9d5e6ff2a719b5691ddeba57229c6c43'
 
   binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/chicken-4.13.0-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/chicken-4.13.0-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/chicken-4.13.0-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/chicken-4.13.0-chromeos-x86_64.tar.xz',
+    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/chicken-4.13.0-1-chromeos-armv7l.tar.xz',
+     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/chicken-4.13.0-1-chromeos-armv7l.tar.xz',
+       i686: 'https://dl.bintray.com/chromebrew/chromebrew/chicken-4.13.0-1-chromeos-i686.tar.xz',
+     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/chicken-4.13.0-1-chromeos-x86_64.tar.xz',
   })
   binary_sha256 ({
-    aarch64: 'bfc9280f5d2c3e079f7bdc1819e71243c6464e0e855878bbcb8f05f4f033ae20',
-     armv7l: 'bfc9280f5d2c3e079f7bdc1819e71243c6464e0e855878bbcb8f05f4f033ae20',
-       i686: '431b8e207f33561da047c373f38904c54aa8680d258c2b4788f327461243e776',
-     x86_64: 'fff1ca9617ebf651e31f552fb68c916d38a0278521f188956cdf2d284e7f5d61',
+    aarch64: '8877684cca5b473a07bed10b722e823218056eb8e30d3c920d87c2f932145476',
+     armv7l: '8877684cca5b473a07bed10b722e823218056eb8e30d3c920d87c2f932145476',
+       i686: '3d1914f286e6c5d96cddbd7aadfeb9b327983218caebe3773c101a7c26bc9657',
+     x86_64: 'ee8820ba71c1db4e90152cd52f133e2106292071b95d2bf6538b6e28aa723022',
   })
 
+  depends_on 'filecmd'
+
   def self.build
     system "make", "PLATFORM=linux"
   end
 
   def self.install
-    system "make", "DESTDIR=#{CREW_DEST_DIR}", "install", "PLATFORM=linux"
+    system "make", "PREFIX=#{CREW_PREFIX}", "LIBDIR=#{CREW_LIB_PREFIX}", "DESTDIR=#{CREW_DEST_DIR}", "install", "PLATFORM=linux"
   end
 end

packages/openconnect.rb

 require 'package'
 
 class Openconnect < Package
-  version '7.08'
+  version '7.08-1'
   description 'OpenConnect is an SSL VPN client initially created to support Cisco\'s AnyConnect SSL VPN.'
   homepage 'http://www.infradead.org/openconnect/'
   source_url 'ftp://ftp.infradead.org/pub/openconnect/openconnect-7.08.tar.gz'
   source_sha256 '1c44ec1f37a6a025d1ca726b9555649417f1d31a46f747922b84099ace628a03'
 
   binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/openconnect-7.08-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/openconnect-7.08-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/openconnect-7.08-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/openconnect-7.08-chromeos-x86_64.tar.xz',
+    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/openconnect-7.08-1-chromeos-armv7l.tar.xz',
+     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/openconnect-7.08-1-chromeos-armv7l.tar.xz',
+       i686: 'https://dl.bintray.com/chromebrew/chromebrew/openconnect-7.08-1-chromeos-i686.tar.xz',
+     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/openconnect-7.08-1-chromeos-x86_64.tar.xz',
   })
   binary_sha256 ({
-    aarch64: '8e6a51bbf9a4f7025b5db6b0e638db523704e89171e109ecc987ee6cb6cbef3f',
-     armv7l: '8e6a51bbf9a4f7025b5db6b0e638db523704e89171e109ecc987ee6cb6cbef3f',
-       i686: '644cc95d14d27735f78ece4cd8ed2896588a5df30a232581942c03e44eeeafce',
-     x86_64: '166ff91359ad64ca5a7227ec9a164096c89b46215dc92e990bf14a46ab8b851d',
+    aarch64: 'ca2e5a3d1deaa91670d114f94afb6a20e155efe6fbbaf24c0c7ab998711236dc',
+     armv7l: 'ca2e5a3d1deaa91670d114f94afb6a20e155efe6fbbaf24c0c7ab998711236dc',
+       i686: 'bd5819451328a81e4a1e78db9964cabbb8e84c1d97679e7699c8b3dced4267cf',
+     x86_64: 'e76d8af2e66e08618b40ca788442dcd317dc334c145748332ce3fcd5f03ddf29',
   })
 
-  depends_on 'buildessential'
+  depends_on 'libproxy'
   depends_on 'libxml2'
+  depends_on 'lz4'
   depends_on 'gnutls'
   depends_on 'vpnc'
 
   def self.build
-    system "./configure CFLAGS=' -fPIC' --with-vpnc-script=#{CREW_PREFIX}/etc/vpnc/vpnc-script"
-    system "make"
+    system "./configure \
+           CFLAGS=' -fPIC' \
+           --prefix=#{CREW_PREFIX} \
+           --libdir=#{CREW_LIB_PREFIX} \
+           --with-vpnc-script=#{CREW_PREFIX}/etc/vpnc/vpnc-script"
+    system 'make'
   end
 
   def self.install
     system "make", "DESTDIR=#{CREW_DEST_DIR}", "install"
-    system "mkdir -p #{CREW_DEST_DIR}#{CREW_PREFIX}/bin"
-    FileUtils.cd("#{CREW_DEST_DIR}#{CREW_PREFIX}/bin") do
+    system "mkdir -p #{CREW_DEST_PREFIX}/bin"
+    FileUtils.cd("#{CREW_DEST_PREFIX}/bin") do
       system "echo '#!/bin/bash' > vpnc-start"
       system "echo 'if test \$1; then' >> vpnc-start"
       system "echo '  sudo ip tuntap add mode tun tun0' >> vpnc-start"