Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/dtdinst/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	28 Jul 2002 05:02:16 -0000	1.3
+++ Makefile	26 Jan 2003 07:14:53 -0000
@@ -6,29 +6,26 @@
 #
 
 PORTNAME=	dtdinst
-PORTVERSION=	2002.07.24
+PORTVERSION=	2003.01.22
 CATEGORIES=	textproc
-MASTER_SITES=	http://www.thaiopensource.com/dtdinst/
+MASTER_SITES=	http://www.thaiopensource.com/relaxng/dtdinst/
 DISTNAME=	${PORTNAME}
-DISTFILES=	${JARFILE} dtdinst2rng.xsl index.html copying.txt
-DIST_SUBDIR=	${PORTNAME}
+DISTFILES=	dtdinst.jar dtdinst2rng.xsl index.html copying.txt
+DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 EXTRACT_ONLY=
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 
 USE_JAVA=	1.1+
-NO_BUILD_DEPENDS_JAVA=	yes
 NO_BUILD=	yes
 
-JARFILE=	${DISTNAME}.jar
-JAVALIBDIR=	${PREFIX}/share/java/classes
-XMLDIR=		${PREFIX}/share/xml/${PORTNAME}
+NO_BUILD_DEPENDS_JAVA=	yes
 
 do-install:
-	${MKDIR} ${JAVALIBDIR}
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${JARFILE} ${JAVALIBDIR}
-	${MKDIR} ${XMLDIR}
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/*.xsl ${XMLDIR}
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/*.jar ${JAVAJARDIR}
+	${MKDIR} ${PREFIX}/share/xsl/${PORTNAME}
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/*.xsl \
+		${PREFIX}/share/xsl/${PORTNAME}
 
 post-install:
 	${MKDIR} ${DOCSDIR}
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/textproc/dtdinst/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo	28 Jul 2002 05:02:16 -0000	1.2
+++ distinfo	26 Jan 2003 07:14:53 -0000
@@ -1,4 +1,4 @@
-MD5 (dtdinst/dtdinst.jar) = 9797744eae2e2e04e10eaa993555dbbf
-MD5 (dtdinst/dtdinst2rng.xsl) = b06e045533c29c177f407cd4f79010fa
-MD5 (dtdinst/index.html) = 14b1707b2ee1238f9be53bcd18188a68
-MD5 (dtdinst/copying.txt) = febb9f1c62da7a0b7838728442c2d44f
+MD5 (dtdinst-2003.01.22/dtdinst.jar) = 0e0b372e7647212a6fce08013768fa3e
+MD5 (dtdinst-2003.01.22/dtdinst2rng.xsl) = b06e045533c29c177f407cd4f79010fa
+MD5 (dtdinst-2003.01.22/index.html) = 4406758cdb5cc31b2e29e64e03bf0ce2
+MD5 (dtdinst-2003.01.22/copying.txt) = 23b5091824c13e8d6b68133e0d23d052
Index: pkg-descr
===================================================================
RCS file: /home/ncvs/ports/textproc/dtdinst/pkg-descr,v
retrieving revision 1.2
diff -u -r1.2 pkg-descr
--- pkg-descr	28 Jul 2002 05:02:16 -0000	1.2
+++ pkg-descr	26 Jan 2003 07:14:53 -0000
@@ -2,7 +2,4 @@
 format. The XML instance can be in either a format specific to DTDinst
 or RELAX NG format.
 
-WWW: http://www.thaiopensource.com/dtdinst/
-
-- Kimura Fuyuki
-fuyuki@hadaly.org
+WWW: http://www.thaiopensource.com/relaxng/dtdinst/
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/textproc/dtdinst/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist	7 Feb 2002 01:46:52 -0000	1.1
+++ pkg-plist	26 Jan 2003 07:14:53 -0000
@@ -1,6 +1,7 @@
 share/java/classes/dtdinst.jar
-share/xml/dtdinst/dtdinst2rng.xsl
-@dirrm share/xml/dtdinst
-share/doc/dtdinst/copying.txt
-share/doc/dtdinst/index.html
-@dirrm share/doc/dtdinst
+share/xsl/dtdinst/dtdinst2rng.xsl
+@dirrm share/xsl/dtdinst
+@unexec rmdir %D/share/xsl 2>/dev/null || true
+%%DOCSDIR%%/copying.txt
+%%DOCSDIR%%/index.html
+@dirrm %%DOCSDIR%%