Index: branches/2014Q3/Keywords/sample.yaml
===================================================================
--- branches/2014Q3/Keywords/sample.yaml	(revision 368395)
+++ branches/2014Q3/Keywords/sample.yaml	(revision 368396)
@@ -1,29 +1,31 @@
 # $FreeBSD$
 #
 # MAINTAINER: portmgr@FreeBSD.org
 #
 # @sample etc/somefile.conf.sample
 #
 # This will install the somefile.conf.sample and automatically copy to
 # somefile.conf if it doesn't exist. On deinstall it will remove the
 # somefile.conf if it still matches the sample, otherwise it is
 # kept.
 #
 # This replaces the old pattern:
 #  @unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; then rm -f %D/etc/pkgtools.conf; fi
 #  etc/pkgtools.conf.sample
 #  @exec [ -f %B/pkgtools.conf ] || cp %B/%f %B/pkgtools.conf
 
 actions: [file]
 post-install: |
   sample_file="%D/%@"
   target_file="${sample_file%.sample}"
   if ! [ -f "${target_file}" ]; then
     /bin/cp -p "${sample_file}" "${target_file}"
   fi
 pre-deinstall: |
   sample_file="%D/%@"
   target_file="${sample_file%.sample}"
   if cmp -s "${target_file}" "${sample_file}"; then
     rm -f "${target_file}"
+  else
+    echo "You may need to manually remove ${target_file} if it's no longer needed."
   fi
Index: branches/2014Q3
===================================================================
--- branches/2014Q3	(revision 368395)
+++ branches/2014Q3	(revision 368396)

Property changes on: branches/2014Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r367994