Browse Source

fix some broken stuff

master
Alison Watson 1 year ago
parent
commit
4563a3e587
2 changed files with 26 additions and 31 deletions
  1. +1
    -3
      .SRCINFO
  2. +25
    -28
      PKGBUILD

+ 1
- 3
.SRCINFO View File

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


+ 25
- 28
PKGBUILD View File

@@ -1,49 +1,46 @@
# Maintainer: Yardena Cohen <yardenack at gmail dot com>

gitname=alpine
pkgname=$gitname-git
pkgver=2.21.9999.351.d5f1993
_pkgname=alpine
pkgname=$_pkgname-git
pkgver=2.21.99999.373.fe5ffaf
pkgrel=1
pkgdesc="Fork of the PINE mail client (git)"
arch=('i686' 'x86_64')
url='http://alpine.x10host.com/'
license=('APACHE')
depends=(
'gettext'
'krb5'
'libldap'
'pam'
)
depends=('gettext' 'krb5' 'libldap' 'pam')
makedepends=('git')
provides=('alpine' 'pine' 're-alpine')
conflicts=('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')

pkgver() {
cd "${srcdir}/${gitname}"
cd "${srcdir}/${_pkgname}"

# we recently went
# from 2.21.204.5117359
# to 2.21.1.209.a9d7a00
# which rightfully confused pacman's version ordering
# so let's add a .0 to versions with only one dot
local v=$(cat VERSION)
[[ "$v" =~ ^[^\.]+\.[^\.]+\..*$ ]] || v=$v.0
# we recently went
# from 2.21.204.5117359
# to 2.21.1.209.a9d7a00
# which rightfully confused pacman's version ordering
# so let's add a .0 to versions with only one dot
_ver=$(cat VERSION)
[[ "$_ver" =~ ^[^\.]+\.[^\.]+\..*$ ]] || _ver=$_ver.0

local ver="${v}.$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
printf "%s" "${ver//-/.}"
_ver="${_ver}.$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
printf "%s" "${_ver//-/.}"
}
build() {
cd "${srcdir}/${gitname}"
LIBS+="-lpam -lkrb5 -lcrypto" ./configure --prefix=/usr \
--without-passfile --without-tcl --disable-shared \
--with-system-pinerc=/etc/${pkgname}.d/pine.conf \
--with-system-fixed-pinerc=/etc/${pkgname}.d/pine.conf.fixed
make
cd "${srcdir}/${_pkgname}"
LIBS="-lpam -lkrb5 -lcrypto -lssl -ltcl" \
./configure \
--prefix=/usr \
--with-passfile=.pine-passfile \
--with-system-pinerc=/etc/${pkgname}.d/pine.conf \
--with-system-fixed-pinerc=/etc/${pkgname}.d/pine.conf.fixed
make
}
package() {
cd "${srcdir}/${gitname}"
make DESTDIR="${pkgdir}" install
cd "${srcdir}/${_pkgname}"
make DESTDIR="${pkgdir}" install
}

Loading…
Cancel
Save