Attachment 24802 Details for Bug 42330 – file.diff

[patch] file.diff

file.diff (text/plain), 8.82 KB, created by statue on 2002-09-02 17:30:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: statue

Created: 2002-09-02 17:30:02 UTC

Size: 8.82 KB

patch

obsolete

>diff -ruN abiword.orig/pkg-install abiword/pkg-install
>--- abiword.orig/pkg-install	Tue Sep  3 00:13:19 2002
>+++ abiword/pkg-install	Tue Sep  3 00:13:39 2002
>@@ -17,7 +17,7 @@
> fi
> 
> for f in $FONTS; do
>-    $TTFM --add ghostscript6 $FONTDIR/$f
>+    $TTFM --add gscjk $FONTDIR/$f
> done
> 
> for f in $FONTS; do
>diff -ruN arphicttf.orig/Makefile arphicttf/Makefile
>--- arphicttf.orig/Makefile	Tue Sep  3 00:14:28 2002
>+++ arphicttf/Makefile	Tue Sep  3 00:18:17 2002
>@@ -23,7 +23,7 @@
> 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 @@
> .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 @@
> .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 -ruN arphicttf.orig/pkg-install arphicttf/pkg-install
>--- arphicttf.orig/pkg-install	Tue Sep  3 00:14:28 2002
>+++ arphicttf/pkg-install	Tue Sep  3 00:18:33 2002
>@@ -24,17 +24,17 @@
>     # 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 -ruN moettf.orig/Makefile moettf/Makefile
>--- moettf.orig/Makefile	Tue Sep  3 00:24:36 2002
>+++ moettf/Makefile	Tue Sep  3 00:25:17 2002
>@@ -28,7 +28,7 @@
> 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 @@
> .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 @@
> .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 @@
> .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 -ruN moettf.orig/pkg-install moettf/pkg-install
>--- moettf.orig/pkg-install	Tue Sep  3 00:24:36 2002
>+++ moettf/pkg-install	Tue Sep  3 00:25:38 2002
>@@ -29,17 +29,17 @@
>     # 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 -ruN mozilla-tclp.orig/pkg-message mozilla-tclp/pkg-message
>--- mozilla-tclp.orig/pkg-message	Tue Sep  3 00:22:47 2002
>+++ mozilla-tclp/pkg-message	Tue Sep  3 00:23:56 2002
>@@ -3,7 +3,6 @@
>      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 -ruN wangttf.orig/Makefile wangttf/Makefile
>--- wangttf.orig/Makefile	Tue Sep  3 00:21:30 2002
>+++ wangttf/Makefile	Tue Sep  3 00:22:02 2002
>@@ -26,7 +26,7 @@
> 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 @@
> .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 @@
> .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 -ruN wangttf.orig/pkg-install wangttf/pkg-install
>--- wangttf.orig/pkg-install	Tue Sep  3 00:21:30 2002
>+++ wangttf/pkg-install	Tue Sep  3 00:22:18 2002
>@@ -24,17 +24,17 @@
>     # 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

Actions: View | Diff

Attachments on bug 42330: 24802