13 files changed, 173 insertions, 127 deletions

diff --git a/editors/psgml/Makefile b/editors/psgml/Makefile
index 97b5b8aa56bb..0adefa236137 100644
--- a/editors/psgml/Makefile
+++ b/editors/psgml/Makefile
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	psgml
-PORTVERSION=	1.3.2
-PORTREVISION=	22
+PORTVERSION=	1.4.0
 CATEGORIES=	editors elisp
 MASTER_SITES=	SF/${PORTNAME}/ALPHA%20${PORTNAME}/${PORTVERSION}
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+DISTNAME=	${PORTNAME}-1.3.2
 
 PATCH_SITES=	LOCAL/hrs
 PATCHFILES=	psgml-symbol-conflict-050503.diff.gz
@@ -14,7 +14,8 @@ PATCHFILES=	psgml-symbol-conflict-050503.diff.gz
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Major mode for editing SGML and XML documents for Emacs
 
-POST_PATCHES=	${PATCHDIR}/post-patch-psgml.el
+LICENSE=	GPLv2
+
 USE_EMACS=	yes
 NOT_FOR_ARCHS=	ia64
 GNU_CONFIGURE=	YES
@@ -29,22 +30,9 @@ INFO=		psgml psgml-api
 PSGML_STARTUPEL=	psgml-startup.el
 PSGML_LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/psgml
 
-.include <bsd.port.pre.mk>
-
-.if ${EMACS_PORT_NAME} == xemacs21-mule
-PLIST_SUB+=	XEMACS="" \
-		NON_XEMACS="@comment "
-.else
-PLIST_SUB+=	XEMACS="@comment " \
-		NON_XEMACS=""
-.endif
-
-post-patch:
-	cd ${WRKSRC} && ${CAT} < ${POST_PATCHES}
-
 post-install:
 	cd ${WRKSRC} && ${SETENV} DESTDIR="${STAGEDIR}" ${MAKE} install-info
 	${INSTALL_DATA} ${WRKDIR}/${PSGML_STARTUPEL} \
 	    ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/editors/psgml/files/patch-Makefile.in b/editors/psgml/files/patch-Makefile.in
index 9f2a82501d05..b756bfa5424f 100644
--- a/editors/psgml/files/patch-Makefile.in
+++ b/editors/psgml/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2005-03-06 01:23:40.000000000 +0900
-+++ Makefile.in	2014-11-22 15:59:39.000000000 +0900
-@@ -20,27 +20,39 @@
+--- Makefile.in.orig	2005-03-05 16:23:40 UTC
++++ Makefile.in
+@@ -20,27 +20,39 @@ INSTALL_DATA = @INSTALL_DATA@
  SHELL = /bin/sh
  
  compile:
diff --git a/editors/psgml/files/patch-ac b/editors/psgml/files/patch-ac
deleted file mode 100644
index 2a0a2b73abcd..000000000000
--- a/editors/psgml/files/patch-ac
+++ /dev/null
@@ -1,29 +0,0 @@
---- psgml.el.orig	Wed May 21 14:47:45 2003
-+++ psgml.el	Wed May 21 15:44:47 2003
-@@ -340,7 +340,7 @@
- (put 'sgml-system-path 'sgml-type 'file-list)
- 
- (defvar sgml-public-map (or (sgml-parse-colon-path (getenv "SGML_PATH"))
--			    '("%S" "/usr/local/lib/sgml/%o/%c/%d" ))
-+			    '("%S" "@prefix@/share/sgml/%o/%c/%d" ))
-   "*Mapping from public identifiers to file names.
- This is a list of possible file names.  To find the file for a public
- identifier the elements of the list are used one at the time from the
-@@ -366,13 +366,15 @@
- (defvar sgml-catalog-files (or (delete nil
- 				       (sgml-parse-colon-path
- 					(getenv "SGML_CATALOG_FILES")))
--			       '("catalog" "/usr/local/lib/sgml/catalog"))
-+			       '("catalog" "@prefix@/share/sgml/catalog"
-+			         "@prefix@/share/xml/catalog"))
-   "*List of catalog entry files.
- The files are in the format defined in the SGML Open Draft Technical
- Resolution on Entity Management.")
- (put 'sgml-catalog-files 'sgml-type 'file-list)
- 
--(defvar sgml-ecat-files '("ECAT" "~/sgml/ECAT" "/usr/local/lib/sgml/ECAT")
-+(defvar sgml-ecat-files '("ECAT" "~/sgml/ECAT" "@prefix@/share/sgml/ECAT"
-+			  "@prefix@/share/xml/ECAT")
-   "*List of catalog files for PSGML.")
- (put 'sgml-ecat-files 'sgml-type 'file-list)
- 
diff --git a/editors/psgml/files/patch-ai b/editors/psgml/files/patch-configure
index 27e686bef7d9..cb562c8af10e 100644
--- a/editors/psgml/files/patch-ai
+++ b/editors/psgml/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sun Oct 10 23:12:40 1999
-+++ configure	Sat Oct 16 20:02:52 1999
-@@ -73,6 +73,11 @@
+--- configure.orig	2005-03-05 16:23:40 UTC
++++ configure
+@@ -73,6 +73,11 @@ do
  
    case "$ac_option" in
  
@@ -12,7 +12,7 @@
    -bindir | --bindir | --bindi | --bind | --bin | --bi)
      ac_prev=bindir ;;
    -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-@@ -687,6 +692,7 @@
+@@ -687,6 +692,7 @@ test -n "$EMACS" && break
  done
  test -n "$EMACS" || EMACS="no"
  
@@ -20,7 +20,7 @@
    if test $EMACS != "no"; then
      echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6
  echo "configure:693: checking where .elc files should go" >&5
-@@ -710,6 +716,7 @@
+@@ -710,6 +716,7 @@ echo "configure:693: checking where .elc
      fi
      echo "$ac_t""$lispdir" 1>&6
    fi
diff --git a/editors/psgml/files/patch-af b/editors/psgml/files/patch-psgml-api.texi
index 18a916598525..45c9821d9b32 100644
--- a/editors/psgml/files/patch-af
+++ b/editors/psgml/files/patch-psgml-api.texi
@@ -1,6 +1,7 @@
---- psgml-api.texi.orig	Mon Nov 16 06:45:06 1998
-+++ psgml-api.texi	Sat Jan 23 21:11:18 1999
-@@ -8,10 +8,9 @@
+--- psgml-api.texi.orig	2005-03-05 16:23:40 UTC
++++ psgml-api.texi
+@@ -7,11 +7,10 @@
+ @c $Id: psgml-api.texi,v 1.2 1999/12/03 17:29:39 lenst Exp $
  
  @ifinfo
 -@format
diff --git a/editors/psgml/files/patch-psgml-dtd.el b/editors/psgml/files/patch-psgml-dtd.el
index 77a5070d3e3a..c644d4f552fb 100644
--- a/editors/psgml/files/patch-psgml-dtd.el
+++ b/editors/psgml/files/patch-psgml-dtd.el
@@ -1,5 +1,5 @@
---- psgml-dtd.el.orig	2005-03-06 01:23:40.000000000 +0900
-+++ psgml-dtd.el	2012-08-04 11:56:25.000000000 +0900
+--- psgml-dtd.el.orig	2005-03-05 16:23:40 UTC
++++ psgml-dtd.el
 @@ -93,12 +93,12 @@
  (defmacro sgml-for-all-final-states (s dfa &rest forms)
    "For all final states S in DFA do FORMS.
@@ -18,7 +18,7 @@
  
  (put 'sgml-for-all-final-states 'lisp-indent-hook 2)
  (put 'sgml-for-all-final-states 'edebug-form-hook '(symbolp &rest form))
-@@ -217,7 +217,7 @@
+@@ -217,7 +217,7 @@ Syntax: var dfa-expr &body forms"
  (defun sgml-make-pcdata ()
    (sgml-make-* (sgml-make-primitive-content-token sgml-pcdata-token)))
  
@@ -27,7 +27,7 @@
    (while (cdr l)
      (setcar (cdr l)
  	    (sgml-make-conc (car l) (cadr l)))
-@@ -279,7 +279,7 @@
+@@ -279,7 +279,7 @@ Syntax: var dfa-expr &body forms"
  	  (sgml-parse-delim "CRO" (digit nmstart))
  	(sgml-parse-delim "CRO" (digit)))
        (prog1 (if (sgml-is-delim "NULL" digit)
@@ -36,7 +36,7 @@
  	       (let ((spec (sgml-check-name)))
  		 (or (cdr (assoc spec '(("RE" . 10)
  					("RS" . 1)
-@@ -336,7 +336,7 @@
+@@ -336,7 +336,7 @@ Syntax: var dfa-expr &body forms"
  (defsubst sgml-parse-connector ()
    (sgml-skip-ps)
    (cond ((sgml-parse-delim "SEQ")
@@ -45,7 +45,7 @@
  	((sgml-parse-delim "OR")
  	 (function sgml-reduce-|))
  	((sgml-parse-delim "AND")
-@@ -884,10 +884,10 @@
+@@ -884,10 +884,10 @@ Syntax: (var seq) &body forms
  FORMS should produce the binary coding of element in VAR."
    (let ((var (car loop-c))
  	(seq (cadr loop-c)))
diff --git a/editors/psgml/files/patch-psgml-edit.el b/editors/psgml/files/patch-psgml-edit.el
index ca7a11372bb8..a16a32df10b3 100644
--- a/editors/psgml/files/patch-psgml-edit.el
+++ b/editors/psgml/files/patch-psgml-edit.el
@@ -1,6 +1,6 @@
---- psgml-edit.el.orig	2013-06-03 13:44:59.000000000 +0900
-+++ psgml-edit.el	2013-06-03 14:13:25.000000000 +0900
-@@ -185,7 +185,9 @@
+--- psgml-edit.el.orig	2015-11-12 06:36:57 UTC
++++ psgml-edit.el
+@@ -185,7 +185,9 @@ possible."
      (goto-char (sgml-element-start element))
      (delete-char (sgml-element-stag-len element))
      (insert (sgml-delim "STAGO")
@@ -11,7 +11,7 @@
              tagc)
      (let* ((newel (sgml-find-context-of (point)))
  	   (newattlist (sgml-element-attlist newel))
-@@ -1870,24 +1872,28 @@
+@@ -1870,24 +1872,28 @@ characters in the current coding system.
     (invert
      (or (looking-at "&#\\([0-9]+\\)[;\n]?")
  	(error "No character reference after point"))
diff --git a/editors/psgml/files/patch-psgml-lucid.el b/editors/psgml/files/patch-psgml-lucid.el
new file mode 100644
index 000000000000..279e92369ef7
--- /dev/null
+++ b/editors/psgml/files/patch-psgml-lucid.el
@@ -0,0 +1,24 @@
+--- psgml-lucid.el.orig	2015-11-12 06:36:57 UTC
++++ psgml-lucid.el
+@@ -126,16 +126,16 @@ if the item is selected."
+ 		(loop for c in type collect
+ 		      (if (atom c)
+ 			  (vector (prin1-to-string c)
+-				  (`(setq (, var) (, c)))
++				  `(setq ,var ,c)
+ 				  :style 'toggle
+-				  :selected (`(eq (, var) '(, c))))
++				  :selected `(eq ,var ',c))
+ 			(vector (car c)
+-				(`(setq (, var) '(,(cdr c))))
++				`(setq ,var ',(cdr c))
+ 				:style 'toggle
+-				:selected (`(eq (, var) '(,(cdr c)))))))))
++				:selected `(eq ,var ',(cdr c)))))))
+ 	 (t
+ 	  (vector desc
+-		  (`(sgml-do-set-option '(, var)))
++		  `(sgml-do-set-option ',var)
+ 		  t)))))
+ 
+ 
diff --git a/editors/psgml/files/patch-psgml-parse.el b/editors/psgml/files/patch-psgml-parse.el
index fe0a32ce9783..02dcbf36d9c2 100644
--- a/editors/psgml/files/patch-psgml-parse.el
+++ b/editors/psgml/files/patch-psgml-parse.el
@@ -1,6 +1,6 @@
---- psgml-parse.el.orig	2012-08-04 11:37:03.000000000 +0900
-+++ psgml-parse.el	2012-08-04 11:37:19.000000000 +0900
-@@ -329,28 +329,28 @@
+--- psgml-parse.el.orig	2015-11-12 06:36:57 UTC
++++ psgml-parse.el
+@@ -329,28 +329,28 @@ Applicable to XML.")
  ;;(progn (set-syntax-table xml-parser-syntax) (describe-syntax))
  
  (defmacro sgml-with-parser-syntax (&rest body)
@@ -35,7 +35,7 @@
  
  (defun sgml-set-buffer-multibyte (flag)
    (cond ((featurep 'xemacs)
-@@ -361,7 +361,7 @@
+@@ -361,7 +361,7 @@ Applicable to XML.")
                default-enable-multibyte-characters
              flag)))
  	((boundp 'MULE)
@@ -44,7 +44,7 @@
          (t
           flag)))
  ;; Probably better.  -- fx
-@@ -428,21 +428,21 @@
+@@ -428,21 +428,21 @@ Applicable to XML.")
  ;;move: (token . node)
  
  (defmacro sgml-make-move (token node)
@@ -71,7 +71,7 @@
  
  ;; normal-state: ('normal-state opts . reqs)
  
-@@ -450,16 +450,16 @@
+@@ -450,16 +450,16 @@ Applicable to XML.")
    (cons 'normal-state (cons nil nil)))
  
  (defmacro sgml-normal-state-p (s)
@@ -92,7 +92,7 @@
  
  ;; adding moves
  ;; *** Should these functions check for ambiguity?
-@@ -507,10 +507,10 @@
+@@ -507,10 +507,10 @@ Applicable to XML.")
    (cons next dfas))
  
  (defmacro sgml-and-node-next (n)
@@ -105,7 +105,7 @@
  
  
  ;;; Using states
-@@ -903,8 +903,8 @@
+@@ -903,8 +903,8 @@ If ATTSPEC is nil, nil is returned."
    (cons
     'progn
     (loop for n in names collect
@@ -116,7 +116,7 @@
  
  (sgml-prop-fields
   ;;flags			; optional tags and mixed
-@@ -919,7 +919,7 @@
+@@ -919,7 +919,7 @@ If ATTSPEC is nil, nil is returned."
   )
  
  (defmacro sgml-eltype-flags (et)
@@ -125,7 +125,7 @@
  
  (defun sgml-eltype-model (et)
    (if (fboundp et)
-@@ -966,7 +966,7 @@
+@@ -966,7 +966,7 @@ If ATTSPEC is nil, nil is returned."
    "Get application data from element type ET with name PROP.
  PROP should be a symbol, reserved names are: flags, model, attlist,
  includes, excludes, conref-regexp, mixed, stag-optional, etag-optional."
@@ -134,7 +134,7 @@
  
  (defun sgml-eltype-all-miscdata (et)
    (loop for p on (symbol-plist et) by (function cddr)
-@@ -1059,7 +1059,7 @@
+@@ -1059,7 +1059,7 @@ a default for the element type name."
  ;;; Wing addition
  (defmacro sgml-char-int (ch)
    (if (fboundp 'char-int)
@@ -143,7 +143,7 @@
      ch))
  
  (defsubst sgml-read-octet ()
-@@ -1434,51 +1434,51 @@
+@@ -1434,51 +1434,51 @@ list -- any of the contextual constraint
  	   (setq context '(t)))
  	  ((not (listp context))
  	   (setq context (list context))))
@@ -216,7 +216,7 @@
  
  (defmacro sgml-skip-upto (delim)
    "Skip until the delimiter or first char of one of the delimiters.
-@@ -1502,8 +1502,8 @@
+@@ -1502,8 +1502,8 @@ in any of them."
      (let ((ds (sgml-get-delim-string (upcase (format "%s" delim)))))
        (if (= 1 (length ds))
  	  (list 'skip-chars-forward (concat "^" ds))
@@ -227,7 +227,7 @@
  
  
  ;;(macroexpand '(sgml-is-delim mdo))
-@@ -1520,22 +1520,22 @@
+@@ -1520,22 +1520,22 @@ in any of them."
  ;;;                aproporiate value.
  
  (defmacro sgml-parse-char (char)
@@ -259,7 +259,7 @@
  
  (defun sgml-check-char (char)
    (cond ((not (sgml-parse-char char))
-@@ -1546,7 +1546,7 @@
+@@ -1546,7 +1546,7 @@ in any of them."
        (sgml-parse-char ?\r)))
  
  (defmacro sgml-startnm-char (c)
@@ -268,7 +268,7 @@
  
  (defsubst sgml-startnm-char-next ()
    (and (not (eobp))
-@@ -1693,11 +1693,11 @@
+@@ -1693,11 +1693,11 @@ in any of them."
  (define-compiler-macro sgml-parse-name (&whole form &optional entity-name)
    (cond
     ((memq entity-name '(nil t))
@@ -283,7 +283,7 @@
     (t
      form)))
  
-@@ -1827,8 +1827,8 @@
+@@ -1827,8 +1827,8 @@ Return true if not at the end of the buf
  With optional NAME, RNI must be followed by NAME."
    (cond
     (name
@@ -294,7 +294,7 @@
     (t '(sgml-parse-delim "RNI"))))
  
  (defun sgml-check-token (name)
-@@ -2733,11 +2733,11 @@
+@@ -2733,11 +2733,11 @@ overrides the entity type in entity look
    (let ((macs nil))
      (while fields
        (push
@@ -310,7 +310,7 @@
         macs)
        (setq fields (cdr fields)))
      (cons 'progn macs)))
-@@ -2775,7 +2775,7 @@
+@@ -2775,7 +2775,7 @@ overrides the entity type in entity look
  
  (defmacro sgml-element-stag-optional (element)
    "True if start-tag of ELEMENT is omissible."
@@ -319,7 +319,7 @@
  
  (defsubst sgml-element-etag-optional (element)
    "True if end-tag of ELEMENT is omissible."
-@@ -2929,8 +2929,10 @@
+@@ -2929,8 +2929,10 @@ overrides the entity type in entity look
  
  (defun sgml-set-initial-state (dtd)
    "Set initial state of parsing."
@@ -332,7 +332,7 @@
    (add-hook 'before-change-functions 'sgml-note-change-at nil 'local)
    (add-hook 'after-change-functions 'sgml-set-face-after-change nil 'local)
    (sgml-set-active-dtd-indicator (sgml-dtd-doctype dtd))
-@@ -3504,7 +3506,7 @@
+@@ -3504,7 +3506,7 @@ Where PAIRS is a list of (delim . ename)
  Also move point.  Return nil, either if no shortref or undefined."
  
    (macrolet
diff --git a/editors/psgml/files/patch-psgml.el b/editors/psgml/files/patch-psgml.el
new file mode 100644
index 000000000000..581bdb720ba1
--- /dev/null
+++ b/editors/psgml/files/patch-psgml.el
@@ -0,0 +1,83 @@
+--- psgml.el.orig	2015-11-12 06:36:57 UTC
++++ psgml.el
+@@ -52,7 +52,7 @@
+ 
+ ;;; Code:
+ 
+-(defconst psgml-version "1.3.2"
++(defconst psgml-version "1.4.0"
+   "Version of psgml package.")
+ 
+ (defconst psgml-maintainer-address "lenst@lysator.liu.se")
+@@ -381,7 +381,7 @@ Setting this variable automatically make
+ (put 'sgml-system-path 'sgml-type 'file-list)
+ 
+ (defvar sgml-public-map (or (sgml-parse-colon-path (getenv "SGML_PATH"))
+-			    '("%S" "/usr/local/lib/sgml/%o/%c/%d" ))
++			    '("%S" "@prefix@/share/sgml/%o/%c/%d" ))
+   "*Mapping from public identifiers to file names.
+ This is a list of possible file names.  To find the file for a public
+ identifier the elements of the list are used one at the time from the
+@@ -407,13 +407,15 @@ This variable is automatically local to 
+ (defvar sgml-catalog-files (or (delete nil
+ 				       (sgml-parse-colon-path
+ 					(getenv "SGML_CATALOG_FILES")))
+-			       '("catalog" "/usr/local/lib/sgml/catalog"))
++			       '("catalog" "@prefix@/share/sgml/catalog"
++			         "@prefix@/share/xml/catalog"))
+   "*List of catalog entry files.
+ The files are in the format defined in the SGML Open Draft Technical
+ Resolution on Entity Management.")
+ (put 'sgml-catalog-files 'sgml-type 'file-list)
+ 
+-(defvar sgml-ecat-files '("ECAT" "~/sgml/ECAT" "/usr/local/lib/sgml/ECAT")
++(defvar sgml-ecat-files '("ECAT" "~/sgml/ECAT" "@prefix@/share/sgml/ECAT"
++			  "@prefix@/share/xml/ECAT")
+   "*List of catalog files for PSGML.")
+ (put 'sgml-ecat-files 'sgml-type 'file-list)
+ 
+@@ -722,9 +724,9 @@ as that may change."
+ 
+ (defun sgml-markup (entry text)
+   (cons entry
+-	(` (lambda ()
++	`(lambda ()
+ 	     (interactive)
+-	     (sgml-insert-markup (, text))))))
++	     (sgml-insert-markup ,text))))
+ 
+ (defun sgml-insert-markup (text)
+   (let ((end (sgml-mouse-region))
+@@ -1040,13 +1042,13 @@ as that may change."
+ (defun sgml-compute-insert-dtd-items ()
+   (loop for e in sgml-custom-dtd collect
+         (vector (first e)
+-                (` (sgml-doctype-insert (, (cadr e)) '(, (cddr e))))
++                `(sgml-doctype-insert ,(cadr e) ',(cddr e))
+                 t)))
+ 
+ (defun sgml-compute-custom-markup-items ()
+   (loop for e in sgml-custom-markup collect
+         (vector (first e)
+-                (` (sgml-insert-markup  (, (cadr e))))
++                `(sgml-insert-markup  ,(cadr e))
+                 t)))
+ 
+ (defun sgml-build-custom-menus ()
+@@ -1229,12 +1231,14 @@ All bindings:
+     (make-local-variable 'text-property-default-nonsticky)
+     ;; see `sgml-set-face-for':
+     (add-to-list 'text-property-default-nonsticky '(face . t)))
+-  (make-local-hook 'post-command-hook)
++  (if (fboundp 'make-local-hook)
++    (eval '(make-local-hook 'post-command-hook)))
+   (add-hook 'post-command-hook 'sgml-command-post 'append 'local)
+   (unless sgml-running-lucid
+     ;; XEmacs 20.4 doesn't handle local activate-menubar-hook
+     ;; it tries to call the function `t' when using the menubar
+-    (make-local-hook 'activate-menubar-hook))
++    (if (fboundp 'make-local-hook)
++      (eval '(make-local-hook 'activate-menubar-hook))))
+   (add-hook 'activate-menubar-hook 'sgml-update-all-options-menus
+ 	    nil 'local)
+   (run-hooks 'text-mode-hook 'psgml-mode-hook)
diff --git a/editors/psgml/files/patch-ae b/editors/psgml/files/patch-psgml.texi
index 6910b39d7a89..fe63eed4eda9 100644
--- a/editors/psgml/files/patch-ae
+++ b/editors/psgml/files/patch-psgml.texi
@@ -1,6 +1,7 @@
---- psgml.texi.orig	Mon Nov 16 06:45:07 1998
-+++ psgml.texi	Sat Jan 23 21:10:21 1999
-@@ -11,10 +11,9 @@
+--- psgml.texi.orig	2005-03-05 16:23:40 UTC
++++ psgml.texi
+@@ -10,11 +10,10 @@
+ @c $Id: psgml.texi,v 1.8 2005/03/02 19:44:20 lenst Exp $
  
  @ifinfo
 -@format
@@ -14,7 +15,7 @@
  @end ifinfo
  
  @ifinfo
-@@ -401,10 +400,10 @@
+@@ -398,10 +397,10 @@ psgml understand the following substitut
  @code{SGML_PATH}.
  
  Given the public identifier above and the file name template 
@@ -27,7 +28,7 @@
  @end example
  
  Note: blanks are transliterated to @samp{_} (and also @samp{/} to
-@@ -420,7 +419,7 @@
+@@ -417,7 +416,7 @@ the environment variable @code{SGML_CATA
  is undefined the default is
  
  @lisp
@@ -36,7 +37,7 @@
  @end lisp
  @end defopt
  
-@@ -448,7 +447,7 @@
+@@ -445,7 +444,7 @@ the same environment variable that @file
  environment variable is undefined the default is
  
  @lisp
diff --git a/editors/psgml/files/post-patch-psgml.el b/editors/psgml/files/post-patch-psgml.el
index a8cf9ce3166e..d86e8fa248df 100644
--- a/editors/psgml/files/post-patch-psgml.el
+++ b/editors/psgml/files/post-patch-psgml.el
@@ -1,34 +1,14 @@
---- psgml.el.orig	2012-08-04 11:43:47.000000000 +0900
-+++ psgml.el	2012-08-04 11:43:51.000000000 +0900
-@@ -381,7 +381,7 @@
- (put 'sgml-system-path 'sgml-type 'file-list)
+--- psgml.el.orig	2015-11-12 14:12:58.516938000 +0900
++++ psgml.el	2015-11-12 14:13:03.188835000 +0900
+@@ -52,7 +52,7 @@
+ 
+ ;;; Code:
  
- (defvar sgml-public-map (or (sgml-parse-colon-path (getenv "SGML_PATH"))
--			    '("%S" "@prefix@/share/sgml/%o/%c/%d" ))
-+			    '("%S" "/usr/local/share/sgml/%o/%c/%d" ))
-   "*Mapping from public identifiers to file names.
- This is a list of possible file names.  To find the file for a public
- identifier the elements of the list are used one at the time from the
-@@ -407,15 +407,15 @@
- (defvar sgml-catalog-files (or (delete nil
- 				       (sgml-parse-colon-path
- 					(getenv "SGML_CATALOG_FILES")))
--			       '("catalog" "@prefix@/share/sgml/catalog"
--			         "@prefix@/share/xml/catalog"))
-+			       '("catalog" "/usr/local/share/sgml/catalog"
-+			         "/usr/local/share/xml/catalog"))
-   "*List of catalog entry files.
- The files are in the format defined in the SGML Open Draft Technical
- Resolution on Entity Management.")
- (put 'sgml-catalog-files 'sgml-type 'file-list)
- 
--(defvar sgml-ecat-files '("ECAT" "~/sgml/ECAT" "@prefix@/share/sgml/ECAT"
--			  "@prefix@/share/xml/ECAT")
-+(defvar sgml-ecat-files '("ECAT" "~/sgml/ECAT" "/usr/local/share/sgml/ECAT"
-+			  "/usr/local/share/xml/ECAT")
-   "*List of catalog files for PSGML.")
- (put 'sgml-ecat-files 'sgml-type 'file-list)
+-(defconst psgml-version "1.3.2"
++(defconst psgml-version "1.4.0"
+   "Version of psgml package.")
  
+ (defconst psgml-maintainer-address "lenst@lysator.liu.se")
 @@ -724,9 +724,9 @@
  
  (defun sgml-markup (entry text)
diff --git a/editors/psgml/pkg-plist b/editors/psgml/pkg-plist
index d7358f40c82e..4abcc12bbf90 100644
--- a/editors/psgml/pkg-plist
+++ b/editors/psgml/pkg-plist
@@ -11,10 +11,8 @@
 %%EMACS_VERSION_SITE_LISPDIR%%/psgml/psgml-ids.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/psgml/psgml-info.el
 %%EMACS_VERSION_SITE_LISPDIR%%/psgml/psgml-info.elc
-%%NON_XEMACS%%%%EMACS_VERSION_SITE_LISPDIR%%/psgml/psgml-other.el
-%%NON_XEMACS%%%%EMACS_VERSION_SITE_LISPDIR%%/psgml/psgml-other.elc
-%%XEMACS%%%%EMACS_VERSION_SITE_LISPDIR%%/psgml/psgml-lucid.el
-%%XEMACS%%%%EMACS_VERSION_SITE_LISPDIR%%/psgml/psgml-lucid.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/psgml/psgml-other.el
+%%EMACS_VERSION_SITE_LISPDIR%%/psgml/psgml-other.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/psgml/psgml-parse.el
 %%EMACS_VERSION_SITE_LISPDIR%%/psgml/psgml-parse.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/psgml/psgml-sysdep.el