diff options
Diffstat (limited to 'main/xdm')
| -rw-r--r-- | main/xdm/APKBUILD | 23 | ||||
| -rw-r--r-- | main/xdm/xdm.confd | 1 | ||||
| -rwxr-xr-x | main/xdm/xdm.initd | 2 |
3 files changed, 10 insertions, 16 deletions
diff --git a/main/xdm/APKBUILD b/main/xdm/APKBUILD index dd43b8fde2..3b69eced80 100644 --- a/main/xdm/APKBUILD +++ b/main/xdm/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Johannes Matheis <jomat+alpinebuild@jmt.gr> pkgname=xdm pkgver=1.1.11 -pkgrel=4 +pkgrel=5 pkgdesc="X Display Manager" url="http://xorg.freedesktop.org/" arch="all" @@ -15,6 +15,7 @@ subpackages="$pkgname-doc" source=" $url/releases/individual/app/$pkgname-$pkgver.tar.bz2 $pkgname.initd + $pkgname.confd Xresources.alpinelinux Xresources.alpinelinux_old alpinelinux_old_blue_black.xpm @@ -45,8 +46,11 @@ package() { cd "$builddir" make DESTDIR="$pkgdir" install - install -D -m755 "$srcdir"/$pkgname.initd \ + install -Dm755 "$srcdir"/$pkgname.initd \ "$pkgdir"/etc/init.d/$pkgname + install -Dm644 "$srcdir"/$pkgname.confd \ + "$pkgdir"/etc/conf.d/$pkgname + install -D -m644 "$srcdir"/Xresources.alpinelinux \ "$pkgdir"/etc/X11/$pkgname/Xresources.alpinelinux install -D -m644 "$srcdir"/Xresources.alpinelinux_old \ @@ -57,20 +61,9 @@ package() { "$pkgdir"/etc/X11/$pkgname/pixmaps/alpinelinux_white_blue.xpm } -md5sums="64a1af1f7eb69feae12e75d4cc3aaf19 xdm-1.1.11.tar.bz2 -7b09a1690c503f3cce293bbccf487cff xdm.initd -b2c215bc54ecb349ff5f54cc0c5e5529 Xresources.alpinelinux -7342c0be3ce17c84a2872138ff122fc6 Xresources.alpinelinux_old -eac1a660d7e389768cbc9883f0730281 alpinelinux_old_blue_black.xpm -650ee72b634ff7fb146b7a7652416b5a alpinelinux_white_blue.xpm" -sha256sums="d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47 xdm-1.1.11.tar.bz2 -1c9b5983ceb0787fe3a8e32448f3d0d46daa3d4f3a34dca3ee17bb313c5a4bb3 xdm.initd -d9453bf82ff28270e79d2cfaed1aaebeb7f806954b1f8fc8401e9473a9cab2cc Xresources.alpinelinux -8e0b0780bfb974f718dd491edab23ac95fc050f478f5bcc347172194f4d907f3 Xresources.alpinelinux_old -fd868f01d1b6e1ca6905e9f35599cc7e6a0e0818b34a47f56819ccee1d8db0d8 alpinelinux_old_blue_black.xpm -848334ce1dfafe22746a57005910ef68641df8cc09bd5ad803048bc22e534feb alpinelinux_white_blue.xpm" sha512sums="fe6f2b7817c0f7f07a1f5f497edcdfa15b93986fd87f314daa472dac8625327ef46ebbf40d27fe8d4a8a2f8d5af8a01c4438a29356740e0eb350f2bd0c7ec0d5 xdm-1.1.11.tar.bz2 -afd702f72b10ce7a11c48f4350bc50ba8e1a4addb634241de6494cea2b468d9d4a5fcd854db12c2e91540319e51ab65f97dcfec4b31762c1e4c08851dc86ff52 xdm.initd +20c1ada62d139fe8c8f8f7d6479ff45f6c009dbf5af454939bd11433700d8c5ef56a2068645ee0ab31e16cea29e708836f80a598ae708179844d56e31b90cfaa xdm.initd +9d08ee82afeb85e7d9e0a1013226a44bdbef8d6da227f5fef7734524861c41f0cdc9ba4616b2faaf3a8d4b16134115ed004bf0a5fcf71be7c6e13506fbcda95b xdm.confd 2a9db579323d680b6b3d7a0377ea1140c8570870c4f06f2ecc5e0ec73233b3621e46823ff3f694d8fa296a4de83b4fd62c2635c3c6b413b613ebe83cba4cf033 Xresources.alpinelinux 5d667541fdb39bdbd637da45e05a243736af32b7aa75ce27f2bbf097bce2fad87932619b372ab03add29b0bef7dd8816eb89875fbf2426eba83978d720687d90 Xresources.alpinelinux_old b55424fd9ea0970fdbecd11c1abecf41cad1a7ede03f38011f666ae4eed2a88def5ac364bdf4ebcac09fa66963ed534e85faff74fcd01e9f040229d999382472 alpinelinux_old_blue_black.xpm diff --git a/main/xdm/xdm.confd b/main/xdm/xdm.confd new file mode 100644 index 0000000000..541166b6e9 --- /dev/null +++ b/main/xdm/xdm.confd @@ -0,0 +1 @@ +xdm_opts="-resources /etc/X11/xdm/Xresources.alpinelinux" diff --git a/main/xdm/xdm.initd b/main/xdm/xdm.initd index 76531354fb..e3fc614416 100755 --- a/main/xdm/xdm.initd +++ b/main/xdm/xdm.initd @@ -6,7 +6,7 @@ depends() { description="X Display Manager" command="/usr/bin/xdm" -command_args="-resources /etc/X11/xdm/Xresources.alpinelinux" +command_args="${xdm_opts}" pidfile="/var/run/xdm.pid" # uses the openrc templates for start()/stop() |