due to ttfm module ghostscript6 change to gscjk

PR:		42330
Submitted by:	Statue <statue@freebsd.sinica.edu.tw>

8 files changed, 38 insertions, 39 deletions

diff --git a/chinese/abiword/pkg-install b/chinese/abiword/pkg-install
index 093248a37e61..f3923a4263b4 100644
--- a/chinese/abiword/pkg-install
+++ b/chinese/abiword/pkg-install
@@ -17,7 +17,7 @@ if [ ! -x $TTFM ]; then
 fi
 
 for f in $FONTS; do
-    $TTFM --add ghostscript6 $FONTDIR/$f
+    $TTFM --add gscjk $FONTDIR/$f
 done
 
 for f in $FONTS; do
diff --git a/chinese/arphicttf/Makefile b/chinese/arphicttf/Makefile
index 78d8b4292741..f064fa5d4d0c 100644
--- a/chinese/arphicttf/Makefile
+++ b/chinese/arphicttf/Makefile
@@ -23,7 +23,7 @@ USE_XLIB=	yes
 FONTDIR=	${PREFIX}/share/fonts/TrueType
 XFONTDIR=	${X11BASE}/lib/X11/fonts/TrueType
 INSTALL_ENV=	PKG_PREFIX=${PREFIX} XFREE86_VERSION=${XFREE86_VERSION} \
-		WANT_CJK=${WANT_CJK} WANT_GS6=${WANT_GS6} \
+		WANT_CJK=${WANT_CJK} WANT_GS=${WANT_GS} \
 		WITHOUT_X=${WITHOUT_X}
 
 .include <bsd.port.pre.mk>
@@ -31,8 +31,8 @@ INSTALL_ENV=	PKG_PREFIX=${PREFIX} XFREE86_VERSION=${XFREE86_VERSION} \
 .if defined(WANT_CJK)
 RUN_DEPENDS+=	bg5latex:${PORTSDIR}/chinese/CJK
 .endif
-.if defined(WANT_GS6)
-RUN_DEPENDS+=	${LOCALBASE}/share/ghostscript/CJK/CMap/B5pc-H:${PORTSDIR}/chinese/ghostscript6
+.if defined(WANT_GS)
+RUN_DEPENDS+=	${LOCALBASE}/share/ghostscript/Resource/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps
 .endif
 .if ${XFREE86_VERSION} == 3 && !defined(WITHOUT_X)
 RUN_DEPENDS+=	mkfontdir.pl:${PORTSDIR}/x11-servers/XttXF86srv-common
@@ -42,16 +42,16 @@ pre-fetch:
 .if defined(WANT_CJK)
 	@${ECHO} "CJK support will be added."
 .endif
-.if defined(WANT_GS6)
-	@${ECHO} "Ghostscript6 support will be added."
+.if defined(WANT_GS)
+	@${ECHO} "Ghostscript support will be added."
 .endif
 .if defined(WITHOUT_X)
 	@${ECHO} "X Window support will NOT be added."
 .endif
-.if !defined(WANT_CJK) && !defined(WANT_GS6) && !defined(WITHOUT_X)
+.if !defined(WANT_CJK) && !defined(WANT_GS) && !defined(WITHOUT_X)
 	@${ECHO} --
 	@${ECHO} "Type \"make WANT_CJK=yes\" if you want CJK support."
-	@${ECHO} "Type \"make WANT_GS6=yes\" if you want Ghostscript6 support."
+	@${ECHO} "Type \"make WANT_GS=yes\" if you want Ghostscript support."
 	@${ECHO} "Type \"make WITHOUT_X=yes\" if you DONT want X Window support."
 	@${ECHO} "You can use them in combinations."
 	@${ECHO} --
diff --git a/chinese/arphicttf/pkg-install b/chinese/arphicttf/pkg-install
index 246a0ea46816..dc24660fef43 100644
--- a/chinese/arphicttf/pkg-install
+++ b/chinese/arphicttf/pkg-install
@@ -24,17 +24,17 @@ if [ "X$WANT_CJK" != "X" ]; then
     # There's no CJK module now.
 fi
 
-if [ "X$WANT_GS6" != "X" ]; then
+if [ "X$WANT_GS" != "X" ]; then
     for f in $FONTS; do
-        $TTFM --add ghostscript6 $FONTDIR/$f
+        $TTFM --add gscjk $FONTDIR/$f
     done
     for f in $DEFAULTMING; do
-        $TTFM --setdefault ghostscript6 $FONTDIR/$f
+        $TTFM --setdefault gscjk $FONTDIR/$f
     done
     for f in $DEFAULTKAI; do
-        $TTFM --setdefault_kai ghostscript6 $FONTDIR/$f
+        $TTFM --setdefault_kai gscjk $FONTDIR/$f
     done
-    echo "ghostscript6" >> $FONTDIR/$PKGNAME
+    echo "gscjk" >> $FONTDIR/$PKGNAME
 fi
 
 if [ "X$WITHOUT_X" = "X" ]; then
diff --git a/chinese/moettf/Makefile b/chinese/moettf/Makefile
index 78a2209b3983..c136664c5bf5 100644
--- a/chinese/moettf/Makefile
+++ b/chinese/moettf/Makefile
@@ -28,7 +28,7 @@ SHAREMODE=	644
 FONTDIR=	${PREFIX}/share/fonts/TrueType
 XFONTDIR=	${X11BASE}/lib/X11/fonts/TrueType
 INSTALL_ENV=	PKG_PREFIX=${PREFIX} XFREE86_VERSION=${XFREE86_VERSION} \
-		DEFAULT=${DEFAULT} WANT_CJK=${WANT_CJK} WANT_GS6=${WANT_GS6} \
+		DEFAULT=${DEFAULT} WANT_CJK=${WANT_CJK} WANT_GS=${WANT_GS} \
 		WITHOUT_X=${WITHOUT_X}
 
 .include <bsd.port.pre.mk>
@@ -36,8 +36,8 @@ INSTALL_ENV=	PKG_PREFIX=${PREFIX} XFREE86_VERSION=${XFREE86_VERSION} \
 .if defined(WANT_CJK)
 RUN_DEPENDS+=	bg5latex:${PORTSDIR}/chinese/CJK
 .endif
-.if defined(WANT_GS6)
-RUN_DEPENDS+=	${LOCALBASE}/share/ghostscript/CJK/CMap/B5pc-H:${PORTSDIR}/chinese/ghostscript6
+.if defined(WANT_GS)
+RUN_DEPENDS+=	${LOCALBASE}/share/ghostscript/Resource/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps
 .endif
 .if ${XFREE86_VERSION} == 3 && !defined(WITHOUT_X)
 RUN_DEPENDS+=	mkfontdir.pl:${PORTSDIR}/x11-servers/XttXF86srv-common
@@ -47,8 +47,8 @@ pre-fetch:
 .if defined(WANT_CJK)
 	@${ECHO} "CJK support will be added."
 .endif
-.if defined(WANT_GS6)
-	@${ECHO} "Ghostscript6 support will be added."
+.if defined(WANT_GS)
+	@${ECHO} "Ghostscript support will be added."
 .endif
 .if defined(WITHOUT_X)
 	@${ECHO} "X Window support will NOT be added."
@@ -56,10 +56,10 @@ pre-fetch:
 .if defined(DEFAULT)
 	@${ECHO} "MOETTF will be set as default font."
 .endif
-.if !defined(WANT_CJK) && !defined(WANT_GS6) && !defined(WITHOUT_X) && !defined(DEFAULT)
+.if !defined(WANT_CJK) && !defined(WANT_GS) && !defined(WITHOUT_X) && !defined(DEFAULT)
 	@${ECHO} --
 	@${ECHO} "Type \"make WANT_CJK=yes\" if you want CJK support."
-	@${ECHO} "Type \"make WANT_GS6=yes\" if you want Ghostscript6 support."
+	@${ECHO} "Type \"make WANT_GS=yes\" if you want Ghostscript support."
 	@${ECHO} "Type \"make WITHOUT_X=yes\" if you DONT want X Window support."
 	@${ECHO} "Type \"make DEFAULT=yes\" to set MOETTF the default font."
 	@${ECHO} "You can use them in combinations."
diff --git a/chinese/moettf/pkg-install b/chinese/moettf/pkg-install
index 2fee3f534597..179dcbb24c45 100644
--- a/chinese/moettf/pkg-install
+++ b/chinese/moettf/pkg-install
@@ -29,17 +29,17 @@ if [ "X$WANT_CJK" != "X" ]; then
     # There's no CJK module now.
 fi
 
-if [ "X$WANT_GS6" != "X" ]; then
+if [ "X$WANT_GS" != "X" ]; then
     for f in $FONTS; do
-        $TTFM --add ghostscript6 $FONTDIR/$f
+        $TTFM --add gscjk $FONTDIR/$f
     done
     for f in $DEFAULTMING; do
-        $TTFM --setdefault ghostscript6 $FONTDIR/$f
+        $TTFM --setdefault gscjk $FONTDIR/$f
     done
     for f in $DEFAULTKAI; do
-        $TTFM --setdefault_kai ghostscript6 $FONTDIR/$f
+        $TTFM --setdefault_kai gscjk $FONTDIR/$f
     done
-    echo "ghostscript6" >> $FONTDIR/$PKGNAME
+    echo "gscjk" >> $FONTDIR/$PKGNAME
 fi
 
 if [ "X$WITHOUT_X" = "X" ]; then
diff --git a/chinese/mozilla-tclp/pkg-message b/chinese/mozilla-tclp/pkg-message
index e722bbd67c1e..33687c02d610 100644
--- a/chinese/mozilla-tclp/pkg-message
+++ b/chinese/mozilla-tclp/pkg-message
@@ -3,7 +3,6 @@ Edit the file "${HOME}/.mozilla/${USER}/*.slt/user.js" (per user)
      or "/usr/X11R6/lib/mozilla/defaults/pref/unix.js" (for all)
      to change XIM settings (if not working),
      Anti-Alias settings, and Printing settings.
-If need printing, go /usr/ports/chinese/arphicttf to make WANT_GS6=yes
-     then go /usr/ports/chinese/ghostscript6 to make all install
+If need printing, go /usr/ports/chinese/arphicttf to make WANT_GS=yes
 For detail: http://freebsd.sinica.edu.tw/~statue/zh-tut/web-browse.html
 ***********************************************************************
diff --git a/chinese/wangttf/Makefile b/chinese/wangttf/Makefile
index fbc00e1e7d61..343828866b97 100644
--- a/chinese/wangttf/Makefile
+++ b/chinese/wangttf/Makefile
@@ -26,7 +26,7 @@ SHAREMODE=	644
 FONTDIR=	${PREFIX}/share/fonts/TrueType
 XFONTDIR=	${X11BASE}/lib/X11/fonts/TrueType
 INSTALL_ENV=	PKG_PREFIX=${PREFIX} XFREE86_VERSION=${XFREE86_VERSION} \
-		DEFAULT=${DEFAULT} WANT_CJK=${WANT_CJK} WANT_GS6=${WANT_GS6} \
+		DEFAULT=${DEFAULT} WANT_CJK=${WANT_CJK} WANT_GS=${WANT_GS} \
 		WITHOUT_X=${WITHOUT_X}
 
 .include <bsd.port.pre.mk>
@@ -34,8 +34,8 @@ INSTALL_ENV=	PKG_PREFIX=${PREFIX} XFREE86_VERSION=${XFREE86_VERSION} \
 .if defined(WANT_CJK)
 RUN_DEPENDS+=	bg5latex:${PORTSDIR}/chinese/CJK
 .endif
-.if defined(WANT_GS6)
-RUN_DEPENDS+=	${LOCALBASE}/share/ghostscript/CJK/CMap/B5pc-H:${PORTSDIR}/chinese/ghostscript6
+.if defined(WANT_GS)
+RUN_DEPENDS+=	${LOCALBASE}/share/ghostscript/Resource/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps
 .endif
 .if ${XFREE86_VERSION} == 3 && !defined(WITHOUT_X)
 RUN_DEPENDS+=	mkfontdir.pl:${PORTSDIR}/x11-servers/XttXF86srv-common
@@ -45,16 +45,16 @@ pre-fetch:
 .if defined(WANT_CJK)
 	@${ECHO} "CJK support will be added."
 .endif
-.if defined(WANT_GS6)
-	@${ECHO} "Ghostscript6 support will be added."
+.if defined(WANT_GS)
+	@${ECHO} "Ghostscript support will be added."
 .endif
 .if defined(WITHOUT_X)
 	@${ECHO} "X Window support will NOT be added."
 .endif
-.if !defined(WANT_CJK) && !defined(WANT_GS6) && !defined(WITHOUT_X)
+.if !defined(WANT_CJK) && !defined(WANT_GS) && !defined(WITHOUT_X)
 	@${ECHO} --
 	@${ECHO} "Type \"make WANT_CJK=yes\" if you want CJK support."
-	@${ECHO} "Type \"make WANT_GS6=yes\" if you want Ghostscript6 support."
+	@${ECHO} "Type \"make WANT_GS=yes\" if you want Ghostscript support."
 	@${ECHO} "Type \"make WITHOUT_X=yes\" if you DONT want X Window support."
 	@${ECHO} "You can use them in combinations."
 	@${ECHO} --
diff --git a/chinese/wangttf/pkg-install b/chinese/wangttf/pkg-install
index 5bbd84f0388c..a581fd1b4b2b 100644
--- a/chinese/wangttf/pkg-install
+++ b/chinese/wangttf/pkg-install
@@ -24,17 +24,17 @@ if [ "X$WANT_CJK" != "X" ]; then
     # There's no CJK module now.
 fi
 
-if [ "X$WANT_GS6" != "X" ]; then
+if [ "X$WANT_GS" != "X" ]; then
     for f in $FONTS; do
-        $TTFM --add ghostscript6 $FONTDIR/$f
+        $TTFM --add gscjk $FONTDIR/$f
     done
     for f in $DEFAULTMING; do
-        $TTFM --setdefault ghostscript6 $FONTDIR/$f
+        $TTFM --setdefault gscjk $FONTDIR/$f
     done
     for f in $DEFAULTKAI; do
-        $TTFM --setdefault_kai ghostscript6 $FONTDIR/$f
+        $TTFM --setdefault_kai gscjk $FONTDIR/$f
     done
-    echo "ghostscript6" >> $FONTDIR/$PKGNAME
+    echo "gscjk" >> $FONTDIR/$PKGNAME
 fi
 
 if [ "X$WITHOUT_X" = "X" ]; then