diff -urN /usr/ports/editors/emacs23/Makefile emacs23/Makefile
--- /usr/ports/editors/emacs23/Makefile	2012-08-03 20:27:28.000000000 +0530
+++ emacs23/Makefile	2012-09-23 03:48:04.779957448 +0530
@@ -8,6 +8,7 @@
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}
 PORTREVISION?=	2
+PORTEPOCH=	1
 CATEGORIES=	editors ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff -urN /usr/ports/editors/emacs23/files/patch-lisp_files.el emacs23/files/patch-lisp_files.el
--- /usr/ports/editors/emacs23/files/patch-lisp_files.el	1970-01-01 05:30:00.000000000 +0530
+++ emacs23/files/patch-lisp_files.el	2012-09-23 03:28:45.493638516 +0530
@@ -0,0 +1,27 @@
+
+$FreeBSD$
+
+--- lisp/files.el.orig
++++ lisp/files.el
+@@ -2986,11 +2986,16 @@
+ 	      ;; Obey `enable-local-eval'.
+ 	      ((eq var 'eval)
+ 	       (when enable-local-eval
+-		 (push elt all-vars)
+-		 (or (eq enable-local-eval t)
+-		     (hack-one-local-variable-eval-safep (eval (quote val)))
+-		     (safe-local-variable-p var val)
+-		     (push elt unsafe-vars))))
++		 (let ((safe (or (hack-one-local-variable-eval-safep
++				  (eval (quote val)))
++				 ;; In case previously marked safe (bug#5636).
++				 (safe-local-variable-p var val))))
++		   ;; If not safe and e-l-v = :safe, ignore totally.
++		   (when (or safe (not (eq enable-local-variables :safe)))
++		     (push elt all-vars)
++		     (or (eq enable-local-eval t)
++			 safe
++			 (push elt unsafe-vars))))))
+ 	      ;; Ignore duplicates (except `mode') in the present list.
+ 	      ((and (assq var all-vars) (not (eq var 'mode))) nil)
+ 	      ;; Accept known-safe variables.