Subject: Re: pkg/29514: teTeX package does not install listings package
To: None <theman@eradman.com>
From: SUNAGAWA Keiki <kei_sun@ba2.so-net.ne.jp>
List: pkgsrc-bugs
Date: 03/20/2005 23:58:09
----Next_Part(Sun_Mar_20_23_58_09_2005_023)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Hi,

I'd like to commit the modify as attached to teTeX-share and
teTex-sharesrc packages.  Could you please tell me if it's
solve your problem?

--
SUNAGAWA Keiki <kei_sun@ba2.so-net.ne.jp>


----Next_Part(Sun_Mar_20_23_58_09_2005_023)--
Content-Type: Message/Rfc822
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Date: Sun, 20 Mar 2005 20:24:40 +0900 (JST)
Message-Id: <20050320.202440.87602002.kei_sun@ba2.so-net.ne.jp>
To: Peter.Bex@student.kun.nl
Cc: pkg-manager@netbsd.org, gnats-admin@netbsd.org, pkgsrc-bugs@netbsd.org
Subject: Re: pkg/28876: teTeX-share does not include full `listings'
 package resulting in errors.
From: SUNAGAWA Keiki <kei_sun@ba2.so-net.ne.jp>
In-Reply-To: <20050105192700.B813363B846@narn.netbsd.org>
References: <20050105192700.B813363B846@narn.netbsd.org>
Mime-Version: 1.0
Content-Type: Multipart/Mixed;
 boundary="--Next_Part(Sun_Mar_20_20_24_40_2005_724)--"
Content-Transfer-Encoding: 7bit

----Next_Part(Sun_Mar_20_20_24_40_2005_724)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Hi,

Applogies for my delayed response.  I made a modification to
print/teTeX-share and print/teTeX-sharesrc.  Could you
please check if the attached diff is ok?  Here are random
notes:

- I took a look at newly released teTeX-3.0 and current
  version 2.0.2.  The difference is the place of
  listings.sty.  So I made no change in
  print/teTeX-share/files/exclude, just moved the file from
  teTeX-sharesrc to teTeX-share.

- After the change, I tried typestting your test.tex.
  the ruslt is below.  Is it expected?


$ latex test.tex
This is TeX, Version 3.14159 (Web2C 7.4.5)
(./test.tex
LaTeX2e <2001/06/01>
Babel <v3.7h> and hyphenation patterns for american, french, german, ngerman, n
ohyphenation, loaded.
(/usr/pkg/share/texmf/tex/latex/base/article.cls
Document Class: article 2001/04/21 v1.4e Standard LaTeX document class
(/usr/pkg/share/texmf/tex/latex/base/size10.clo))
(/usr/pkg/share/texmf/tex/latex/psnfss/t1bch.fd)
(/usr/pkg/share/texmf/tex/latex/listings/listings.sty
(/usr/pkg/share/texmf/tex/latex/graphics/keyval.sty)
(/usr/pkg/share/texmf/tex/latex/listings/lstpatch.sty)
(/usr/pkg/share/texmf/tex/latex/listings/lstmisc.sty)
(/usr/pkg/share/texmf/tex/latex/listings/listings.cfg)) (./test.aux)

LaTeX Warning: No \author given.

)
*<then it waits for user>

--
SUNAGAWA Keiki <kei_sun@ba2.so-net.ne.jp>

----Next_Part(Sun_Mar_20_20_24_40_2005_724)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="tetex.diff"

Index: print/teTeX-share/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/print/teTeX-share/Makefile,v
retrieving revision 1.25
diff -u -d -r1.25 Makefile
--- print/teTeX-share/Makefile	12 Feb 2004 21:52:08 -0000	1.25
+++ print/teTeX-share/Makefile	20 Mar 2005 11:06:20 -0000
@@ -3,13 +3,18 @@
 
 DISTNAME=	tetex-texmf-2.0.2
 PKGNAME=	teTeX-share-2.0.2
+PKGREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/2.0/distrib/}
+DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}
+DISTFILES+=	listings${EXTRACT_SUFX}
 
 MAINTAINER=	kei@NetBSD.org
 HOMEPAGE=	http://www.tug.org/tetex/
 COMMENT=	Machine-independent part of teTeX, version 2
 
+SITES_listings.tar.gz= ${LOCAL_PORTS}
+
 CONFLICTS+=	teTeX2-share-[0-9]*
 
 WRKSRC=		${WRKDIR}
@@ -22,9 +27,13 @@
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/texmf
 .if defined(EXTRACT_USING_PAX)
-	cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${PAX} -O -cr `${CAT} ${FILESDIR}/exclude`
+	for i in ${DISTFILES}; do \
+		cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/$$i | ${PAX} -O -cr `${CAT} ${FILESDIR}/exclude`; \
+	done
 .else
-	cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${GTAR} -X ${FILESDIR}/exclude -xpf -
+	for i in ${DISTFILES}; do \
+		cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/$$i | ${GTAR} -X ${FILESDIR}/exclude -xpf -; \
+	done
 .endif
 	cd ${PREFIX}/share/texmf/dvipdfm/config && \
 	${PATCH} ${_PATCH_BACKUP_ARG} .orig < ${FILESDIR}/dvipdfm-config.diff && \
Index: print/teTeX-share/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/print/teTeX-share/PLIST,v
retrieving revision 1.4
diff -u -d -r1.4 PLIST
--- print/teTeX-share/PLIST	24 Dec 2003 12:51:31 -0000	1.4
+++ print/teTeX-share/PLIST	20 Mar 2005 11:06:23 -0000
@@ -10685,6 +10685,7 @@
 share/texmf/tex/latex/labels/labels.sty
 share/texmf/tex/latex/labels/olabels.sty
 share/texmf/tex/latex/listings/listings.cfg
+share/texmf/tex/latex/listings/listings.sty
 share/texmf/tex/latex/listings/lstdoc.sty
 share/texmf/tex/latex/listings/lstlang1.sty
 share/texmf/tex/latex/listings/lstlang2.sty
Index: print/teTeX-share/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/print/teTeX-share/distinfo,v
retrieving revision 1.4
diff -u -d -r1.4 distinfo
--- print/teTeX-share/distinfo	24 Feb 2005 12:51:45 -0000	1.4
+++ print/teTeX-share/distinfo	20 Mar 2005 11:06:23 -0000
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.4 2005/02/24 12:51:45 agc Exp $
 
-SHA1 (teTeX/tetex-texmf-2.0.2.tar.gz) = 9ad88d5fc1df7e10b3538f7b5e3871ceefe8ee2f
-RMD160 (teTeX/tetex-texmf-2.0.2.tar.gz) = ff88622c2d97416a4f67fbdf7a00d837af35d94e
-Size (teTeX/tetex-texmf-2.0.2.tar.gz) = 52424280 bytes
+SHA1 (teTeX/listings.tar.gz) = ce2d9759f2490f56892c12e94a60b8bb86d7611f
+RMD160 (teTeX/listings.tar.gz) = 4d12ee8e0af0afd579aed65fb71f0b55befb452e
+Size (teTeX/listings.tar.gz) = 15807 bytes
Index: print/teTeX-sharesrc/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/print/teTeX-sharesrc/Makefile,v
retrieving revision 1.21
diff -u -d -r1.21 Makefile
--- print/teTeX-sharesrc/Makefile	20 Jan 2004 12:24:29 -0000	1.21
+++ print/teTeX-sharesrc/Makefile	20 Mar 2005 11:06:23 -0000
@@ -4,6 +4,7 @@
 
 DISTNAME=	tetex-texmfsrc-2.0.2
 PKGNAME=	teTeX-sharesrc-2.0.2
+PKGREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/2.0/distrib/}
 
@@ -30,5 +31,6 @@
 .else
 	cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${GTAR} -xpf -
 .endif
+	${RM} ${PREFIX}/share/texmf/source/latex/listings/listings.sty
 
 .include "../../mk/bsd.pkg.mk"
Index: print/teTeX-sharesrc/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/print/teTeX-sharesrc/PLIST,v
retrieving revision 1.3
diff -u -d -r1.3 PLIST
--- print/teTeX-sharesrc/PLIST	24 Dec 2003 12:51:31 -0000	1.3
+++ print/teTeX-sharesrc/PLIST	20 Mar 2005 11:06:23 -0000
@@ -1976,7 +1976,6 @@
 share/texmf/source/latex/listings/README.comment-on-license
 share/texmf/source/latex/listings/listings.dtx
 share/texmf/source/latex/listings/listings.ins
-share/texmf/source/latex/listings/listings.sty
 share/texmf/source/latex/listings/lstdrvrs.dtx
 share/texmf/source/latex/listings/lstpatch.sty
 share/texmf/source/latex/listings/tetex.ins

----Next_Part(Sun_Mar_20_20_24_40_2005_724)----

----Next_Part(Sun_Mar_20_23_58_09_2005_023)----