3 files changed, 65 insertions, 20 deletions

diff --git a/print/dvipsk-tetex/Makefile b/print/dvipsk-tetex/Makefile
index 78a1259d0a33..e1c195cc9474 100644
--- a/print/dvipsk-tetex/Makefile
+++ b/print/dvipsk-tetex/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	dvipsk-tetex
 PORTVERSION=	5.92b
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://sunsite.informatik.rwth-aachen.de/pub/comp/tex/teTeX/2.0/distrib/ \
 		${MASTER_SITE_TEX_CTAN}
@@ -16,13 +17,23 @@ DIST_SUBDIR=	teTeX
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Convert a TeX DVI file to PostScript
 
-BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX
-RUN_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX
+BUILD_DEPENDS=	tetex-modesw:${PORTSDIR}/print/tex-texmflocal \
+		${LOCALBASE}/${TEXMF}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
+		mktexlsr:${PORTSDIR}/print/teTeX-base
+RUN_DEPENDS=	tetex-modesw:${PORTSDIR}/print/tex-texmflocal \
+		${LOCALBASE}/${TEXMF}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
+		mktexlsr:${PORTSDIR}/print/teTeX-base
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		wwwcore.1:${PORTSDIR}/www/libwww \
 		t1.5:${PORTSDIR}/devel/t1lib
 
-PLIST_SUB=	TEXMFDIR=${TEXMFDIR} MKTEXLSR=${MKTEXLSR}
+PLIST_SUB=	TEXMF=${TEXMF} MKTEXLSR=${MKTEXLSR}
+
+BUILD_WRKSRC_A=	${WRKDIR}/${DISTNAME}/texk/dvipsk
+INSTALL_WRKSRC_A=	${WRKDIR}/${DISTNAME}/texk/dvipsk
+BUILD_WRKSRC_B=	${WRKDIR}/${DISTNAME}/texk/odvipsk
+INSTALL_WRKSRC_B=	${WRKDIR}/${DISTNAME}/texk/odvipsk
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--disable-multiplatform \
@@ -34,27 +45,42 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--with-pnglib-include=${LIBPNG_PREFIX}/include \
 		--with-system-t1lib --with-t1lib-libdir=${LIBT1_PREFIX}/lib \
 		--with-t1lib-include=${LIBT1_PREFIX}/include
-CONFLICTS=	ja-ptex-base* ja-*dvips* *dvips-*
+CONFLICTS=	*-teTeX* ja-ptex-base* *-*dvips* *dvips-*
 
 MAN1=		dvips.1 afm2tfm.1
 INFO=		dvips
 
 TETEX_VER=	2.0.2
 MKTEXLSR?=	${LOCALBASE}/bin/mktexlsr
-TEXMFDIR?=	share/texmf
+TEXMF?=		share/texmf
 LIBPNG_PREFIX?=	${LOCALBASE}
 LIBWWW_PREFIX?=	${LOCALBASE}
 LIBT1_PREFIX?=	${LOCALBASE}
 
+PKGINSTALL=	${WRKDIR}/pkg-install.sh
+PKGDEINSTALL=	${WRKDIR}/pkg-install.sh
+TETEX_MODESW=	${PREFIX}/bin/tetex-modesw
+PKGINSTALL_SUB=	TETEX_MODESW=${TETEX_MODESW} \
+		MKTEXLSR=${MKTEXLSR}
+
+pre-build:
+	${SED} ${PKGINSTALL_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+		< ${FILESDIR}/pkg-install.in > ${PKGINSTALL}
+	${CHMOD} 0755 ${PKGINSTALL}
+
 do-build:
-	cd ${WRKSRC}/texk/dvipsk &&\
-		${SETENV} ${MAKE_ENV} ${MAKE} ${ALL_TARGET}
+.for W in A B
+	@(cd ${BUILD_WRKSRC_${W}} &&\
+		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+.endfor
 
 do-install:
-	cd ${WRKSRC}/texk/dvipsk &&\
-		${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET}
+.for W in A B
+	@(cd ${INSTALL_WRKSRC_${W}} &&\
+		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+.endfor
 
 post-install:
-	${MKTEXLSR}
+	@${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/print/dvipsk-tetex/files/pkg-install.in b/print/dvipsk-tetex/files/pkg-install.in
new file mode 100644
index 000000000000..be92a3c27cab
--- /dev/null
+++ b/print/dvipsk-tetex/files/pkg-install.in
@@ -0,0 +1,20 @@
+#!/bin/sh
+# $FreeBSD$
+
+GREP=/usr/bin/grep
+SED=/usr/bin/sed
+MODE=default
+
+MKTEXLSR=%%MKTEXLSR%%
+TETEX_MODESW=%%TETEX_MODESW%%
+
+case $2 in
+POST-INSTALL)
+	${TETEX_MODESW} ${MODE} dvips force
+	${MKTEXLSR}
+	;;
+DEINSTALL)
+	${TETEX_MODESW} uninstall dvips
+	${MKTEXLSR}
+	;;
+esac
diff --git a/print/dvipsk-tetex/pkg-plist b/print/dvipsk-tetex/pkg-plist
index 68d9af4770b5..8e86f72e369b 100644
--- a/print/dvipsk-tetex/pkg-plist
+++ b/print/dvipsk-tetex/pkg-plist
@@ -1,13 +1,12 @@
 @comment $FreeBSD$
 bin/afm2tfm
 bin/dvips
-%%TEXMFDIR%%/dvips/base/tex.pro
-%%TEXMFDIR%%/dvips/base/texps.pro
-%%TEXMFDIR%%/dvips/base/texc.pro
-%%TEXMFDIR%%/dvips/base/special.pro
-%%TEXMFDIR%%/dvips/base/finclude.pro
-%%TEXMFDIR%%/dvips/base/color.pro
-%%TEXMFDIR%%/dvips/base/crop.pro
-%%TEXMFDIR%%/dvips/base/hps.pro
-@exec %%MKTEXLSR%%
-@unexec %%MKTEXLSR%%
+bin/odvips
+%%TEXMF%%/dvips/base/color.pro
+%%TEXMF%%/dvips/base/crop.pro
+%%TEXMF%%/dvips/base/finclude.pro
+%%TEXMF%%/dvips/base/hps.pro
+%%TEXMF%%/dvips/base/special.pro
+%%TEXMF%%/dvips/base/tex.pro
+%%TEXMF%%/dvips/base/texc.pro
+%%TEXMF%%/dvips/base/texps.pro