diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-09-04 21:55:40 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-09-04 21:55:40 -0300 |
| commit | 7121fa40a8f5a195f91efcd4cb42a17c64652ed6 (patch) | |
| tree | a71b5443d4ac2ed34151f9eef1623aeaf31644f9 | |
| parent | 8bafb162b9546cee075e293caec2c281958601ab (diff) | |
| parent | 7c277a3e0333c9dcb2bfc56e418d810473f7e802 (diff) | |
| download | abslibre-7121fa40a8f5a195f91efcd4cb42a17c64652ed6.tar.gz abslibre-7121fa40a8f5a195f91efcd4cb42a17c64652ed6.tar.bz2 abslibre-7121fa40a8f5a195f91efcd4cb42a17c64652ed6.zip | |
Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre
| -rw-r--r-- | libre/apache-ant/PKGBUILD | 7 | ||||
| -rw-r--r-- | libre/cdrkit/PKGBUILD | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/libre/apache-ant/PKGBUILD b/libre/apache-ant/PKGBUILD index 7601f526a..4fba0fcb2 100644 --- a/libre/apache-ant/PKGBUILD +++ b/libre/apache-ant/PKGBUILD @@ -8,11 +8,10 @@ pkgdesc="A Java-based build tool" license=('Apache' 'custom:BSD3') url="http://ant.apache.org/" -provides=("apache-ant-libre=$pkgver") -replaces=("apache-ant-libre") -conflicts=("apache-ant-libre") +replaces=("$pkgname-libre") +conflicts=("$pkgname-libre") -pkgrel=1 +pkgrel=1.parabola1 arch=('any') depends=('java-environment') makedepends=('jh') diff --git a/libre/cdrkit/PKGBUILD b/libre/cdrkit/PKGBUILD index aaa47f6ce..d641146d0 100644 --- a/libre/cdrkit/PKGBUILD +++ b/libre/cdrkit/PKGBUILD @@ -29,17 +29,17 @@ mksource() { } prepare() { - cd "$srcdir/$_pkgname-$pkgver" + cd "$srcdir/$pkgname-$pkgver" sed -i "s#sbin#bin#" netscsid/CMakeLists.txt } build() { - cd "$srcdir/$_pkgname-$pkgver" + cd "$srcdir/$pkgname-$pkgver" make } package() { - cd "$srcdir/$_pkgname-$pkgver" + cd "$srcdir/$pkgname-$pkgver" make PREFIX="$pkgdir/usr" install # Make symlinks for cdrtools compatibility |