3 files changed, 18 insertions, 20 deletions

diff --git a/textproc/dtdparse/Makefile b/textproc/dtdparse/Makefile
index 5afc80539a7d..19cc58544579 100644
--- a/textproc/dtdparse/Makefile
+++ b/textproc/dtdparse/Makefile
@@ -7,20 +7,21 @@
 
 PORTNAME=	dtdparse
 PORTVERSION=	2.0.b6
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	dtdparse
-DISTNAME=       ${PORTNAME}-${PORTVERSION:S/.b/beta/}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/beta/}
 
-MAINTAINER=	fuyuki@mj.0038.net
+MAINTAINER=	fuyuki@hadaly.org
 
 RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/DelimMatch.pm:${PORTSDIR}/textproc/p5-DelimMatch \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/DOM.pm:${PORTSDIR}/textproc/p5-XML-DOM \
-		${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/DOM.pm:${PORTSDIR}/textproc/p5-XML-DOM
 
 USE_PERL5=	yes
 
-NO_BUILD=	yes
+# pod's are broken
+#MAN1=		dtdformat.1 dtdparse.1
 
 SITE_PERL=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}
 XMLDIR=		${PREFIX}/share/xml/${PORTNAME}
@@ -28,32 +29,32 @@ XMLDIR=		${PREFIX}/share/xml/${PORTNAME}
 SCRIPTS=	dtdflatten dtdformat dtdparse \
 		tools/contentmodel tools/dtdstats tools/elements
 
-MKCATALOG=	${LOCALBASE}/sbin/mkcatalog
-PLIST_SUB=	MKCATALOG=${MKCATALOG}
-
 post-patch:
 	cd ${WRKSRC}; \
 		${PERL} -pi -e 's,/usr/local/bin/perl5,${PERL},' ${SCRIPTS}
+	${PERL} -pi -e 's,modules/,XML/DTDParse/,' ${WRKSRC}/dtdformat
+
+do-build:
+#.for i in dtdformat dtdparse
+#	cd ${WRKSRC}; pod2man ${i} >${i}.1
+#.endfor
 
 do-install:
 	cd ${WRKSRC}; ${INSTALL_SCRIPT} ${SCRIPTS} ${PREFIX}/bin
 	${MKDIR} ${SITE_PERL}/XML/DTDParse
 	${INSTALL_DATA} ${WRKSRC}/XML/DTDParse/*.pm ${SITE_PERL}/XML/DTDParse
-	${MKDIR} ${SITE_PERL}/modules
-	${INSTALL_DATA} ${WRKSRC}/modules/*.pl ${SITE_PERL}/modules
+	${INSTALL_DATA} ${WRKSRC}/modules/*.pl ${SITE_PERL}/XML/DTDParse
 	${MKDIR} ${XMLDIR}
 	${INSTALL_DATA} ${WRKSRC}/dtd.dtd ${XMLDIR}
 	${ECHO_CMD} \
 		'PUBLIC "-//Norman Walsh//DTD DTDParse V2.0//EN" "dtd.dtd"' \
 		>${XMLDIR}/catalog
+#	cd ${WRKSRC}; ${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1
 
 post-install:
-	${MKCATALOG} -c ${PREFIX}/share/xml/catalog -q install dtdparse
 	${MKDIR} ${EXAMPLESDIR}
 	cd ${WRKSRC}/sample; \
 		${INSTALL_DATA} sample* simple* ${EXAMPLESDIR}
-# README is not 'additional' documentation because it's the only file
-# that contains copyright notice
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC}; ${INSTALL_DATA} README WhatsNew ${DOCSDIR}
 
diff --git a/textproc/dtdparse/pkg-descr b/textproc/dtdparse/pkg-descr
index 9b079e8083dc..8b3b707e9efe 100644
--- a/textproc/dtdparse/pkg-descr
+++ b/textproc/dtdparse/pkg-descr
@@ -5,4 +5,4 @@ understanding and documentation of DTDs.
 WWW: http://sourceforge.net/projects/dtdparse/
 
 - Kimura Fuyuki
-fuyuki@mj.0038.net
+fuyuki@hadaly.org
diff --git a/textproc/dtdparse/pkg-plist b/textproc/dtdparse/pkg-plist
index 2473a3b74249..21a36281206a 100644
--- a/textproc/dtdparse/pkg-plist
+++ b/textproc/dtdparse/pkg-plist
@@ -8,15 +8,12 @@ lib/perl5/site_perl/%%PERL_VER%%/XML/DTDParse/Catalog.pm
 lib/perl5/site_perl/%%PERL_VER%%/XML/DTDParse/ContentModel.pm
 lib/perl5/site_perl/%%PERL_VER%%/XML/DTDParse/DTD.pm
 lib/perl5/site_perl/%%PERL_VER%%/XML/DTDParse/Tokenizer.pm
+lib/perl5/site_perl/%%PERL_VER%%/XML/DTDParse/html.pl
+lib/perl5/site_perl/%%PERL_VER%%/XML/DTDParse/plain.pl
+lib/perl5/site_perl/%%PERL_VER%%/XML/DTDParse/refentry.pl
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/XML/DTDParse
 @unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
-lib/perl5/site_perl/%%PERL_VER%%/modules/html.pl
-lib/perl5/site_perl/%%PERL_VER%%/modules/plain.pl
-lib/perl5/site_perl/%%PERL_VER%%/modules/refentry.pl
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/modules
-@unexec %%MKCATALOG%% -c %D/share/xml/catalog -q deinstall dtdparse
 share/xml/dtdparse/catalog
-@exec %%MKCATALOG%% -c %D/share/xml/catalog -q install dtdparse
 share/xml/dtdparse/dtd.dtd
 @dirrm share/xml/dtdparse
 share/examples/dtdparse/sample.dtd