4 files changed, 86 insertions, 82 deletions

diff --git a/japanese/xdvik-vflib/Makefile b/japanese/xdvik-vflib/Makefile
index 2b04ad663967..bd3beba33e65 100644
--- a/japanese/xdvik-vflib/Makefile
+++ b/japanese/xdvik-vflib/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	xdvik-vflib
-PORTVERSION=	22.40.w.1.17
+PORTVERSION=	22.40w.1.17
 CATEGORIES=	japanese print
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,xdvi,}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	xdvi
 DISTNAME=	xdvik-22.40w
 
 PATCH_SITES=	http://www.nn.iij4u.or.jp/~tutimura/tex/
@@ -21,13 +22,13 @@ COMMENT=	DVI Previewer(kpathsearch) for X. + jp-patch
 LIB_DEPENDS=	VFlib2:${PORTSDIR}/japanese/vflib \
 		wwwcore.1:${PORTSDIR}/www/libwww \
 		t1.5:${PORTSDIR}/devel/t1lib
-#RUN_DEPENDS+=	makejvf:${PORTSDIR}/japanese/makejvf
 
 DIST_SUBDIR=	xdvik
+USE_XLIB=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ARGS=	--enable-a4 --enable-bdpi=${BDPI} --enable-shrink=${SHRINK} \
+CONFIGURE_ARGS=	--enable-a4 --enable-shrink=${SHRINK} \
 		--with-dvifilter=${DVIPS} \
 		--enable-xdviprint=${PREFIX}/libexec/xdviprint \
 		--enable-smallpanel --enable-zoombutton \
@@ -51,6 +52,9 @@ LIBT1_PREFIX?=	${LOCALBASE}
 TEXMF=		${PREFIX}/share/texmf
 #VARTEXFONTS=	/var/tmp/texfonts
 XDVIDIR=	${TEXMF}/xdvi
+APPDEFAULTSDIR?=	lib/X11/app-defaults
+
+PLIST_SUB+=	APPDEFAULTSDIR=${APPDEFAULTSDIR}
 
 #VFFONTS=	.:${MAKEJVFDIR}/vf//
 #XDEFS+=		-DDEFAULT_VFFONTS=\"\\\"${VFFONTS}\\\"\"
@@ -149,12 +153,6 @@ pre-fetch:
 	${ECHO} "*                ${PREFIX}/libexec/xdviprint.                *"; \
 	${ECHO} "**************************************************************")
 
-pre-patch:
-.for i in FTP.c Host.c String.c String.h
-	@${PERL} -pi -e 's|strcasestr|HTStrCaseStr|g' \
-		${WRKSRC}/libs/libwww/HT${i}
-.endfor
-
 pre-build:
 	@(cd ${WRKSRC} ; find . -name '*.orig' -exec ${RM} -f {} \;)
 
@@ -163,13 +161,14 @@ do-install:
 		${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
 
 post-install:
-	@$(INSTALL_DATA) $(FILESDIR)/vfontmap $(XDVIDIR)
+	@${INSTALL_DATA} ${FILESDIR}/vfontmap ${XDVIDIR}
+	@${INSTALL_DATA} ${WRKSRC}/texk/xdvik/texmf/XDvi ${X11BASE}/${APPDEFAULTSDIR}
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/xdvi
+	@${MKDIR} ${DOCSDIR}
 	@for i in ${DOCS} ; do \
-	    ${INSTALL_DATA} ${WRKSRC}/texk/xdvik/$$i \
-		${PREFIX}/share/doc/xdvi ; \
+	    ${INSTALL_DATA} ${WRKSRC}/texk/xdvik/$$i ${DOCSDIR}; \
 	done
 .endif
+	@${PREFIX}/bin/mktexlsr ${PREFIX}/share/texmf
 
 .include <bsd.port.post.mk>
diff --git a/japanese/xdvik-vflib/pkg-plist b/japanese/xdvik-vflib/pkg-plist
index 76fed98449f9..25daf0852cd3 100644
--- a/japanese/xdvik-vflib/pkg-plist
+++ b/japanese/xdvik-vflib/pkg-plist
@@ -2,36 +2,39 @@ bin/t1mapper
 bin/xdvi
 bin/xdvizilla
 libexec/xdviprint
-share/texmf/xdvi/XDvi
 share/texmf/xdvi/vfontmap
 share/texmf/xdvi/xdvi.cfg
 share/texmf/xdvi/xdvipaper.dvi2ps-j
 share/texmf/xdvi/xdvipaper.dvips
 share/texmf/xdvi/xdvipaper.jdvi2kps
-share/doc/xdvi/CHANGES.xdvik-jp
-share/doc/xdvi/ChangeLog.xdvik20a-j1.1
-share/doc/xdvi/ChangeLog.xdvik20c-j1.0
-share/doc/xdvi/FAQ
-share/doc/xdvi/HEADERS.DOC
-share/doc/xdvi/InternalVars
-share/doc/xdvi/README.jp+toc+hal2
-share/doc/xdvi/README.jp-patch
-share/doc/xdvi/README.markpage+toc+printdvi
-share/doc/xdvi/README.markpage+toc+printdvi+paper
-share/doc/xdvi/README.miyu-beta6
-share/doc/xdvi/README.ptex
-share/doc/xdvi/README.src-specials
-share/doc/xdvi/README.t1fonts
-share/doc/xdvi/README.t1mapper
-share/doc/xdvi/README.tasai-ussy
-share/doc/xdvi/README.vf2ft
-share/doc/xdvi/README.xdvik-jp
-share/doc/xdvi/README.xdvik18f-j1.0.patch
-share/doc/xdvi/README.xdvik18f-j1.1p5.patch
-share/doc/xdvi/README.xdvik20a-j1.1.patch
-share/doc/xdvi/README.xdvik20c-j1.0+hal2+dvisel
-share/doc/xdvi/README.xdvik20c-j1.0p1.patch 
-share/doc/xdvi/README.xdvik-22.15-j1.04.patch  
-share/doc/xdvi/xdvi.icon
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES.xdvik-jp
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.xdvik20a-j1.1
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.xdvik20c-j1.0
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/HEADERS.DOC
+%%PORTDOCS%%%%DOCSDIR%%/InternalVars
+%%PORTDOCS%%%%DOCSDIR%%/README.jp+toc+hal2
+%%PORTDOCS%%%%DOCSDIR%%/README.jp-patch
+%%PORTDOCS%%%%DOCSDIR%%/README.markpage+toc+printdvi
+%%PORTDOCS%%%%DOCSDIR%%/README.markpage+toc+printdvi+paper
+%%PORTDOCS%%%%DOCSDIR%%/README.miyu-beta6
+%%PORTDOCS%%%%DOCSDIR%%/README.ptex
+%%PORTDOCS%%%%DOCSDIR%%/README.src-specials
+%%PORTDOCS%%%%DOCSDIR%%/README.t1fonts
+%%PORTDOCS%%%%DOCSDIR%%/README.t1mapper
+%%PORTDOCS%%%%DOCSDIR%%/README.tasai-ussy
+%%PORTDOCS%%%%DOCSDIR%%/README.vf2ft
+%%PORTDOCS%%%%DOCSDIR%%/README.xdvik-jp
+%%PORTDOCS%%%%DOCSDIR%%/README.xdvik18f-j1.0.patch
+%%PORTDOCS%%%%DOCSDIR%%/README.xdvik18f-j1.1p5.patch
+%%PORTDOCS%%%%DOCSDIR%%/README.xdvik20a-j1.1.patch
+%%PORTDOCS%%%%DOCSDIR%%/README.xdvik20c-j1.0+hal2+dvisel
+%%PORTDOCS%%%%DOCSDIR%%/README.xdvik20c-j1.0p1.patch 
+%%PORTDOCS%%%%DOCSDIR%%/README.xdvik-22.15-j1.04.patch  
+%%PORTDOCS%%%%DOCSDIR%%/xdvi.icon
 @dirrm share/texmf/xdvi
-@dirrm share/doc/xdvi
+@dirrm %%DOCSDIR%%
+@exec %D/bin/mktexlsr %D/share/texmf
+@unexec %D/bin/mktexlsr %D/share/texmf
+@cwd %%X11BASE%%
+%%APPDEFAULTSDIR%%/XDvi
diff --git a/japanese/xdvik/Makefile b/japanese/xdvik/Makefile
index 2b04ad663967..bd3beba33e65 100644
--- a/japanese/xdvik/Makefile
+++ b/japanese/xdvik/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	xdvik-vflib
-PORTVERSION=	22.40.w.1.17
+PORTVERSION=	22.40w.1.17
 CATEGORIES=	japanese print
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,xdvi,}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	xdvi
 DISTNAME=	xdvik-22.40w
 
 PATCH_SITES=	http://www.nn.iij4u.or.jp/~tutimura/tex/
@@ -21,13 +22,13 @@ COMMENT=	DVI Previewer(kpathsearch) for X. + jp-patch
 LIB_DEPENDS=	VFlib2:${PORTSDIR}/japanese/vflib \
 		wwwcore.1:${PORTSDIR}/www/libwww \
 		t1.5:${PORTSDIR}/devel/t1lib
-#RUN_DEPENDS+=	makejvf:${PORTSDIR}/japanese/makejvf
 
 DIST_SUBDIR=	xdvik
+USE_XLIB=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ARGS=	--enable-a4 --enable-bdpi=${BDPI} --enable-shrink=${SHRINK} \
+CONFIGURE_ARGS=	--enable-a4 --enable-shrink=${SHRINK} \
 		--with-dvifilter=${DVIPS} \
 		--enable-xdviprint=${PREFIX}/libexec/xdviprint \
 		--enable-smallpanel --enable-zoombutton \
@@ -51,6 +52,9 @@ LIBT1_PREFIX?=	${LOCALBASE}
 TEXMF=		${PREFIX}/share/texmf
 #VARTEXFONTS=	/var/tmp/texfonts
 XDVIDIR=	${TEXMF}/xdvi
+APPDEFAULTSDIR?=	lib/X11/app-defaults
+
+PLIST_SUB+=	APPDEFAULTSDIR=${APPDEFAULTSDIR}
 
 #VFFONTS=	.:${MAKEJVFDIR}/vf//
 #XDEFS+=		-DDEFAULT_VFFONTS=\"\\\"${VFFONTS}\\\"\"
@@ -149,12 +153,6 @@ pre-fetch:
 	${ECHO} "*                ${PREFIX}/libexec/xdviprint.                *"; \
 	${ECHO} "**************************************************************")
 
-pre-patch:
-.for i in FTP.c Host.c String.c String.h
-	@${PERL} -pi -e 's|strcasestr|HTStrCaseStr|g' \
-		${WRKSRC}/libs/libwww/HT${i}
-.endfor
-
 pre-build:
 	@(cd ${WRKSRC} ; find . -name '*.orig' -exec ${RM} -f {} \;)
 
@@ -163,13 +161,14 @@ do-install:
 		${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
 
 post-install:
-	@$(INSTALL_DATA) $(FILESDIR)/vfontmap $(XDVIDIR)
+	@${INSTALL_DATA} ${FILESDIR}/vfontmap ${XDVIDIR}
+	@${INSTALL_DATA} ${WRKSRC}/texk/xdvik/texmf/XDvi ${X11BASE}/${APPDEFAULTSDIR}
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/xdvi
+	@${MKDIR} ${DOCSDIR}
 	@for i in ${DOCS} ; do \
-	    ${INSTALL_DATA} ${WRKSRC}/texk/xdvik/$$i \
-		${PREFIX}/share/doc/xdvi ; \
+	    ${INSTALL_DATA} ${WRKSRC}/texk/xdvik/$$i ${DOCSDIR}; \
 	done
 .endif
+	@${PREFIX}/bin/mktexlsr ${PREFIX}/share/texmf
 
 .include <bsd.port.post.mk>
diff --git a/japanese/xdvik/pkg-plist b/japanese/xdvik/pkg-plist
index 76fed98449f9..25daf0852cd3 100644
--- a/japanese/xdvik/pkg-plist
+++ b/japanese/xdvik/pkg-plist
@@ -2,36 +2,39 @@ bin/t1mapper
 bin/xdvi
 bin/xdvizilla
 libexec/xdviprint
-share/texmf/xdvi/XDvi
 share/texmf/xdvi/vfontmap
 share/texmf/xdvi/xdvi.cfg
 share/texmf/xdvi/xdvipaper.dvi2ps-j
 share/texmf/xdvi/xdvipaper.dvips
 share/texmf/xdvi/xdvipaper.jdvi2kps
-share/doc/xdvi/CHANGES.xdvik-jp
-share/doc/xdvi/ChangeLog.xdvik20a-j1.1
-share/doc/xdvi/ChangeLog.xdvik20c-j1.0
-share/doc/xdvi/FAQ
-share/doc/xdvi/HEADERS.DOC
-share/doc/xdvi/InternalVars
-share/doc/xdvi/README.jp+toc+hal2
-share/doc/xdvi/README.jp-patch
-share/doc/xdvi/README.markpage+toc+printdvi
-share/doc/xdvi/README.markpage+toc+printdvi+paper
-share/doc/xdvi/README.miyu-beta6
-share/doc/xdvi/README.ptex
-share/doc/xdvi/README.src-specials
-share/doc/xdvi/README.t1fonts
-share/doc/xdvi/README.t1mapper
-share/doc/xdvi/README.tasai-ussy
-share/doc/xdvi/README.vf2ft
-share/doc/xdvi/README.xdvik-jp
-share/doc/xdvi/README.xdvik18f-j1.0.patch
-share/doc/xdvi/README.xdvik18f-j1.1p5.patch
-share/doc/xdvi/README.xdvik20a-j1.1.patch
-share/doc/xdvi/README.xdvik20c-j1.0+hal2+dvisel
-share/doc/xdvi/README.xdvik20c-j1.0p1.patch 
-share/doc/xdvi/README.xdvik-22.15-j1.04.patch  
-share/doc/xdvi/xdvi.icon
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES.xdvik-jp
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.xdvik20a-j1.1
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.xdvik20c-j1.0
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/HEADERS.DOC
+%%PORTDOCS%%%%DOCSDIR%%/InternalVars
+%%PORTDOCS%%%%DOCSDIR%%/README.jp+toc+hal2
+%%PORTDOCS%%%%DOCSDIR%%/README.jp-patch
+%%PORTDOCS%%%%DOCSDIR%%/README.markpage+toc+printdvi
+%%PORTDOCS%%%%DOCSDIR%%/README.markpage+toc+printdvi+paper
+%%PORTDOCS%%%%DOCSDIR%%/README.miyu-beta6
+%%PORTDOCS%%%%DOCSDIR%%/README.ptex
+%%PORTDOCS%%%%DOCSDIR%%/README.src-specials
+%%PORTDOCS%%%%DOCSDIR%%/README.t1fonts
+%%PORTDOCS%%%%DOCSDIR%%/README.t1mapper
+%%PORTDOCS%%%%DOCSDIR%%/README.tasai-ussy
+%%PORTDOCS%%%%DOCSDIR%%/README.vf2ft
+%%PORTDOCS%%%%DOCSDIR%%/README.xdvik-jp
+%%PORTDOCS%%%%DOCSDIR%%/README.xdvik18f-j1.0.patch
+%%PORTDOCS%%%%DOCSDIR%%/README.xdvik18f-j1.1p5.patch
+%%PORTDOCS%%%%DOCSDIR%%/README.xdvik20a-j1.1.patch
+%%PORTDOCS%%%%DOCSDIR%%/README.xdvik20c-j1.0+hal2+dvisel
+%%PORTDOCS%%%%DOCSDIR%%/README.xdvik20c-j1.0p1.patch 
+%%PORTDOCS%%%%DOCSDIR%%/README.xdvik-22.15-j1.04.patch  
+%%PORTDOCS%%%%DOCSDIR%%/xdvi.icon
 @dirrm share/texmf/xdvi
-@dirrm share/doc/xdvi
+@dirrm %%DOCSDIR%%
+@exec %D/bin/mktexlsr %D/share/texmf
+@unexec %D/bin/mktexlsr %D/share/texmf
+@cwd %%X11BASE%%
+%%APPDEFAULTSDIR%%/XDvi