[csw-devel] SF.net SVN: gar:[12019] csw/mgar/pkg/exim/branches/dir-loc-fixes

[bdwalton at users.sourceforge.net]

Revision: 12019
          http://gar.svn.sourceforge.net/gar/?rev=12019&view=rev
Author:   bdwalton
Date:     2010-12-19 01:35:23 +0000 (Sun, 19 Dec 2010)

Log Message:
-----------
exim/dir-loc-fixes: use cswpreserveconf for config file handling

Modified Paths:
--------------
    csw/mgar/pkg/exim/branches/dir-loc-fixes/Makefile
    csw/mgar/pkg/exim/branches/dir-loc-fixes/files/CSWexim.postinstall

Removed Paths:
-------------
    csw/mgar/pkg/exim/branches/dir-loc-fixes/files/CSWexim.preremove

Modified: csw/mgar/pkg/exim/branches/dir-loc-fixes/Makefile
===================================================================
--- csw/mgar/pkg/exim/branches/dir-loc-fixes/Makefile	2010-12-18 21:48:21 UTC (rev 12018)
+++ csw/mgar/pkg/exim/branches/dir-loc-fixes/Makefile	2010-12-19 01:35:23 UTC (rev 12019)
@@ -16,8 +16,7 @@
 
 MASTER_SITES = ftp://ftp.exim.org/pub/exim/exim4/
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
-DISTFILES += CSWexim.postinstall CSWexim.postremove CSWexim.preremove
-DISTFILES += CSWexim.request
+DISTFILES += CSWexim.postinstall CSWexim.postremove CSWexim.request
 
 # NOTE TO FUTURE MAINTAINERS:
 # This patch should be thoroughly reviewed for each update so as not to
@@ -75,6 +74,9 @@
 CHECKPKG_OVERRIDES_CSWexim += surplus-dependency|CSWgzipextras
 CHECKPKG_OVERRIDES_CSWexim += surplus-dependency|CSWgzip
 
+PRESERVECONF  = /etc/opt/csw/exim/exim.conf /etc/opt/csw/exim/aliases
+PRESERVECONF += /etc/opt/csw/exim/exim-env.sh
+
 PROTOTYPE_MODIFIERS = eximsuid eximlogs
 PROTOTYPE_PERMS_eximsuid = 4755
 PROTOTYPE_FILES_eximsuid = $(sbindir)/exim
@@ -107,18 +109,11 @@
 	mv exim-$(VERSION)-1 exim; \
 	/usr/ccs/bin/strip $(BINS); \
 	/usr/ccs/bin/mcs -d $(BINS))
-	(cd $(DESTDIR)/etc/opt/csw/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
 	cp -p files/README.CSW  $(DESTDIR)$(prefix)/share/doc/exim/README.CSW
-	cp -p files/exim-env.sh $(DESTDIR)/etc/opt/csw/exim/exim-env.sh.CSW
+	cp -p files/exim-env.sh $(DESTDIR)/etc/opt/csw/exim/exim-env.sh
 	(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/branches/dir-loc-fixes/files/CSWexim.postinstall
===================================================================
--- csw/mgar/pkg/exim/branches/dir-loc-fixes/files/CSWexim.postinstall	2010-12-18 21:48:21 UTC (rev 12018)
+++ csw/mgar/pkg/exim/branches/dir-loc-fixes/files/CSWexim.postinstall	2010-12-19 01:35:23 UTC (rev 12019)
@@ -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

Deleted: csw/mgar/pkg/exim/branches/dir-loc-fixes/files/CSWexim.preremove
===================================================================
--- csw/mgar/pkg/exim/branches/dir-loc-fixes/files/CSWexim.preremove	2010-12-18 21:48:21 UTC (rev 12018)
+++ csw/mgar/pkg/exim/branches/dir-loc-fixes/files/CSWexim.preremove	2010-12-19 01:35:23 UTC (rev 12019)
@@ -1,17 +0,0 @@
-#!/sbin/sh
-
-CONFDIR=$PKG_INSTALL_ROOT/opt/csw/etc/exim
-CONFFILES="aliases exim.conf exim-env.sh"
-PATH=/bin:/usr/bin:"$PATH"
-export PATH
-
-for file in $CONFFILES; do
-  confpath="$CONFDIR/$file"
-  diff "$confpath" "$confpath.CSW" >/dev/null 2>&1
-  if [ $? != 0 ]; then
-    echo "Not touching modified $confpath"
-  else
-    echo "Removing unmodified $confpath"
-    rm -f "$confpath"
-  fi
-done


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