[csw-devel] SF.net SVN: gar:[4023] csw/mgar/pkg/dovecot/trunk

[skayser at users.sourceforge.net]

Revision: 4023
          http://gar.svn.sourceforge.net/gar/?rev=4023&view=rev
Author:   skayser
Date:     2009-03-28 21:22:41 +0000 (Sat, 28 Mar 2009)

Log Message:
-----------
dovecot: adjusted file paths

Modified Paths:
--------------
    csw/mgar/pkg/dovecot/trunk/Makefile
    csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW

Modified: csw/mgar/pkg/dovecot/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dovecot/trunk/Makefile	2009-03-28 21:07:34 UTC (rev 4022)
+++ csw/mgar/pkg/dovecot/trunk/Makefile	2009-03-28 21:22:41 UTC (rev 4023)
@@ -131,8 +131,8 @@
 		repackage
 	@$(MAKECOOKIE)
 
+
 post-install-modulated: DOCS = NEWS AUTHORS COPYING.LGPL COPYING.MIT
-post-install-modulated: CSWDOCS = changelog.CSW README.CSW
 post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME)
 post-install-modulated: SSLDIR = $(DESTDIR)/opt/csw/ssl
 post-install-modulated: build-and-install-sieveplugin
@@ -141,17 +141,24 @@
 	@ginstall -d $(DESTDIR)$(sysconfdir)/pkg/CSWdovecot
 	@ginstall -d $(SSLDIR)/certs
 	@ginstall -d $(SSLDIR)/private
+
+	@cp $(DESTDIR)$(sysconfdir)/dovecot-example.conf \
+		$(DESTDIR)$(sysconfdir)/dovecot.conf.CSW
+
+	# Create self-signed sample cert
 	@( cd $(WORKSRC)/doc; SSLDIR=$(SSLDIR) /bin/sh ./mkcert.sh )
 	@mv $(SSLDIR)/certs/dovecot.pem $(SSLDIR)/certs/dovecot.pem.CSW
 	@mv $(SSLDIR)/private/dovecot.pem $(SSLDIR)/private/dovecot.pem.CSW
 	@chmod 400 $(SSLDIR)/private/dovecot.pem.CSW
-	@cp $(DESTDIR)$(sysconfdir)/dovecot-example.conf \
-		$(DESTDIR)$(sysconfdir)/dovecot.conf.CSW
+
+	# Copy documentation (upstream + CSW) and mkcert.sh
 	@$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);)
-	@$(foreach DOC,$(CSWDOCS),\
-		ginstall -m 644 $(FILEDIR)/CSWdovecot.$(DOC) $(DOCDEST);)
+	@cp $(FILEDIR)/CSWdovecot.changelog.CSW $(DOCDEST)/changelog.CSW
+	@cp $(FILEDIR)/CSWdovecot.README.CSW $(DOCDEST)/README.CSW
 	@ginstall -m 755 $(WORKSRC)/doc/mkcert.sh $(DOCDEST)
 	@cp $(WORKSRC)/doc/dovecot-openssl.cnf $(DOCDEST)
+
+	# Files for cswinitsmf and cswusergroup
 	@ginstall -m 755 $(FILEDIR)/CSWdovecot.cswdovecot  \
 		$(DESTDIR)/etc/opt/csw/init.d/cswdovecot
 	@ginstall -m 644 $(FILEDIR)/CSWdovecot.cswusergroup \

Modified: csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW
===================================================================
--- csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW	2009-03-28 21:07:34 UTC (rev 4022)
+++ csw/mgar/pkg/dovecot/trunk/files/CSWdovecot.changelog.CSW	2009-03-28 21:22:41 UTC (rev 4023)
@@ -1,4 +1,4 @@
-dovecot (1.1.11,REV=2009.03.26)
+dovecot (1.1.11,REV=2009.03.28)
 
   * Package adopted and updated to 1.1.11.
   * Tested and validated LDAP interopability with PAM. (Closes: #2760)
@@ -6,4 +6,4 @@
   * Compiled with --localstatedir=/var/opt/csw. Changes base_dir from
     /opt/csw/var/run/dovecot to /var/opt/csw/run/dovecot.
 
- -- Sebastian Kayser <skayser at opencsw.org>  Thu, 26 Mar 2009 13:35:07 +0100
+ -- Sebastian Kayser <skayser at opencsw.org>  Sat, 28 Mar 2009 18:18:35 +0100


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