[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: ptex and platex



こんばんは。

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

SUNAGAWA> ja-ptex-euc→ja-ptex-common→ja-ptex-texmfの順に
SUNAGAWA> DEPENDSしているのにどうして入っていなかったが謎で
SUNAGAWA> すが、もう一度始めからやってみます。

この修正も含め、ptex-*の部分の修正ができました。

# cd ptex-euc; make install

で3つともインストールされることを確認しました。大石さんの
19991104版からの差分になっています。X-Ml-Count: 528での修正
も含んでいます。また、

$ pkglint -a -b -c -N

で'ja-' prefix以外の警告が出ないようにしてあります。

次はplatexです。野望はEWB:-)

----- ptex-texmflib.diff
diff -Nru ptex-texmflib.orig/Makefile ptex-texmflib/Makefile
--- ptex-texmflib.orig/Makefile	Tue Nov  2 12:08:41 1999
+++ ptex-texmflib/Makefile	Wed Dec  8 11:13:04 1999
@@ -1,17 +1,22 @@
+# $NetBSD$
+
 DISTNAME=	texmflib-7.3
 PKGNAME=	ja-texmflib-7.3
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/ptex218/web2c/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} 
+
+MAINTAINER=	oishi@ims.ac.jp
+HOMEPAGE=	http://www.ascii.co.jp/pb/ptex/
+
 DIST_SUBDIR=	ptex
 INST_SUBDIR=	share/fonts/ptex
-MAINTAINER=	oishi@ims.ac.jp
-EXTRACT_CMD=	/usr/bin/true
+
+EXTRACT_CMD=	${TRUE}
 NO_BUILD=	yes
 
 do-install:
-		${MKDIR} ${PREFIX}/${INST_SUBDIR} 
+		${MKDIR} ${PREFIX}/${INST_SUBDIR}
 		${GTAR} -C ${PREFIX}/${INST_SUBDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES}
 		${RM} -R ${PREFIX}/${INST_SUBDIR}/texmf/dvips
 
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/bsd.pkg.mk"
diff -Nru ptex-texmflib.orig/files/md5 ptex-texmflib/files/md5
--- ptex-texmflib.orig/files/md5	Mon Aug  2 13:12:30 1999
+++ ptex-texmflib/files/md5	Wed Dec  8 11:07:07 1999
@@ -1 +1,3 @@
+$NetBSD$
+
 MD5 (ptex/texmflib-7.3.tar.gz) = 6ad489dab000f5830aa78b17c362a97a
diff -Nru ptex-texmflib.orig/pkg/PLIST ptex-texmflib/pkg/PLIST
--- ptex-texmflib.orig/pkg/PLIST	Tue Nov  2 12:10:19 1999
+++ ptex-texmflib/pkg/PLIST	Wed Dec  8 14:09:25 1999
@@ -1,3 +1,5 @@
+@comment $NetBSD$
+
 share/fonts/ptex/texmf/VERSION-7.3
 share/fonts/ptex/texmf/bibtex/bib/base/xampl.bib
 share/fonts/ptex/texmf/bibtex/bst/base/abbrv.bst


----- ptex-common.diff
diff -Nru ptex-common.orig/Makefile ptex-common/Makefile
--- ptex-common.orig/Makefile	Tue Nov  2 16:31:59 1999
+++ ptex-common/Makefile	Wed Dec  8 13:41:13 1999
@@ -1,18 +1,23 @@
-DISTNAME=	web2c-7.2
-PKGNAME=	ja-ptex-common-2.1.8
-CATEGORIES=	japanese print
-MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/ptex218/web2c/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} web-7.2.tar.gz 
-
-MAINTAINER=	
-
-DEPENDS=	ja-texmflib-7.3:../../japanese/ptex-texmflib \
-		png-1.0.3:../../graphics/png \
-		jpeg-6b:../../graphics/jpeg
-USE_GMAKE=	yes
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} web-7.2.tar.gz
-DIST_SUBDIR=	ptex
+# $NetBSD$
+
+DISTNAME=		web2c-7.2
+PKGNAME=		ja-ptex-common-2.1.8
+CATEGORIES=		japanese print
+MASTER_SITES=		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/ptex218/web2c/
+DISTFILES=		${DISTNAME}${EXTRACT_SUFX} web-7.2.tar.gz
+
 PATCH_DIST_STRIP=	-p1
+
+MAINTAINER=		oishi@ims.ac.jp
+HOMEPAGE=		http://www.ascii.co.jp/pb/ptex/
+
+DEPENDS+=		ja-texmflib-7.3:../../japanese/ptex-texmflib \
+			png-1.0.3:../../graphics/png \
+			jpeg-6b:../../graphics/jpeg
+
+USE_GMAKE=		yes
+EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX} web-7.2.tar.gz
+DIST_SUBDIR=		ptex
 INST_SUBDIR=		libexec/ptex
 TEXMF_SUBDIR=		share/fonts/ptex
 INSTALL_PROGRAM=	${INSTALL} -c
@@ -22,12 +27,12 @@
 			--infodir=${PREFIX}/${INST_SUBDIR}/info \
 			--with-system-zlib \
 			--with-system-pnglib
-CONFIGURE_ENV+=	CC='${CC} -Dunix' 
+CONFIGURE_ENV+=		CC='${CC} -Dunix'
 
 post-install:
 		${MV} ${PREFIX}/${INST_SUBDIR}/bin/pltotf \
-			${PREFIX}/${INST_SUBDIR}/bin/en-pltotf 
+			${PREFIX}/${INST_SUBDIR}/bin/en-pltotf
 		${MV} ${PREFIX}/${INST_SUBDIR}/bin/tftopl \
-			${PREFIX}/${INST_SUBDIR}/bin/en-tftopl 
+			${PREFIX}/${INST_SUBDIR}/bin/en-tftopl
 
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/bsd.pkg.mk"
diff -Nru ptex-common.orig/files/md5 ptex-common/files/md5
--- ptex-common.orig/files/md5	Mon Aug  2 14:24:02 1999
+++ ptex-common/files/md5	Wed Dec  8 11:16:57 1999
@@ -1,2 +1,4 @@
+$NetBSD$
+
 MD5 (ptex/web2c-7.2.tar.gz) = 1451b51656d9624bee4052f6688af4cf
 MD5 (ptex/web-7.2.tar.gz) = e1ef22e0a79f9f0170730531b242f7f1
diff -Nru ptex-common.orig/files/patch-sum ptex-common/files/patch-sum
--- ptex-common.orig/files/patch-sum	Thu Jan  1 09:00:00 1970
+++ ptex-common/files/patch-sum	Wed Dec  8 15:17:17 1999
@@ -0,0 +1,4 @@
+$NetBSD$
+
+MD5 (patch-aa) = cb71bf55733f247e06d5182959f26b2e
+MD5 (patch-ab) = f614585f76b3c018128d9b15b7cc8b0d
diff -Nru ptex-common.orig/patches/patch-aa ptex-common/patches/patch-aa
--- ptex-common.orig/patches/patch-aa	Mon Aug  2 14:41:10 1999
+++ ptex-common/patches/patch-aa	Wed Dec  8 11:17:08 1999
@@ -1,3 +1,5 @@
+$NetBSD$
+
 --- web2c/Makefile.in.orig	Mon Aug  2 12:10:34 1999
 +++ web2c/Makefile.in	Mon Aug  2 13:55:02 1999
 @@ -5,7 +5,7 @@
diff -Nru ptex-common.orig/patches/patch-ab ptex-common/patches/patch-ab
--- ptex-common.orig/patches/patch-ab	Thu Jan  1 09:00:00 1970
+++ ptex-common/patches/patch-ab	Wed Dec  8 15:17:10 1999
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- config.sub.orig	Mon Nov  8 08:48:17 1999
++++ config.sub	Mon Nov  8 08:52:34 1999
+@@ -229,6 +229,9 @@
+ 		basic_machine=ns32k-sequent
+ 		os=-dynix
+ 		;;
++	bebox-* | macppc-* | ofppc-*)
++		basic_machine=powerpc-unknown
++		;;
+ 	convex-c1)
+ 		basic_machine=c1-convex
+ 		os=-bsd
+
diff -Nru ptex-common.orig/pkg/PLIST ptex-common/pkg/PLIST
--- ptex-common.orig/pkg/PLIST	Tue Nov  2 16:32:24 1999
+++ ptex-common/pkg/PLIST	Wed Dec  8 15:01:20 1999
@@ -1,35 +1,43 @@
-libexec/ptex/bin/mktexpk
-libexec/ptex/bin/mktexmf
-libexec/ptex/bin/mktextfm
-libexec/ptex/bin/mktexlsr
-libexec/ptex/bin/kpsewhich
-libexec/ptex/bin/kpsestat
+@comment $NetBSD$
+
 libexec/ptex/bin/access
-libexec/ptex/bin/readlink
-libexec/ptex/bin/mpto
-libexec/ptex/bin/newer
-libexec/ptex/bin/dmp
-libexec/ptex/bin/makempx
-libexec/ptex/bin/tie
 libexec/ptex/bin/bibtex
+libexec/ptex/bin/dmp
 libexec/ptex/bin/dvicopy
 libexec/ptex/bin/dvitomp
 libexec/ptex/bin/dvitype
+libexec/ptex/bin/en-pltotf
+libexec/ptex/bin/en-tftopl
 libexec/ptex/bin/gftodvi
 libexec/ptex/bin/gftopk
 libexec/ptex/bin/gftype
+libexec/ptex/bin/inimf
+libexec/ptex/bin/inimpost
+libexec/ptex/bin/initex
+libexec/ptex/bin/kpsestat
+libexec/ptex/bin/kpsewhich
+libexec/ptex/bin/makempx
 libexec/ptex/bin/mf
 libexec/ptex/bin/mft
+libexec/ptex/bin/mktexlsr
+libexec/ptex/bin/mktexmf
+libexec/ptex/bin/mktexpk
+libexec/ptex/bin/mktextfm
 libexec/ptex/bin/mpost
+libexec/ptex/bin/mpto
+libexec/ptex/bin/newer
 libexec/ptex/bin/patgen
 libexec/ptex/bin/pktogf
 libexec/ptex/bin/pktype
-libexec/ptex/bin/en-pltotf
 libexec/ptex/bin/pooltype
+libexec/ptex/bin/readlink
 libexec/ptex/bin/tangle
 libexec/ptex/bin/tex
-libexec/ptex/bin/en-tftopl
+libexec/ptex/bin/tie
 libexec/ptex/bin/vftovp
+libexec/ptex/bin/virmf
+libexec/ptex/bin/virmpost
+libexec/ptex/bin/virtex
 libexec/ptex/bin/vptovf
 libexec/ptex/bin/weave
 libexec/ptex/lib/libkpathsea.a
@@ -130,19 +138,6 @@
 libexec/ptex/include/kpathsea/win32lib.h
 libexec/ptex/include/kpathsea/xopendir.h
 libexec/ptex/include/kpathsea/xstat.h
-share/fonts/ptex/texmf/web2c/mktex.opt
-share/fonts/ptex/texmf/web2c/mktexdir
-share/fonts/ptex/texmf/web2c/mktexdir.opt
-share/fonts/ptex/texmf/web2c/mktexnam
-share/fonts/ptex/texmf/web2c/mktexnam.opt
-share/fonts/ptex/texmf/web2c/mktexupd
-share/fonts/ptex/texmf/web2c/texmf.cnf
-share/fonts/ptex/texmf/web2c/tex.fmt
-share/fonts/ptex/texmf/web2c/mf.base
-share/fonts/ptex/texmf/web2c/mpost.mem
-share/fonts/ptex/texmf/web2c/tex.pool
-share/fonts/ptex/texmf/web2c/mf.pool
-share/fonts/ptex/texmf/web2c/mp.pool
 share/fonts/ptex/texmf/fontname/adobe.map
 share/fonts/ptex/texmf/fontname/apple.map
 share/fonts/ptex/texmf/fontname/bitstrea.map
@@ -160,15 +155,29 @@
 share/fonts/ptex/texmf/fontname/variant.map
 share/fonts/ptex/texmf/fontname/weight.map
 share/fonts/ptex/texmf/fontname/width.map
-@dirrm libexec/ptex/bin
-@dirrm libexec/ptex/lib
+share/fonts/ptex/texmf/web2c/mf.base
+share/fonts/ptex/texmf/web2c/mf.pool
+share/fonts/ptex/texmf/web2c/mktex.opt
+share/fonts/ptex/texmf/web2c/mktexdir
+share/fonts/ptex/texmf/web2c/mktexdir.opt
+share/fonts/ptex/texmf/web2c/mktexnam
+share/fonts/ptex/texmf/web2c/mktexnam.opt
+share/fonts/ptex/texmf/web2c/mktexupd
+share/fonts/ptex/texmf/web2c/mp.pool
+share/fonts/ptex/texmf/web2c/mpost.mem
+share/fonts/ptex/texmf/web2c/plain.base
+share/fonts/ptex/texmf/web2c/plain.fmt
+share/fonts/ptex/texmf/web2c/plain.mem
+share/fonts/ptex/texmf/web2c/tex.fmt
+share/fonts/ptex/texmf/web2c/tex.pool
+share/fonts/ptex/texmf/web2c/texmf.cnf
+@dirrm share/fonts/ptex/texmf/web2c
+@dirrm share/fonts/ptex/texmf/fontname
 @dirrm libexec/ptex/man/man1
 @dirrm libexec/ptex/man
+@dirrm libexec/ptex/lib
 @dirrm libexec/ptex/info
 @dirrm libexec/ptex/include/kpathsea
 @dirrm libexec/ptex/include
+@dirrm libexec/ptex/bin
 @dirrm libexec/ptex
-@dirrm share/fonts/ptex/texmf/web2c
-@dirrm share/fonts/ptex/texmf/fontname
-@dirrm share/fonts/ptex/texmf
-@dirrm share/fonts/ptex


----- ptex-euc.diff
diff -Nru ptex-euc.orig/Makefile ptex-euc/Makefile
--- ptex-euc.orig/Makefile	Thu Nov  4 14:09:50 1999
+++ ptex-euc/Makefile	Wed Dec  8 15:16:37 1999
@@ -1,3 +1,5 @@
+# $NetBSD$
+
 DISTNAME=	ptex218
 PKGNAME=	ja-ptex-euc-2.1.8
 CATEGORIES=	japanese print
@@ -5,9 +7,10 @@
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} plib-1.4-euc.tar.gz \
 		Makefile.in.patch.txt
 
-MAINTAINER=	
+MAINTAINER=	oishi@ims.ac.jp
+HOMEPAGE=	http://www.ascii.co.jp/pb/ptex/
 
-DEPENDS=	ptex-common:../../japanese/ptex-common
+DEPENDS+=	ja-ptex-common-2.1.8:../../japanese/ptex-common
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -15,28 +18,28 @@
 INST_SUBDIR=	libexec/ptex
 TEXMF_SUBDIR=	share/fonts/ptex
 CONFIGURE_ARGS=	euc
-WRKSRC=		${.CURDIR}/../ptex-common/work/web2c-7.2/web2c/${DISTNAME}
+WRKSRC=		${.CURDIR}/../ptex-common/${WRKDIR_BASENAME}/web2c-7.2/web2c/${DISTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 ALL_TARGET=	default
 
 BINARIES=	iniptex jbibtex pdvitype pltotf ptex tftopl virptex
 
 pre-extract:
-.if !exists(${.CURDIR}/../ptex-common/work/.build_done)
+.if !exists(${.CURDIR}/../ptex-common/${WRKDIR_BASENAME}/.build_done)
 	@(cd ${.CURDIR}/../ptex-common; \
 	  ${SETENV} ${MAKE_ENV} ${MAKE})
 .endif
 
 post-extract:
 	@${RM} -rf ${WRKSRC}
-	@${MV} ${WRKDIR}/${DISTNAME} ${.CURDIR}/../ptex-common/work/web2c-7.2/web2c
+	@${MV} ${WRKDIR}/${DISTNAME} ${.CURDIR}/../ptex-common/${WRKDIR_BASENAME}/web2c-7.2/web2c
 
 pre-patch:
 	@/usr/bin/uudecode -p ${DISTDIR}/${DIST_SUBDIR}/Makefile.in.patch.txt | \
 	  ${PATCH} ${PATCH_DIST_ARGS}
 
 pre-install:
-	tar -C ${PREFIX}/${TEXMF_SUBDIR} \
+	${GTAR} -C ${PREFIX}/${TEXMF_SUBDIR} \
 		-zxf ${DISTDIR}/${DIST_SUBDIR}/plib-1.4-euc.tar.gz
 
 post-install:
@@ -44,12 +47,12 @@
 	@strip ${PREFIX}/${INST_SUBDIR}/bin/${bin}
 .endfor
 	${CAT} ${FILESDIR}/ptex | \
-		sed -e 's#@BINDIR@#${PREFIX}/libexec/ptex/bin#g' | \
-		sed -e 's#@TEXMF@#${PREFIX}/${TEXMF_SUBDIR}#g' \
+		${SED} -e 's#@BINDIR@#${PREFIX}/libexec/ptex/bin#g' | \
+		${SED} -e 's#@TEXMF@#${PREFIX}/${TEXMF_SUBDIR}#g' \
 		> ${PREFIX}/bin/ptex
 	${CHMOD} 755 ${PREFIX}/bin/ptex
 
 pre-clean:
 	@${RM} -rf ${WRKSRC}
 
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/bsd.pkg.mk"
diff -Nru ptex-euc.orig/files/md5 ptex-euc/files/md5
--- ptex-euc.orig/files/md5	Tue Jun 29 18:19:05 1999
+++ ptex-euc/files/md5	Wed Dec  8 11:23:10 1999
@@ -1,3 +1,5 @@
+$NetBSD$
+
 MD5 (ptex/ptex218.tar.gz) = f2cd2e3a0162b4bb8319562ec3331c65
 MD5 (ptex/plib-1.4-euc.tar.gz) = 8913238d89fd1d4a57e9853a91c76c4d
 MD5 (ptex/Makefile.in.patch.txt) = c2fc4ffad2a90eabf7a8f0c645b4cd77
diff -Nru ptex-euc.orig/patches/patch-aa ptex-euc/patches/patch-aa
--- ptex-euc.orig/patches/patch-aa	Thu Nov  4 14:08:42 1999
+++ ptex-euc/patches/patch-aa	Wed Dec  8 11:23:13 1999
@@ -1,3 +1,5 @@
+$NetBSD$
+
 --- Makefile.in.orig	Thu Nov  4 14:06:20 1999
 +++ Makefile.in	Thu Nov  4 14:08:21 1999
 @@ -3,7 +3,7 @@
diff -Nru ptex-euc.orig/pkg/PLIST ptex-euc/pkg/PLIST
--- ptex-euc.orig/pkg/PLIST	Tue Nov  2 16:33:15 1999
+++ ptex-euc/pkg/PLIST	Wed Dec  8 16:14:24 1999
@@ -1,3 +1,5 @@
+@comment $NetBSD$
+
 libexec/ptex/bin/jbibtex
 libexec/ptex/bin/pdvitype
 libexec/ptex/bin/pltotf
@@ -115,3 +117,20 @@
 share/fonts/ptex/texmf/web2c/ptex.fmt
 share/fonts/ptex/texmf/web2c/ptex.pool
 share/fonts/ptex/texmf/web2c/ptex/texmf.cnf
+@dirrm share/fonts/ptex/texmf/web2c/ptex
+@comment share/fonts/ptex/texmf/web2c
+@dirrm share/fonts/ptex/texmf/tex/ptex
+@dirrm share/fonts/ptex/texmf/jbibtex/bst
+@dirrm share/fonts/ptex/texmf/jbibtex/bib
+@dirrm share/fonts/ptex/texmf/jbibtex
+@dirrm share/fonts/ptex/texmf/fonts/tfm/ptex
+@dirrm share/fonts/ptex/texmf/fonts/tfm/ascgrp
+@dirrm share/fonts/ptex/texmf/fonts/source/ptex
+@dirrm share/fonts/ptex/texmf/fonts/source/ascgrp
+@dirrm share/fonts/ptex/texmf/doc/ptex
+@comment share/fonts/ptex/texmf/doc/latex
+@dirrm share/fonts/ptex/texmf/doc/jbibtex/doc-ascii
+@dirrm share/fonts/ptex/texmf/doc/jbibtex
+@comment share/fonts/ptex/texmf/doc/eplain
+@comment share/fonts/ptex/texmf/doc/bibtex
+@dirrm share/fonts/ptex/texmf/doc



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