12 files changed, 76 insertions, 8 deletions

diff --git a/editors/Makefile b/editors/Makefile
index ce3a7e1f9646..54369891f91b 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -90,7 +90,8 @@
     SUBDIR += openoffice
     SUBDIR += pico
     SUBDIR += poedit
-    SUBDIR += psgml-emacs
+    SUBDIR += psgml
+    SUBDIR += psgml-emacs19
     SUBDIR += psgml-emacs20
     SUBDIR += psgml-mule
     SUBDIR += psgml-xemacs21-mule
diff --git a/editors/psgml-emacs19/Makefile b/editors/psgml-emacs19/Makefile
new file mode 100644
index 000000000000..f2d7ec4d48f3
--- /dev/null
+++ b/editors/psgml-emacs19/Makefile
@@ -0,0 +1,21 @@
+# New ports collection makefile for:	psgml for emacs19
+# Date created:		23 January 1999
+# Whom:			shige
+#
+# $FreeBSD$
+#
+
+MAINTAINER=	shige@FreeBSD.org
+
+# This is a slave port.
+PORTCLASS=	slave
+
+MASTERDIR=	${.CURDIR}/../psgml
+
+# emacs port setup
+EMACS_PORT_NAME=	emacs19
+
+# pkg-* files in ${.CURDIR} are used
+PKGDIR=		${.CURDIR}
+
+.include <${MASTERDIR}/Makefile>
diff --git a/editors/psgml-emacs19/pkg-comment b/editors/psgml-emacs19/pkg-comment
new file mode 100644
index 000000000000..e797b65d0591
--- /dev/null
+++ b/editors/psgml-emacs19/pkg-comment
@@ -0,0 +1 @@
+A major mode for editing SGML and XML documents for emacs19
diff --git a/editors/psgml-emacs19/pkg-descr b/editors/psgml-emacs19/pkg-descr
new file mode 100644
index 000000000000..8ef9fdd25070
--- /dev/null
+++ b/editors/psgml-emacs19/pkg-descr
@@ -0,0 +1,20 @@
+PSGML: a major mode for editing SGML and XML documents for emacs19.
+
+--- Emacs Library Porting
+
+   PSGML is a major mode for editing SGML and XML documents.  It works
+with GNU Emacs 19.34, 20.3 and later or with XEmacs 19.9 and later.
+PSGML contains a simple SGML parser and can work with any DTD.
+Functions provided includes menus and commands for inserting tags with
+only the contextually valid tags, identification of structural errors,
+editing of attribute values in a separate window with information about
+types and defaults, and structure based editing.
+
+  PSGML is installed the following directory tree:
+	${PREFIX}/share/emacs/site-lisp/psgml/
+
+To use psgml, put the following setup into your ~/.emacs:
+
+	(require 'psgml-startup)
+
+--- Porting by shige <shige@FreeBSD.ORG>.
diff --git a/editors/psgml-emacs19/pkg-plist b/editors/psgml-emacs19/pkg-plist
new file mode 100644
index 000000000000..b0348f120b1f
--- /dev/null
+++ b/editors/psgml-emacs19/pkg-plist
@@ -0,0 +1,25 @@
+%%EMACS_LIBDIR%%/site-lisp/psgml/iso88591.map
+%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-api.el
+%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-api.elc
+%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-charent.el
+%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-charent.elc
+%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-dtd.el
+%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-dtd.elc
+%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-edit.el
+%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-edit.elc
+%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-info.el
+%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-info.elc
+%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-other.el
+%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-other.elc
+%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-parse.el
+%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-parse.elc
+%%EMACS_LIBDIR%%/site-lisp/psgml/psgml.el
+%%EMACS_LIBDIR%%/site-lisp/psgml/psgml.elc
+%%EMACS_LIBDIR%%/site-lisp/%%PSGML_STARTUPEL%%
+@dirrm %%EMACS_LIBDIR%%/site-lisp/psgml
+@unexec install-info --delete %D/info/psgml.info %D/info/dir
+@unexec install-info --delete %D/info/psgml-api.info %D/info/dir
+info/psgml.info
+info/psgml-api.info
+@exec install-info %D/info/psgml.info %D/info/dir
+@exec install-info %D/info/psgml-api.info %D/info/dir
diff --git a/editors/psgml-emacs20/Makefile b/editors/psgml-emacs20/Makefile
index edd0fcf02353..971a234cc328 100644
--- a/editors/psgml-emacs20/Makefile
+++ b/editors/psgml-emacs20/Makefile
@@ -10,7 +10,7 @@ MAINTAINER=	shige@FreeBSD.org
 # This is a slave port.
 PORTCLASS=	slave
 
-MASTERDIR=	${.CURDIR}/../psgml-emacs
+MASTERDIR=	${.CURDIR}/../psgml
 
 # emacs port setup
 EMACS_PORT_NAME=	emacs20
diff --git a/editors/psgml-emacs20/pkg-descr b/editors/psgml-emacs20/pkg-descr
index b93c2dd44a1b..e95327d78adc 100644
--- a/editors/psgml-emacs20/pkg-descr
+++ b/editors/psgml-emacs20/pkg-descr
@@ -11,7 +11,7 @@ editing of attribute values in a separate window with information about
 types and defaults, and structure based editing.
 
   PSGML is installed the following directory tree:
-	${LOCALBASE}/share/emacs/site-lisp/psgml/
+	${PREFIX}/share/emacs/site-lisp/psgml/
 
 To use psgml, put the following setup into your ~/.emacs:
 
diff --git a/editors/psgml-mule/Makefile b/editors/psgml-mule/Makefile
index 702c7ab84428..52132ff7c36b 100644
--- a/editors/psgml-mule/Makefile
+++ b/editors/psgml-mule/Makefile
@@ -10,7 +10,7 @@ MAINTAINER=	shige@FreeBSD.org
 # This is a slave port.
 PORTCLASS=	slave
 
-MASTERDIR=	${.CURDIR}/../../editors/psgml-emacs
+MASTERDIR=	${.CURDIR}/../psgml
 
 # emacs port setup
 EMACS_PORT_NAME=	mule
diff --git a/editors/psgml-xemacs21-mule/Makefile b/editors/psgml-xemacs21-mule/Makefile
index 29187bf21753..23309cdd4ed8 100644
--- a/editors/psgml-xemacs21-mule/Makefile
+++ b/editors/psgml-xemacs21-mule/Makefile
@@ -10,7 +10,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 # This is a slave port.
 PORTCLASS=	slave
 
-MASTERDIR=	${.CURDIR}/../psgml-emacs
+MASTERDIR=	${.CURDIR}/../psgml
 
 # emacs port setup
 EMACS_PORT_NAME=	xemacs21-mule
diff --git a/editors/psgml/Makefile b/editors/psgml/Makefile
index 8fe99266cf65..b02da3dac178 100644
--- a/editors/psgml/Makefile
+++ b/editors/psgml/Makefile
@@ -26,7 +26,7 @@ PLIST_SUB=		PSGML_STARTUPEL=${PSGML_STARTUPEL}
 PORTCLASS?=	master
 
 .if (${PORTCLASS} == "master")
-EMACS_PORT_NAME=	emacs
+EMACS_PORT_NAME=	emacs21
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/editors/psgml/pkg-comment b/editors/psgml/pkg-comment
index 9193bbbc77ad..fd7e5686f5d8 100644
--- a/editors/psgml/pkg-comment
+++ b/editors/psgml/pkg-comment
@@ -1 +1 @@
-A major mode for editing SGML and XML documents for emacs
+A major mode for editing SGML and XML documents for emacs21
diff --git a/editors/psgml/pkg-descr b/editors/psgml/pkg-descr
index a7d18952ab89..d002f896068c 100644
--- a/editors/psgml/pkg-descr
+++ b/editors/psgml/pkg-descr
@@ -1,4 +1,4 @@
-PSGML: a major mode for editing SGML and XML documents for emacs.
+PSGML: a major mode for editing SGML and XML documents for emacs21.
 
 --- Emacs Library Porting