4 files changed, 8 insertions, 29 deletions
diff --git a/japanese/ptex/Makefile b/japanese/ptex/Makefile
index b9e316f4c0c8..06203c513d49 100644
--- a/japanese/ptex/Makefile
+++ b/japanese/ptex/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ptex
 PORTVERSION=	3.1.2
+PORTREVISION=	1
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/
 PKGNAMEPREFIX=	ja-
@@ -48,7 +49,9 @@ post-extract:
 	@${MV} ${WRKDIR}/${SRCDIR} ${WRKDIRPREFIX}${.CURDIR}/../ptex-base/work/tetex-src-${TETEX_VERSION}/texk/web2c
 
 pre-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+	@if [ -L ${PREFIX}/share/texmf/web2c/texmf.cnf ]; then \
+	  ${RM} ${PREFIX}/share/texmf/web2c/texmf.cnf; \
+	  fi
 
 post-install:
 .for bin in ${BINARIES}
diff --git a/japanese/ptex/pkg-deinstall b/japanese/ptex/pkg-deinstall
deleted file mode 100644
index c432da27777a..000000000000
--- a/japanese/ptex/pkg-deinstall
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# Preserve files installed by ptex-common, or other package/application.
-#
-files="${PKG_PREFIX}/bin/pltotf ${PKG_PREFIX}/bin/tftopl ${PKG_PREFIX}/share/texmf/web2c/texmf.cnf ${PKG_PREFIX}/share/texmf/ls-R"
-
-if [ "$2" != "POST-DEINSTALL" ]; then
-  exit;
-fi
-
-for f in ${files}; do
-  if [ -f $f.old ]; then
-    mv $f.old $f
-  fi
-done
diff --git a/japanese/ptex/pkg-install b/japanese/ptex/pkg-install
deleted file mode 100644
index 3c64b806ae06..000000000000
--- a/japanese/ptex/pkg-install
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# Preserve files installed by ptex-common, or other package/application.
-#
-files="${PKG_PREFIX}/bin/pltotf ${PKG_PREFIX}/bin/tftopl ${PKG_PREFIX}/share/texmf/web2c/texmf.cnf ${PKG_PREFIX}/share/texmf/ls-R"
-
-if [ "$2" != "PRE-INSTALL" ]; then
-  exit;
-fi
-
-for f in ${files}; do
-    if [ -f $f ]; then
-      mv $f $f.old
-      fi
-    done
diff --git a/japanese/ptex/pkg-plist b/japanese/ptex/pkg-plist
index bef11b998420..d470b9bb0109 100644
--- a/japanese/ptex/pkg-plist
+++ b/japanese/ptex/pkg-plist
@@ -4,6 +4,7 @@ bin/pdvitype
 bin/platex
 bin/pltotf
 bin/ptex
+bin/tftopl
 bin/virptex
 share/texmf/web2c/platex-euc.fmt
 share/texmf/web2c/platex-jis.fmt
@@ -16,3 +17,6 @@ share/texmf/web2c/ptex.fmt
 share/texmf/web2c/ptex.pool
 share/texmf/web2c/texmf.cnf
 @exec %D/bin/mktexlsr %D/share/texmf
+@unexec %D/bin/mktexlsr %D/share/texmf
+@exec if [ -L %D/share/texmf/web2c/texmf.cnf ]; then /bin/rm %D/share/texmf/web2c/texmf.cnf ; fi
+@unexec if [ ! -e %D/share/texmf/web2c/texmf.cnf -a -f %D/share/texmf/web2c/texmf.cnf-teTeX-dist ]; then /bin/ln -fs %D/share/texmf/web2c/texmf.cnf-teTeX-dist %D/share/texmf/web2c/texmf.cnf ; fi