5 files changed, 23 insertions, 29 deletions

diff --git a/editors/psgml/Makefile b/editors/psgml/Makefile
index 31007bbaa59b..0868a7bd7947 100644
--- a/editors/psgml/Makefile
+++ b/editors/psgml/Makefile
@@ -7,24 +7,26 @@
 
 PORTNAME=	psgml
 PORTVERSION=	${PSGML_VER}
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	editors elisp
-MASTER_SITES=	ftp://ftp.lysator.liu.se/pub/sgml/ \
-		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	psgml
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
-PATCH_SITES=	http://dist.bsdlab.org/
-PATCHFILES=	psgml-symbol-conflict-041015.gz
+PATCH_SITES=	${MASTER_SITE_LOCAL}
+PATCH_SITE_SUBDIR=	hrs
+PATCHFILES=	psgml-symbol-conflict-050503.diff.gz
 
-MAINTAINER?=	ports@FreeBSD.org
+MAINTAINER?=	hrs@FreeBSD.org
 COMMENT?=	A major mode for editing SGML and XML documents for emacs21
 
+INFO=		psgml psgml-api
+
 # distfile version
-PSGML_VER=		1.2.5
+PSGML_VER=		1.3.2
 PSGML_STARTUPEL=	psgml-startup.el
 
-SCRIPTS_ENV=		TARGETS="${PSGML_STARTUPEL}"
+SCRIPTS_ENV=		TARGETS="${PSGML_STARTUPEL}" SED=${SED}
 PLIST_SUB=		PSGML_STARTUPEL=${PSGML_STARTUPEL}
 
 # This is a master port.
@@ -52,19 +54,11 @@ CONFIGURE_ENV=	EMACS=${EMACS_CMD}
 .endif
 
 pre-configure:
-	(cd ${WRKSRC} ; \
-	  for i in psgml.el psgml.texi ; do \
-	      ${RM} -f $${i}.in; \
-	      ${MV} $${i} $${i}.in; \
-	      ${CAT} $${i}.in | ${SED} -e "s;@prefix@;${LOCALBASE};g" > $${i}; \
-	  done)
 	${CP} ${FILESDIR}/${PSGML_STARTUPEL}.in ${WRKDIR}
 
 post-install:
-	@(cd ${WRKSRC} ; \
-		${MAKE} install-info ; \
-	)
-	@${INSTALL_DATA} ${WRKDIR}/${PSGML_STARTUPEL} \
+	cd ${WRKSRC} && ${MAKE} install-info
+	${INSTALL_DATA} ${WRKDIR}/${PSGML_STARTUPEL} \
 			${LOCALBASE}/${EMACS_LIBDIR}/site-lisp
 
 .include <bsd.port.post.mk>
diff --git a/editors/psgml/distinfo b/editors/psgml/distinfo
index b1aebc1419f9..9f8decaa48ea 100644
--- a/editors/psgml/distinfo
+++ b/editors/psgml/distinfo
@@ -1,4 +1,4 @@
-MD5 (psgml-1.2.5.tar.gz) = d4f346b0242035e54860b29d7466b0a2
-SIZE (psgml-1.2.5.tar.gz) = 243668
-MD5 (psgml-symbol-conflict-041015.gz) = 11236af27a6aaf937c61b815346e4a65
-SIZE (psgml-symbol-conflict-041015.gz) = 6627
+MD5 (psgml-1.3.2.tar.gz) = 63a287e2fb4e9987b1c236f7cf508abb
+SIZE (psgml-1.3.2.tar.gz) = 252394
+MD5 (psgml-symbol-conflict-050503.diff.gz) = 16ec913e8ce955ab567655ce0742f811
+SIZE (psgml-symbol-conflict-050503.diff.gz) = 5669
diff --git a/editors/psgml/pkg-descr b/editors/psgml/pkg-descr
index 4c2bba5907b3..33e24d70287f 100644
--- a/editors/psgml/pkg-descr
+++ b/editors/psgml/pkg-descr
@@ -19,3 +19,4 @@ To use psgml, put the following setup into your ~/.emacs:
 
 --- Porting by shige <shige@FreeBSD.ORG>.
 WWW: http://www.lysator.liu.se/~lenst/about_psgml/
+WWW: http://sourceforge.net/projects/psgml/
diff --git a/editors/psgml/pkg-plist b/editors/psgml/pkg-plist
index b0348f120b1f..4de78cc58933 100644
--- a/editors/psgml/pkg-plist
+++ b/editors/psgml/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 %%EMACS_LIBDIR%%/site-lisp/psgml/iso88591.map
 %%EMACS_LIBDIR%%/site-lisp/psgml/psgml-api.el
 %%EMACS_LIBDIR%%/site-lisp/psgml/psgml-api.elc
@@ -7,19 +8,17 @@
 %%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-ids.el
+%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-ids.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-sysdep.el
+%%EMACS_LIBDIR%%/site-lisp/psgml/psgml-sysdep.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/scripts/configure b/editors/psgml/scripts/configure
index ecb50ff2751f..589c62fd0e78 100644
--- a/editors/psgml/scripts/configure
+++ b/editors/psgml/scripts/configure
@@ -3,7 +3,7 @@
 for i in ${TARGETS}
 do
 	if [ -f ${WRKDIR}/${i}.in ]; then
-		cat ${WRKDIR}/${i}.in | /usr/bin/sed \
+		cat ${WRKDIR}/${i}.in | ${SED} \
 			-e "s;@@PREFIX@@;${PREFIX};g" \
 			-e "s;@@EMACS_LIBDIR@@;${EMACS_LIBDIR};g" \
 			-e "s;@@EMACS_VER@@;${EMACS_VER};g" \