- Update to 22.84.8.

- Remove tetex-modesw dependency.

6 files changed, 62 insertions, 44 deletions

diff --git a/print/xdvik/Makefile b/print/xdvik/Makefile
index a8fa66a49aa3..2410038a1be4 100644
--- a/print/xdvik/Makefile
+++ b/print/xdvik/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	xdvik
-PORTVERSION=	22.78
-PORTREVISION=	2
+PORTVERSION=	22.84.8
+PORTREVISION=	0
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xdvi
@@ -16,42 +16,57 @@ PKGNAMESUFFIX=	-tetex
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	DVI Previewer(kpathsearch) for X
 
-BUILD_DEPENDS=	tetex-modesw:${PORTSDIR}/print/tex-texmflocal \
+BUILD_DEPENDS=	${TEXMFLOCAL_LSR}:${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 \
+RUN_DEPENDS=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
 		${LOCALBASE}/${TEXMF}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
 		mktexlsr:${PORTSDIR}/print/teTeX-base
 LIB_DEPENDS=	t1.5:${PORTSDIR}/devel/t1lib
 
 USE_XLIB=	yes
 USE_GMAKE=	yes
+USE_MOTIF=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX} \
-		--with-system-t1lib --with-t1lib-libdir=${LIBT1_PREFIX}/lib \
-		--with-t1lib-include=${LIBT1_PREFIX}/include
+CONFIGURE_ARGS= --with-system-t1lib \
+		--with-t1lib-libdir=${LIBT1_PREFIX}/lib \
+		--with-t1lib-include=${LIBT1_PREFIX}/include \
+		--disable-multiplatform
 CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 		INSTALL_DATA="${INSTALL_DATA}" \
 		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 		CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
 INSTALL_WRKSRC=	${WRKSRC}/texk/xdvik
 
-PLIST_SUB=	TEXMF=${TEXMF} MKTEXLSR=${MKTEXLSR}
+PLIST_SUB=	TEXMF=${TEXMF}
 CONFLICTS=	xdvi-* *-xdvi*
 
-MAN1=		xdvi.1 t1mapper.1 xdvizilla.1
+MAN1=		xdvi.1 xdvizilla.1
 
 TEXMF?=		share/texmf
+TEXMFLOCAL?=	share/texmf-local
+TEXMFLOCAL_LSR?=${LOCALBASE}/${TEXMFLOCAL}/ls-R
+TEXCONFIG?=	${LOCALBASE}/bin/texconfig
 MKTEXLSR?=	${LOCALBASE}/bin/mktexlsr
 LIBT1_PREFIX?=	${LOCALBASE}
 DOC_FILES=	BUGS CHANGES INSTALL \
 		README README.CVS README_maintainer TODO
 
-TETEX_MODESW=	${LOCALBASE}/bin/tetex-modesw
+.if defined(WITH_LETTERSIZE)
+FLAVOR+=        letter
+PAPERSIZE=      letter
+.else
+PAPERSIZE=      a4
+.endif
+
 PKGINSTALL=	${WRKDIR}/pkg-install.sh
 PKGDEINSTALL=	${WRKDIR}/pkg-install.sh
-PKGINSTALL_SUB=	TETEX_MODESW=${TETEX_MODESW} \
-		MKTEXLSR=${MKTEXLSR}
+PKGINSTALL_SUB=	MKTEXLSR=${MKTEXLSR} \
+		XDVIDIR=${PREFIX}/${TEXMF}/xdvi \
+		XDVIVARDIR=${PREFIX}/${TEXMF}-var/xdvi \
+		PAPERSIZE=${PAPERSIZE} \
+		TEXCONFIG=${TEXCONFIG} \
+		LOCALBASE=${LOCALBASE}
 
 pre-build:
 	${SED} ${PKGINSTALL_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
@@ -59,7 +74,6 @@ pre-build:
 	${CHMOD} 0755 ${PKGINSTALL}
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/texk/xdvik/t1mapper ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${DOC_FILES:S@^@${WRKSRC}/@} ${DOCSDIR}
diff --git a/print/xdvik/distinfo b/print/xdvik/distinfo
index 36d300cfa0f8..b8bc9f3e67c0 100644
--- a/print/xdvik/distinfo
+++ b/print/xdvik/distinfo
@@ -1,2 +1,2 @@
-MD5 (xdvik-22.78.tar.gz) = 4dab412036834744e8d33750bc474adc
-SIZE (xdvik-22.78.tar.gz) = 1674666
+MD5 (xdvik-22.84.8.tar.gz) = 293932c9f53a570e33852252b8a0fc89
+SIZE (xdvik-22.84.8.tar.gz) = 1909683
diff --git a/print/xdvik/files/patch-texk::make::common.mk b/print/xdvik/files/patch-texk::make::common.mk
deleted file mode 100644
index fdd9f4925e4b..000000000000
--- a/print/xdvik/files/patch-texk::make::common.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- texk/make/common.mk.orig	Mon Feb  9 19:09:33 2004
-+++ texk/make/common.mk	Mon Feb  9 19:09:53 2004
-@@ -49,7 +49,7 @@
- # Installation.
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
--INSTALL_SCRIPT = $(INSTALL_PROGRAM)
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_LIBTOOL_LIBS = INSTALL_DATA='$(INSTALL_DATA)' $(LIBTOOL) install-lib
- INSTALL_LIBTOOL_PROG = INSTALL_PROGRAM='$(INSTALL_PROGRAM)' $(LIBTOOL) install-prog
diff --git a/print/xdvik/files/patch-texk::xdvik::Makefile.in b/print/xdvik/files/patch-texk::xdvik::Makefile.in
index c935841f15b1..d79301d55dee 100644
--- a/print/xdvik/files/patch-texk::xdvik::Makefile.in
+++ b/print/xdvik/files/patch-texk::xdvik::Makefile.in
@@ -1,10 +1,10 @@
---- texk/xdvik/Makefile.in.orig	Sat May 15 01:15:17 2004
-+++ texk/xdvik/Makefile.in	Sat May 15 01:15:39 2004
-@@ -137,7 +137,6 @@
- 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(mandir) 
+--- texk/xdvik/Makefile.in.orig	Tue Dec 21 22:23:47 2004
++++ texk/xdvik/Makefile.in	Tue Dec 21 22:24:05 2004
+@@ -138,6 +138,7 @@
  	$(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/xdvi/pixmaps
- 	$(INSTALL_DATA) $(srcdir)/$(manpage).1 $(mandir)/$(manpage).$(manext)
--	$(INSTALL_DATA) $(srcdir)/texmf/XDvi $(texmf)/xdvi/XDvi
+ 	$(INSTALL_DATA) $(manpage).1 $(man1dir)/$(manpage).$(manext)
+ 	$(INSTALL_DATA) $(srcdir)/texmf/XDvi $(texmf)/xdvi/XDvi
++	$(INSTALL_DATA) $(srcdir)/texmf/XDvi $(texmf)/xdvi/XDvi.xdvik-tetex
  	$(INSTALL_DATA) $(srcdir)/pixmaps/toolbar.xpm $(srcdir)/pixmaps/toolbar2.xpm $(texmf)/xdvi/pixmaps
  	if \
  	    grep 'original xdvi.cfg --' $(texmf)/xdvi/xdvi.cfg >/dev/null 2>&1 \
diff --git a/print/xdvik/files/pkg-install.in b/print/xdvik/files/pkg-install.in
index e77b345ce298..c1603750aac9 100644
--- a/print/xdvik/files/pkg-install.in
+++ b/print/xdvik/files/pkg-install.in
@@ -1,20 +1,36 @@
 #!/bin/sh
 # $FreeBSD$
 
-GREP=/usr/bin/grep
-SED=/usr/bin/sed
-MODE=default
-
+PAPERSIZE=%%PAPERSIZE%%
+XDVIDIR=%%XDVIDIR%%
+XDVIVARDIR=%%XDVIVARDIR%%
 MKTEXLSR=%%MKTEXLSR%%
-TETEX_MODESW=%%TETEX_MODESW%%
+TEXCONFIG=%%TEXCONFIG%%
+PATH=${PATH}:%%LOCALBASE%%/bin
 
 case $2 in
 POST-INSTALL)
-	${TETEX_MODESW} ${MODE} XDvi forceinstall
-	${MKTEXLSR}
+	cp -v ${XDVIDIR}/XDvi.xdvik-tetex ${XDVIDIR}/XDvi
+	if [ -f ${XDVIVARDIR}/XDvi ]; then
+		echo "======"
+		echo "NOTICE: you have to merge "\
+			"${XDVIVARDIR}/XDvi from ${XDVIDIR}/XDvi."
+		echo "======"
+	fi
+	case ${PAPERSIZE} in
+	letter)
+		${TEXCONFIG} xdvi us
+	;;
+	*)
+		${TEXCONFIG} xdvi a4
 	;;
+	esac
+	${MKTEXLSR}
+;;
 DEINSTALL)
-	${TETEX_MODESW} uninstall XDvi
+	rm -f ${XDVIVARDIR}/XDvi
+	cp -v ${XDVIDIR}/XDvi.tetex ${XDVIDIR}/XDvi
 	${MKTEXLSR}
-	;;
+;;
 esac
+
diff --git a/print/xdvik/pkg-plist b/print/xdvik/pkg-plist
index 6134f03d6e03..0c494adfb266 100644
--- a/print/xdvik/pkg-plist
+++ b/print/xdvik/pkg-plist
@@ -1,9 +1,8 @@
 @comment $FreeBSD$
-bin/t1mapper
 bin/xdvi
-bin/xdvi-xaw.bin
-bin/xdvi.bin
+bin/xdvi-motif.bin
 bin/xdvizilla
+%%TEXMF%%/xdvi/XDvi.xdvik-tetex
 %%TEXMF%%/xdvi/xdvi.cfg
 %%TEXMF%%/xdvi/pixmaps/toolbar.xpm
 %%TEXMF%%/xdvi/pixmaps/toolbar2.xpm