[csw-devel] SF.net SVN: gar:[17003] csw/mgar/pkg/spamass-milter/trunk

[guengel at users.sourceforge.net]

Revision: 17003
          http://gar.svn.sourceforge.net/gar/?rev=17003&view=rev
Author:   guengel
Date:     2012-02-05 15:13:16 +0000 (Sun, 05 Feb 2012)
Log Message:
-----------
spamass-milter/trunk: Minor change to startup script. Added license information. Added -norunpath.

Modified Paths:
--------------
    csw/mgar/pkg/spamass-milter/trunk/Makefile
    csw/mgar/pkg/spamass-milter/trunk/files/cswspamass-milter

Modified: csw/mgar/pkg/spamass-milter/trunk/Makefile
===================================================================
--- csw/mgar/pkg/spamass-milter/trunk/Makefile	2012-02-05 14:21:24 UTC (rev 17002)
+++ csw/mgar/pkg/spamass-milter/trunk/Makefile	2012-02-05 15:13:16 UTC (rev 17003)
@@ -14,6 +14,7 @@
 DISTFILES += spamass-milter.CSW
 DISTFILES += README.CSW
 DISTFILES += changelog.CSW
+DISTFILES += COPYING
 
 PATCHFILES  = 0000-Workaround-for-missing-paths.h.patch
 
@@ -21,19 +22,21 @@
 PRESERVECONF = $(sysconfdir)/spamass-milter
 
 PACKAGES = CSWspamass-milter
-CATALOGNAME = spamass_milter
 RUNTIME_DEP_PKGS = CSWspamassassin
 
 BUILD_DEP_PKGS  = CSWspamassassin
 BUILD_DEP_PKGS += CSWsendmail
 BUILD_DEP_PKGS += CSWlibmilter
 
+LICENSE = COPYING
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
 SENDMAIL = $(libdir)/sendmail
 
 EXTRA_CONFIGURE_ENV = SENDMAIL=$(SENDMAIL)
+EXTRA_CXX_FLAGS = -norunpath
 
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/spamass-milter/trunk/files/cswspamass-milter
===================================================================
--- csw/mgar/pkg/spamass-milter/trunk/files/cswspamass-milter	2012-02-05 14:21:24 UTC (rev 17002)
+++ csw/mgar/pkg/spamass-milter/trunk/files/cswspamass-milter	2012-02-05 15:13:16 UTC (rev 17003)
@@ -11,8 +11,6 @@
 #                     being useful, would otherwise leave service in
 #                     maintenance mode
 #
-# /etc/init.d/ sample script for Solaris
-# Modified for CSW
 # $Id$
 
 # The defaults. They can be overwritten by /opt/csw/etc/spamass-milter
@@ -106,6 +104,7 @@
     if [ $? -ne 0 ]
     then
 	warning "spamass-milter not running. Nothing to stop."
+	rm -f "${SPAMASS_PID}"
 	return 0
     fi
 

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