Update to 22.78 and take the maintainership.

Approved by:	linimon (mentor)

7 files changed, 71 insertions, 96 deletions

diff --git a/print/xdvik/Makefile b/print/xdvik/Makefile
index 2ae99f86a9c7..5de9435adfe7 100644
--- a/print/xdvik/Makefile
+++ b/print/xdvik/Makefile
@@ -6,33 +6,49 @@
 #
 
 PORTNAME=	xdvik
-PORTVERSION=	20a
-PORTREVISION=	1
+PORTVERSION=	22.78
 CATEGORIES=	print
-MASTER_SITES=	http://www.tug.org/ftp/historic/systems/dviware/xdvik/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	xdvi
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	DVI Previewer(kpathsearch) for X
 
-RUN_DEPENDS=	mf:${PORTSDIR}/print/tex
+BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX
+RUN_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX
+LIB_DEPENDS=	t1.5:${PORTSDIR}/devel/t1lib
 
 USE_XLIB=	yes
-GNU_CONFIGURE=YES
-#CONFIGURE_ARGS=--enable-shared=yes
-USE_GMAKE=YES
-
-MAN1=xdvi.1 gsftopk.1
-
-pre-build:
-	(cd ${WRKSRC} ; ${FIND} . -name '*.orig' -exec ${RM} -f {} \;)
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix=${PREFIX} \
+		--with-system-t1lib --with-t1lib-libdir=${LIBT1_PREFIX}/lib \
+		--with-t1lib-include=${LIBT1_PREFIX}/include
+CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
+		INSTALL_DATA="${INSTALL_DATA}" \
+		INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+
+PLIST_SUB=	TEXMFDIR=${TEXMFDIR} MKTEXLSR=${MKTEXLSR}
+CONFLICTS=	xdvi-* *-xdvi*
+
+MAN1=		xdvi.1 t1mapper.1 xdvizilla.1
+
+TEXMFDIR?=	share/texmf
+MKTEXLSR?=	${LOCALBASE}/bin/mktexlsr
+LIBT1_PREFIX?=	${LOCALBASE}
+DOC_FILES=	BUGS CHANGES INSTALL \
+		README README.CVS README_maintainer TODO
 
 do-install:
-	(cd ${WRKSRC}/xdvik ; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
+	cd ${WRKSRC}/texk/xdvik && \
+		${MAKE_ENV} ${MAKE} ${INSTALL_TARGET}
 
 post-install:
-	${MKDIR} ${PREFIX}/share/doc/xdvi
-	${INSTALL_DATA} ${WRKSRC}/xdvik/xdvi.FAQ ${PREFIX}/share/doc/xdvi
-	${INSTALL_DATA} ${WRKSRC}/xdvik/README ${PREFIX}/share/doc/xdvi
-	${INSTALL_DATA} ${WRKSRC}/xdvik/ChangeLog ${PREFIX}/share/doc/xdvi
+	${INSTALL_SCRIPT} ${WRKSRC}/texk/xdvik/t1mapper ${PREFIX}/bin
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${DOC_FILES:S@^@${WRKSRC}/@} ${DOCSDIR}
+.endif
+	${MKTEXLSR}
 
 .include <bsd.port.mk>
diff --git a/print/xdvik/distinfo b/print/xdvik/distinfo
index 6d00e8b0879d..36d300cfa0f8 100644
--- a/print/xdvik/distinfo
+++ b/print/xdvik/distinfo
@@ -1,2 +1,2 @@
-MD5 (xdvik-20a.tar.gz) = 58090c0a4e8f4cc5a406f47a95b81b67
-SIZE (xdvik-20a.tar.gz) = 693886
+MD5 (xdvik-22.78.tar.gz) = 4dab412036834744e8d33750bc474adc
+SIZE (xdvik-22.78.tar.gz) = 1674666
diff --git a/print/xdvik/files/patch-aa b/print/xdvik/files/patch-aa
deleted file mode 100644
index 081533cf9331..000000000000
--- a/print/xdvik/files/patch-aa
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ru ../xdvik-20a.orig/configure ./configure
---- ../xdvik-20a.orig/configure	Tue Feb  4 04:22:07 1997
-+++ ./configure	Tue Feb 24 23:12:05 1998
-@@ -890,6 +890,7 @@
-   fi
- fi
- echo "$ac_t""$INSTALL" 1>&6
-+ac_given_INSTALL=${INSTALL}
- 
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
-diff -ru ../xdvik-20a.orig/kpathsea/configure ./kpathsea/configure
---- ../xdvik-20a.orig/kpathsea/configure	Tue Feb  4 04:27:18 1997
-+++ ./kpathsea/configure	Tue Feb 24 23:13:09 1998
-@@ -774,6 +774,7 @@
-   fi
- fi
- echo "$ac_t""$INSTALL" 1>&6
-+ac_given_INSTALL=${INSTALL}
- 
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
-diff -ru ../xdvik-20a.orig/xdvik/configure ./xdvik/configure
---- ../xdvik-20a.orig/xdvik/configure	Tue Feb 24 23:09:22 1998
-+++ ./xdvik/configure	Tue Feb 24 23:15:44 1998
-@@ -786,6 +786,7 @@
-   fi
- fi
- echo "$ac_t""$INSTALL" 1>&6
-+ac_given_INSTALL=${INSTALL}
- 
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
-diff -ru ../xdvik-20a.orig/klibtool ./klibtool
---- ../xdvik-20a.orig/klibtool	Sat Dec 28 07:50:27 1996
-+++ ./klibtool	Fri Feb 27 23:54:11 1998
-@@ -251,6 +251,11 @@
- 
-     # Override defaults for this system.
-     case $host_type in
-+      *-*-freebsd*)
-+	shared_support=true
-+	SHARED_postinstall='ldconfig -m $libdir'
-+	;;
-+
-       *-*-linux*)
-         shared_support=true
-         SHARED_postinstall='ldconfig $libdir'
diff --git a/print/xdvik/files/patch-ab b/print/xdvik/files/patch-ab
deleted file mode 100644
index 828e6c47088d..000000000000
--- a/print/xdvik/files/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
---- xdvik/Makefile.in.orig	Mon Oct 12 22:28:09 1998
-+++ xdvik/Makefile.in	Mon Oct 12 22:46:32 1998
-@@ -9,6 +9,9 @@
- # This matches web2c (needed only for Metafont).
- x_cppflags = @X_CFLAGS@
- x_ldflags = @X_LIBS@
-+ifeq ($(PORTOBJFORMAT),elf)
-+x_ldflags += -Wl,-rpath,$(X11BASE)/lib
-+endif
- x_pre_libs = @X_PRE_LIBS@
- x_extra_libs = @X_EXTRA_LIBS@
- x_tool_libs = @x_tool_libs@
diff --git a/print/xdvik/files/patch-texk::make::common.mk b/print/xdvik/files/patch-texk::make::common.mk
new file mode 100644
index 000000000000..fdd9f4925e4b
--- /dev/null
+++ b/print/xdvik/files/patch-texk::make::common.mk
@@ -0,0 +1,11 @@
+--- 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/pkg-descr b/print/xdvik/pkg-descr
index 6f6d3c1af3a0..f21622980a80 100644
--- a/print/xdvik/pkg-descr
+++ b/print/xdvik/pkg-descr
@@ -1,10 +1,5 @@
+Xdvik is a program for displaying DVI files (generated e.g. by Troff or TeX)
+on the X window system. It is based on the regular (non-k) xdvi of the same
+version number.
 
-dvi file previewer for X.
-
-    1. require METAFONT
-    2. require kpathsearch libraries version 3.0 (search library)
-    3. built-in EPS preview(need to any ghostscript)
-    4. print out from this program(use lpr).
-
-- Kentarou Inagaki
-JBD01226@niftyserve.ne.jp
+WWW: http://xdvi.sourceforge.net/
diff --git a/print/xdvik/pkg-plist b/print/xdvik/pkg-plist
index 0899c88667d2..6e98cf47fe45 100644
--- a/print/xdvik/pkg-plist
+++ b/print/xdvik/pkg-plist
@@ -1,8 +1,21 @@
+@comment $FreeBSD$
+bin/t1mapper
 bin/xdvi
-bin/gsftopk
-share/texmf/dvips/render.ps
-share/doc/xdvi/ChangeLog
-share/doc/xdvi/README
-share/doc/xdvi/xdvi.FAQ
-@dirrm share/doc/xdvi
-@unexec rmdir %D/share/texmf/dvips 2> /dev/null || true
+bin/xdvi-xaw.bin
+bin/xdvi.bin
+bin/xdvizilla
+%%TEXMFDIR%%/xdvi/XDvi
+%%TEXMFDIR%%/xdvi/xdvi.cfg
+%%TEXMFDIR%%/xdvi/pixmaps/toolbar.xpm
+%%TEXMFDIR%%/xdvi/pixmaps/toolbar2.xpm
+@dirrm %%TEXMFDIR%%/xdvi/pixmaps
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.CVS
+%%PORTDOCS%%%%DOCSDIR%%/README_maintainer
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@exec %%MKTEXLSR%%
+@unexec %%MKTEXLSR%%