Remove ja-ptex-bin, which was obsoleted by tex-ptex and pdvipsk.

14 files changed, 2 insertions, 508 deletions

diff --git a/print/Makefile b/print/Makefile
index 00bc83a3474..5ca1cd07402 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.466 2011/02/07 20:10:24 minskim Exp $
+# $NetBSD: Makefile,v 1.467 2011/02/07 20:14:28 minskim Exp $
 #
 
 COMMENT=	Desktop publishing
@@ -62,7 +62,6 @@ SUBDIR+=	img2eps
 SUBDIR+=	imposter
 SUBDIR+=	ja-a2ps
 SUBDIR+=	ja-ptex
-SUBDIR+=	ja-ptex-bin
 SUBDIR+=	ja-ptex-share
 SUBDIR+=	ja-vflib
 SUBDIR+=	ja-vflib-lib
diff --git a/print/ja-ptex-bin/DESCR b/print/ja-ptex-bin/DESCR
deleted file mode 100644
index 159bc1833f8..00000000000
--- a/print/ja-ptex-bin/DESCR
+++ /dev/null
@@ -1,15 +0,0 @@
-pTeX/pLaTeX (Publishing TeX/LaTeX) are Japanese-support versions of
-TeX/LaTeX in respectively and have the following new/improved features
-as well as the one TeX has:
-
-  o it can layout text lines in vertically as well as horizontally, it
-    can even be mixed in the same page.
-  o it supports Japanese line-layout rules (kinsoku).
-  o it generates high quality page by adjusting the spacing between
-    Japanese-Japanese characters, or Japanese-Latin characters.
-  o it layout lines of the Japanese characters by JFM.
-
-pTeX is developed by ASCII Corp. and now distributed under the BSD style
-license.
-
-This package contains executables and few configuration files.
diff --git a/print/ja-ptex-bin/Makefile b/print/ja-ptex-bin/Makefile
deleted file mode 100644
index 11eecc49f28..00000000000
--- a/print/ja-ptex-bin/Makefile
+++ /dev/null
@@ -1,117 +0,0 @@
-# $NetBSD: Makefile,v 1.40 2011/01/13 13:40:12 wiz Exp $
-
-DISTNAME=	ptex-src-${PTEX_VERS}
-PKGNAME=	ja-ptex-bin-${PTEX_VERS}
-PKGREVISION=	6
-CATEGORIES=	print japanese
-MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/ \
-		ftp://ftp.ring.gr.jp/pub/text/TeX/ascii-ptex/tetex/
-DISTFILES+=	${DISTNAME}${EXTRACT_SUFX} # XXX
-DISTFILES+=	${DF_DVIPSK_PATCH}
-DISTFILES+=	mendexk${MENDEXK_VERS}${EXTRACT_SUFX}
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.ascii.co.jp/pb/ptex/
-COMMENT=	Publishing TeX (pTeX)
-
-USE_TOOLS+=	lex
-
-# XXX ${MAKE_VARIABLES} won't be extracted here.  strange...
-SITES.dvipsk-jpatch-p1.7a.tar.gz= \
-		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/dvips/ \
-		ftp://ftp.ring.gr.jp/pub/text/TeX/ascii-ptex/dvips/
-SITES.mendexk2.6d.tar.gz= \
-		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/mendex/ \
-		ftp://ftp.ring.gr.jp/pub/text/TeX/ascii-ptex/mendex/
-
-DEPENDS+=	ja-ptex-share>=2.4nb1:../../print/ja-ptex-share
-DEPENDS+=	teTeX-bin>=3.0nb26:../../print/teTeX3-bin
-DEPENDS+=	teTeX-texmf>=3.0nb10:../../print/teTeX3-texmf
-DEPENDS+=	tex-dvips-[0-9]*:../../print/tex-dvips
-
-.include "../../print/teTeX3-bin/Makefile.common"
-
-PTEX_VERS=		3.1.9
-DVIPSK_PATCH_VERS=	p1.7a
-MENDEXK_VERS=		2.6d
-
-DF_TETEX_BIN= tetex-src-${TETEX_BIN_VERS}${EXTRACT_SUFX}
-DF_DVIPSK_PATCH= dvipsk-jpatch-${DVIPSK_PATCH_VERS}${EXTRACT_SUFX}
-DF_MENDEXK= mendexk${MENDEXK_VERS}${EXTRACT_SUFX}
-
-WRKDIR_!=		cd ${PKGSRCDIR}/print/teTeX3-bin; \
-				${MAKE} show-var VARNAME=WRKDIR
-TETEX_DIR=		${WRKDIR_}/tetex-src-${TETEX_BIN_VERS}
-WRKSRC=			${TETEX_DIR}
-WRKSRC_PTEX=		${WRKSRC}/texk/web2c/${DISTNAME}
-EXTRACT_ONLY=		# none
-MAKE_ENV+=		TRUE=${TRUE}
-
-TEX_TEXMF_DIRS=	${PREFIX}/share/texmf-local
-
-.include "../../print/kpathsea/texmf.mk"
-
-pre-extract:
-	if [ ! -r ${WRKSRC} ]; then \
-		cd ../../print/teTeX3-bin && ${MAKE} patch; \
-	elif [ ! -r ${WRKSRC_PTEX} ]; then \
-		cd ../../print/teTeX3-bin && ${MAKE} clean; ${MAKE} patch; \
-	fi;
-
-post-extract:
-	cd ${WRKDIR_};							\
-		extract_file=${_DISTDIR:Q}/${DF_TETEX_BIN:Q};		\
-		${EXTRACT_CMD}
-	cd ${WRKSRC}/texk/web2c;					\
-		extract_file=${_DISTDIR:Q}/${DISTNAME:Q}${EXTRACT_SUFX}; \
-		${EXTRACT_CMD}
-	cd ${WRKSRC}/texk;						\
-		extract_file=${_DISTDIR:Q}/${DF_DVIPSK_PATCH:Q};	\
-		${EXTRACT_CMD}
-	cd ${WRKSRC}/texk;						\
-		extract_file=${_DISTDIR:Q}/${DF_MENDEXK:Q};		\
-		${EXTRACT_CMD}
-	${RM} -f ${WRKSRC}/texmf
-	${LN} -s ${LOCALBASE}/share/texmf ${WRKSRC}
-	${LN} -s ${LOCALBASE}/share/texmf-local ${WRKSRC}
-
-pre-patch:
-	${PATCH} -d ${WRKSRC}/texk -p0 -s \
-		< ${WRKSRC}/texk/dvipsk-${DVIPSK_PATCH_VERS}.patch
-
-post-patch:
-	${MV} ${WRKSRC}/texk/kpathsea/texmf.in \
-		${WRKSRC}/texk/kpathsea/texmf.in.orig
-	${SED} -e 's,@texmfsite@,${TEXMFSITE},' \
-		-e 's,@texmflocal@,${PREFIX}/share/texmf-local,' \
-		${WRKSRC}/texk/kpathsea/texmf.in.orig > \
-		${WRKSRC}/texk/kpathsea/texmf.in
-
-post-configure:
-	cd ${WRKSRC_PTEX}; ./configure EUC ${PREFIX}/share/texmf-local
-
-do-build:
-	cd ${WRKSRC}/texk/web2c; ${MAKE_PROGRAM}
-	cd ${WRKSRC_PTEX}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
-	cd ${WRKSRC}/texk/dvipsk; ${MAKE_PROGRAM}
-	cd ${WRKSRC}/texk/mendexk${MENDEXK_VERS}; \
-		./configure EUC; ${MAKE_PROGRAM} # This needs libkpathsea.a
-
-do-install:
-	cd ${WRKSRC_PTEX}; \
-		${SETENV} texmflcl=${PREFIX}/share/texmf-local ${MAKE_PROGRAM} install
-	cd ${WRKSRC}/texk/dvipsk; \
-		${SETENV} texmflcl=${PREFIX}/share/texmf-local ${MAKE_PROGRAM} install; \
-	${INSTALL_DATA} psfonts.map ${PREFIX}/share/texmf-local/dvips/base
-	${INSTALL_PROGRAM} ${WRKSRC}/texk/mendexk${MENDEXK_VERS}/mendex \
-		${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/texmf-local/dvips/pstricks
-	cd ${PREFIX}/share/texmf-local/dvips/pstricks; \
-		${CP} ${LOCALBASE}/share/texmf-dist/dvips/pstricks/pst-text.pro .; \
-		${PATCH} < ${WRKSRC}/texk/PSTricks.patch; \
-		${RM} -f pst-text.pro.orig
-
-pre-clean:
-	cd ../../print/teTeX3-bin && ${MAKE} clean
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/print/ja-ptex-bin/PLIST b/print/ja-ptex-bin/PLIST
deleted file mode 100644
index 0549f867b02..00000000000
--- a/print/ja-ptex-bin/PLIST
+++ /dev/null
@@ -1,31 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2009/04/10 20:07:28 minskim Exp $
-bin/mendex
-bin/pdvips
-bin/pdvitype
-bin/pjbibtex
-bin/platex
-bin/ppltotf
-bin/ptex
-bin/ptftopl
-share/texmf-local/dvips/base/color.pro
-share/texmf-local/dvips/base/crop.pro
-share/texmf-local/dvips/base/finclude.pro
-share/texmf-local/dvips/base/hps.pro
-share/texmf-local/dvips/base/psfonts.map
-share/texmf-local/dvips/base/special.pro
-share/texmf-local/dvips/base/tex.pro
-share/texmf-local/dvips/base/texc.pro
-share/texmf-local/dvips/base/texps.pro
-share/texmf-local/dvips/config/config.ps
-share/texmf-local/dvips/pstricks/pst-text.pro
-share/texmf-local/fonts/map/dvips/ptex/psfonts_jp.map
-share/texmf-local/web2c/platex-euc.fmt
-share/texmf-local/web2c/platex-jis.fmt
-share/texmf-local/web2c/platex-sjis.fmt
-share/texmf-local/web2c/platex.fmt
-share/texmf-local/web2c/ptex-euc.fmt
-share/texmf-local/web2c/ptex-jis.fmt
-share/texmf-local/web2c/ptex-sjis.fmt
-share/texmf-local/web2c/ptex.fmt
-share/texmf-local/web2c/ptex.pool
-share/texmf-local/web2c/texmf.cnf
diff --git a/print/ja-ptex-bin/distinfo b/print/ja-ptex-bin/distinfo
deleted file mode 100644
index dca18a10171..00000000000
--- a/print/ja-ptex-bin/distinfo
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: distinfo,v 1.6 2008/12/09 19:49:22 minskim Exp $
-
-SHA1 (teTeX/dvipsk-jpatch-p1.7a.tar.gz) = 1b4051fe443fcffe2b12199fcf2df01550c57f32
-RMD160 (teTeX/dvipsk-jpatch-p1.7a.tar.gz) = f9c1a12b17e3d0c904bfe0bb145f84b59eb74eff
-Size (teTeX/dvipsk-jpatch-p1.7a.tar.gz) = 26669 bytes
-SHA1 (teTeX/mendexk2.6d.tar.gz) = 462416b4e6c20cfdd8babad25e99c0468a048eb0
-RMD160 (teTeX/mendexk2.6d.tar.gz) = 79aa7aadb78c1db1fdb0247d2bb50fece9a37b7c
-Size (teTeX/mendexk2.6d.tar.gz) = 30503 bytes
-SHA1 (teTeX/ptex-src-3.1.9.tar.gz) = 816ca1bb43f8835a81a8804a3d6068f1710984bf
-RMD160 (teTeX/ptex-src-3.1.9.tar.gz) = 05aca5199437a5d5a99d531f33d04f2a472ca2f7
-Size (teTeX/ptex-src-3.1.9.tar.gz) = 131943 bytes
-SHA1 (patch-aa) = 622575507406aeda1c98062e98e234053a55923d
-SHA1 (patch-ab) = 7015dfdaa6cbaf50a91afd5682231b30a9f17d22
-SHA1 (patch-ac) = 12cf26c6fe254fc4dc1ca1414429935d7c45e207
-SHA1 (patch-ad) = 98e6edf48ff971ab9864336678a59afa44c92126
-SHA1 (patch-af) = c3d591ab2b9917c7a06355618b96662fe6a7b375
-SHA1 (patch-ai) = 4ad131be8273ff52ad0f3778a0b5bf3370f698eb
-SHA1 (patch-ak) = 2f0d690023d5dac50e99321e240992870f32304b
-SHA1 (patch-al) = 1755fe12a2e336cca619e8b61954b6205e4c3390
diff --git a/print/ja-ptex-bin/patches/patch-aa b/print/ja-ptex-bin/patches/patch-aa
deleted file mode 100644
index b0d58b0d13d..00000000000
--- a/print/ja-ptex-bin/patches/patch-aa
+++ /dev/null
@@ -1,134 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/11/27 14:32:24 hira Exp $
-
---- texk/web2c/ptex-src-3.1.9/Makefile.in.orig	2005-03-07 15:30:44.000000000 +0900
-+++ texk/web2c/ptex-src-3.1.9/Makefile.in	2006-11-27 19:12:16.000000000 +0900
-@@ -5,12 +5,18 @@
- 
- default: programs formats
- 
--programs=ptex tftopl pltotf pdvitype jbibtex
-+programs=ptex ptftopl ppltotf pdvitype pjbibtex
- euc-formats=ptex-euc.fmt platex-euc.fmt
- sjis-formats=ptex-sjis.fmt platex-sjis.fmt
- 
- ac_include ../../make/paths.mk
- 
-+#
-+texmflcl = @texmflocal@
-+web2c_lcl_dir = $(texmflcl)/web2c
-+fmt_lcl_dir = $(web2c_lcl_dir)
-+texpool_lcl_dir = $(web2c_lcl_dir)
-+
- # Used for triptrap.
- DIFF = diff
- DIFFFLAGS =
-@@ -94,6 +100,9 @@
- 	$(srcdir)/tie -c ptex.ch ptex.web ptex-base.ch
- 
- ### TFtoPL
-+ptftopl: tftopl
-+	rm -f pftopl
-+	$(LN) tftopl ptftopl
- tftopl: tftopl.o $(plib_o) $(kpathsea) $(proglib)
- 	$(kpathsea_link) tftopl.o $(plib_o) $(LOADLIBES)
- tftopl.o: tftopl.c kanji.h ptexhelp.h
-@@ -105,6 +114,9 @@
- 
- 
- ### PLtoTF
-+ppltotf: pltotf
-+	rm -f ppltotf
-+	$(LN) pltotf ppltotf
- pltotf: pltotf.o $(plib_o) $(kpathsea) $(proglib)
- 	$(kpathsea_link) pltotf.o $(plib_o) $(LOADLIBES)
- pltotf.o: pltotf.c kanji.h ptexhelp.h
-@@ -126,6 +138,9 @@
- 	$(LN) $(srcdir)/dvitype.web pdvitype.web
- 
- ### jBibTeX
-+pjbibtex: jbibtex
-+	rm -f pjbibtex
-+	$(LN) jbibtex pjbibtex
- jbibtex: jbibtex.o jbibextra.o $(plib_o) $(kpathsea) $(proglib)
- 	$(kpathsea_link) jbibtex.o jbibextra.o $(plib_o) $(LOADLIBES)
- jbibextra.o: jbibextra.c jbibd.h kanji.h ptexhelp.h
-@@ -168,11 +183,16 @@
- texmf.cnf: $(kpathsea_dir)/texmf.cnf
- 	$(SHELL) $(thisdir)/mkconf $(kpathsea_dir)/texmf.cnf > texmf.cnf
- 
--dumpenv = TEXMFCNF=$(thisdir)
-+#dumpenv = TEXMFCNF=$(thisdir)
-+newtexmf = $(srcdir)/../../texmf
-+newtexmflcl = $(srcdir)/../../texmf-local
-+texin = $(srcdir):{$(newtexmf),$(newtexmflcl)}/ptex//
-+texfonts = {$(newtexmf),$(newtexmflcl)}/fonts/tfm/ptex//
-+dumpenv = TEXMFCNF=../../kpathsea TEXINPUTS=.:$(texin): TEXFONTS=$(texfonts):
- 
- ptex-euc.fmt: ptex texmf.cnf
- 	$(dumpenv) $(MAKE) progname=ptex files="ptex.tex min10.tfm" prereq-check
--	$(dumpenv) ./ptex --ini --kanji=euc --progname=ptex --jobname=ptex-euc \\input ptex.tex \\dump </dev/null
-+	$(dumpenv) ./ptex --ini --kanji=euc --progname=ptex --jobname=ptex-euc \\input ptex.tex \\dump </dev/null || ${TRUE} # XXX
- 
- ptex-sjis.fmt: ptex texmf.cnf
- 	$(dumpenv) $(MAKE) progname=ptex files="ptex.tex min10.tfm" prereq-check
-@@ -180,7 +200,7 @@
- 
- platex-euc.fmt: ptex texmf.cnf
- 	$(dumpenv) $(MAKE) progname=platex files="platex.ltx" prereq-check
--	$(dumpenv) ./ptex --ini --kanji=euc --progname=platex --jobname=platex-euc \\input platex.ltx </dev/null
-+	$(dumpenv) ./ptex --ini --kanji=euc --progname=platex --jobname=platex-euc \\input platex.ltx </dev/null || ${TRUE} # XXX
- 
- platex-sjis.fmt: ptex texmf.cnf
- 	$(dumpenv) $(MAKE) progname=platex files="platex.ltx" prereq-check
-@@ -207,7 +227,6 @@
- 
- # 
- install: install-exec install-data
--	$(top_srcdir)/kpathsea/mktexlsr
- install-exec:: install-links
- install-data:: install-formats
- 
-@@ -216,6 +235,8 @@
- 	$(SHELL) $(top_srcdir)/mkinstalldirs $(bindir)
- $(web2cdir)::
- 	$(SHELL) $(top_srcdir)/mkinstalldirs $(web2cdir)
-+$(fmt_lcl_dir)::
-+	$(SHELL) $(top_srcdir)/mkinstalldirs $(fmt_lcl_dir)
- 
- # The actual binary executables and pool files.
- install-programs: $(programs) $(bindir)
-@@ -226,23 +247,24 @@
- 	cd $(bindir) && (rm -f iniptex virptex platex; $(LN) ptex platex)
- 
- # Always do plain.*, so examples from the TeXbook (etc.) will work.
--install-formats: $(formats) $(web2cdir)
--	for f in $(formats); do $(INSTALL_DATA) $$f $(web2cdir)/$$f; done
--	cd $(web2cdir) && (rm -f ptex-jis.fmt platex-jis.fmt ;\
-+install-formats: $(formats) $(fmt_lcl_dir)
-+	for f in $(formats); do $(INSTALL_DATA) $$f $(fmt_lcl_dir)/$$f; done
-+	cd $(fmt_lcl_dir) && (rm -f ptex-jis.fmt platex-jis.fmt ;\
- 		$(LN) ptex-euc.fmt ptex-jis.fmt ;\
- 		$(LN) platex-euc.fmt platex-jis.fmt)
--	cd $(web2cdir) && (rm -f ptex.fmt platex.fmt ;\
-+	cd $(fmt_lcl_dir) && (rm -f ptex.fmt platex.fmt ;\
- 		$(LN) ptex-$(configkcode).fmt ptex.fmt ;\
- 		$(LN) platex-$(configkcode).fmt platex.fmt )
- 
- # Auxiliary files.
- install-data::
--	$(SHELL) $(top_srcdir)/mkinstalldirs $(web2cdir)
--	$(INSTALL_DATA) ptex.pool $(web2cdir)/ptex.pool
--	if [ -f $(web2cdir)/texmf.cnf ]; then \
--		mv -f $(web2cdir)/texmf.cnf $(web2cdir)/texmf.cnf.orig ;\
--	else true; fi
--	$(INSTALL_DATA) texmf.cnf $(web2cdir)/texmf.cnf
-+	$(SHELL) $(top_srcdir)/mkinstalldirs \
-+		$(texpool_lcl_dir) $(web2c_lcl_dir)
-+	$(INSTALL_DATA) ptex.pool $(texpool_lcl_dir)/ptex.pool
-+#	if [ -f $(web2cdir)/texmf.cnf ]; then \
-+#		mv -f $(web2cdir)/texmf.cnf $(web2cdir)/texmf.cnf.orig ;\
-+#	else true; fi
-+	$(INSTALL_DATA) texmf.cnf $(web2c_lcl_dir)/texmf.cnf
- # 
- # Testing, including triptrap. The `x' filenames are for output.
- check: pltotf-check tftopl-check pooltype-check ptex-check 
diff --git a/print/ja-ptex-bin/patches/patch-ab b/print/ja-ptex-bin/patches/patch-ab
deleted file mode 100644
index a55aa85eb6e..00000000000
--- a/print/ja-ptex-bin/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2006/06/24 10:52:23 hira Exp $
-
---- texk/web2c/ptex-src-3.1.9/configure.orig	2006-05-10 15:14:20.000000000 +0900
-+++ texk/web2c/ptex-src-3.1.9/configure	2006-05-10 15:14:20.000000000 +0900
-@@ -5,7 +5,7 @@
- configopt=
- 
- printUsage () {
--	echo "Usage: $progname {EUC|JIS|SJIS}"
-+	echo "Usage: $progname {EUC|JIS|SJIS} texmf_local_dir"
- 	exit 1
- }
- 
-@@ -27,6 +27,7 @@
- CONFIGSED=config.sed 
- echo "s%@configopt@%$*%g" > $CONFIGSED
- echo "s%@TERMCODE@%$termcode%g" >> $CONFIGSED
-+echo "s%@texmflocal@%$2%g" >> $CONFIGSED
- case $termcode in
-   "SJIS") echo "s%@configkcode@%sjis%g" >> $CONFIGSED ;;
-   "JIS")  echo "s%@configkcode@%jis%g" >> $CONFIGSED ;;
diff --git a/print/ja-ptex-bin/patches/patch-ac b/print/ja-ptex-bin/patches/patch-ac
deleted file mode 100644
index ec94aae86a4..00000000000
--- a/print/ja-ptex-bin/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2008/12/09 19:49:22 minskim Exp $
-
---- texk/make/paths.mk.orig	2006-05-10 15:15:03.000000000 +0900
-+++ texk/make/paths.mk	2006-05-10 15:15:18.000000000 +0900
-@@ -47,7 +47,7 @@
- texmf = @texmfmain@
- 
- # The directory used by varfonts.
--vartexfonts = /var/tmp/texfonts
-+vartexfonts = /var/lib/texmf/fonts
- 
- # Regular input files.
- texinputdir = $(texmf)/tex
diff --git a/print/ja-ptex-bin/patches/patch-ad b/print/ja-ptex-bin/patches/patch-ad
deleted file mode 100644
index 7dbc7158434..00000000000
--- a/print/ja-ptex-bin/patches/patch-ad
+++ /dev/null
@@ -1,84 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2006/11/12 08:51:54 hira Exp $
-
---- texk/dvipsk/Makefile.in.orig	2006-11-12 17:09:31.000000000 +0900
-+++ texk/dvipsk/Makefile.in	2006-11-12 17:21:04.000000000 +0900
-@@ -19,6 +19,7 @@
- ac_include ../make/cross.mk
- ac_include ../make/texi.mk
- prog_cflags = -DUNIX -DKPATHSEA -DNeedFunctionPrototypes -DSHIFTLOWCHARS
-+psheaderdir = $(texmflcl)/dvips
- 
- # The `t[mp]-' business is so that we don't create an empty .pro file,
- # if running squeeze fails for some reason.  A dependency on squeeze
-@@ -37,13 +38,16 @@
- pprescan.o papersiz.o color.o bbox.o hps.o t1part.o
- 
- program = dvips
--programs = afm2tfm $(program)
-+programs = pdvips
- 
- 
- default all: $(programs) $(prologues) dvips.info
- 
- $(program): $(kpathsea) $(objects)
- 	$(kpathsea_link) $(objects) $(LOADLIBES) 
-+pdvips: $(program)
-+	rm -f pdvips
-+	ln $(program) pdvips
- afm2tfm: $(kpathsea) afm2tfm.o
- 	$(kpathsea_link) afm2tfm.o $(LOADLIBES) 
- # Omit LOADLIBES since no need to dynamically link with kpathsea.
-@@ -87,11 +91,8 @@
- install-exec: all
- 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
- 	for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
--	rm -f $(bindir)/o$(program)
--	ln -s $(program) $(bindir)/o$(program)
- uninstall-exec:
- 	for p in $(programs); do rm -f $(bindir)/$$p; done
--	rm -f $(bindir)/o$(program)
- 
- install-data: $(program).info
- 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) $(infodir) $(psheaderdir)/base
-@@ -110,31 +111,18 @@
- #	  $(INSTALL_DATA) $(srcdir)/psfonts.map $(psheaderdir)/base/psfonts.map; \
- #        else true; fi
- # psfonts_jp.map.
--	$(INSTALL) -d $(texmf)/fonts/map/dvips/ptex
--	$(INSTALL_DATA) $(srcdir)/psfonts_jp.map $(texmf)/fonts/map/dvips/ptex/psfonts_jp.map
-+	$(INSTALL) -d $(texmflcl)/fonts/map/dvips/ptex
-+	$(INSTALL_DATA) $(srcdir)/psfonts_jp.map $(texmflcl)/fonts/map/dvips/ptex/psfonts_jp.map
- # Info files.
--	cd $(srcdir) && for i in $(program).i*; do \
--	  $(INSTALL_DATA) $$i $(infodir)/$$i; done
- # Man pages.
--	$(INSTALL_DATA) $(srcdir)/$(program).1 $(man1dir)/$(program).$(manext)
--	rm -f $(man1dir)/o$(program).$(manext)
--	ln -s $(program).$(manext) $(man1dir)/o$(program).$(manext)
--	$(INSTALL_DATA) $(srcdir)/afm2tfm.1 $(man1dir)/afm2tfm.$(manext)
- # TeX macros.
- #	cd $(srcdir)/tex && for m in *.tex; do \
- #	  $(INSTALL_DATA) $$m $(dvips_plain_macrodir)/$$m; done
- 	$(POST_INSTALL)
--	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
--	  install-info --info-dir=$(infodir) $(infodir)/$(program).info; \
--	else true; fi
- 
- uninstall-data:
- 	$(PRE_UNINSTALL)
--	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
--	  install-info --delete --info-dir=$(infodir) $(infodir)/$(program).info; \
--	else true; fi
- 	$(NORMAL_UNINSTALL)
--	rm -f $(infodir)/dvips.i*
- #	for h in $(prologues); do rm -f $(psheaderdir)/base/$$h; done
- #	cd $(srcdir)/reencode && for e in *.enc; do rm -f $(psheaderdir)/base/$$e; \
- #	  done
-@@ -146,7 +134,6 @@
- #        else true; fi
- 	rm -f $(texmf)/fonts/map/dvips/ptex/psfonts_jp.map
- 	rmdir $(texmf)/fonts/map/dvips/ptex
--	rm -f $(man1dir)/dvips.$(manext) $(man1dir)/afm2tfm.$(manext)
- 
- distname = dvipsk
- program_files = *.texi *.info* *.lpro psfonts.map *.1 texc.script \
diff --git a/print/ja-ptex-bin/patches/patch-af b/print/ja-ptex-bin/patches/patch-af
deleted file mode 100644
index 83db7632e99..00000000000
--- a/print/ja-ptex-bin/patches/patch-af
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-af,v 1.2 2006/06/24 10:52:23 hira Exp $
-
---- texk/web2c/Makefile.in.orig	2005-02-06 19:56:56.000000000 +0900
-+++ texk/web2c/Makefile.in	2006-05-10 15:19:59.000000000 +0900
-@@ -816,9 +816,9 @@
- 	$(dumpenv) $(MAKE) progname=tex files="plain.tex cmr10.tfm" prereq-check
- 	$(dumpenv) ./tex --progname=tex --jobname=tex --ini \\input plain \\dump </dev/null
- 
--#latex.fmt: tex
--#	$(dumpenv) $(MAKE) progname=latex files="latex.ltx" prereq-check
--#	$(dumpenv) ./tex --progname=latex --jobname=latex --ini \\input latex.ltx </dev/null
-+latex.fmt: tex
-+	$(dumpenv) $(MAKE) progname=latex files="latex.ltx" prereq-check
-+	$(dumpenv) ./tex --progname=latex --jobname=latex --ini \\input latex.ltx </dev/null || ${TRUE} # XXX
- 
- olatex.fmt: tex
- 	$(dumpenv) $(MAKE) progname=olatex files="latex.ltx" prereq-check
diff --git a/print/ja-ptex-bin/patches/patch-ai b/print/ja-ptex-bin/patches/patch-ai
deleted file mode 100644
index 1dc15e21869..00000000000
--- a/print/ja-ptex-bin/patches/patch-ai
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2006/06/24 10:52:23 hira Exp $
-
---- texk/kpathsea/texmf.in.orig	2006-05-10 15:20:38.000000000 +0900
-+++ texk/kpathsea/texmf.in	2006-05-10 15:22:46.000000000 +0900
-@@ -64,7 +64,10 @@
- % A place for local additions to a "standard" texmf tree.
- % This tree is not used for local configuration maintained by
- % texconfig, it uses TEXMFCONFIG below.
--TEXMFLOCAL = @texmf@-local
-+TEXMFLOCAL = @texmflocal@
-+
-+% Add site-specific configurations as well as above.
-+TEXMFSITE = @texmfsite@
- 
- % TEXMFSYSVAR, where texconfig-sys stores variable runtime data.
- % With teTeX-3.0 or later, this must be set.
-@@ -111,7 +114,7 @@
- %
- % For texconfig to work properly, TEXMFCONGIG and TEXMFVAR should be named
- % explicitly and before all other trees.
--TEXMF = {!!$TEXMFCONFIG,!!$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
-+TEXMF = {!!$TEXMFCONFIG,!!$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFSITE,!!$TEXMFLOCAL,!!$TEXMFMAIN,!!$TEXMFDIST}
- 
- % The system trees.  These are the trees that are shared by all the users.
- SYSTEXMF = $TEXMFLOCAL;$TEXMFMAIN;$TEXMFDIST
diff --git a/print/ja-ptex-bin/patches/patch-ak b/print/ja-ptex-bin/patches/patch-ak
deleted file mode 100644
index 82045711167..00000000000
--- a/print/ja-ptex-bin/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2006/06/24 10:52:23 hira Exp $
-
---- texk/configure.orig	2005-02-07 03:27:03.000000000 +0900
-+++ texk/configure	2006-05-10 15:24:14.000000000 +0900
-@@ -6595,7 +6595,7 @@
- done
- 
- 
--subdirs="kpathsea web2c $ESUBDIRS"
-+subdirs="kpathsea web2c web2c/ptex-${PTEX_VERS} mendexk${MENDEXK_VERS} $ESUBDIRS"
- 
- 
- trap '' 1 2 15
diff --git a/print/ja-ptex-bin/patches/patch-al b/print/ja-ptex-bin/patches/patch-al
deleted file mode 100644
index 3a05ed18468..00000000000
--- a/print/ja-ptex-bin/patches/patch-al
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-al,v 1.1 2006/06/24 10:52:23 hira Exp $
-
---- texk/web2c/ptex-src-3.1.9/mkconf.orig	2006-05-11 10:57:32.000000000 +0900
-+++ texk/web2c/ptex-src-3.1.9/mkconf	2006-05-11 11:05:52.000000000 +0900
-@@ -46,8 +46,8 @@
- TEXINPUTS.ptex = $ptex_inputs\
- 
- /^% BibTeX bibliographies and style files./ a\
--BIBINPUTS.jbibtex = .;$TEXMF/{jbibtex,bibtex}/bib//\
--BSTINPUTS.jbibtex = .;$TEXMF/{jbibtex,bibtex}/bst//\
-+BIBINPUTS.pjbibtex = .;$TEXMF/{jbibtex,bibtex}/bib//\
-+BSTINPUTS.pjbibtex = .;$TEXMF/{jbibtex,bibtex}/bst//\
- ' | uniq
- 
- ### EOT ###
diff --git a/print/teTeX3-bin/Makefile.common b/print/teTeX3-bin/Makefile.common
index 985eed4810f..43b7145e02b 100644
--- a/print/teTeX3-bin/Makefile.common
+++ b/print/teTeX3-bin/Makefile.common
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile.common,v 1.13 2011/01/12 10:46:13 wiz Exp $
+# $NetBSD: Makefile.common,v 1.14 2011/02/07 20:14:29 minskim Exp $
 # used by print/teTeX3-bin/Makefile
-# used by print/ja-ptex-bin/Makefile
 
 TETEX_BIN_VERS=		3.0
 DIST_SUBDIR=		teTeX