Update to 20040411. Even though it is still a test version, many users,

including hrs-san (the MAINTAINER of teTeX-related ports), said it's ok
for daily use.

Also update to adopt to recent teTeX-related ports strucute.

PR:			68218
Patch submitted by:	hrs

5 files changed, 43 insertions, 110 deletions

diff --git a/print/dvipdfmx/Makefile b/print/dvipdfmx/Makefile
index 3fe85519ff5a..fbd4cb75c128 100644
--- a/print/dvipdfmx/Makefile
+++ b/print/dvipdfmx/Makefile
@@ -6,31 +6,34 @@
 #
 
 PORTNAME=	dvipdfmx
-PORTVERSION=	20031116
-PORTREVISION=	1
+PORTVERSION=	20040411
 CATEGORIES=	print
-MASTER_SITES=	http://project.ktug.or.kr/dvipdfmx/snapshot/release/:main \
-		http://project.ktug.or.kr/dvipdfmx/snapshot/patch/:patch1
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:main \
-		dvipdfmx-${PORTVERSION}.patch:patch1
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES=	http://project.ktug.or.kr/dvipdfmx/snapshot/current/
 
 MAINTAINER=	matusita@FreeBSD.org
 COMMENT=	Dvipdfm with Asian languages by CID-keyed font technology support
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libkpathsea.a:${PORTSDIR}/print/teTeX
-LIB_DEPENDS=	png:${PORTSDIR}/graphics/png
-RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/Resource/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps \
-		kpsepath:${PORTSDIR}/print/teTeX
+BUILD_DEPENDS=	${LOCALBASE}/lib/libkpathsea.a:${PORTSDIR}/print/teTeX-base
+LIB_DEPENDS=	png:${PORTSDIR}/graphics/png \
+		paper:${PORTSDIR}/print/libpaper
+RUN_DEPENDS=	${LOCALBASE}/${TEXMFLOCAL}/ls-R:${PORTSDIR}/print/tex-texmflocal \
+		${ADOBECMAPDIR}/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps \
+		kpsepath:${PORTSDIR}/print/teTeX-base
 
 GNU_CONFIGURE=	yes
-PATCH_STRIP=	-p1
+CONFIGURE_ARGS=	--datadir=${LOCALBASE}/${TEXMFLOCAL}
+PLIST_SUB=	TEXMFLOCAL=${TEXMFLOCAL} \
+		MKTEXLSR=${MKTEXLSR} \
+		ADOBECMAPDIR=${ADOBECMAPDIR} \
+		DVIPDFMCMAPDIR=${DVIPDFMCMAPDIR}
 
-post-patch:
-	(cd ${WRKSRC}/src; ${PATCH} --quiet < ${DISTDIR}/dvipdfmx-${PORTVERSION}.patch)
+TEXMFLOCAL=	share/texmf-local
+MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
+DVIPDFMCMAPDIR=	${LOCALBASE}/${TEXMFLOCAL}/dvipdfm/CMap
+ADOBECMAPDIR=	${LOCALBASE}/share/fonts/adobe-cmaps
 
 post-install:
-	@${LN} -fs ${LOCALBASE}/share/ghostscript/Resource ${PREFIX}/share/texmf/dvipdfm/
-	${LOCALBASE}/bin/mktexlsr
+	${LN} -s -f ${ADOBECMAPDIR} ${DVIPDFMCMAPDIR}/adobe-cmaps
+	${MKTEXLSR}
 
 .include <bsd.port.mk>
diff --git a/print/dvipdfmx/distinfo b/print/dvipdfmx/distinfo
index 7e694ad19c33..9d0b96c5fa40 100644
--- a/print/dvipdfmx/distinfo
+++ b/print/dvipdfmx/distinfo
@@ -1,4 +1,2 @@
-MD5 (dvipdfmx-20031116.tar.gz) = 9c56e59c1536b4cb6f2606948c3e669c
-SIZE (dvipdfmx-20031116.tar.gz) = 325457
-MD5 (dvipdfmx-20031116.patch) = a2313bf0e2b4a7ce1aaf3d0b48a409fc
-SIZE (dvipdfmx-20031116.patch) = 676
+MD5 (dvipdfmx-20040411.tar.gz) = 020082733aef4a10b6580a3a4e846b69
+SIZE (dvipdfmx-20040411.tar.gz) = 399000
diff --git a/print/dvipdfmx/files/patch-data-Makefile.in b/print/dvipdfmx/files/patch-data-Makefile.in
new file mode 100644
index 000000000000..9bb881d1f5a5
--- /dev/null
+++ b/print/dvipdfmx/files/patch-data-Makefile.in
@@ -0,0 +1,11 @@
+--- data/Makefile.in.orig	Mon Jun  7 21:31:01 2004
++++ data/Makefile.in	Mon Jun  7 21:31:24 2004
+@@ -61,7 +61,7 @@
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+ 
+-pkgdatadir = $(datadir)/texmf/dvipdfm
++pkgdatadir = $(datadir)/dvipdfm
+ pkgdata_DATA = CMap config
+ DIST_COMMON = Makefile.in $(pkgdata_DATA)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/print/dvipdfmx/files/patch-psspecial.c-epsbox.sty b/print/dvipdfmx/files/patch-psspecial.c-epsbox.sty
deleted file mode 100644
index c431274f0056..000000000000
--- a/print/dvipdfmx/files/patch-psspecial.c-epsbox.sty
+++ /dev/null
@@ -1,80 +0,0 @@
-Origin: http://cvs.ktug.or.kr/viewcvs/dvipdfmx/src/psspecial.c.diff?r1=1.3&r2=1.4&diff_format=u
-
-This patch enables to handle dvifile using epsbox.sty.  The epsbox.sty
-embeds EPS files with "postscriptbox" directive, but original dvipdfmx
-doesn't know what postscriptbox is, showing "Unrecognized special ignored"
-and exit abnormally.
-
-See also: http://www.matsusaka-u.ac.jp/~okumura/texfaq/qa/23745.html
-(in Japanese)
-
---- contents below --
-===================================================================
-RCS file: /home/cvsroot/dvipdfmx/src/psspecial.c,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -r1.3 -r1.4
---- dvipdfmx/src/psspecial.c	2002/10/30 02:27:16	1.3
-+++ dvipdfmx/src/psspecial.c	2003/11/28 23:57:51	1.4
-@@ -1,4 +1,4 @@
--/*  $Header: /home/cvsroot/dvipdfmx/src/psspecial.c,v 1.3 2002/10/30 02:27:16 chofchof Exp $
-+/*  $Header: /home/cvsroot/dvipdfmx/src/psspecial.c,v 1.4 2003/11/28 23:57:51 hirata Exp $
-     
-     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
- 
-@@ -260,6 +260,55 @@
-     result = 1; /* Likewise */
-     do_raw_ps_special (&start, end, 1,
- 		       block_pending?pending_x:x_user, block_pending?pending_y:y_user);
-+  } else if (!strncmp (start, "postscriptbox", strlen("postscriptbox"))) {
-+    char filename[256];
-+    double width, height;
-+
-+    if (sscanf (start+13, "{%lfpt}{%lfpt}{%256[^}]}",
-+		&width, &height, filename) == 3) {
-+      struct xform_info *p = new_xform_info();
-+
-+      p -> width = width*72/72.27;
-+      p -> height = height*72/72.27;
-+
-+      {
-+	FILE *image_file;
-+	char *kpse_file_name;
-+	char buf[256], *pos;
-+	if ((kpse_file_name = kpse_find_pict (filename)) &&
-+	    (image_file = MFOPEN (kpse_file_name, FOPEN_R_MODE))) {
-+	  while (fgets (buf, 256, image_file)) {
-+	    if ((pos = strstr(buf, "%%BoundingBox:" )) != NULL){
-+	      double llx, lly, urx, ury;
-+
-+	      while (*pos++ != ':' );
-+	      if (sscanf (pos, "%lf %lf %lf %lf",
-+			  &llx, &lly, &urx, &ury) == 4) {
-+		p -> u_llx = llx;
-+		p -> u_lly = lly;
-+		p -> u_urx = urx;
-+		p -> u_ury = ury;
-+		p -> user_bbox = 1;
-+		break;
-+	      }
-+	    }
-+	  }
-+	  MFCLOSE (image_file);
-+	}
-+      }
-+             
-+      if(p -> user_bbox && validate_image_xform_info (p)) {
-+	pdf_obj *embeded;
-+	embeded = embed_image (filename, p, x_user, y_user, NULL);
-+	if (embeded)
-+	  pdf_release_obj (embeded);
-+	result = 1;
-+      }
-+      
-+      release_xform_info (p);
-+    }
-   }
-+
-   return result;
- }
-+
diff --git a/print/dvipdfmx/pkg-plist b/print/dvipdfmx/pkg-plist
index 95f666baed0b..60a53545005a 100644
--- a/print/dvipdfmx/pkg-plist
+++ b/print/dvipdfmx/pkg-plist
@@ -1,11 +1,12 @@
 bin/dvipdfmx
-share/texmf/dvipdfm/Resource
-share/texmf/dvipdfm/CMap/Adobe-Identity-UCS2
-share/texmf/dvipdfm/CMap/EUC-UCS2
-share/texmf/dvipdfm/CMap/UniKSCms-UCS2-H
-share/texmf/dvipdfm/CMap/UniKSCms-UCS2-V
-share/texmf/dvipdfm/config/cid-x.map
-share/texmf/dvipdfm/config/dvipdfmx.cfg
-@dirrm share/texmf/dvipdfm/CMap
-@exec %D/bin/mktexlsr
-@unexec %D/bin/mktexlsr
+%%TEXMFLOCAL%%/dvipdfm/CMap/Adobe-Identity-UCS2
+%%TEXMFLOCAL%%/dvipdfm/CMap/EUC-UCS2
+%%TEXMFLOCAL%%/dvipdfm/CMap/UniKSCms-UCS2-H
+%%TEXMFLOCAL%%/dvipdfm/CMap/UniKSCms-UCS2-V
+%%TEXMFLOCAL%%/dvipdfm/config/cid-x.map
+%%TEXMFLOCAL%%/dvipdfm/config/dvipdfmx.cfg
+@exec ln -s -f %%ADOBECMAPDIR%% %%DVIPDFMCMAPDIR%%/adobe-cmaps
+@unexec rm -f %%DVIPDFMCMAPDIR%%/adobe-cmaps
+@dirrm %%TEXMFLOCAL%%/dvipdfm/CMap
+@exec %%MKTEXLSR%%
+@unexec %%MKTEXLSR%%