Index: head/Keywords/shell.ucl
===================================================================
--- head/Keywords/shell.ucl	(revision 379118)
+++ head/Keywords/shell.ucl	(revision 379119)
@@ -1,32 +1,32 @@
 # $FreeBSD$
 #
 # MAINTAINER: portmgr@FreeBSD.org
 #
 # @shell bin/shell
 #
 # Handle adding and remove a path to a shell binary into /etc/shells
 # it replaces the following code:
 #
 # bin/shell
 # @exec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
 # @unexec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
 
 actions: [file]
 post-install: <<EOD
   case "%@" in
   /*) file="%@" ;;
   *) file="%D/%@" ;;
   esac
         cp /etc/shells /etc/shells.bak
-        (grep -v ${file} /etc/shells.bak; echo ${file}) > /etc/shells
+        (grep -v "^${file}$" /etc/shells.bak; echo ${file}) > /etc/shells
         rm -f /etc/shells.bak
 EOD
 pre-deinstall: <<EOD
   case "%@" in
   /*) file="%@" ;;
   *) file="%D/%@" ;;
   esac
         cp /etc/shells /etc/shells.bak
-        grep -v ${file} /etc/shells.bak > /etc/shells
+        grep -v "^${file}$" /etc/shells.bak > /etc/shells
         rm -f /etc/shells.bak
 EOD