From fa43dfaeefe908a1304087f7bcabc1b841e2af3f Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Sun, 30 Jun 2013 15:24:01 -0300
Subject: lilo-24.0-1: updating version

---
 libre/lilo/PKGBUILD | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

(limited to 'libre/lilo')

diff --git a/libre/lilo/PKGBUILD b/libre/lilo/PKGBUILD
index 7bca08571..10d334b05 100644
--- a/libre/lilo/PKGBUILD
+++ b/libre/lilo/PKGBUILD
@@ -1,20 +1,15 @@
-# $Id$
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# Maintainer: Connor Behan <connor.behan@gmail.com>
+# Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=lilo
-pkgver=23.2
-pkgrel=3.2
-pkgdesc="A bootloader for GNU/Linux, Parabola rebranded"
+pkgver=24.0
+pkgrel=1
+pkgdesc="A bootloader for GNU/Linux (Parabola rebranded)"
 arch=('i686' 'x86_64')
 url="https://alioth.debian.org/projects/lilo/"
 license=('BSD')
-# While lilo should stay in the base category,
-# it usually makes no sense if it is installed
-# with pacman -S base, therefore, don't add
-# the base group here.
-#groups=('base')
 backup=('etc/lilo.conf')
 depends=('device-mapper' 'coreutils')
 makedepends=('bin86' 'sharutils')
@@ -23,12 +18,12 @@ install=lilo.install
 options=('!makeflags')
 source=("http://lilo.alioth.debian.org/ftp/sources/${pkgname}-${pkgver}.tar.gz"
         'lilo.conf')
-md5sums=('51b9b9db665d3b8724919e3d46054d12'
-         'd06b3c4655577ed01fea79ec5743b4b0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   export LC_ALL=C
+
+  sed -i -e 's/strip lilo.static/strip lilo.static || true/' src/Makefile
   make all
 }
 
@@ -36,6 +31,17 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
-  install -D -m644 "${srcdir}/lilo.conf" "${pkgdir}/etc/lilo.conf"
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -D -m644 "${srcdir}"/lilo.conf "${pkgdir}"/etc/lilo.conf
+  install -D -m644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+
+  # All binaries in /usr/bin
+  mkdir "${pkgdir}"/usr/bin
+  mv "${pkgdir}"/sbin/lilo "${pkgdir}"/usr/bin/
+  mv "${pkgdir}"/usr/sbin/* "${pkgdir}"/usr/bin/
+  rm -rf "${pkgdir}"/sbin
+  rm -rf "${pkgdir}"/usr/sbin
+
+  # Avoid conflict with syslinux
+  mv "${pkgdir}"/usr/bin/keytab-lilo "${pkgdir}"/usr/bin/keytab-lilo.pl
 }
+md5sums=('03d7090835a5675314082847f1ac7910' 'd06b3c4655577ed01fea79ec5743b4b0')
-- 
cgit v1.2.3-54-g00ecf