update apcupsd ebuild

diff --git a/sys-apps/apcupsd/ChangeLog b/sys-apps/apcupsd/ChangeLog
index ef11e6efbb25bad827546bb4a522feaaf30fff3d..75c1124081182e48d6fc18202040ba6662222426 100644 (file)
--- a/sys-apps/apcupsd/ChangeLog
+++ b/sys-apps/apcupsd/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for sys-apps/apcupsd
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/ChangeLog,v 1.4 2002/10/21 04:45:53 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/ChangeLog,v 1.5 2002/10/26 11:26:39 zwelch Exp $
 
 *apcupsd-3.10.1 (20 Oct 2002)
 
+  25 Oct 2002; Zach Welch <zwelch@gentoo.org> :
+  Update ebuild to patch configure to use correct system version.
+  Sucessfully merged on ppc, added ~ppc
+
   20 Oct 2002; Zach Welch <zwelch@gentoo.org> :
   New version incorporating changes made by Superlucidity Services, LLC, to
   support Gentoo without additional patching.  

diff --git a/sys-apps/apcupsd/apcupsd-3.10.1.ebuild b/sys-apps/apcupsd/apcupsd-3.10.1.ebuild
index 88582bfcb8fe1d1826398c7f720f6b58fa94c185..916676ae62207bf8af5f3b96b63420575db367ea 100644 (file)
--- a/sys-apps/apcupsd/apcupsd-3.10.1.ebuild
+++ b/sys-apps/apcupsd/apcupsd-3.10.1.ebuild
@@ -1,17 +1,18 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.1.ebuild,v 1.1 2002/10/21 04:45:53 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.1.ebuild,v 1.2 2002/10/26 11:26:39 zwelch Exp $
 
 S=${WORKDIR}/${P}
-DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown (*ALPHA*)"
+DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
 SRC_URI="ftp://ftp.apcupsd.com/pub/apcupsd/development/${P}.tar.gz \
        ftp://ftp.apcupsd.com/pub/apcupsd/contrib/gd1.2.tar.gz"
 HOMEPAGE="http://www.sibbald.com/apcupsd/"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 SLOT="0"
 LICENSE="GPL-2"
  
-DEPEND="virtual/glibc
+DEPEND=">=sys-apps/baselayout-1.8.4
+       virtual/glibc
        virtual/mta
        sys-libs/ncurses"
  
@@ -25,12 +26,14 @@ src_unpack() {
        unpack ${A}
 
        cp -a ${WORKDIR}/gd1.2 ${S}/src/
-       cp -a ${S} ${S}-orig
-       ln -s /usr/portage/sys-apps/apcupsd/files ${WORKDIR}/files
+#      cp -a ${S} ${S}-orig
+       cd ${S}
+       sed -e 's:gentoo-version:gentoo-release:' configure >configure.1
+       sed -e '10627s:DISTVER=`uname -r`:DISTVER=$(sed -e "s/Gentoo Base System version//" /etc/gentoo-release):' configure.1 >configure
+       rm configure.1
 }
 
 src_compile() {
-       # --with-distname redundant for >=baselayout-1.8.4, but req'd for prev.
        MAIL=/usr/sbin/sendmail ./configure \
                --prefix=/usr \
                --sbindir=/usr/sbin \
@@ -39,7 +42,6 @@ src_compile() {
                --with-lock-dir=${XLOCKDIR} \
                --with-pid-dir=${XPIDDIR} \
                --with-log-dir=${XLOGDIR} \
-               --with-distname=gentoo \
                --with-upstype=usb \
                --with-upscable=usb \
                --with-serial-dev=/dev/usb/hid/hiddev[0-9] \