diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-19 12:40:04 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-19 12:40:04 +0200 |
| commit | d186e96728bff4cc4873c59d48d01fe6eefe6131 (patch) | |
| tree | 1eefcef8058414b07b2750f52d9746f5323472ff /core/gpm | |
| parent | 84c217e2d9acc64713978324761816e2468b5292 (diff) | |
| parent | 1fedf1f5d5351aefd88268cba7353c79adac9b8a (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/collectd/PKGBUILD
community/drivel/PKGBUILD
community/fcitx-mozc/PKGBUILD
community/gnomesu/PKGBUILD
community/gnuchess/PKGBUILD
community/gphpedit/PKGBUILD
community/gsql/PKGBUILD
community/libmatchbox/PKGBUILD
community/lockfile-progs/PKGBUILD
community/opencc/PKGBUILD
community/roxterm/PKGBUILD
community/uriparser/PKGBUILD
community/xcircuit/PKGBUILD
core/bison/PKGBUILD
core/curl/PKGBUILD
core/expat/PKGBUILD
core/gcc/PKGBUILD
core/gpm/PKGBUILD
core/m4/PKGBUILD
core/systemd/PKGBUILD
core/tar/PKGBUILD
extra/alsa-lib/PKGBUILD
extra/alsa-utils/PKGBUILD
extra/bitlbee/PKGBUILD
extra/chkrootkit/PKGBUILD
extra/fakechroot/PKGBUILD
extra/farstream/PKGBUILD
extra/freeglut/PKGBUILD
extra/gob2/PKGBUILD
extra/libcdio-paranoia/PKGBUILD
extra/liblqr/PKGBUILD
extra/libnl1/PKGBUILD
extra/libpst/PKGBUILD
extra/libwpd/PKGBUILD
extra/xorg-server/PKGBUILD
Diffstat (limited to 'core/gpm')
| -rw-r--r-- | core/gpm/PKGBUILD | 11 | ||||
| -rwxr-xr-x | core/gpm/gpm | 41 | ||||
| -rw-r--r-- | core/gpm/gpm.conf.d | 4 |
3 files changed, 3 insertions, 53 deletions
diff --git a/core/gpm/PKGBUILD b/core/gpm/PKGBUILD index 5d8cc3348..9e0f895ea 100644 --- a/core/gpm/PKGBUILD +++ b/core/gpm/PKGBUILD @@ -1,22 +1,19 @@ -# $Id: PKGBUILD 170033 2012-10-31 05:23:26Z eric $ +# $Id: PKGBUILD 182863 2013-04-15 21:02:26Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gpm pkgver=1.20.7 -pkgrel=1.1 +pkgrel=2 pkgdesc="A mouse server for the console and xterm" arch=('i686' 'x86_64' 'mips64el') url="http://www.nico.schottelius.org/software/gpm/" license=('GPL') depends=('ncurses' 'bash') -backup=('etc/conf.d/gpm') options=('!makeflags') install=gpm.install source=(http://www.nico.schottelius.org/software/gpm/archives/${pkgname}-${pkgver}.tar.lzma \ - gpm gpm.conf.d gpm.sh gpm.service) + gpm.sh gpm.service) sha1sums=('8d9f3655c80ce7667d31ede2a100b44986480369' - '19e1feb1493373512a77801699df012d186336ea' - '4c31cb7dd51cee4d16d3f7a8956e6d87fac1ad86' '88fe5ff10916c68a87abc8418a56eb0073f69fa9' '20b92360f0ad38a2032fcae37bdbd01b31e43f77') @@ -30,8 +27,6 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -D -m755 ../gpm "${pkgdir}/etc/rc.d/gpm" - install -D -m644 ../gpm.conf.d "${pkgdir}/etc/conf.d/gpm" install -D -m755 ../gpm.sh "${pkgdir}/etc/profile.d/gpm.sh" install -D -m644 ../gpm.service "${pkgdir}/usr/lib/systemd/system/gpm.service" diff --git a/core/gpm/gpm b/core/gpm/gpm deleted file mode 100755 index 7b5213dd7..000000000 --- a/core/gpm/gpm +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -# source application-specific settings -GPM_ARGS= -[ -f /etc/conf.d/gpm ] && . /etc/conf.d/gpm - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=$(pidof -o %PPID /usr/sbin/gpm) -case "$1" in - start) - stat_busy "Starting GPM Daemon" - [ -z "$PID" ] && /usr/sbin/gpm ${GPM_ARGS} - PID=$(pidof -o %PPID /usr/sbin/gpm) - if [ -z "$PID" ]; then - stat_fail - else - add_daemon gpm - stat_done - fi - ;; - stop) - stat_busy "Stopping GPM Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon gpm - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/core/gpm/gpm.conf.d b/core/gpm/gpm.conf.d deleted file mode 100644 index ab43bb7eb..000000000 --- a/core/gpm/gpm.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to gpm -# -GPM_ARGS="-m /dev/input/mice -t imps2" |