aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2017-09-03 15:00:00 -0500
committerNatanael Copa <ncopa@alpinelinux.org>2017-09-19 10:51:29 +0000
commit17d55f5bf868df42d950f74c055d86f1e944521e (patch)
treed1b250352fa82f04eee9117bd171e4c8f9a14a47
parentea49699ac3a4f8828c15e8048f8e241357ee31e4 (diff)
downloadaports-17d55f5bf868df42d950f74c055d86f1e944521e.tar.gz
aports-17d55f5bf868df42d950f74c055d86f1e944521e.tar.bz2
aports-17d55f5bf868df42d950f74c055d86f1e944521e.tar.xz
main/fixesproto: modernise, add -doc, mark as having no test suite
-rw-r--r--main/fixesproto/APKBUILD26
-rw-r--r--main/libxi/APKBUILD20
2 files changed, 26 insertions, 20 deletions
diff --git a/main/fixesproto/APKBUILD b/main/fixesproto/APKBUILD
index 8ccb03dec0..265ef1bb18 100644
--- a/main/fixesproto/APKBUILD
+++ b/main/fixesproto/APKBUILD
@@ -1,34 +1,34 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fixesproto
pkgver=5.0
-pkgrel=1
+pkgrel=2
pkgdesc="X11 Fixes extension wire protocol"
url="http://xorg.freedesktop.org/"
-arch="all"
+arch="noarch"
license="custom"
+options="!check" # No test suite.
depends="xextproto"
-makedepends=""
+makedepends="util-macros"
+subpackages="$pkgname-doc"
source="http://www.x.org/releases/individual/proto/$pkgname-$pkgver.tar.bz2"
-_builddir="$srcdir/$pkgname-$pkgver"
-
prepare() {
- cd "$_builddir"
- update_config_sub || return 1
+ cd "$builddir"
+ default_prepare
+ update_config_sub
}
build() {
- cd "$_builddir"
+ cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
- --prefix=/usr \
- || return 1
- make || return 1
+ --prefix=/usr
+ make
}
package() {
- cd "$srcdir"/$pkgname-$pkgver
- make DESTDIR="$pkgdir" install || return 1
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
}
sha512sums="93c6a8b6e4345c3049c08f2f3960f5eb5f92c487f26d227430964361bf82041b49e61f873fbbb8ee0e111556f90532b852c20e6082ee8008be641373251fa78c fixesproto-5.0.tar.bz2"
diff --git a/main/libxi/APKBUILD b/main/libxi/APKBUILD
index 3f2c83d016..5d0d56258b 100644
--- a/main/libxi/APKBUILD
+++ b/main/libxi/APKBUILD
@@ -1,24 +1,29 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libxi
pkgver=1.7.9
-pkgrel=0
+pkgrel=1
pkgdesc="X11 Input extension library"
url="http://xorg.freedesktop.org"
arch="all"
license="custom"
+options="!check" # No test suite.
subpackages="$pkgname-dev $pkgname-doc"
depends=
-depends_dev="inputproto libx11-dev libxext-dev libxfixes-dev"
makedepends="
- $depends_dev
+ inputproto
+ libx11-dev
+ libxext-dev
+ libxfixes-dev
pkgconfig
+ util-macros
xextproto
+ xmlto
xproto
"
source="http://www.x.org/releases/individual/lib/libXi-$pkgver.tar.bz2"
builddir="$srcdir"/libXi-$pkgver
-build () {
+build() {
cd "$builddir"
./configure \
--build=$CBUILD \
@@ -27,13 +32,14 @@ build () {
--sysconfdir=/etc \
--mandir=/usr/share/man \
--localstatedir=/var \
- || return 1
- make || return 1
+ --with-xmlto \
+ --without-fop
+ make
}
package() {
cd "$builddir"
- make DESTDIR="$pkgdir" install || return 1
+ make DESTDIR="$pkgdir" install
install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}