From hrs@allbsd.org  Thu Jan 29 20:16:39 2004
Return-Path: <hrs@allbsd.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C00D316A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 29 Jan 2004 20:16:39 -0800 (PST)
Received: from smtp.eos.ocn.ne.jp (eos.ocn.ne.jp [211.6.83.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AC09A43D2F
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 29 Jan 2004 20:16:36 -0800 (PST)
	(envelope-from hrs@allbsd.org)
Received: from delta.allbsd.org (p56210-adsao12honb4-acca.tokyo.ocn.ne.jp [220.96.138.210])
	by smtp.eos.ocn.ne.jp (Postfix) with ESMTP id 4027D1DBE
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 30 Jan 2004 13:16:35 +0900 (JST)
Received: from alph.allbsd.org (alph.allbsd.org [192.168.0.10])
	by delta.allbsd.org (8.12.9p2/8.12.9) with ESMTP id i0U4FgA2034847
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 30 Jan 2004 13:15:42 +0900 (JST)
	(envelope-from hrs@alph.d.allbsd.org)
Received: from alph.allbsd.org (localhost [127.0.0.1])
	by alph.allbsd.org (8.12.9p2/8.12.9) with ESMTP id i0U4Ff8c016688
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 30 Jan 2004 13:15:41 +0900 (JST)
	(envelope-from hrs@alph.d.allbsd.org)
Received: (from hrs@localhost)
	by alph.allbsd.org (8.12.9p2/8.12.9/Submit) id i0U4FfgQ016687;
	Fri, 30 Jan 2004 13:15:41 +0900 (JST)
	(envelope-from hrs)
Message-Id: <200401300415.i0U4FfgQ016687@alph.allbsd.org>
Date: Fri, 30 Jan 2004 13:15:41 +0900 (JST)
From: Hiroki Sato <hrs@freebsd.org>
Reply-To: Hiroki Sato <hrs@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Subject: Update port: print/passivetex 2.14
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         62095
>Category:       ports
>Synopsis:       Update port: print/passivetex 2.14
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    nik
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 29 20:20:10 PST 2004
>Closed-Date:    Tue Feb 03 09:12:27 PST 2004
>Last-Modified:  Tue Feb 03 09:12:27 PST 2004
>Originator:     Hiroki Sato
>Release:        FreeBSD 4.9-RELEASE-p1 i386
>Organization:
Tokyo University of Science
>Environment:
System: FreeBSD alph.allbsd.org  4.9-RELEASE-p1 FreeBSD 4.9-RELEASE-p1 #0: Mon Dec 29 10:42:23 JST 2003     hrs@alph.allbsd.org:/home/obj/home/src/sys/ALPH  i386

>Description:
	Update to 2.14 and some cleanups.  Although ports/48683 has been reported,
	this port has been broken for a long time.  If the current maintainer(nik@)
	does not intend or have time to continue maintaining this port, I will
	take the maintainership.

	Please close ports/48683 when the port is updated.

>How-To-Repeat:
	N/A

>Fix:

Index: passivetex/Makefile
===================================================================
RCS file: /home/ncvs/ports/print/passivetex/Makefile,v
retrieving revision 1.6
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.6 Makefile
--- passivetex/Makefile	7 Mar 2003 06:09:05 -0000	1.6
+++ passivetex/Makefile	30 Jan 2004 04:05:08 -0000
@@ -6,41 +6,79 @@
 #
 
 PORTNAME=		passivetex
-PORTVERSION=		1.21
+PORTVERSION=		1.24
 CATEGORIES=		print
 MASTER_SITES=		http://www.tei-c.org.uk/Software/passivetex/
-DISTFILES=		passivetex.zip
+DISTNAME=		${PORTNAME}
+DIST_SUBDIR=		${PORTNAME}
 
-MAINTAINER=		nik@FreeBSD.org
-COMMENT=	XSL FO processor, written in TeX
+MAINTAINER=		hrs@FreeBSD.org
+COMMENT=		XSL FO processor, written in TeX
 
-BUILD_DEPENDS=		${LOCALBASE}/share/texmf/web2c/xmltex.fmt:${PORTSDIR}/print/xmltex
+BUILD_DEPENDS=		kpsewhich:${PORTSDIR}/print/teTeX \
+			${LOCALBASE}/share/texmf/web2c/xmltex.fmt:${PORTSDIR}/print/xmltex
 
-DIST_SUBDIR=		passivetex
 NO_BUILD=		yes
 USE_ZIP=		yes
-
 WRKSRC=			${WRKDIR}/passivetex
-
 MAKE_ENV=		TEXMFCNF=${FILESDIR}:${LOCALBASE}/share/texmf/web2c
 
 MESSAGE=		${PKGDIR}/pkg-message
 PKGMESSAGE=		${WRKDIR}/pkg-message
 
+.include <bsd.port.pre.mk>
+
+PLIST_SUB=	MKTEXLSR=${MKTEXLSR} CLASSDIR=${CLASSDIR}
+
+MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
+.if exists(${LOCALBASE}/bin/kpsewhich)
+TEXMFDIR!=	${LOCALBASE}/bin/kpsewhich -expand-var '$$TEXMFMAIN'
+.else
+TEXMFDIR=	# empty
+.endif
+CLASSDIR=	${TEXMFDIR:S,^${PREFIX},,:S,^/,,}/tex/passivetex
+
+CLASS_FILES=	dummyels.sty fotex.xmt fotex.sty
+CLASS_FILES+=	mlnames.sty ucharacters.sty unicode.sty
+CLASS_FILES+=	dummyels.sty nomulticol.sty
+
+DOC_FILES=	LICENSE README.passivetex index.html index.xml
+
+TEST_FILES=	Makefile
+TEST_FILES+=	chap01.xml chap02.xml chap03.xml chap04.xml
+TEST_FILES+=	check.xsl
+TEST_FILES+=	darkness.fo darkness.pdf darkness.xml darkness.xsl
+TEST_FILES+=	exercise-print.xsl exercise.fo exercise.pdf exercise.xml
+TEST_FILES+=	fezziPic.png fotex.cfg.eg hyperref.cfg
+TEST_FILES+=	mathex.xml mathex.xsl mathml.xsl
+TEST_FILES+=	mathtei.dtd novel.dtd
+TEST_FILES+=	phys332-1.jpg phys332-2.jpg
+TEST_FILES+=	rmsd.xml
+TEST_FILES+=	tei-oucs.dtd tei.sty teimath-print.xsl teimath.aux teimath.fo
+TEST_FILES+=	teimath.log teimath.out teimath.pdf teimath.xml teimath.xsl
+TEST_FILES+=	teimath2.xml teiu5-print.xsl teiu5.fo teiu5.pdf teiu5.xml
+TEST_FILES+=	teixlite.dtd teixml.cfg test1.fot test2.fot
+
 post-patch:
-	@${SED} -e 's,%%LOCALBASE%%,${LOCALBASE},' ${MESSAGE} > ${PKGMESSAGE}
+	@${SED} -e 's,%%TEXMFDIR%%,${TEXMFDIR},' \
+		${MESSAGE} > ${PKGMESSAGE}
 
 do-install:
-	@cd ${WRKSRC}; TEXMFMAIN=$$(kpsewhich -expand-var '$$TEXMFMAIN'); \
-	 ${MKDIR} -m 555 $$TEXMFMAIN/tex/passivetex; \
-	 ${INSTALL_DATA} dummyels.sty fotex.xmt fotex.sty mlnames.sty ucharacters.sty unicode.sty $$TEXMFMAIN/tex/passivetex;
+	${MKDIR} -m 555 ${PREFIX}/${CLASSDIR}
+	${INSTALL_DATA} ${CLASS_FILES:S@^@${WRKSRC}/@} ${PREFIX}/${CLASSDIR}
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${DOC_FILES:S@^@${WRKSRC}/@} ${DOCSDIR}
+	${MKDIR} ${DOCSDIR}/test
+	${INSTALL_DATA} ${TEST_FILES:S@^@${WRKSRC}/test/@} ${DOCSDIR}/test
+.endif
 
 post-install: rebuild-tex-database display-message
 
 rebuild-tex-database:
-	${LOCALBASE}/bin/mktexlsr
+	${MKTEXLSR}
 
 display-message:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: passivetex/distinfo
===================================================================
RCS file: /home/ncvs/ports/print/passivetex/distinfo,v
retrieving revision 1.3
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.3 distinfo
--- passivetex/distinfo	24 Nov 2002 20:41:49 -0000	1.3
+++ passivetex/distinfo	30 Jan 2004 03:59:43 -0000
@@ -1 +1 @@
-MD5 (passivetex/passivetex.zip) = 700c10a716ef14ad9bbc073061ad7307
+MD5 (passivetex/passivetex.zip) = 03e05ab33d3abe1a316c8d9877c315d6
Index: passivetex/pkg-message
===================================================================
RCS file: /home/ncvs/ports/print/passivetex/pkg-message,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 pkg-message
--- passivetex/pkg-message	4 Jun 2002 11:28:57 -0000	1.1
+++ passivetex/pkg-message	30 Jan 2004 04:01:31 -0000
@@ -1,8 +1,8 @@
 PassiveTeX uses quite a lot of TeX's resources.  You may find it
 necessary to increase the size of some of TeX's resource pools by
-editing the file %%LOCALBASE%%/share/texmf/web2c/texmf.cnf with any text
+editing the file %%TEXMFDIR%%/web2c/texmf.cnf with any text
 editor.
 
-If you change %%LOCALBASE%%/share/texmf/web2c/texmf.cnf, delete the word
+If you change %%TEXMFDIR%%/web2c/texmf.cnf, delete the word
 "original" on line 1 of the file.  This will prevent future
 installations of TeX from overwriting changes you've made.
Index: passivetex/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/print/passivetex/pkg-plist,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 pkg-plist
--- passivetex/pkg-plist	4 Jun 2002 11:28:57 -0000	1.1
+++ passivetex/pkg-plist	30 Jan 2004 03:54:36 -0000
@@ -1,10 +1,61 @@
 @comment $FreeBSD: ports/print/passivetex/pkg-plist,v 1.1 2002/06/04 11:28:57 nik Exp $
-share/texmf/tex/passivetex/dummyels.sty
-share/texmf/tex/passivetex/fotex.xmt
-share/texmf/tex/passivetex/fotex.sty
-share/texmf/tex/passivetex/mlnames.sty
-share/texmf/tex/passivetex/ucharacters.sty
-share/texmf/tex/passivetex/unicode.sty
-@dirrm share/texmf/tex/passivetex
-@exec %D/bin/mktexlsr
-@unexec %D/bin/mktexlsr
+%%PORTDOCS%%%%DOCSDIR%%/test/Makefile
+%%PORTDOCS%%%%DOCSDIR%%/test/chap01.xml
+%%PORTDOCS%%%%DOCSDIR%%/test/chap02.xml
+%%PORTDOCS%%%%DOCSDIR%%/test/chap03.xml
+%%PORTDOCS%%%%DOCSDIR%%/test/chap04.xml
+%%PORTDOCS%%%%DOCSDIR%%/test/check.xsl
+%%PORTDOCS%%%%DOCSDIR%%/test/darkness.fo
+%%PORTDOCS%%%%DOCSDIR%%/test/darkness.pdf
+%%PORTDOCS%%%%DOCSDIR%%/test/darkness.xml
+%%PORTDOCS%%%%DOCSDIR%%/test/darkness.xsl
+%%PORTDOCS%%%%DOCSDIR%%/test/exercise-print.xsl
+%%PORTDOCS%%%%DOCSDIR%%/test/exercise.fo
+%%PORTDOCS%%%%DOCSDIR%%/test/exercise.pdf
+%%PORTDOCS%%%%DOCSDIR%%/test/exercise.xml
+%%PORTDOCS%%%%DOCSDIR%%/test/fezziPic.png
+%%PORTDOCS%%%%DOCSDIR%%/test/fotex.cfg.eg
+%%PORTDOCS%%%%DOCSDIR%%/test/hyperref.cfg
+%%PORTDOCS%%%%DOCSDIR%%/test/mathex.xml
+%%PORTDOCS%%%%DOCSDIR%%/test/mathex.xsl
+%%PORTDOCS%%%%DOCSDIR%%/test/mathml.xsl
+%%PORTDOCS%%%%DOCSDIR%%/test/mathtei.dtd
+%%PORTDOCS%%%%DOCSDIR%%/test/novel.dtd
+%%PORTDOCS%%%%DOCSDIR%%/test/phys332-1.jpg
+%%PORTDOCS%%%%DOCSDIR%%/test/phys332-2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/test/rmsd.xml
+%%PORTDOCS%%%%DOCSDIR%%/test/tei-oucs.dtd
+%%PORTDOCS%%%%DOCSDIR%%/test/tei.sty
+%%PORTDOCS%%%%DOCSDIR%%/test/teimath-print.xsl
+%%PORTDOCS%%%%DOCSDIR%%/test/teimath.aux
+%%PORTDOCS%%%%DOCSDIR%%/test/teimath.fo
+%%PORTDOCS%%%%DOCSDIR%%/test/teimath.log
+%%PORTDOCS%%%%DOCSDIR%%/test/teimath.out
+%%PORTDOCS%%%%DOCSDIR%%/test/teimath.pdf
+%%PORTDOCS%%%%DOCSDIR%%/test/teimath.xml
+%%PORTDOCS%%%%DOCSDIR%%/test/teimath.xsl
+%%PORTDOCS%%%%DOCSDIR%%/test/teimath2.xml
+%%PORTDOCS%%%%DOCSDIR%%/test/teiu5-print.xsl
+%%PORTDOCS%%%%DOCSDIR%%/test/teiu5.fo
+%%PORTDOCS%%%%DOCSDIR%%/test/teiu5.pdf
+%%PORTDOCS%%%%DOCSDIR%%/test/teiu5.xml
+%%PORTDOCS%%%%DOCSDIR%%/test/teixlite.dtd
+%%PORTDOCS%%%%DOCSDIR%%/test/teixml.cfg
+%%PORTDOCS%%%%DOCSDIR%%/test/test1.fot
+%%PORTDOCS%%%%DOCSDIR%%/test/test2.fot
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/test
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README.passivetex
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/index.xml
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%CLASSDIR%%/dummyels.sty
+%%CLASSDIR%%/fotex.xmt
+%%CLASSDIR%%/fotex.sty
+%%CLASSDIR%%/mlnames.sty
+%%CLASSDIR%%/ucharacters.sty
+%%CLASSDIR%%/unicode.sty
+%%CLASSDIR%%/nomulticol.sty
+@dirrm %%CLASSDIR%%
+@exec %%MKTEXLSR%%
+@unexec %%MKTEXLSR%%
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->nik 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Fri Jan 30 01:30:41 PST 2004 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=62095 
State-Changed-From-To: open->closed 
State-Changed-By: nik 
State-Changed-When: Tue Feb 3 09:12:08 PST 2004 
State-Changed-Why:  
Patch applied, maintainership handed over.  Cheers. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=62095 
>Unformatted:
