[patch] 2.0.2 bump

nut-2.0.2.ebuild.diff (text/plain), 3.58 KB, created by Julien Biezemans on 2005-07-04 17:19:33 UTC

--- nut-2.0.1_pre4.ebuild	2005-02-21 04:22:23.000000000 +0100
+++ nut-2.0.2.ebuild	2005-06-29 23:16:04.000000000 +0200
@@ -2,31 +2,27 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/www-apps/nut/nut-2.0.1_pre4.ebuild,v 1.3 2005/02/21 02:43:58 dragonheart Exp $
 
-inherit fixheadtails
-
-MY_P="${P/_/-}"
+inherit fixheadtails webapp
 
 DESCRIPTION="Network-UPS Tools"
 HOMEPAGE="http://www.networkupstools.org/"
-SRC_URI="mirror://nut/source/2.0/testing/${MY_P}.tar.gz"
-
-S=${WORKDIR}/${MY_P/-pre4//}
+SRC_URI="mirror://nut/source/2.0/${P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="0"
+#SLOT="0"
 KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64"
-IUSE="cgi snmp usb"
+IUSE="cgi snmp usb ssl"
 
-RDEPEND="cgi? ( media-libs/gd )
-		snmp? ( net-analyzer/net-snmp )"
+RDEPEND="cgi? ( >= media-libs/gd-2 )
+	snmp? ( virtual/snmp )
+	usb? ( dev-libs/libusb )
+	ssl? ( >=dev-libs/openssl-0.9.6e )"
 DEPEND="$RDEPEND
 		>=sys-apps/sed-4
 		>=sys-devel/autoconf-2.58"
 
 src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
+	unpack ${A} && cd "${S}"
 
 	sed -e "s/install: install-dirs/install: install-dirs install-conf/" \
 		-i Makefile.in || die "sed failed"
@@ -37,13 +33,14 @@
 		-i configure.in || die "sed failed"
 
 	ebegin "Recreating configure"
+	aclocal
 	WANT_AUTOCONF=2.5 autoconf || die "autoconf failed"
 	eend $?
 }
 
 src_compile() {
 	local myconf
-	myconf="${myconf} `use_with cgi` `use_with cgi cgipath /usr/share/nut`"
+	myconf="${myconf} `use_with cgi` `use_with ssl`"
 
 	if [ -n "${NUT_DRIVERS}" ]; then
 		myconf="${myconf} --with-drivers=${NUT_DRIVERS// /,}"
@@ -65,7 +62,7 @@
 	fi
 
 	if use usb; then
-		emake usb || die "snmp compile problem"
+		emake usb || die "usb compile problem"
 	fi
 
 	if use cgi; then
@@ -76,12 +73,8 @@
 src_install() {
 	make DESTDIR="${D}" install install-lib || die "make install failed"
 
-	dodir /usr/sbin
-	dosym /usr/lib/nut/upsdrvctl /usr/sbin/upsdrvctl
-
-	for i in "${D}"/etc/nut/*.sample ; do
-		mv "${i}" "${i/.sample/}"
-	done
+	dodir /sbin
+	dosym /usr/lib/nut/upsdrvctl /sbin/upsdrvctl
 
 	if use snmp; then
 		make DESTDIR="${D}" install-snmp || die "make install-snmp failed"
@@ -92,10 +85,18 @@
 	fi
 
 	if use cgi; then
-		make DESTDIR="${D}" install-cgi || die "make install-cgi failed"
-		einfo "CGI monitoring scripts are installed in /usr/share/nut,"
-		einfo "copy them to your web server's ScriptPath to activate."
-	fi
+		make DESTDIR="${D}" install-cgi-conf || die "make install-cgi-conf failed"
+
+		webapp_src_preinst
+		
+		cp clients/*.cgi ${D}/${MY_CGIBINDIR}
+
+		webapp_src_install
+ 	fi
+ 
+	for i in "${D}"/etc/nut/*.sample ; do
+		mv "${i}" "${i/.sample/}"
+	done
 
 	dodoc CHANGES COPYING CREDITS INSTALL MAINTAINERS NEWS README UPGRADING \
 			docs/{FAQ,*.txt}
@@ -105,18 +106,17 @@
 	docinto cables
 	dodoc docs/cables/*
 
-
 	exeinto /etc/init.d
 	newexe "${FILESDIR}/upsd.rc6" upsd
-	newexe "${FILESDIR}/upsdrv.rc6-r1" upsdrv
+	newexe "${FILESDIR}/upsdrv.rc6" upsdrv
 	newexe "${FILESDIR}/upsmon.rc6" upsmon
 
 	keepdir /var/lib/nut
 
 	fperms 0700 /var/lib/nut
-	fperms 0640 /etc/nut/{upsd.conf,upsd.users,upsmon.conf}
+	fperms 0640 /etc/nut/*
 	fowners nut:nut /var/lib/nut
-	fowners root:nut /etc/nut/{upsd.conf,upsd.users,upsmon.conf}
+	fowners root:nut /etc/nut/*
 }
 
 pkg_postinst() {
@@ -126,4 +126,8 @@
 	chmod 0700 ${ROOT}/var/lib/nut 2>/dev/null
 	chown root:nut ${ROOT}/etc/nut/{upsd.conf,upsd.users,upsmon.conf} 2>/dev/null
 	chmod 0640 ${ROOT}/etc/nut/{upsd.conf,upsd.users,upsmon.conf} 2>/dev/null
+
+	ewarn "use the command"
+	ewarn "     webapp-config"
+	ewarn "to install nut for each virtual host. See proper man page."
 }