More cleanups. Added a new version.

8 files changed, 176 insertions, 13 deletions

diff --git a/sys-apps/apcupsd/Manifest b/sys-apps/apcupsd/Manifest
index 0cdbb9d8a4ed..b710fddfc9de 100644
--- a/sys-apps/apcupsd/Manifest
+++ b/sys-apps/apcupsd/Manifest
@@ -1,14 +1,15 @@
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 1783406992be3bfcb32747d400c3493d ChangeLog 4666
-MD5 baca9b3f3dc7278055e5d85fda894fb4 apcupsd-3.10.9.ebuild 2540
+MD5 df6e510a796cc92c1623638002b538c9 ChangeLog 5144
+MD5 85be9158f7780c38d560c27c5e0bb426 apcupsd-3.10.9.ebuild 2540
 MD5 134ce42c69ee4501893d91a2fec897c5 apcupsd-3.10.8.ebuild 2539
-MD5 7a523b5d29637d319f2e38bc94947289 apcupsd-3.10.5-r4.ebuild 2182
 MD5 2f6ea2e245c6a5aeeabf554390867389 apcupsd-3.10.6.ebuild 2531
-MD5 f7092406e32869eb0535d85b4c09be0d files/digest-apcupsd-3.10.5-r4 123
 MD5 f66859d42d0af37659622f78b276a8bc files/digest-apcupsd-3.10.6 123
 MD5 c5a0f1d4de26b7e7e76641d5c722cd9f files/digest-apcupsd-3.10.8 123
 MD5 ab17d3fa671f63d263570aebe6f611b1 files/digest-apcupsd-3.10.9 123
-MD5 0a6d9da1e13f3a3a37fc77104eb8e2f2 files/3.10.5/apache.conf 163
+MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.9/smtp.patch 2663
+MD5 ac24c9a1e199dfd66650ca55ce1e33f4 files/3.10.9/ucd-snmp.patch 425
+MD5 69cfaea0e3937c778c710b8120cbd379 files/3.10.9/apache.conf 157
+MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.9/apcupsd.in.patch 315
 MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.6/smtp.patch 2663
 MD5 ac24c9a1e199dfd66650ca55ce1e33f4 files/3.10.6/ucd-snmp.patch 425
 MD5 69cfaea0e3937c778c710b8120cbd379 files/3.10.6/apache.conf 157
diff --git a/sys-apps/apcupsd/apcupsd-3.10.5-r4.ebuild b/sys-apps/apcupsd/apcupsd-3.10.9.ebuild
index c6e366611224..850b7cea6439 100644
--- a/sys-apps/apcupsd/apcupsd-3.10.5-r4.ebuild
+++ b/sys-apps/apcupsd/apcupsd-3.10.9.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.5-r4.ebuild,v 1.4 2004/01/03 00:54:46 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.9.ebuild,v 1.1 2004/01/14 16:35:28 tantive Exp $
 
-IUSE="doc snmp usb"
+IUSE="doc snmp usb apache2"
 
 S=${WORKDIR}/${P}
 DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
@@ -30,6 +30,10 @@ XPWRFAILDIR=${XSYSCONFDIR}
 src_unpack() {
 	unpack ${A}
 	cp -a ${WORKDIR}/gd1.2 ${S}/src/
+	cd ${S}/platforms/gentoo
+	epatch ${FILESDIR}/${PV}/apcupsd.in.patch
+	cd ${S}
+	epatch ${FILESDIR}/${PV}/ucd-snmp.patch
 }
 
 src_compile() {
@@ -54,8 +58,8 @@ src_compile() {
 		--enable-master-slave \
 		--enable-powerflute \
 		--enable-pthreads \
-		--with-css-dir=/home/httpd/apcupsd \
-		--with-cgi-bin=/home/httpd/apcupsd \
+		--with-css-dir=/var/www/apcupsd \
+		--with-cgi-bin=/var/www/apcupsd \
 		--enable-cgi \
 		${myconf} \
 		|| die
@@ -65,11 +69,20 @@ src_compile() {
 src_install () {
 	make DESTDIR=${D} install || die "installed failed"
 
-	insinto /etc/apache/conf/addon-modules
-	newins ${FILESDIR}/${PV}/apache.conf apcupsd.conf
+	use apache2 || insinto /etc/apache/conf/addon-modules
+	use apache2 || newins  ${FILESDIR}/${PV}/apache.conf apcupsd.conf
+
+	use apache2 && insinto /etc/apache2/conf/modules.d
+	use apache2 && newins ${FILESDIR}/${PV}/apache.conf 60_apcupsd.conf
+
 	insinto /etc/apcupsd
 	newins examples/safe.apccontrol safe.apccontrol
 
+	cd ${D}/etc/apcupsd
+	epatch ${FILESDIR}/${PV}/smtp.patch
+
+	ln -s onbattery powerout
+
 	if [ "`use doc`x" != "x" ]
 	then
 		einfo "Installing full documentation into /usr/share/doc/${P}..."
diff --git a/sys-apps/apcupsd/files/3.10.9/apache.conf b/sys-apps/apcupsd/files/3.10.9/apache.conf
new file mode 100644
index 000000000000..21305d257846
--- /dev/null
+++ b/sys-apps/apcupsd/files/3.10.9/apache.conf
@@ -0,0 +1,8 @@
+Alias /apcupsd/ /var/www/apcupsd/
+
+<Directory "/var/www/apcupsd/">
+	AllowOverride AuthConfig
+	Options ExecCGI
+	Order allow,deny
+	Allow from all
+</Directory>
diff --git a/sys-apps/apcupsd/files/3.10.9/apcupsd.in.patch b/sys-apps/apcupsd/files/3.10.9/apcupsd.in.patch
new file mode 100644
index 000000000000..7bcb0f41c086
--- /dev/null
+++ b/sys-apps/apcupsd/files/3.10.9/apcupsd.in.patch
@@ -0,0 +1,15 @@
+--- apcupsd.in	2002-09-14 14:03:18.000000000 +0200
++++ apcupsd.in.new	2003-11-06 16:34:28.000000000 +0100
+@@ -6,6 +6,12 @@
+ APCPID=@PIDDIR@/apcupsd.pid
+ APCUPSD=@sbindir@/apcupsd
+ 
++depend() {
++	after hotplug
++	after usb
++	after net
++}
++
+ start() {
+ 	rm -f /etc/apcupsd/powerfail
+ 	ebegin "Starting APC UPS daemon"
diff --git a/sys-apps/apcupsd/files/3.10.9/smtp.patch b/sys-apps/apcupsd/files/3.10.9/smtp.patch
new file mode 100644
index 000000000000..d0c6bbcbdd48
--- /dev/null
+++ b/sys-apps/apcupsd/files/3.10.9/smtp.patch
@@ -0,0 +1,112 @@
+diff -u old/changeme new/changeme
+--- old/changeme	2003-11-01 11:31:10.000000000 -0500
++++ new/changeme	2003-11-01 11:27:09.000000000 -0500
+@@ -13,9 +13,10 @@
+ #
+ (
+    echo "Subject: $MSG"
+-   echo " "
++   echo "To: $SYSADMIN"
++   echo
+    echo "$MSG"
+    echo " "
+    /usr/sbin/apcaccess status
+-) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
++) | $APCUPSD_MAIL $SYSADMIN
+ exit 0
+diff -u old/commfailure new/commfailure
+--- old/commfailure	2003-11-01 11:31:26.000000000 -0500
++++ new/commfailure	2003-11-01 11:27:13.000000000 -0500
+@@ -13,9 +13,10 @@
+ #
+ (
+    echo "Subject: $MSG"
+-   echo " "
++   echo "To: $SYSADMIN"
++   echo
+    echo "$MSG"
+    echo " "
+    /usr/sbin/apcaccess status
+-) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
++) | $APCUPSD_MAIL $SYSADMIN
+ exit 0
+diff -u old/commok new/commok
+--- old/commok	2003-11-01 11:31:33.000000000 -0500
++++ new/commok	2003-11-01 11:27:16.000000000 -0500
+@@ -13,9 +13,10 @@
+ #
+ (
+    echo "Subject: $MSG"
+-   echo " "
++   echo "To: $SYSADMIN"
++   echo
+    echo "$MSG"
+    echo " "
+    /usr/sbin/apcaccess status
+-) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
++) | $APCUPSD_MAIL $SYSADMIN
+ exit 0
+diff -u old/mainsback new/mainsback
+--- old/mainsback	2003-11-01 11:30:55.000000000 -0500
++++ new/mainsback	2003-11-01 11:27:21.000000000 -0500
+@@ -13,9 +13,10 @@
+ #
+ (
+    echo "Subject: $MSG"
+-   echo " "
++   echo "To: $SYSADMIN"
++   echo
+    echo "$MSG"
+    echo " "
+    /usr/sbin/apcaccess status
+-) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
++) | $APCUPSD_MAIL $SYSADMIN
+ exit 0
+diff -u old/masterconnect new/masterconnect
+--- old/masterconnect	2003-11-01 11:31:43.000000000 -0500
++++ new/masterconnect	2003-11-01 11:27:30.000000000 -0500
+@@ -13,9 +13,10 @@
+ #
+ (
+    echo "Subject: $MSG"
+-   echo " "
++   echo "To: $SYSADMIN"
++   echo
+    echo "$MSG"
+    echo " "
+    /usr/sbin/apcaccess status
+-) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
++) | $APCUPSD_MAIL $SYSADMIN
+ exit 0
+diff -u old/mastertimeout new/mastertimeout
+--- old/mastertimeout	2003-11-01 11:31:52.000000000 -0500
++++ new/mastertimeout	2003-11-01 11:27:33.000000000 -0500
+@@ -13,9 +13,10 @@
+ #
+ (
+    echo "Subject: $MSG"
+-   echo " "
++   echo "To: $SYSADMIN"
++   echo
+    echo "$MSG"
+    echo " "
+    /usr/sbin/apcaccess status
+-) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
++) | $APCUPSD_MAIL $SYSADMIN
+ exit 0
+diff -u old/onbattery new/onbattery
+--- old/onbattery	2003-11-01 11:32:03.000000000 -0500
++++ new/onbattery	2003-11-01 11:27:35.000000000 -0500
+@@ -13,9 +13,10 @@
+ #
+ (
+    echo "Subject: $MSG"
+-   echo " "
++   echo "To: $SYSADMIN"
++   echo
+    echo "$MSG"
+    echo " "
+    /usr/sbin/apcaccess status
+-) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
++) | $APCUPSD_MAIL $SYSADMIN
+ exit 0
diff --git a/sys-apps/apcupsd/files/3.10.9/ucd-snmp.patch b/sys-apps/apcupsd/files/3.10.9/ucd-snmp.patch
new file mode 100644
index 000000000000..af9c363b2328
--- /dev/null
+++ b/sys-apps/apcupsd/files/3.10.9/ucd-snmp.patch
@@ -0,0 +1,14 @@
+--- src/drivers/snmp/snmp.c 2003-04-05 14:58:00.000000000 +0200
++++ src/drivers/snmp/snmp.c 2003-08-21 14:25:11.000000000 +0200
+@@ -245,7 +245,10 @@
+     return ret;
+ }
+
+-int snmp_ups_program_eeprom(UPSINFO *ups, int command, char *data)
++/*int snmp_ups_program_eeprom(UPSINFO *ups, int command, char *data)
++ * Modified for debian
++*/
++int snmp_ups_program_eeprom(UPSINFO *ups, int command, void *data)
+ {
+     return 0;
+ }
diff --git a/sys-apps/apcupsd/files/digest-apcupsd-3.10.5-r4 b/sys-apps/apcupsd/files/digest-apcupsd-3.10.5-r4
deleted file mode 100644
index 7bb96a139a01..000000000000
--- a/sys-apps/apcupsd/files/digest-apcupsd-3.10.5-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f182db64c8acdae18f896ecdc064a239 apcupsd-3.10.5.tar.gz 2749777
-MD5 d9a0ddf7918c93ca28fa5832a4af54d8 gd1.2.tar.gz 64595
diff --git a/sys-apps/apcupsd/files/digest-apcupsd-3.10.9 b/sys-apps/apcupsd/files/digest-apcupsd-3.10.9
new file mode 100644
index 000000000000..ca2f12c5bdcc
--- /dev/null
+++ b/sys-apps/apcupsd/files/digest-apcupsd-3.10.9
@@ -0,0 +1,2 @@
+MD5 693a4ecfecf5ae777f3ef4000f58d6fe apcupsd-3.10.9.tar.gz 3754398
+MD5 d9a0ddf7918c93ca28fa5832a4af54d8 gd1.2.tar.gz 64595