Revision: 3890
http://gar.svn.sourceforge.net/gar/?rev=3890&view=rev
Author: idogan23
Date: 2009-03-23 20:00:58 +0000 (Mon, 23 Mar 2009)
Log Message:
-----------
apcupsd: moved config files to /etc/opt/csw, config files now handled by
classutils
Modified Paths:
--------------
csw/mgar/pkg/apcupsd/trunk/Makefile
csw/mgar/pkg/apcupsd/trunk/checksums
csw/mgar/pkg/apcupsd/trunk/files/CSWapcupsd.postinstall
Removed Paths:
-------------
csw/mgar/pkg/apcupsd/trunk/files/CSWapcupsd.prototype
Modified: csw/mgar/pkg/apcupsd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apcupsd/trunk/Makefile 2009-03-23 19:53:38 UTC (rev 3889)
+++ csw/mgar/pkg/apcupsd/trunk/Makefile 2009-03-23 20:00:58 UTC (rev 3890)
@@ -12,7 +12,7 @@
MASTER_SITES = http://www.apcupsd.org/
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWapcupsd, prototype postinstall)
+DISTFILES += $(call admfiles,CSWapcupsd, postinstall)
DISTFILES += cswapcupsd
# We define upstream file regex so we can be notifed of new upstream software
release
@@ -20,10 +20,11 @@
REQUIRED_PKGS = CSWcswclassutils
-SPKG_CLASSES = none cswinitsmf
+SPKG_CLASSES = none cswcpsampleconf cswinitsmf
+PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswapcupsd$$$$/ { $$$$2 =
"cswinitsmf" } $$$$3 ~ /\/apcupsd\/apcupsd.conf.CSW$$$$/ { $$$$2 =
"cswcpsampleconf" } { print }' | grep -v \/etc\/rc
CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --sysconfdir=/opt/csw/etc/apcupsd
+CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw/apcupsd
CONFIGURE_ARGS += --with-nologin=/var/run
CONFIGURE_ARGS += --with-pwrfail-dir=/opt/csw/etc/apcupsd/powerfail
CONFIGURE_ARGS += --with-log-dir=/opt/csw/var/apcupsd
@@ -35,7 +36,7 @@
# moving configuration file & installing init script
post-install-modulated:
- (cd $(DESTDIR)$(prefix)/etc/apcupsd; \
+ (cd $(DESTDIR)/etc/opt/csw/apcupsd; \
for i in apcupsd.conf; do \
if [ -r "$$i" ]; then \
echo "$$i -> $$i.CSW"; \
Modified: csw/mgar/pkg/apcupsd/trunk/checksums
===================================================================
--- csw/mgar/pkg/apcupsd/trunk/checksums 2009-03-23 19:53:38 UTC (rev
3889)
+++ csw/mgar/pkg/apcupsd/trunk/checksums 2009-03-23 20:00:58 UTC (rev
3890)
@@ -1,6 +1,4 @@
78811129db1a882b9a2b9afd540470b3 download/apcupsd-3.14.4.tar.gz
8f6ac052c4f049b79553ba43eda38d30 download/CSWapcupsd.gspec
-e5586868ebec465f4b66d0da3c1eedda download/CSWapcupsd.depend
-9aba501d897f84e4c9973cdb1e9a2a74 download/CSWapcupsd.prototype
-e501dccc827094e6d536fd51752d065b download/CSWapcupsd.postinstall
+27409e07fa0133f0ed22e0b76d5a5ada download/CSWapcupsd.postinstall
6b63d7b83cb6bc893797d41b751fef70 download/cswapcupsd
Modified: csw/mgar/pkg/apcupsd/trunk/files/CSWapcupsd.postinstall
===================================================================
--- csw/mgar/pkg/apcupsd/trunk/files/CSWapcupsd.postinstall 2009-03-23
19:53:38 UTC (rev 3889)
+++ csw/mgar/pkg/apcupsd/trunk/files/CSWapcupsd.postinstall 2009-03-23
20:00:58 UTC (rev 3890)
@@ -1,3 +1,4 @@
-if [ ! -f $BASEDIR/opt/csw/etc/apcupsd/apcupsd.conf ] ; then
- cp $BASEDIR/opt/csw/etc/apcupsd/apcupsd.conf.CSW
$BASEDIR/opt/csw/etc/apcupsd/apcupsd.conf
+if [ -f $BASEDIR/opt/csw/etc/apcupsd/apcupsd.conf ] ; then
+ echo "moving configuration file to /etc/opt/csw/apcupsd"
+ mv $BASEDIR/opt/csw/etc/apcupsd/apcupsd.conf
$BASEDIR/etc/opt/csw/apcupsd/apcupsd.conf
fi
Deleted: csw/mgar/pkg/apcupsd/trunk/files/CSWapcupsd.prototype
===================================================================
--- csw/mgar/pkg/apcupsd/trunk/files/CSWapcupsd.prototype 2009-03-23
19:53:38 UTC (rev 3889)
+++ csw/mgar/pkg/apcupsd/trunk/files/CSWapcupsd.prototype 2009-03-23
20:00:58 UTC (rev 3890)
@@ -1,19 +0,0 @@
-d none /opt/csw/etc 0755 root bin
-d none /opt/csw/etc/apcupsd 0755 root bin
-f none /opt/csw/etc/apcupsd/apccontrol 0744 root bin
-f none /opt/csw/etc/apcupsd/apcupsd.conf.CSW 0644 root bin
-f none /opt/csw/etc/apcupsd/changeme 0744 root bin
-f none /opt/csw/etc/apcupsd/commfailure 0744 root bin
-f none /opt/csw/etc/apcupsd/commok 0744 root bin
-f none /opt/csw/etc/apcupsd/offbattery 0744 root bin
-f none /opt/csw/etc/apcupsd/onbattery 0744 root bin
-d none /opt/csw/sbin 0755 root bin
-f none /opt/csw/sbin/apcaccess 0755 root bin
-f none /opt/csw/sbin/apctest 0700 root bin
-f none /opt/csw/sbin/apcupsd 0700 root bin
-f none /opt/csw/sbin/smtp 0755 root bin
-d none /opt/csw/share 0755 root bin
-d none /opt/csw/share/man 0755 root bin
-d none /opt/csw/share/man/man8 0755 root bin
-f none /opt/csw/share/man/man8/apcupsd.8 0644 root bin
-f cswinitsmf /etc/opt/csw/init.d/cswapcupsd 0755 root bin
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
