Index: head/Keywords/sample.ucl
===================================================================
--- head/Keywords/sample.ucl	(revision 550859)
+++ head/Keywords/sample.ucl	(revision 550860)
@@ -1,61 +1,47 @@
 # $FreeBSD$
 #
 # MAINTAINER: portmgr@FreeBSD.org
 #
 # @sample etc/somefile.conf.sample
 # or
 # @sample file1 file2
 #
 # Where file1 is considered as a sample file and file2 the target file
 #
 # 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(1)]
 arguments: true
-post-install: <<EOD
-  case "%1" in
-  /*) sample_file="%1" ;;
-  *) sample_file="%D/%1" ;;
-  esac
-  target_file="${sample_file%.sample}"
-  set -- %@
-  if [ $# -eq 2 ]; then
-      target_file=${2}
-  fi
-  case "${target_file}" in
-  /*) target_file="${target_file}" ;;
-  *) target_file="%D/${target_file}" ;;
-  esac
-  if ! [ -f "${target_file}" ]; then
-    /bin/cp -p "${sample_file}" "${target_file}"
-  fi
-EOD
-pre-deinstall: <<EOD
-  case "%1" in
-  /*) sample_file="%1" ;;
-  *) sample_file="%D/%1" ;;
-  esac
-  target_file="${sample_file%.sample}"
-  set -- %@
-  if [ $# -eq 2 ]; then
-      set -- %@
-      target_file=${2}
-  fi
-  case "${target_file}" in
-  /*) target_file="${target_file}" ;;
-  *) target_file="%D/${target_file}" ;;
-  esac
-  if cmp -s "${target_file}" "${sample_file}"; then
-    rm -f "${target_file}"
-  elif [ -e "${target_file}" ] ; then
-    echo "You may need to manually remove ${target_file} if it is no longer needed."
-  fi
-EOD
+post-install-lua: <<EOS
+  sample_file = pkg.prefixed_path("%1")
+  if "%#" == 2 then
+    target_file = pkg.prefixed_path("%1")
+  else
+    target_file = string.gsub(sample_file,'%.sample$', "")
+  end
+  if not pkg.stat(target_file) then
+    pkg.copy(sample_file, target_file)
+  end
+EOS
+
+pre-deinstall-lua: <<EOS
+  sample_file = pkg.prefixed_path("%1")
+  if "%#" == 2 then
+    target_file = pkg.prefixed_path("%1")
+  else
+    target_file = string.gsub(sample_file,'%.sample$', "")
+  end
+  if pkg.filecmp(sample_file, target_file) == 0 then
+    os.remove(target_file)
+  else
+    pkg.print_msg("You may need to manually remove " .. target_file .. " if it is no longer needed.")
+  end
+EOS