- Update to 2.00

PR:		ports/83859
Submitted by:	Ports Fury

4 files changed, 24 insertions, 74 deletions

diff --git a/textproc/dtdparse/Makefile b/textproc/dtdparse/Makefile
index 4485f2e3af05..03f2fb8d7a06 100644
--- a/textproc/dtdparse/Makefile
+++ b/textproc/dtdparse/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	dtdparse
-PORTVERSION=	2.0.b6
-PORTREVISION=	1
+PORTVERSION=	2.00
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	dtdparse
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/beta/}
+DISTNAME=	SGML-DTDParse-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Parse a DTD and produce an XML document that represents it
@@ -20,32 +19,9 @@ RUN_DEPENDS=	${SITE_PERL}/Text/DelimMatch.pm:${PORTSDIR}/textproc/p5-DelimMatch
 		${SITE_PERL}/XML/DOM.pm:${PORTSDIR}/textproc/p5-XML-DOM
 
 USE_PERL5=	yes
-NO_BUILD=	yes
-XMLDIR=		${PREFIX}/share/xml/${PORTNAME}
-SCRIPTS=	dtdflatten dtdformat dtdparse \
-		tools/contentmodel tools/dtdstats tools/elements
+PERL_CONFIGURE=	yes
 
-post-patch:
-	cd ${WRKSRC}; \
-		${PERL} -pi -e 's,/usr/local/bin/perl5,${PERL},' ${SCRIPTS}
-	${PERL} -pi -e 's,modules/,XML/DTDParse/,' ${WRKSRC}/dtdformat
-
-do-install:
-	cd ${WRKSRC}; ${INSTALL_SCRIPT} ${SCRIPTS} ${PREFIX}/bin
-	${MKDIR} ${SITE_PERL}/XML/DTDParse
-	${INSTALL_DATA} ${WRKSRC}/XML/DTDParse/*.pm ${SITE_PERL}/XML/DTDParse
-	${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
-
-post-install:
-	${MKDIR} ${EXAMPLESDIR}
-	cd ${WRKSRC}/sample; \
-		${INSTALL_DATA} sample* simple* ${EXAMPLESDIR}
-	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}; ${INSTALL_DATA} README WhatsNew ${DOCSDIR}
+MAN1=		dtddiff2html.1 dtdformat.1 dtddiff.1 dtdparse.1 dtdflatten.1
+MAN3=		SGML::DTDParse::DTD.3 SGML::DTDParse.3 SGML::DTDParse::Util.3
 
 .include <bsd.port.mk>
diff --git a/textproc/dtdparse/distinfo b/textproc/dtdparse/distinfo
index 6f226bea948b..1233090926e1 100644
--- a/textproc/dtdparse/distinfo
+++ b/textproc/dtdparse/distinfo
@@ -1,2 +1,2 @@
-MD5 (dtdparse-2.0beta6.tar.gz) = 905b08b8e814585cf8f49461521dee6c
-SIZE (dtdparse-2.0beta6.tar.gz) = 37950
+MD5 (SGML-DTDParse-2.00.tar.gz) = bcff0835a0a7480794311fa0821d4db9
+SIZE (SGML-DTDParse-2.00.tar.gz) = 57846
diff --git a/textproc/dtdparse/files/patch-aa b/textproc/dtdparse/files/patch-aa
deleted file mode 100644
index ebc0c7331257..000000000000
--- a/textproc/dtdparse/files/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- dtdformat.orig	Wed Aug  1 23:54:27 2001
-+++ dtdformat	Tue Jan 29 14:38:09 2002
-@@ -122,16 +122,8 @@
- 	require $userlib;
-     }
- } else {
--    my $plain = $0;
--    $plain =~ s/\\/\//g;
--    if ($plain =~ /\//) {
--	$plain =~ s/^(.*)\/[^\/]+$/$1\/modules\/plain.pl/;
--    } else {
--	$plain = "modules/plain.pl";
--    }
--
-     &status("Using plain library.",1);
--    require $plain;
-+    require 'modules/plain.pl';
- }
-
- foreach my $key (keys %option) {
diff --git a/textproc/dtdparse/pkg-plist b/textproc/dtdparse/pkg-plist
index 5007a5378ab2..9cea1cbee973 100644
--- a/textproc/dtdparse/pkg-plist
+++ b/textproc/dtdparse/pkg-plist
@@ -1,26 +1,20 @@
-bin/contentmodel
+bin/dtddiff
+bin/dtddiff2html
 bin/dtdflatten
 bin/dtdformat
 bin/dtdparse
-bin/dtdstats
-bin/elements
-%%SITE_PERL%%/XML/DTDParse/Catalog.pm
-%%SITE_PERL%%/XML/DTDParse/ContentModel.pm
-%%SITE_PERL%%/XML/DTDParse/DTD.pm
-%%SITE_PERL%%/XML/DTDParse/Tokenizer.pm
-%%SITE_PERL%%/XML/DTDParse/html.pl
-%%SITE_PERL%%/XML/DTDParse/plain.pl
-%%SITE_PERL%%/XML/DTDParse/refentry.pl
-@dirrm %%SITE_PERL%%/XML/DTDParse
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
-share/xml/dtdparse/catalog
-share/xml/dtdparse/dtd.dtd
-@dirrm share/xml/dtdparse
-%%EXAMPLESDIR%%/sample.dtd
-%%EXAMPLESDIR%%/sample.mod
-%%EXAMPLESDIR%%/simple-inline.mod
-%%EXAMPLESDIR%%/simple.dtd
-@dirrm %%EXAMPLESDIR%%
-%%DOCSDIR%%/README
-%%DOCSDIR%%/WhatsNew
-@dirrm %%DOCSDIR%%
+%%SITE_PERL%%/SGML/DTDParse/Catalog.pm
+%%SITE_PERL%%/SGML/DTDParse/ContentModel.pm
+%%SITE_PERL%%/SGML/DTDParse/DTD.pm
+%%SITE_PERL%%/SGML/DTDParse/Format/html.pl
+%%SITE_PERL%%/SGML/DTDParse/Format/plain.pl
+%%SITE_PERL%%/SGML/DTDParse/Format/refentry.pl
+%%SITE_PERL%%/SGML/DTDParse/Tokenizer.pm
+%%SITE_PERL%%/SGML/DTDParse/Util.pm
+%%SITE_PERL%%/SGML/DTDParse.pm
+%%SITE_PERL%%/mach/auto/SGML/DTDParse/.packlist
+@dirrm %%SITE_PERL%%/mach/auto/SGML/DTDParse
+@dirrm %%SITE_PERL%%/SGML/DTDParse/Format
+@dirrm %%SITE_PERL%%/SGML/DTDParse
+@unexec rmdir %D/%%SITE_PERL%%/mach/auto/SGML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/SGML 2>/dev/null || true