diff options
author | Ivy Foster | 2018-01-25 20:24:10 -0600 |
---|---|---|
committer | Ivy Foster | 2018-01-25 20:24:10 -0600 |
commit | 9ec33ea7d8562a374b38bab4cbb13bcc61bdae9b (patch) | |
tree | 8a53d138320ddb2c599ed8669a16ac030110285c | |
parent | 4425cdc56a1a1e96a3323714a60d003b79df012a (diff) | |
download | aur-9ec33ea7d8562a374b38bab4cbb13bcc61bdae9b.tar.gz |
Update prepare() for current build, fix spurious conflict with self
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 17 |
2 files changed, 13 insertions, 12 deletions
@@ -1,18 +1,20 @@ pkgbase = frotz-git pkgdesc = Z-machine interpreter for interactive fiction games - pkgver = 2.44.r188.g869c99e + pkgver = 2.44.r196.gf3ceac9 pkgrel = 1 url = http://frotz.sourceforge.net/ arch = i686 arch = x86_64 license = GPL - provides = frotz - conflicts = frotz source = git+https://github.com/DavidGriffith/frotz md5sums = SKIP pkgname = frotz-ncurses-git depends = ncurses + provides = frotz + conflicts = frotz pkgname = frotz-dumb-git + provides = frotz-dumb + conflicts = frotz-dumb @@ -2,13 +2,10 @@ pkgbase=frotz-git pkgname=(frotz-ncurses-git frotz-dumb-git) -pkgver=2.44.r188.g869c99e +pkgver=2.44.r196.gf3ceac9 pkgrel=1 pkgdesc='Z-machine interpreter for interactive fiction games' -conflicts=(frotz) -provides=(frotz) - arch=(i686 x86_64) url='http://frotz.sourceforge.net/' license=(GPL) @@ -23,11 +20,8 @@ pkgver() { prepare() { cd frotz sed '/^PREFIX/ s:/usr/local:/usr: - /^CONFIG_DIR = $(PREFIX)/ s/^/#/ - /^CONFIG_DIR/ s:/usr/local:: - /^CURSES/ s/-lcurses/-lncurses/ - /^#CURSES_DEF/ s/^#//' \ - -i Makefile + /^MAN_PREFIX/ s:$:/share: + ' -i Makefile } build() { @@ -37,6 +31,8 @@ build() { } package_frotz-ncurses-git() { + conflicts=(frotz) + provides=(frotz) depends=('ncurses') cd frotz @@ -44,6 +40,9 @@ package_frotz-ncurses-git() { } package_frotz-dumb-git() { + conflicts=(frotz-dumb) + provides=(frotz-dumb) + cd frotz make DESTDIR="$pkgdir" install_dumb } |