[csw-devel] SF.net SVN: gar:[9987] csw/mgar/pkg/policyd-weight/trunk

[bonivart at users.sourceforge.net]

Revision: 9987
          http://gar.svn.sourceforge.net/gar/?rev=9987&view=rev
Author:   bonivart
Date:     2010-05-26 12:40:59 +0000 (Wed, 26 May 2010)

Log Message:
-----------
policyd-weight: fix init script, use 0.1.15 source, move conf file

Modified Paths:
--------------
    csw/mgar/pkg/policyd-weight/trunk/Makefile
    csw/mgar/pkg/policyd-weight/trunk/checksums
    csw/mgar/pkg/policyd-weight/trunk/files/policyd-weight.init

Modified: csw/mgar/pkg/policyd-weight/trunk/Makefile
===================================================================
--- csw/mgar/pkg/policyd-weight/trunk/Makefile	2010-05-26 12:29:53 UTC (rev 9986)
+++ csw/mgar/pkg/policyd-weight/trunk/Makefile	2010-05-26 12:40:59 UTC (rev 9987)
@@ -1,6 +1,7 @@
 GARNAME = policyd-weight
-GARVERSION = 0.1.14
+GARVERSION = 0.1.15
 CATEGORIES = net
+WORKSRC = $(WORKDIR)
 
 DESCRIPTION = Policy daemon for the Postfix MTA (2.1 and later)
 define BLURB
@@ -8,8 +9,16 @@
   forged envelope senders and HELOs (i.e. in bogus mails)
 endef
 
-MASTER_SITES = http://www.policyd-weight.org/releases/
-DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+MASTER_SITES  = http://www.policyd-weight.org/releases/
+MASTER_SITES += http://www.policyd-weight.org/
+DISTFILES += $(GARNAME)-devel
+DISTFILES += $(GARNAME).conf.sample
+DISTFILES += $(GARNAME).8
+DISTFILES += $(GARNAME).conf.5
+DISTFILES += documentation.txt
+DISTFILES += todo.txt
+DISTFILES += changes.txt
+DISTFILES += COPYING
 
 ARCHALL = 1
 
@@ -27,7 +36,7 @@
 
 INITSMF = /opt/csw/etc/init.d/csw$(GARNAME)
 USERGROUP = /etc/opt/csw/pkg/CSW$(GARNAME)/cswusergroup
-SAMPLECONF  = /etc/opt/csw/postfix/policyd-weight.conf
+SAMPLECONF  = /etc/opt/csw/policyd-weight.conf
 
 CHECKPKG_OVERRIDES += surplus-dependency|CSWperl
 CHECKPKG_OVERRIDES += surplus-dependency|CSWpmnetdns
@@ -38,18 +47,18 @@
 	@echo " ==> Installing $(GARNAME) (custom)"
 	@ginstall -m 755 -d $(DESTDIR)/opt/csw/etc/init.d
 	@ginstall -m 755 $(FILEDIR)/$(GARNAME).init $(DESTDIR)/opt/csw/etc/init.d/csw$(GARNAME)
-	@ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/postfix
-	@ginstall -m 644 $(WORKSRC)/policyd-weight.conf.sample $(DESTDIR)/etc/opt/csw/postfix/policyd-weight.conf
+	@ginstall -m 755 -d $(DESTDIR)/etc/opt/csw
+	@ginstall -m 644 $(WORKSRC)/policyd-weight.conf.sample $(DESTDIR)/etc/opt/csw/policyd-weight.conf
 	@ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSW$(GARNAME)
 	@ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSW$(GARNAME)/cswusergroup
 	@ginstall -m 755 -d $(DESTDIR)$(sbindir)
-	@ginstall -m 755 $(WORKSRC)/$(GARNAME) $(DESTDIR)$(sbindir)
-	@ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME)
-	@ginstall -m 444 $(WORKSRC)/changes.txt $(DESTDIR)$(docdir)/$(GARNAME)
-	@ginstall -m 444 $(WORKSRC)/documentation.txt $(DESTDIR)$(docdir)/$(GARNAME)
-	@ginstall -m 755 $(WORKSRC)/todo.txt $(DESTDIR)$(docdir)/$(GARNAME)
+	@ginstall -m 755 $(WORKSRC)/$(GARNAME)-devel $(DESTDIR)$(sbindir)/$(GARNAME)
+	@ginstall -m 755 -d $(DESTDIR)$(docdir)/$(CATALOGNAME)
+	@ginstall -m 444 $(WORKSRC)/changes.txt $(DESTDIR)$(docdir)/$(CATALOGNAME)
+	@ginstall -m 444 $(WORKSRC)/documentation.txt $(DESTDIR)$(docdir)/$(CATALOGNAME)
+	@ginstall -m 755 $(WORKSRC)/todo.txt $(DESTDIR)$(docdir)/$(CATALOGNAME)
 	@ginstall -m 755 -d $(DESTDIR)$(mandir)/man5
-	@ginstall -m 755 $(WORKSRC)/man/man5/policyd-weight.conf.5 $(DESTDIR)$(mandir)/man5
+	@ginstall -m 755 $(WORKSRC)/policyd-weight.conf.5 $(DESTDIR)$(mandir)/man5
 	@ginstall -m 755 -d $(DESTDIR)$(mandir)/man8
-	@ginstall -m 755 $(WORKSRC)/man/man8/policyd-weight.8 $(DESTDIR)$(mandir)/man8
+	@ginstall -m 755 $(WORKSRC)/policyd-weight.8 $(DESTDIR)$(mandir)/man8
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/policyd-weight/trunk/checksums
===================================================================
--- csw/mgar/pkg/policyd-weight/trunk/checksums	2010-05-26 12:29:53 UTC (rev 9986)
+++ csw/mgar/pkg/policyd-weight/trunk/checksums	2010-05-26 12:40:59 UTC (rev 9987)
@@ -1 +1,8 @@
-fb4829a57c8b805fe981ee949a145042  policyd-weight-0.1.14.tar.gz
+608826974d5644ee7967a713fa72cf36  COPYING
+f50762cfa92b54f474df96541cc5679d  changes.txt
+ec5ca49feba2eab047a5da16143fe6cb  documentation.txt
+0aa05a54758f39b6f910a616e8139a30  policyd-weight-devel
+792ae8f214bcb109e40dfeaba79e6e90  policyd-weight.8
+98a66135c59c484290d06654dac93584  policyd-weight.conf.5
+b0ce437f3640023831554fc989d87477  policyd-weight.conf.sample
+53afc640bd8b88efb59519db358d6163  todo.txt

Modified: csw/mgar/pkg/policyd-weight/trunk/files/policyd-weight.init
===================================================================
--- csw/mgar/pkg/policyd-weight/trunk/files/policyd-weight.init	2010-05-26 12:29:53 UTC (rev 9986)
+++ csw/mgar/pkg/policyd-weight/trunk/files/policyd-weight.init	2010-05-26 12:40:59 UTC (rev 9987)
@@ -9,9 +9,6 @@
 # Source SMF includes
 [ -r /lib/svc/share/smf_include.sh ] && . /lib/svc/share/smf_include.sh
 
-# Source config file
-[ -r /etc/opt/csw/postfix/policyd-weight.conf ] && . /etc/opt/csw/postfix/policyd-weight.conf
-
 SERVICE=policyd-weight
 PATH=$PATH:/usr/bin:/opt/csw/bin
 
@@ -20,7 +17,7 @@
 case "$1" in
   start)
         echo "Starting $SERVICE ..."
-        /opt/csw/sbin/policyd-weight -f /etc/opt/csw/postfix/policyd-weight.conf
+        [ -r /etc/opt/csw/policyd-weight.conf ] && /opt/csw/sbin/policyd-weight -f /etc/opt/csw/policyd-weight.conf || /opt/csw/sbin/policyd-weight
         ;;
   stop)
         echo "Stopping $SERVICE ..."


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