[csw-devel] SF.net SVN: gar:[2321] csw/trunk/net/spamassassin

[bonivart at users.sourceforge.net]

Revision: 2321
          http://gar.svn.sourceforge.net/gar/?rev=2321&view=rev
Author:   bonivart
Date:     2008-11-19 15:48:41 +0000 (Wed, 19 Nov 2008)

Log Message:
-----------
spamassassin: hacked cswproto to fix build

Modified Paths:
--------------
    csw/trunk/net/spamassassin/Makefile
    csw/trunk/net/spamassassin/checksums
    csw/trunk/net/spamassassin/files/CSWspamassassin.gspec

Modified: csw/trunk/net/spamassassin/Makefile
===================================================================
--- csw/trunk/net/spamassassin/Makefile	2008-11-19 13:39:52 UTC (rev 2320)
+++ csw/trunk/net/spamassassin/Makefile	2008-11-19 15:48:41 UTC (rev 2321)
@@ -27,7 +27,7 @@
 configure-custom:
 	@echo " ==> Configuring $(GARNAME) (custom)"
 	@( cd $(WORKSRC) ; \
-	   perl Makefile.PL INSTALLDIRS=vendor DESTDIR=$(DESTDIR) CONFDIR=/opt/csw/etc/spamassassin LOCALSTATEDIR=/opt/csw/var CONTACT_ADDRESS=postmaster )
+	   perl Makefile.PL INSTALLDIRS=vendor DESTDIR=$(DESTDIR) CONFDIR=/opt/csw/etc/spamassassin LOCALSTATEDIR=/var/opt/csw/spamassassin CONTACT_ADDRESS=postmaster )
 	@$(MAKECOOKIE)
 
 build-custom:
@@ -46,7 +46,7 @@
 	@echo " ==> Installing $(GARNAME) (custom)"
 	@rm -rf $(DESTDIR)
 	@ginstall -d $(DESTDIR)$(docdir)/$(GARNAME)
-	@ginstall -d $(DESTDIR)/opt/csw/var/$(GARNAME)
+	@ginstall -d $(DESTDIR)/var/opt/csw/$(GARNAME)
 	@cp $(FILEDIR)/CSWspamassassin.README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW
 	@cp $(FILEDIR)/CSWspamassassin.README.spamd $(DESTDIR)$(docdir)/$(GARNAME)/README.spamd
 	@cp $(FILEDIR)/CSWspamassassin.cswspamd $(DESTDIR)$(docdir)/$(GARNAME)/cswspamd
@@ -55,11 +55,10 @@
 	@( cd $(WORKSRC) ; \
 	   gmake install )
 	@( cd $(WORKSRC) ; \
-	   cp -r C* INSTALL LICENSE NOTICE README TRADEMARK U* ldap/ sql/ procmailrc.example sample-* $(DESTDIR)$(docdir)/$(GARNAME)/ ; \
-	   mv $(DESTDIR)$(docdir)/spamassassin/LICENSE $(DESTDIR)$(docdir)/$(GARNAME)/copyright )
+	   cp -r C* INSTALL LICENSE NOTICE README TRADEMARK U* ldap/ sql/ procmailrc.example sample-* $(DESTDIR)$(docdir)/$(GARNAME)/ )
 	@( cd $(DESTDIR)/opt/csw/etc/spamassassin ; \
 	   mv local.cf local.cf.CSW ; \
-	   mv init.pre local.pre.CSW ; \
+	   mv init.pre init.pre.CSW ; \
 	   mv v310.pre v310.pre.CSW ; \
 	   mv v312.pre v312.pre.CSW ; \
 	   mv v320.pre v320.pre.CSW )

Modified: csw/trunk/net/spamassassin/checksums
===================================================================
--- csw/trunk/net/spamassassin/checksums	2008-11-19 13:39:52 UTC (rev 2320)
+++ csw/trunk/net/spamassassin/checksums	2008-11-19 15:48:41 UTC (rev 2321)
@@ -1,5 +1,5 @@
 7fdc1651d0371c4a7f95ac9ae6f828a6  download/Mail-SpamAssassin-3.2.5.tar.gz
-3bb44f4c268d90507d9eeeece6dbcc89  download/CSWspamassassin.gspec
+cab47048b63840594cdbef3067760ec6  download/CSWspamassassin.gspec
 7048882870e87e1f8eaa193b5dcaa7a8  download/CSWspamassassin.checkinstall
 ace3e9b5c2b93703e134992fcd73522b  download/CSWspamassassin.depend
 e0f6ee5c2ad9bb89342fcd46c70e6e7b  download/CSWspamassassin.postinstall

Modified: csw/trunk/net/spamassassin/files/CSWspamassassin.gspec
===================================================================
--- csw/trunk/net/spamassassin/files/CSWspamassassin.gspec	2008-11-19 13:39:52 UTC (rev 2320)
+++ csw/trunk/net/spamassassin/files/CSWspamassassin.gspec	2008-11-19 15:48:41 UTC (rev 2321)
@@ -1,7 +1,8 @@
 %var            bitname spamassassin
 %var            pkgname CSWspamassassin
 %include        url file://%{PKGLIB}/csw_dyndepend.gspec
+%prototype exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR}
 %copyright
 
-Please see /opt/csw/share/doc/spamassassin/copyright for license information.
+Please see /opt/csw/share/doc/spamassassin/LICENSE for license information.
 


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