fix some broken stuff

This commit is contained in:
alison wright 2019-10-22 20:52:56 -04:00
parent 1c6af1b8f3
commit 4563a3e587
2 changed files with 26 additions and 31 deletions

View File

@ -1,8 +1,6 @@
# Generated by mksrcinfo v8
# Fri Jun 21 21:07:22 UTC 2019
pkgbase = alpine-git pkgbase = alpine-git
pkgdesc = Fork of the PINE mail client (git) pkgdesc = Fork of the PINE mail client (git)
pkgver = 2.21.9999.351.d5f1993 pkgver = 2.21.99999.373.fe5ffaf
pkgrel = 1 pkgrel = 1
url = http://alpine.x10host.com/ url = http://alpine.x10host.com/
arch = i686 arch = i686

View File

@ -1,49 +1,46 @@
# Maintainer: Yardena Cohen <yardenack at gmail dot com> # Maintainer: Yardena Cohen <yardenack at gmail dot com>
gitname=alpine _pkgname=alpine
pkgname=$gitname-git pkgname=$_pkgname-git
pkgver=2.21.9999.351.d5f1993 pkgver=2.21.99999.373.fe5ffaf
pkgrel=1 pkgrel=1
pkgdesc="Fork of the PINE mail client (git)" pkgdesc="Fork of the PINE mail client (git)"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url='http://alpine.x10host.com/' url='http://alpine.x10host.com/'
license=('APACHE') license=('APACHE')
depends=( depends=('gettext' 'krb5' 'libldap' 'pam')
'gettext'
'krb5'
'libldap'
'pam'
)
makedepends=('git') makedepends=('git')
provides=('alpine' 'pine' 're-alpine') provides=('alpine' 'pine' 're-alpine')
conflicts=('alpine' 'pine' 're-alpine') conflicts=('alpine' 'pine' 're-alpine')
replaces=('alpine' 'pine' 're-alpine') replaces=('alpine' 'pine' 're-alpine')
source=("git+http://repo.or.cz/${gitname}.git") source=("git+http://repo.or.cz/${_pkgname}.git")
sha512sums=('SKIP') sha512sums=('SKIP')
pkgver() { pkgver() {
cd "${srcdir}/${gitname}" cd "${srcdir}/${_pkgname}"
# we recently went # we recently went
# from 2.21.204.5117359 # from 2.21.204.5117359
# to 2.21.1.209.a9d7a00 # to 2.21.1.209.a9d7a00
# which rightfully confused pacman's version ordering # which rightfully confused pacman's version ordering
# so let's add a .0 to versions with only one dot # so let's add a .0 to versions with only one dot
local v=$(cat VERSION) _ver=$(cat VERSION)
[[ "$v" =~ ^[^\.]+\.[^\.]+\..*$ ]] || v=$v.0 [[ "$_ver" =~ ^[^\.]+\.[^\.]+\..*$ ]] || _ver=$_ver.0
local ver="${v}.$(git rev-list --count HEAD).$(git rev-parse --short HEAD)" _ver="${_ver}.$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
printf "%s" "${ver//-/.}" printf "%s" "${_ver//-/.}"
} }
build() { build() {
cd "${srcdir}/${gitname}" cd "${srcdir}/${_pkgname}"
LIBS+="-lpam -lkrb5 -lcrypto" ./configure --prefix=/usr \ LIBS="-lpam -lkrb5 -lcrypto -lssl -ltcl" \
--without-passfile --without-tcl --disable-shared \ ./configure \
--with-system-pinerc=/etc/${pkgname}.d/pine.conf \ --prefix=/usr \
--with-system-fixed-pinerc=/etc/${pkgname}.d/pine.conf.fixed --with-passfile=.pine-passfile \
make --with-system-pinerc=/etc/${pkgname}.d/pine.conf \
--with-system-fixed-pinerc=/etc/${pkgname}.d/pine.conf.fixed
make
} }
package() { package() {
cd "${srcdir}/${gitname}" cd "${srcdir}/${_pkgname}"
make DESTDIR="${pkgdir}" install make DESTDIR="${pkgdir}" install
} }