Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=9539fe2cdf8006a4fd72f284e17cd206e5432c99
commit 9539fe2cdf8006a4fd72f284e17cd206e5432c99
Author: bouleetbil <bouleet...@frogdev.info>
Date: Sun Nov 28 20:46:07 2010 +0000
acpid-1.0.10-2-i686
*switch to systemd
diff --git a/source/base/acpid/FrugalBuild b/source/base/acpid/FrugalBuild
index f49c680..6434c73 100644
--- a/source/base/acpid/FrugalBuild
+++ b/source/base/acpid/FrugalBuild
@@ -3,7 +3,7 @@
pkgname=acpid
pkgver=1.0.10
-pkgrel=1
+pkgrel=2
pkgdesc="Utilities for using ACPI power management"
depends=('glibc>=2.8-3')
backup=(etc/acpi/acpi_handler.sh)
@@ -11,14 +11,11 @@ groups=('base')
archs=('i686' 'x86_64' 'ppc')
_F_archive_grepv="20010510"
Finclude sourceforge
-source=(${sour...@]} rc.acpid rc.acpid-{de,hu,it}.po acpi_handler.sh default)
+source=(${sour...@]} acpi_handler.sh default acpid.service)
sha1sums=('743a11f34993cbd70f011d45634c4520e2d4d426' \
- '009e8c404a93db943f57631bc95625609fb29255' \
- '67c63dd3f5225c33170e1cfc549c0319ada21a84' \
- 'fcf938454f809eeec394ebea64d7f10dfdf11caf' \
- 'fd74c81eab81fad2eedf7f11ac14a33f97f2b213' \
'f232c48dbd9200e4ac79e2edc6ab5929835f42e0' \
- 'afac4fc82e6ca65d4a156f39016ee8d15c6eeabc')
+ 'afac4fc82e6ca65d4a156f39016ee8d15c6eeabc' \
+ '6e8e2fadb63903c8ed336a579aba9aa765b64d63')
build()
{
@@ -30,7 +27,10 @@ build()
make INSTPREFIX=$Fdestdir MAN8DIR=$Fdestdir/usr/share/man/man8 install
Fexe /etc/acpi/acpi_handler.sh
Fexe /etc/acpi/events/default
- Frcd2
+
+ #systemd
+ Fmkdir lib/systemd/system
+ Fcp acpid.service lib/systemd/system
}
# optimization OK
diff --git a/source/base/acpid/acpid.service b/source/base/acpid/acpid.service
new file mode 100644
index 0000000..ee590a4
--- /dev/null
+++ b/source/base/acpid/acpid.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=ACPI Event Daemon
+After=syslog.target
+
+# This could probably benefit from socket activation, but honestly I think it
+# is time for acpid to go away, and hence I am not planning to spend the time
+# to add socket activation here. We use Type=forking to ensure that the
+# communication sockets are in place before boot proceeds with any service
+# needing this service. Would acpid support socket activation we could use
+# Type=simple here.
+
+[Service]
+ExecStart=/usr/sbin/acpid -f
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/source/base/acpid/rc.acpid b/source/base/acpid/rc.acpid
deleted file mode 100644
index 3478ac8..0000000
--- a/source/base/acpid/rc.acpid
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-# (c) 2005 Marcus Habermehl <bmh198...@yahoo.de>
-# (c) 2003 Vajna Miklos <vmik...@frugalware.org>
-# rc.acpid for Frugalware
-# distributed under GPL License
-
-# chkconfig: 2345 44 56
-# description: Listen and dispatch ACPI events from the kernel
-
-source /lib/initscripts/functions
-TEXTDOMAIN=acpid
-TEXTDOMAINDIR=/lib/initscripts/messages
-
-actions=(restart start status stop)
-daemon=$"ACPI daemon"
-
-pid="pidof acpid 2> /dev/null"
-
-rc_start()
-{
- start_msg
- if [ -d /proc/acpi ] && [[ "$(eval ${pid})" == "" ]] ; then
- /usr/sbin/acpid
- ok $?
- else
- ok 999
- fi
-}
-
-rc_stop()
-{
- stop_msg
- if [ -d /proc/acpi ] && [[ "$(eval ${pid})" != "" ]] ; then
- killall acpid
- ok $?
- else
- ok 999
- fi
-}
-
-rc_exec $1
-
-# vim: ft=sh
diff --git a/source/base/acpid/rc.acpid-de.po b/source/base/acpid/rc.acpid-de.po
deleted file mode 100644
index 95098af..0000000
--- a/source/base/acpid/rc.acpid-de.po
+++ /dev/null
@@ -1,20 +0,0 @@
-# rc.acpid.
-# Copyright (C) 2005 THE rc.acpid'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the rc.acpid package.
-# Marcus Habermehl <bmh198...@yahoo.de>, 2005.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: rc.acpid\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 17:05+0100\n"
-"PO-Revision-Date: 2005-11-15 17:06+0100\n"
-"Last-Translator: Marcus Habermehl <bmh198...@yahoo.de>\n"
-"Language-Team: Language deDE\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: rc.acpid:15
-msgid "ACPI daemon"
-msgstr "ACPI Daemon"
diff --git a/source/base/acpid/rc.acpid-hu.po b/source/base/acpid/rc.acpid-hu.po
deleted file mode 100644
index 0a8d648..0000000
--- a/source/base/acpid/rc.acpid-hu.po
+++ /dev/null
@@ -1,21 +0,0 @@
-# rc.acpid.
-# Copyright (C) 2005 THE rc.acpid'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the rc.acpid package.
-# Marcus Habermehl <bmh198...@yahoo.de>, 2005.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: rc.acpid\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 17:05+0100\n"
-"PO-Revision-Date: 2005-11-15 17:07+0100\n"
-"Last-Translator: Marcus Habermehl <bmh198...@yahoo.de>\n"
-"Language-Team: Hungarian <translation-team...@lists.sourceforge.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: rc.acpid:15
-msgid "ACPI daemon"
-msgstr "ACPI démon"
diff --git a/source/base/acpid/rc.acpid-it.po b/source/base/acpid/rc.acpid-it.po
deleted file mode 100644
index 40f8837..0000000
--- a/source/base/acpid/rc.acpid-it.po
+++ /dev/null
@@ -1,21 +0,0 @@
-# rc.acpid.
-# Copyright (C) 2005 THE rc.acpid'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the rc.acpid package.
-# Marcus Habermehl <bmh198...@yahoo.de>, 2005.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: rc.acpi\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 17:05+0100\n"
-"PO-Revision-Date: 2005-11-15 17:08+0100\n"
-"Last-Translator: Marcus Habermehl <bmh198...@yahoo.de>\n"
-"Language-Team: Italian <t...@lists.linux.it>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: rc.acpid:15
-msgid "ACPI daemon"
-msgstr "demonio ACPI"
diff --git a/source/base/acpid/rc.acpid.pot b/source/base/acpid/rc.acpid.pot
deleted file mode 100644
index c0a1d69..0000000
--- a/source/base/acpid/rc.acpid.pot
+++ /dev/null
@@ -1,21 +0,0 @@
-# rc.acpid.
-# Copyright (C) YEAR THE rc.acpid'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the rc.acpid package.
-# FIRST AUTHOR <em...@address>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: rc.acpid\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 17:05+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <em...@address>\n"
-"Language-Team: LANGUAGE <l...@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: rc.acpid:15
-msgid "ACPI daemon"
-msgstr ""
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
