[csw-devel] SF.net SVN: gar:[14663] csw/mgar/pkg/exim/trunk

[bdwalton at users.sourceforge.net]

Revision: 14663
          http://gar.svn.sourceforge.net/gar/?rev=14663&view=rev
Author:   bdwalton
Date:     2011-05-30 01:44:43 +0000 (Mon, 30 May 2011)

Log Message:
-----------
exim/trunk: update config file handling to use preserveconf

Modified Paths:
--------------
    csw/mgar/pkg/exim/trunk/Makefile
    csw/mgar/pkg/exim/trunk/files/CSWexim.postinstall

Modified: csw/mgar/pkg/exim/trunk/Makefile
===================================================================
--- csw/mgar/pkg/exim/trunk/Makefile	2011-05-30 01:42:25 UTC (rev 14662)
+++ csw/mgar/pkg/exim/trunk/Makefile	2011-05-30 01:44:43 UTC (rev 14663)
@@ -42,6 +42,9 @@
 
 INITSMF = /etc/opt/csw/init.d/cswexim
 
+PRESERVECONF += /etc/opt/csw/exim/exim.conf /etc/opt/csw/exim/exim-env.sh
+PRESERVECONF += /etc/opt/csw/exim/aliases
+
 # scripts/exim_install has been patched to use this variable
 EXIM_VERSION = $(VERSION)
 export EXIM_VERSION
@@ -113,19 +116,12 @@
 	mv exim-$(VERSION)-1 exim; \
 	/usr/ccs/bin/strip $(BINS); \
 	/usr/ccs/bin/mcs -d $(BINS))
-	(cd $(DESTDIR)/etc/$(prefix)/exim; \
-	for i in aliases exim.conf; do \
-		if [ -r "$$i" ]; then \
-			echo "$$i -> $$i.CSW"; \
-			mv "$$i" "$$i.CSW";	\
-		fi \
-	done)
 	(cd $(DESTDIR); mkdir -p etc/opt/csw/init.d; \
 		cp $(abspath $(FILEDIR)/cswexim) etc/opt/csw/init.d )
 	mkdir -p $(DESTDIR)$(prefix)/share/doc/exim
 	mkdir -p $(DESTDIR)/var/$(prefix)/spool/exim
 	cp -p files/README.CSW  $(DESTDIR)$(prefix)/share/doc/exim/README.CSW
-	cp -p files/exim-env.sh $(DESTDIR)/etc/$(prefix)/exim/exim-env.sh.CSW
+	cp -p files/exim-env.sh $(DESTDIR)/etc/$(prefix)/exim/
 	(cd $(WORKSRC)/doc; \
 	cp -p $(DOC_LIST) $(DESTDIR)$(prefix)/share/doc/exim)
 	gzip -f $(DESTDIR)$(prefix)/share/doc/exim/ChangeLog

Modified: csw/mgar/pkg/exim/trunk/files/CSWexim.postinstall
===================================================================
--- csw/mgar/pkg/exim/trunk/files/CSWexim.postinstall	2011-05-30 01:42:25 UTC (rev 14662)
+++ csw/mgar/pkg/exim/trunk/files/CSWexim.postinstall	2011-05-30 01:44:43 UTC (rev 14663)
@@ -1,6 +1,6 @@
 #!/sbin/sh
 CONFDIR=$PKG_INSTALL_ROOT/opt/csw/etc/exim
-CONFFILES="aliases exim.conf exim-env.sh"
+
 PATH=/bin:/usr/bin:"$PATH"
 export PATH
 
@@ -9,21 +9,6 @@
   mount | grep '^/usr ' | grep 'read only' >/dev/null
 }
 
-### Set up config-file related stuff
-
-echo ""
-echo "Setting up config-files..."
-for file in $CONFFILES; do
-    confpath="$CONFDIR/$file"
-    if [ -r "$confpath" ]; then
-	echo "Not touching existing $confpath"
-    else
-	echo "Copying $confpath.CSW to $confpath"
-	cp -p "$confpath.CSW" "$confpath"
-    fi
-done
-echo ""
-
 is_usr_readonly
 
 if [ $? -eq 0 -a  "$SENDMAIL_ACTION" != "leave" ]; then


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