- Install a sample config file into share/examples, rather than into

  the texmf tree.
- Correct paths to this package.

No PKGREVISION bump since this package didn't build due to the wrong
path to map.mk.

4 files changed, 13 insertions, 11 deletions

diff --git a/print/dvipdfmx/Makefile b/print/dvipdfmx/Makefile
index 7175c021190..6e35dda0463 100644
--- a/print/dvipdfmx/Makefile
+++ b/print/dvipdfmx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/11/20 18:51:53 minskim Exp $
+# $NetBSD: Makefile,v 1.18 2005/11/20 19:14:50 minskim Exp $
 
 DISTNAME=	dvipdfmx-20050627
 PKGNAME=	${DISTNAME:S/-/-0.0.0./}
@@ -20,7 +20,7 @@ MAKE_ENV+=		PKG_LOCALTEXMFPREFIX=${PKG_LOCALTEXMFPREFIX}
 .include "../../graphics/png/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/ghostscript.mk"
-.include "../../wip-kr/dvipdfmx/map.mk"
+.include "../../print/dvipdfmx/map.mk"
 .include "../../print/teTeX/module.mk"
 
 post-install:
@@ -28,7 +28,8 @@ post-install:
 	for file in ../../../Adobe/Resource/CMap/*; do \
 		${LN} -s $$file `${BASENAME} $$file`; \
 	done
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dvipdfmx
 	${MV} ${PKG_LOCALTEXMFPREFIX}/dvipdfm/config/dvipdfmx.cfg \
-		${PKG_LOCALTEXMFPREFIX}/dvipdfm/config/dvipdfmx-base.cfg
+		${PREFIX}/share/examples/dvipdfmx/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/dvipdfmx/PLIST b/print/dvipdfmx/PLIST
index eeee060f793..7d96108ebea 100644
--- a/print/dvipdfmx/PLIST
+++ b/print/dvipdfmx/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.7 2005/11/20 18:51:53 minskim Exp $
+@comment $NetBSD: PLIST,v 1.8 2005/11/20 19:14:50 minskim Exp $
 bin/dvipdfmx
+share/examples/dvipdfmx/dvipdfmx.cfg
 ${PKG_LOCALTEXMFPREFIX}/dvipdfm/CMap/78-EUC-H
 ${PKG_LOCALTEXMFPREFIX}/dvipdfm/CMap/78-EUC-V
 ${PKG_LOCALTEXMFPREFIX}/dvipdfm/CMap/78-H
@@ -202,7 +203,7 @@ ${PKG_LOCALTEXMFPREFIX}/dvipdfm/CMap/UniKSCms-UCS2-V
 ${PKG_LOCALTEXMFPREFIX}/dvipdfm/CMap/V
 ${PKG_LOCALTEXMFPREFIX}/dvipdfm/CMap/WP-Symbol
 ${PKG_LOCALTEXMFPREFIX}/dvipdfm/config/cid-x.map
-${PKG_LOCALTEXMFPREFIX}/dvipdfm/config/dvipdfmx-base.cfg
 ${PKG_LOCALTEXMFPREFIX}/dvipdfm/config/glyphlist.txt
 @unexec ${RM} -f %D/${PKG_LOCALTEXMFPREFIX}/dvipdfm/config/dvipdfmx.cfg
 @dirrm ${PKG_LOCALTEXMFPREFIX}/dvipdfm/CMap
+@dirrm share/examples/dvipdfmx
diff --git a/print/dvipdfmx/files/map.tmpl b/print/dvipdfmx/files/map.tmpl
index ca9cad657ce..f4d5b775e5e 100644
--- a/print/dvipdfmx/files/map.tmpl
+++ b/print/dvipdfmx/files/map.tmpl
@@ -1,4 +1,4 @@
-# $NetBSD: map.tmpl,v 1.2 2005/11/20 18:51:54 minskim Exp $
+# $NetBSD: map.tmpl,v 1.3 2005/11/20 19:14:50 minskim Exp $
 #
 # Update dvipdfmx.cfg.
 #
@@ -29,7 +29,7 @@ eof
 case ${STAGE} in
 POST-INSTALL)
 	if ${TEST} ! -f @DVIPDFMX_CONFIG_DIR@/dvipdfmx.cfg; then
-		@CP@ @DVIPDFMX_CONFIG_DIR@/dvipdfmx-base.cfg \
+		@CP@ @LOCALBASE@/share/examples/dvipdfmx/dvipdfmx.cfg \
 		     @DVIPDFMX_CONFIG_DIR@/dvipdfmx.cfg
 	fi
 	for map in @DVIPDFMX_FONTMAPS@; do
diff --git a/print/dvipdfmx/map.mk b/print/dvipdfmx/map.mk
index 849f96a681c..6e81f0ad8ad 100644
--- a/print/dvipdfmx/map.mk
+++ b/print/dvipdfmx/map.mk
@@ -1,4 +1,4 @@
-# $NetBSD: map.mk,v 1.1 2005/11/20 18:51:54 minskim Exp $
+# $NetBSD: map.mk,v 1.2 2005/11/20 19:14:50 minskim Exp $
 # This Makefile fragment is intended to be included by packages that
 # install font maps used by dvipdfmx.  It takes care of adding and
 # removing font map entires in dvipdfmx.cfg.
@@ -15,14 +15,14 @@ DVIPDFMX_MAP_MK=	# defined
 DVIPDFMX_FONTMAPS?=	# empty
 
 .if empty(DISTNAME:Mdvipdfmx-[0-9]*)
-DEPENDS+=		dvipdfmx>=0.0.0.20050627:../../wip-kr/dvipdfmx
+DEPENDS+=		dvipdfmx>=0.0.0.20050627:../../print/dvipdfmx
 .endif
 
 USE_PKGINSTALL=		yes
 FILES_SUBST+=		DVIPDFMX_FONTMAPS="${DVIPDFMX_FONTMAPS}"
 FILES_SUBST+=		DVIPDFMX_CONFIG_DIR="${PKG_LOCALTEXMFPREFIX}/dvipdfm/config"
-INSTALL_EXTRA_TMPL+=	../../wip-kr/dvipdfmx/files/map.tmpl
-DEINSTALL_EXTRA_TMPL+=	../../wip-kr/dvipdfmx/files/map.tmpl
+INSTALL_EXTRA_TMPL+=	../../print/dvipdfmx/files/map.tmpl
+DEINSTALL_EXTRA_TMPL+=	../../print/dvipdfmx/files/map.tmpl
 
 PRINT_PLIST_AWK+=	/^${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}\/dvidpfm\/config\/dvipdfmx.cfg$$/ \
 			{ next; }