[csw-devel] SF.net SVN: gar:[18442] csw/mgar/pkg/cfengine3/trunk

[guengel at users.sourceforge.net]

Revision: 18442
          http://gar.svn.sourceforge.net/gar/?rev=18442&view=rev
Author:   guengel
Date:     2012-06-16 17:20:14 +0000 (Sat, 16 Jun 2012)
Log Message:
-----------
cfengine3/trunk: Removed spaces for defines.

Modified Paths:
--------------
    csw/mgar/pkg/cfengine3/trunk/Makefile
    csw/mgar/pkg/cfengine3/trunk/files/cfengine3rc
    csw/mgar/pkg/cfengine3/trunk/files/cswcfengine3-cfexecd
    csw/mgar/pkg/cfengine3/trunk/files/cswcfengine3-cfmonitord
    csw/mgar/pkg/cfengine3/trunk/files/cswcfengine3-cfserverd

Modified: csw/mgar/pkg/cfengine3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/Makefile	2012-06-16 16:37:57 UTC (rev 18441)
+++ csw/mgar/pkg/cfengine3/trunk/Makefile	2012-06-16 17:20:14 UTC (rev 18442)
@@ -1,7 +1,7 @@
 # $Id$
 #
 NAME = cfengine3
-VERSION = 3.2.3
+VERSION = 3.3.3
 CATEGORIES = utils
 GARTYPE = v2
 

Modified: csw/mgar/pkg/cfengine3/trunk/files/cfengine3rc
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/files/cfengine3rc	2012-06-16 16:37:57 UTC (rev 18441)
+++ csw/mgar/pkg/cfengine3/trunk/files/cfengine3rc	2012-06-16 17:20:14 UTC (rev 18442)
@@ -10,8 +10,8 @@
 # cf-serverd.
 
 # Options passed to cf-serverd
-CFSERVERD_OPTS="-D opencsw"
+CFSERVERD_OPTS="-Dopencsw"
 # Options passed to cf-execd
-CFEXECD_OPTS="-D opencsw"
+CFEXECD_OPTS="-Dopencsw"
 # Options passed to cf-monitord
 CFMONITORD_OPTS=""

Modified: csw/mgar/pkg/cfengine3/trunk/files/cswcfengine3-cfexecd
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/files/cswcfengine3-cfexecd	2012-06-16 16:37:57 UTC (rev 18441)
+++ csw/mgar/pkg/cfengine3/trunk/files/cswcfengine3-cfexecd	2012-06-16 17:20:14 UTC (rev 18442)
@@ -27,7 +27,7 @@
 }
 
 
-stop() {
+_stop() {
     if [ -r ${PIDFILE} ]
     then
 	PID=`/bin/cat ${PIDFILE}`
@@ -44,7 +44,7 @@
     return 0
 }
 
-start() {
+_start() {
     if [ -r ${PIDFILE} ]
     then
 	/bin/kill -0 `/bin/cat ${PIDFILE}` > /dev/null 2>&1
@@ -84,7 +84,7 @@
     return 0
 }
 
-status() {
+_status() {
     if [ -r ${PIDFILE} ]
     then
 	/bin/kill -0 `/bin/cat ${PIDFILE}` > /dev/null 2>&1
@@ -101,17 +101,17 @@
 
 case "$1" in
     start)
-	start
+	_start
 	;;
     stop)
-	stop
+	_stop
 	;;
     restart)
-	stop
-	start
+	_stop
+	_start
 	;;
     status)
-	status
+	_status
 	;;
     *)
 	echo "$0 {start|stop|restart|status}"

Modified: csw/mgar/pkg/cfengine3/trunk/files/cswcfengine3-cfmonitord
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/files/cswcfengine3-cfmonitord	2012-06-16 16:37:57 UTC (rev 18441)
+++ csw/mgar/pkg/cfengine3/trunk/files/cswcfengine3-cfmonitord	2012-06-16 17:20:14 UTC (rev 18442)
@@ -27,7 +27,7 @@
 }
 
 
-stop() {
+_stop() {
     if [ -r ${PIDFILE} ]
     then
 	PID=`/bin/cat ${PIDFILE}`
@@ -44,7 +44,7 @@
     return 0
 }
 
-start() {
+_start() {
     if [ -r ${PIDFILE} ]
     then
 	/bin/kill -0 `/bin/cat ${PIDFILE}` > /dev/null 2>&1
@@ -84,7 +84,7 @@
     return 0
 }
 
-status() {
+_status() {
     if [ -r ${PIDFILE} ]
     then
 	/bin/kill -0 `/bin/cat ${PIDFILE}` > /dev/null 2>&1
@@ -101,17 +101,17 @@
 
 case "$1" in
     start)
-	start
+	_start
 	;;
     stop)
-	stop
+	_stop
 	;;
     restart)
-	stop
-	start
+	_stop
+	_start
 	;;
     status)
-	status
+	_status
 	;;
     *)
 	echo "$0 {start|stop|restart|status}"

Modified: csw/mgar/pkg/cfengine3/trunk/files/cswcfengine3-cfserverd
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/files/cswcfengine3-cfserverd	2012-06-16 16:37:57 UTC (rev 18441)
+++ csw/mgar/pkg/cfengine3/trunk/files/cswcfengine3-cfserverd	2012-06-16 17:20:14 UTC (rev 18442)
@@ -27,7 +27,7 @@
 }
 
 
-stop() {
+_stop() {
     if [ -r ${PIDFILE} ]
     then
 	PID=`/bin/cat ${PIDFILE}`
@@ -44,7 +44,7 @@
     return 0
 }
 
-start() {
+_start() {
     if [ -r ${PIDFILE} ]
     then
 	/bin/kill -0 `/bin/cat ${PIDFILE}` > /dev/null 2>&1
@@ -84,7 +84,7 @@
     return 0
 }
 
-status() {
+_status() {
     if [ -r ${PIDFILE} ]
     then
 	/bin/kill -0 `/bin/cat ${PIDFILE}` > /dev/null 2>&1
@@ -101,17 +101,17 @@
 
 case "$1" in
     start)
-	start
+	_start
 	;;
     stop)
-	stop
+	_stop
 	;;
     restart)
-	stop
-	start
+	_stop
+	_start
 	;;
     status)
-	status
+	_status
 	;;
     *)
 	echo "$0 {start|stop|restart|status}"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.