From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Feb 29 10:12:04 2008 Return-Path: Delivered-To: freebsd-ports-bugs@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 74EBB106566B; Fri, 29 Feb 2008 10:12:04 +0000 (UTC) (envelope-from yokota@res.otaru-uc.ac.jp) Received: from ca1.otaru-uc.ac.jp (ca1.otaru-uc.ac.jp [150.83.48.27]) by mx1.freebsd.org (Postfix) with ESMTP id 7ED558FC2E; Fri, 29 Feb 2008 10:12:03 +0000 (UTC) (envelope-from yokota@res.otaru-uc.ac.jp) Received: from canal1.otaru-uc.ac.jp (canal1 [150.83.48.23]) by ca1.otaru-uc.ac.jp (Postfix) with ESMTP id C31D6E1D3E; Fri, 29 Feb 2008 17:08:12 +0900 (JST) Received: from room520-1.yokota-s.otaru-uc.ac.jp (room520-1.yokota-s.otaru-uc.ac.jp [150.83.100.4]) by canal1.otaru-uc.ac.jp (SMTP) with ESMTP id m1T88C0g027488; Fri, 29 Feb 2008 17:08:12 +0900 (JST) Message-ID: <47C7BE98.2020407@res.otaru-uc.ac.jp> Date: Fri, 29 Feb 2008 17:13:12 +0900 From: Koji Yokota Organization: Otaru University of Commerce User-Agent: Thunderbird 2.0.0.9 (X11/20080221) MIME-Version: 1.0 To: rafan@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, FreeBSD-gnats-submit@FreeBSD.org References: <200802030657.m136vEJv077739@freefall.freebsd.org> In-Reply-To: <200802030657.m136vEJv077739@freefall.freebsd.org> X-Enigmail-Version: 0.95.5 Content-Type: multipart/mixed; boundary="------------050603000909050301050002" Cc: Subject: Re: ports/119566: [PATCH] print/ghostscript-gpl: Add support for Japanese fonts and fix the FT_BRIDGE problem X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 10:12:04 -0000 This is a multi-part message in MIME format. --------------050603000909050301050002 Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 I think the attached patch works for 8.61. Could you test and update it if it is ok? rafan@FreeBSD.org wrote: > There are things changed in gs 8.61 (see PR 118608) which causes > this patch to fail in build stage. Could you please take a look > and send me back a new patch for gs 8.61? > > Thanks! > > http://www.freebsd.org/cgi/query-pr.cgi?pr=119566 > -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.8 (FreeBSD) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEARECAAYFAkfHvpcACgkQbrHz2oqsCNtFtgCfaG7K83WKdPRAlwrbmBZadhXJ 4VMAoLNtycj3t4AWaDld6NVszbU5Z3Yv =u/Qr -----END PGP SIGNATURE----- --------------050603000909050301050002 Content-Type: text/x-patch; name="ghostscript-gpl.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="ghostscript-gpl.patch" diff -ru ghostscript-gpl.orig/Makefile ghostscript-gpl/Makefile --- ghostscript-gpl.orig/Makefile 2008-01-12 00:56:16.000000000 +0900 +++ ghostscript-gpl/Makefile 2008-02-29 13:39:13.000000000 +0900 @@ -23,6 +23,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= GPL Postscript interpreter +BUILD_DEPENDS= ${LOCALBASE}/share/automake-1.10/install-sh:${PORTSDIR}/devel/automake110 LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts @@ -36,10 +37,14 @@ PLIST_SUB= GS_VERSION="${GS_VERSION}" \ CIDFONTDIR="${CIDFONTDIR}" -SCRIPTS_ENV= GS_DRIVERS_LIST="${GS_DRIVERS_LIST}" \ - WITHOUT_X11="${WITHOUT_X11}" \ - WITH_SVGALIB="${WITH_SVGALIB}" \ - WITH_ICONV="${WITH_ICONV}" +OPTIONS= A4SIZE "Set A4 (not Letter) as a default paper size" off \ + FONTCONFIG "fontconfig support" off \ + FT_BRIDGE "FreeType bridge" off \ + ICONV "libiconv support (required by opvp/oprp drivers)" on \ + JPNFONTS "Japanese font support" on \ + SHLIB "With shared libraries" off \ + SVGALIB "svgalib support" off \ + X11 "X11 support" on MAN1= dvipdf.1 font2c.1 gs.1 gslp.1 gsnd.1 gs-pcl3.1 pcl3opts.1 \ pdf2dsc.1 pdf2ps.1 pdfopt.1 pf2afm.1 pfbtopfa.1 printafm.1 \ @@ -55,7 +60,14 @@ XCFLAGS= ${PTHREAD_CFLAGS} XLDFLAGS= ${PTHREAD_LIBS} -MSG_PAPERSIZE= "NOTE: Type \"make A4=yes\" to use A4 paper size by default." +.include "Makefile.inc" +.include + +SCRIPTS_ENV= GS_DRIVERS_LIST="${GS_DRIVERS_LIST}" \ + WITHOUT_X11="${WITHOUT_X11}" \ + WITH_SVGALIB="${WITH_SVGALIB}" \ + WITH_ICONV="${WITH_ICONV}" + .if !defined(WITH_LETTERSIZE) .if defined(A4) || defined(WITH_A4SIZE) XCFLAGS+= -DA4 @@ -98,13 +110,11 @@ SOC_CFLAGS="`pkg-config --cflags gtk+-2.0`" \ SOC_LIBS="`pkg-config --libs gtk+-2.0`" .endif -ALL_TARGET= so pcl3opts +ALL_TARGET= so INSTALL_TARGET= soinstall USE_LDCONFIG= yes PLIST_SUB+= SHLIB="" SHLIB_VER="${GS_VERSION:R}" -INCLUDEDIR= ${PREFIX}/include/ghostscript .else -ALL_TARGET= all pcl3opts PLIST_SUB+= SHLIB="@comment " .endif @@ -120,15 +130,31 @@ EPAG_NAME= ${EPAG}-${EPAG_VERS} EPAG_SRCS= ${EPAG_NAME}.tar.gz -.include "Makefile.inc" -.include -.SILENT: +# Add support for Japanese fonts +.if defined(WITH_JPNFONTS) +MASTER_SITES+= http://www.interq.or.jp/mars/cherry/mac/:jpn +DISTFILES+= ${JPN_SRCS}:jpn +JPN_SRCS= Font.tar.bz2 +PLIST_SUB+= JPN="" +.else +PLIST_SUB+= JPN="@comment " +.endif +.SILENT: pre-everything:: ${ECHO_MSG} ${MSG_PAPERSIZE} post-extract: ${ECHO_MSG} ">>> in post-extract ..." +#.for _FILES in config.guess config.sub ltmain.sh +# (cd ${WRKSRC}/ijs; ${RM} ${_FILES}; \ +# ${LN} -s ${LOCALBASE}/share/libtool/${_FILES}) +#.endfor +#.for _FILES in install-sh missing +# (cd ${WRKSRC}/ijs; ${RM} ${_FILES}; \ +# ${LN} -s ${LOCALBASE}/share/automake-1.10/${_FILES}) +#.endfor + # ** 3rd party driver ** # Note: don't forget to add those devices in scripts/configure, # which update unix-gcc.mak to build gs with these new devices! @@ -137,6 +163,11 @@ ${ECHO_MSG} ">>> extracting ${EPAG_SRCS} ..." ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EPAG_SRCS} ${LN} -sf ${EPAG_NAME} ${WRKSRC}/${EPAG} +# for Japanese fonts +.if defined(WITH_JPNFONTS) + ${ECHO_MSG} ">>> extracting ${JPN_SRCS} ..." + ${TAR} -C ${WRKSRC}/Resource -xypof ${DISTDIR}/${DIST_SUBDIR}/${JPN_SRCS} +.endif post-patch: ${REINPLACE_CMD} -e 's|^DEVICE_DEVS|#DEVICE_DEVS|g' \ @@ -160,17 +191,15 @@ post-configure: ${ECHO_MSG} ">>> in post-configure ..." cd ${WRKSRC}/jasper ; \ - ${SETENV} ${MAKE_ENV} ${SH} ./configure + ${SETENV} ${MAKE_ENV} ${SH} ./configure --prefix=${PREFIX} + cd ${WRKSRC}/ijs ; \ + ${SETENV} ${MAKE_ENV} ${SH} ./autogen.sh pre-build: ${ECHO_MSG} ">>> in pre-build ..." ${ECHO_MSG} ">>> creating directories for compilation ..." ${MKDIR} ${WRKSRC}/obj ${MKDIR} ${WRKSRC}/bin -# for EPAG driver - ${ECHO_MSG} ">>> building EPAG utility ..." - cd ${WRKSRC}/${EPAG_NAME} ; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile ${ECHO_MSG} ">>> creating symlinks for EPAG ..." .for i in gdevepag.c ${LN} -sf ${WRKSRC}/${EPAG_NAME}/${i} ${WRKSRC}/src @@ -186,24 +215,28 @@ ${WRKSRC}/freetype/objs/freetype214MT_D.a .endif +post-build: +# for PCL3 driver + ${ECHO_MSG} ">>> building PCL3 utility ..." + cd ${WRKSRC} ; \ + ${CC} ${CFLAGS} -I./obj -I./soobj -I./src \ + -I./contrib/pcl3/eprn -o bin/pcl3opts \ + contrib/pcl3/src/pcl3opts.c contrib/pcl3/src/pclscan.c \ + contrib/pcl3/eprn/mediasize.c contrib/pcl3/src/pclsize.c +# for EPAG driver + ${ECHO_MSG} ">>> building EPAG utility ..." + cd ${WRKSRC}/${EPAG_NAME} ; \ + ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile + pre-su-install: ${ECHO_MSG} ">>> in pre-install ..." ${ECHO_MSG} ">>> creating ghostscript destdir ..." ${MKDIR} ${DATADIR} ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR} -.if defined(WITH_SHLIB) - ${MKDIR} ${INCLUDEDIR} - ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INCLUDEDIR} -.endif post-install: ${ECHO_MSG} ">>> in post-install ..." ${LN} -s -f ${LOCALBASE}/share/fonts/CIDFont ${CIDFONTDIR}/CIDFont -.if defined(WITH_SHLIB) -.for i in iapi.h ierrors.h - ${INSTALL_DATA} ${WRKSRC}/src/${i} ${INCLUDEDIR} -.endfor -.endif ${ECHO_MSG} ">>> stripping gs ..." .if defined(WITH_SHLIB) ${STRIP_CMD} ${PREFIX}/bin/gsc ${PREFIX}/bin/gsx @@ -247,6 +280,12 @@ ${INSTALL_DATA} ${FILESDIR}/${i} \ ${DATADIR}/${GS_VERSION}/lib .endfor +# for Japanese fonts +.if defined(WITH_JPNFONTS) + ${ECHO_MSG} ">>> installing Japanese font resources ..." + ${INSTALL_DATA} ${WRKSRC}/Resource/Font/* \ + ${DATADIR}/${GS_VERSION}/Resource/Font/ +.endif # # now NOPORTDOCS dependend stuff # @@ -299,4 +338,11 @@ @${CAT} ${PKGMESSAGE} @${ECHO_MSG} +.if defined(WITH_FT_BRIDGE) + ${ECHO_MSG} " *** Configure FAPIfontmap and FAPIcidfmap accordingly" + ${ECHO_MSG} " *** in ${DATADIR}/${GS_VERSION}/lib" + ${ECHO_MSG} " *** to use FreeType fonts." + @${ECHO_MSG} +.endif + .include diff -ru ghostscript-gpl.orig/Makefile.inc ghostscript-gpl/Makefile.inc --- ghostscript-gpl.orig/Makefile.inc 2008-01-12 00:56:16.000000000 +0900 +++ ghostscript-gpl/Makefile.inc 2008-02-04 02:28:41.000000000 +0900 @@ -1,5 +1,5 @@ # $FreeBSD: ports/print/ghostscript-gpl/Makefile.inc,v 1.23 2007/08/16 15:20:29 rafan Exp $ -GS_VERSION= 8.60 +GS_VERSION= 8.61 GS_REVISION= 0 GS_EPOCH= 0 diff -ru ghostscript-gpl.orig/distinfo ghostscript-gpl/distinfo --- ghostscript-gpl.orig/distinfo 2008-01-12 00:56:16.000000000 +0900 +++ ghostscript-gpl/distinfo 2008-02-04 06:47:38.000000000 +0900 @@ -1,6 +1,9 @@ -MD5 (ghostscript/ghostscript-8.60.tar.bz2) = 89fc0a90e67caf151a9d6855200c68ca -SHA256 (ghostscript/ghostscript-8.60.tar.bz2) = f615f936e38d2e7a6da588de6655f2b23207c0a906df1960b1d7e83c3241982a -SIZE (ghostscript/ghostscript-8.60.tar.bz2) = 12942029 +MD5 (ghostscript/ghostscript-8.61.tar.bz2) = abff0506cd249cba3ad862d8fe4f6474 +SHA256 (ghostscript/ghostscript-8.61.tar.bz2) = 8c3f62da38688c02442f9b94ac42c6ecefb01141c8319393e8216d8422f7aa33 +SIZE (ghostscript/ghostscript-8.61.tar.bz2) = 13244754 MD5 (ghostscript/epag-3.09.tar.gz) = 63304a6afe44842124d2d880bf24dbe3 SHA256 (ghostscript/epag-3.09.tar.gz) = ad10eca44c781a5851d5a8993dcd95b2e2b99392cbf2c8372a5a658f3b991b3b SIZE (ghostscript/epag-3.09.tar.gz) = 12858 +MD5 (ghostscript/Font.tar.bz2) = 200b2018a01065f4fa6aa063d9f14fce +SHA256 (ghostscript/Font.tar.bz2) = 3805572c2a0fb7012f89ecef93feb757e8f78d59462fb81d7f6b095e9f1f3865 +SIZE (ghostscript/Font.tar.bz2) = 2198 diff -ru ghostscript-gpl.orig/files/patch-epag__gdevepag.c ghostscript-gpl/files/patch-epag__gdevepag.c --- ghostscript-gpl.orig/files/patch-epag__gdevepag.c 2008-01-12 00:56:13.000000000 +0900 +++ ghostscript-gpl/files/patch-epag__gdevepag.c 2008-02-04 02:28:41.000000000 +0900 @@ -1,5 +1,125 @@ --- epag/gdevepag.c.orig Sat Jul 8 13:33:09 2000 -+++ epag/gdevepag.c Mon May 14 01:22:31 2007 ++++ epag/gdevepag.c Sat Nov 24 15:25:11 2007 +@@ -102,30 +102,30 @@ + } EpagBubble; + + /* The device descriptors */ +-private dev_proc_open_device(epag_open); +-private dev_proc_close_device(epag_close); +-private dev_proc_print_page(epag_print_page); +-private void epag_printer_initialize(gx_device_printer *pdev, FILE *fp,int); +-private dev_proc_print_page(epag_print_page); +-private dev_proc_get_params(epag_get_params); +-private dev_proc_put_params(epag_put_params); +-private void epag_paper_set(gx_device_printer *pdev, FILE *fp); +-private void epag_bubble_flush_all(EpagPageCont *cont); +-private void epag_page_cont_init(gx_device_printer *pdev,FILE *fp,EpagPageCont *cont); +-private void epag_page_close(EpagPageCont *cont); +-private int epag_read_image(EpagPageCont *cont); +-private void epag_process_line(EpagPageCont *cont); +-private int epag_is_black(EpagPageCont *cont, int bx); +-private void epag_rect_add(EpagPageCont *cont,int start,int end); +-private void epag_bubble_gen(EpagPageCont *cont, ++static dev_proc_open_device(epag_open); ++static dev_proc_close_device(epag_close); ++static dev_proc_print_page(epag_print_page); ++static void epag_printer_initialize(gx_device_printer *pdev, FILE *fp,int); ++static dev_proc_print_page(epag_print_page); ++static dev_proc_get_params(epag_get_params); ++static dev_proc_put_params(epag_put_params); ++static void epag_paper_set(gx_device_printer *pdev, FILE *fp); ++static void epag_bubble_flush_all(EpagPageCont *cont); ++static void epag_page_cont_init(gx_device_printer *pdev,FILE *fp,EpagPageCont *cont); ++static void epag_page_close(EpagPageCont *cont); ++static int epag_read_image(EpagPageCont *cont); ++static void epag_process_line(EpagPageCont *cont); ++static int epag_is_black(EpagPageCont *cont, int bx); ++static void epag_rect_add(EpagPageCont *cont,int start,int end); ++static void epag_bubble_gen(EpagPageCont *cont, + int x0, int x1, int y0, int y1); +-private void epag_bubble_flush(EpagPageCont *cont,EpagBubble *bbl); +-private void epag_bubble_image_out(EpagPageCont *cont,EpagBubble *bbl); ++static void epag_bubble_flush(EpagPageCont *cont,EpagBubble *bbl); ++static void epag_bubble_image_out(EpagPageCont *cont,EpagBubble *bbl); + + /* + * デバイスの宣言 + */ +-private gx_device_procs prn_epag_procs = ++static gx_device_procs prn_epag_procs = + prn_params_procs(epag_open, gdev_prn_output_page, epag_close, + epag_get_params, epag_put_params); + gx_device_printer far_data gs_epag_device = +@@ -140,13 +140,13 @@ + static char *epson_remote_start = "\033\001@EJL \r\n"; + + /* Open the printer, adjusting the margins if necessary. */ +-private int ++static int + epag_open(gx_device *pdev) + { + return gdev_prn_open(pdev); + } + +-private int ++static int + epag_close(gx_device *pdev) + { + gdev_prn_open_printer(pdev, 1); +@@ -163,7 +163,7 @@ + return gdev_prn_close(pdev); + } + +-private int ++static int + epag_print_page(gx_device_printer *pdev, FILE *fp) + { + EpagPageCont cont; +@@ -205,7 +205,7 @@ + GS, '2', 'a', 'b', 'P', /* イメージ描画後下へ */ + }; + +-private void ++static void + epag_printer_initialize(gx_device_printer *pdev, FILE *fp, int copies) + { + double xDpi,yDpi; +@@ -260,7 +260,7 @@ + fprintf(fp,"%c%dcoO",GS, copies < 256 ? copies : 255); + } + +-private int ++static int + epag_get_params(gx_device *pdev, gs_param_list *plist) + { + int code; +@@ -286,7 +286,7 @@ + } + + /* Put properties. */ +-private int ++static int + epag_put_params(gx_device *pdev, gs_param_list *plist) + { + param_read_int(plist, "cRowBuf", &epag_cont.cRowBuf); +@@ -380,7 +380,7 @@ + /* + * epag_bubble_flush_all: 残っている bubbleを全て出力する。 + */ +-private void epag_bubble_flush_all(EpagPageCont *cont) ++static void epag_bubble_flush_all(EpagPageCont *cont) + { + int i; + +@@ -392,7 +392,7 @@ + /* + * epag_page_cont_init: EpagPageContの初期化、バッファ確保等 + */ +-private void epag_page_cont_init(gx_device_printer *pdev,FILE *fp, ++static void epag_page_cont_init(gx_device_printer *pdev,FILE *fp, + EpagPageCont *cont) + { + int bpl; @@ -417,15 +417,15 @@ cont->maxY = epag_cont.cRowBuf / cont->bh * cont->bh ; if(cont->maxY < cont->bh) cont->maxY = cont->bh; @@ -20,8 +140,12 @@ bbtbl = (EpagBubble *)cont->bubbleBuffer; for(i=0;imaxBx-1;i++) bbtbl[i].next = &bbtbl[i+1]; -@@ -436,9 +436,9 @@ - private void +@@ -433,15 +433,15 @@ + cont->freeBubbleList = &bbtbl[0]; + } + +-private void ++static void epag_page_close(EpagPageCont *cont) { - gs_free(cont->bp, bpl, cont->maxY, "epag_skip_blank_init(bp)"); @@ -32,4 +156,62 @@ + gs_free(gs_lib_ctx_get_non_gc_memory_t(), cont->bubbleBuffer, sizeof(EpagBubble), cont->maxBx,"bubbleBuffer"); } - private int +-private int ++static int + epag_read_image(EpagPageCont *cont) + { + int bh = cont->bh; +@@ -473,7 +473,7 @@ + /* + * bh行分のラスターデータを処理する + */ +-private void ++static void + epag_process_line(EpagPageCont *cont) + { + int bh = cont->bh; +@@ -502,7 +502,7 @@ + else epag_rect_add(cont, 0, cont->maxBx-1); + } + +-private int ++static int + epag_is_black(EpagPageCont *cont, int bx) + { + int bh = cont->bh; +@@ -520,7 +520,7 @@ + return 0; + } + +-private void ++static void + epag_rect_add(EpagPageCont *cont,int start,int end) + { + int x0 = start * cont->bw; +@@ -544,7 +544,7 @@ + } + } + +-private void ++static void + epag_bubble_gen(EpagPageCont *cont, int x0, int x1, int y0, int y1) + { + EpagBubble *bbl; +@@ -569,7 +569,7 @@ + } + } + +-private void epag_bubble_flush(EpagPageCont *cont,EpagBubble *bbl) ++static void epag_bubble_flush(EpagPageCont *cont,EpagBubble *bbl) + { + int bx,bx0,bx1; + +@@ -588,7 +588,7 @@ + + /* イメージを出力 */ + +-private void ++static void + epag_bubble_image_out(EpagPageCont *cont,EpagBubble *bbl) + { + FILE *fp = cont->fp; Only in ghostscript-gpl/files: patch-lib-FAPIcidfmap diff -ru ghostscript-gpl.orig/files/patch-src-gdevvglb.c ghostscript-gpl/files/patch-src-gdevvglb.c --- ghostscript-gpl.orig/files/patch-src-gdevvglb.c 2008-01-12 00:56:14.000000000 +0900 +++ ghostscript-gpl/files/patch-src-gdevvglb.c 2008-02-04 02:28:41.000000000 +0900 @@ -1,9 +1,9 @@ ---- src/gdevvglb.c.orig Mon Jun 4 01:15:47 2007 -+++ src/gdevvglb.c Mon Jun 4 01:18:45 2007 +--- src/gdevvglb.c.orig Tue Sep 25 22:31:24 2007 ++++ src/gdevvglb.c Sat Nov 24 23:00:49 2007 @@ -149,10 +149,13 @@ } - private gx_color_index + static gx_color_index -vgalib_map_rgb_color(gx_device * dev, gx_color_value red, - gx_color_value green, gx_color_value blue) +vgalib_map_rgb_color(gx_device * dev, const gx_color_value cv[]) @@ -16,4 +16,4 @@ + return pc_4bit_map_rgb_color(dev, cv); } - private int + static int Only in ghostscript-gpl/files: patch-src-int.mak diff -ru ghostscript-gpl.orig/files/patch-src:unix-gcc.mak ghostscript-gpl/files/patch-src:unix-gcc.mak --- ghostscript-gpl.orig/files/patch-src:unix-gcc.mak 2008-01-12 00:56:14.000000000 +0900 +++ ghostscript-gpl/files/patch-src:unix-gcc.mak 2008-02-04 02:28:41.000000000 +0900 @@ -1,5 +1,5 @@ ---- src/unix-gcc.mak.orig Tue Jul 31 05:13:56 2007 -+++ src/unix-gcc.mak Fri Aug 10 22:01:41 2007 +--- src/unix-gcc.mak.orig Sat Nov 10 06:18:04 2007 ++++ src/unix-gcc.mak Sat Nov 24 15:09:41 2007 @@ -21,15 +21,17 @@ # source, generated intermediate file, and object directories # for the graphics library (GL) and the PostScript/PDF interpreter (PS). @@ -42,15 +42,7 @@ exec_prefix = $(prefix) bindir = $(exec_prefix)/bin scriptdir = $(bindir) -@@ -62,6 +63,7 @@ - datadir = $(prefix)/share - gsdir = $(datadir)/ghostscript - gsdatadir = $(gsdir)/$(GS_DOT_VERSION) -+gssharedir = $(libdir)/ghostscript/$(GS_DOT_VERSION) - - docdir=$(gsdatadir)/doc - exdir=$(gsdatadir)/examples -@@ -108,7 +110,7 @@ +@@ -107,7 +108,7 @@ # -DHAVE_HYPOT # use the system hypot() call @@ -59,7 +51,7 @@ # Define the name of the executable file. -@@ -143,7 +145,7 @@ +@@ -141,7 +142,7 @@ # some older JPEG streams that violate the standard. If the JPEG # library built from local sources, the patch will be applied. @@ -68,7 +60,7 @@ JPEG_NAME=jpeg # Define the directory where the PNG library sources are stored, -@@ -158,7 +160,7 @@ +@@ -155,7 +156,7 @@ # what its name is. # See gs.mak and Make.htm for more information. @@ -77,7 +69,7 @@ LIBPNG_NAME=png # Define the directory where the zlib sources are stored. -@@ -170,7 +172,7 @@ +@@ -167,7 +168,7 @@ # what its name is (usually libz, but sometimes libgz). # See gs.mak and Make.htm for more information. @@ -86,7 +78,7 @@ #ZLIB_NAME=gz ZLIB_NAME=z -@@ -179,6 +181,14 @@ +@@ -176,6 +177,14 @@ JBIG2_LIB=jbig2dec JBIG2SRCDIR=jbig2dec @@ -101,7 +93,7 @@ # Define the directory where the icclib source are stored. # See icclib.mak for more information -@@ -207,7 +217,7 @@ +@@ -204,7 +213,7 @@ # Define the name of the C compiler. @@ -110,7 +102,7 @@ # Define the name of the linker for the final link step. # Normally this is the same as the C compiler. -@@ -224,10 +234,10 @@ +@@ -221,10 +230,10 @@ # Define the added flags for standard, debugging, profiling # and shared object builds. @@ -123,7 +115,7 @@ # Define the other compilation flags. Add at most one of the following: # -DBSD4_2 for 4.2bsd systems. -@@ -240,7 +250,8 @@ +@@ -237,7 +246,8 @@ # We don't include -ansi, because this gets in the way of the platform- # specific stuff that typically needs; nevertheless, we expect # gcc to accept ANSI-style function prototypes and function definitions. @@ -133,7 +125,7 @@ CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS) -@@ -251,7 +262,7 @@ +@@ -248,7 +258,7 @@ # -R /usr/local/xxx/lib:/usr/local/lib # giving the full path names of the shared library directories. # XLDFLAGS can be set from the command line. @@ -142,7 +134,7 @@ LDFLAGS=$(XLDFLAGS) -@@ -262,7 +273,7 @@ +@@ -259,7 +269,7 @@ # Solaris may need -lnsl -lsocket -lposix4. # (Libraries required by individual drivers are handled automatically.) @@ -151,7 +143,7 @@ # Define the standard libraries to search at the end of linking. # Most platforms require -lpthread for the POSIX threads library; -@@ -284,7 +295,7 @@ +@@ -281,7 +291,7 @@ # Note that x_.h expects to find the header files in $(XINCLUDE)/X11, # not in $(XINCLUDE). @@ -160,7 +152,7 @@ # Define the directory/ies and library names for the X11 library files. # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH -@@ -296,12 +307,12 @@ +@@ -293,12 +303,12 @@ # Solaris and other SVR4 systems with dynamic linking probably want #XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib # X11R6 (on any platform) may need @@ -176,7 +168,7 @@ # Define whether this platform has floating point hardware: # FPU_TYPE=2 means floating point is faster than fixed point. -@@ -319,16 +330,16 @@ +@@ -316,16 +326,16 @@ # If POSIX sync primitives are used, also change the STDLIBS to include # the pthread library. @@ -196,7 +188,7 @@ #FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev # The following is strictly for testing. FEATURE_DEVS_ALL=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)rasterop.dev $(PSD)double.dev $(PSD)trapping.dev $(PSD)stocht.dev $(GLD)pipe.dev -@@ -418,7 +429,7 @@ +@@ -415,7 +425,7 @@ DEVICE_DEVS21=$(DD)spotcmyk.dev $(DD)devicen.dev $(DD)xcf.dev $(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16m.dev $(DD)bmp32b.dev $(DD)psdcmyk.dev $(DD)psdrgb.dev # Shared library target to build. @@ -205,7 +197,7 @@ #GS_SHARED_OBJS=$(GLOBJDIR)/X11.so # ---------------------------- End of options --------------------------- # -@@ -457,6 +468,9 @@ +@@ -454,6 +464,9 @@ include $(GLSRCDIR)/zlib.mak include $(GLSRCDIR)/libpng.mak include $(GLSRCDIR)/jbig2.mak @@ -215,7 +207,7 @@ include $(GLSRCDIR)/icclib.mak include $(GLSRCDIR)/ijs.mak include $(GLSRCDIR)/devs.mak -@@ -466,6 +480,7 @@ +@@ -463,6 +476,7 @@ include $(GLSRCDIR)/unix-dll.mak include $(GLSRCDIR)/unix-end.mak include $(GLSRCDIR)/unixinst.mak diff -ru ghostscript-gpl.orig/files/patch-src__gdevperm.c ghostscript-gpl/files/patch-src__gdevperm.c --- ghostscript-gpl.orig/files/patch-src__gdevperm.c 2008-01-12 00:56:15.000000000 +0900 +++ ghostscript-gpl/files/patch-src__gdevperm.c 2008-02-04 02:28:41.000000000 +0900 @@ -1,9 +1,9 @@ ---- src/gdevperm.c.orig Fri Jun 18 16:00:47 2004 -+++ src/gdevperm.c Fri Dec 31 18:06:42 2004 -@@ -289,7 +289,7 @@ +--- src/gdevperm.c.orig Tue Sep 25 22:31:24 2007 ++++ src/gdevperm.c Sat Nov 24 15:11:12 2007 +@@ -286,7 +286,7 @@ (strncmp((const char *)name, (const char *)str, name_size) == 0)) - private int + static int -perm_get_color_comp_index(const gx_device *pdev, const char *pname, +perm_get_color_comp_index(gx_device *pdev, const char *pname, int name_size, int component_type) diff -ru ghostscript-gpl.orig/pkg-plist ghostscript-gpl/pkg-plist --- ghostscript-gpl.orig/pkg-plist 2008-01-12 00:56:17.000000000 +0900 +++ ghostscript-gpl/pkg-plist 2008-02-04 06:47:38.000000000 +0900 @@ -295,11 +295,19 @@ %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF32-V %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF8-H %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF8-V +%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS2004-UTF16-H +%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS2004-UTF16-V +%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS2004-UTF32-H +%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS2004-UTF32-V +%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS2004-UTF8-H +%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS2004-UTF8-V %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISPro-UCS2-HW-V %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISPro-UCS2-V %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISPro-UTF8-V %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISX0213-UTF32-H %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISX0213-UTF32-V +%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISX02132004-UTF32-H +%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISX02132004-UTF32-V %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UCS2-H %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UCS2-V %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UTF16-H @@ -322,6 +330,168 @@ %%DATADIR%%/%%GS_VERSION%%/Resource/Decoding/StandardEncoding %%DATADIR%%/%%GS_VERSION%%/Resource/Decoding/Unicode %%DATADIR%%/%%GS_VERSION%%/Resource/Encoding/Wingdings +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/FutoGoB101-Bold-EUC-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/FutoGoB101-Bold-EUC-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/FutoGoB101-Bold-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/FutoGoB101-Bold-UniJIS-UTF16-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/FutoGoB101-Bold-UniJIS-UTF16-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/FutoGoB101-Bold-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/FutoGoB101Pro-Bold-EUC-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/FutoGoB101Pro-Bold-EUC-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/FutoGoB101Pro-Bold-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/FutoGoB101Pro-Bold-UniJIS-UTF16-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/FutoGoB101Pro-Bold-UniJIS-UTF16-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/FutoGoB101Pro-Bold-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/FutoMinA101-Bold-EUC-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/FutoMinA101-Bold-EUC-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/FutoMinA101-Bold-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/FutoMinA101-Bold-UniJIS-UTF16-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/FutoMinA101-Bold-UniJIS-UTF16-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/FutoMinA101-Bold-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/FutoMinA101Pro-Bold-EUC-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/FutoMinA101Pro-Bold-EUC-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/FutoMinA101Pro-Bold-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/FutoMinA101Pro-Bold-UniJIS-UTF16-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/FutoMinA101Pro-Bold-UniJIS-UTF16-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/FutoMinA101Pro-Bold-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/GothicBBB-Medium-EUC-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/GothicBBB-Medium-EUC-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/GothicBBB-Medium-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/GothicBBB-Medium-UniJIS-UTF16-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/GothicBBB-Medium-UniJIS-UTF16-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/GothicBBB-Medium-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/GothicBBBPro-Medium-EUC-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/GothicBBBPro-Medium-EUC-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/GothicBBBPro-Medium-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/GothicBBBPro-Medium-UniJIS-UTF16-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/GothicBBBPro-Medium-UniJIS-UTF16-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/GothicBBBPro-Medium-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraKakuPro-W3-EUC-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraKakuPro-W3-EUC-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraKakuPro-W3-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraKakuPro-W3-UniJIS-UTF16-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraKakuPro-W3-UniJIS-UTF16-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraKakuPro-W3-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraKakuPro-W6-EUC-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraKakuPro-W6-EUC-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraKakuPro-W6-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraKakuPro-W6-UniJIS-UTF16-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraKakuPro-W6-UniJIS-UTF16-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraKakuPro-W6-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraKakuStd-W8-EUC-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraKakuStd-W8-EUC-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraKakuStd-W8-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraKakuStd-W8-UniJIS-UTF16-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraKakuStd-W8-UniJIS-UTF16-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraKakuStd-W8-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraMaruPro-W4-EUC-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraMaruPro-W4-EUC-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraMaruPro-W4-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraMaruPro-W4-UniJIS-UTF16-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraMaruPro-W4-UniJIS-UTF16-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraMaruPro-W4-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraMinPro-W3-EUC-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraMinPro-W3-EUC-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraMinPro-W3-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraMinPro-W3-UniJIS-UTF16-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraMinPro-W3-UniJIS-UTF16-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraMinPro-W3-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraMinPro-W6-EUC-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraMinPro-W6-EUC-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraMinPro-W6-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraMinPro-W6-UniJIS-UTF16-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraMinPro-W6-UniJIS-UTF16-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/HiraMinPro-W6-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/Jun101-Light-EUC-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/Jun101-Light-EUC-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/Jun101-Light-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/Jun101-Light-UniJIS-UTF16-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/Jun101-Light-UniJIS-UTF16-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/Jun101-Light-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/Jun101Pro-Light-EUC-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/Jun101Pro-Light-EUC-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/Jun101Pro-Light-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/Jun101Pro-Light-UniJIS-UTF16-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/Jun101Pro-Light-UniJIS-UTF16-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/Jun101Pro-Light-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozGoPro-Bold-EUC-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozGoPro-Bold-EUC-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozGoPro-Bold-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozGoPro-Bold-UniJIS-UTF16-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozGoPro-Bold-UniJIS-UTF16-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozGoPro-Bold-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozGoPro-Heavy-EUC-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozGoPro-Heavy-EUC-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozGoPro-Heavy-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozGoPro-Heavy-UniJIS-UTF16-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozGoPro-Heavy-UniJIS-UTF16-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozGoPro-Heavy-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozGoPro-Medium-EUC-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozGoPro-Medium-EUC-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozGoPro-Medium-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozGoPro-Medium-UniJIS-UTF16-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozGoPro-Medium-UniJIS-UTF16-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozGoPro-Medium-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozGoPro-Regular-EUC-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozGoPro-Regular-EUC-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozGoPro-Regular-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozGoPro-Regular-UniJIS-UTF16-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozGoPro-Regular-UniJIS-UTF16-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozGoPro-Regular-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozMinPro-Bold-EUC-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozMinPro-Bold-EUC-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozMinPro-Bold-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozMinPro-Bold-UniJIS-UTF16-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozMinPro-Bold-UniJIS-UTF16-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozMinPro-Bold-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozMinPro-Light-EUC-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozMinPro-Light-EUC-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozMinPro-Light-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozMinPro-Light-UniJIS-UTF16-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozMinPro-Light-UniJIS-UTF16-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozMinPro-Light-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozMinPro-Medium-EUC-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozMinPro-Medium-EUC-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozMinPro-Medium-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozMinPro-Medium-UniJIS-UTF16-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozMinPro-Medium-UniJIS-UTF16-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozMinPro-Medium-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozMinPro-Regular-EUC-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozMinPro-Regular-EUC-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozMinPro-Regular-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozMinPro-Regular-UniJIS-UTF16-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozMinPro-Regular-UniJIS-UTF16-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/KozMinPro-Regular-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/MidashiGoPro-MB31-EUC-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/MidashiGoPro-MB31-EUC-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/MidashiGoPro-MB31-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/MidashiGoPro-MB31-UniJIS-UTF16-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/MidashiGoPro-MB31-UniJIS-UTF16-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/MidashiGoPro-MB31-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/MidashiMinPro-MA31-EUC-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/MidashiMinPro-MA31-EUC-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/MidashiMinPro-MA31-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/MidashiMinPro-MA31-UniJIS-UTF16-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/MidashiMinPro-MA31-UniJIS-UTF16-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/MidashiMinPro-MA31-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/Ryumin-Light-EUC-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/Ryumin-Light-EUC-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/Ryumin-Light-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/Ryumin-Light-UniJIS-UTF16-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/Ryumin-Light-UniJIS-UTF16-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/Ryumin-Light-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/Ryumin-Regular-EUC-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/Ryumin-Regular-EUC-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/Ryumin-Regular-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/Ryumin-Regular-UniJIS-UTF16-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/Ryumin-Regular-UniJIS-UTF16-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/Ryumin-Regular-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/RyuminPro-Light-EUC-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/RyuminPro-Light-EUC-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/RyuminPro-Light-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/RyuminPro-Light-UniJIS-UTF16-H +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/RyuminPro-Light-UniJIS-UTF16-V +%%JPN%%%%DATADIR%%/%%GS_VERSION%%/Resource/Font/RyuminPro-Light-V %%DATADIR%%/%%GS_VERSION%%/doc/API.htm %%DATADIR%%/%%GS_VERSION%%/doc/C-style.htm %%DATADIR%%/%%GS_VERSION%%/doc/Changes.htm @@ -380,6 +550,9 @@ %%DATADIR%%/%%GS_VERSION%%/examples/tiger.eps %%DATADIR%%/%%GS_VERSION%%/examples/vasarely.ps %%DATADIR%%/%%GS_VERSION%%/examples/waterfal.ps +%%DATADIR%%/%%GS_VERSION%%/lib/FAPIcidfmap +%%DATADIR%%/%%GS_VERSION%%/lib/FAPIconfig +%%DATADIR%%/%%GS_VERSION%%/lib/FAPIfontmap %%DATADIR%%/%%GS_VERSION%%/lib/FCOfontmap-PCLPS2 %%DATADIR%%/%%GS_VERSION%%/lib/Fontmap %%DATADIR%%/%%GS_VERSION%%/lib/Fontmap.GS @@ -557,6 +730,7 @@ %%DATADIR%%/%%GS_VERSION%%/lib/pcharstr.ps %%DATADIR%%/%%GS_VERSION%%/lib/pdf2dsc.ps %%DATADIR%%/%%GS_VERSION%%/lib/pdf_base.ps +%%DATADIR%%/%%GS_VERSION%%/lib/pdf_cslayer.ps %%DATADIR%%/%%GS_VERSION%%/lib/pdf_draw.ps %%DATADIR%%/%%GS_VERSION%%/lib/pdf_font.ps %%DATADIR%%/%%GS_VERSION%%/lib/pdf_main.ps @@ -660,6 +834,7 @@ @dirrm %%DATADIR%%/%%GS_VERSION%%/lib @dirrm %%DATADIR%%/%%GS_VERSION%%/examples @dirrm %%DATADIR%%/%%GS_VERSION%%/doc +%%JPN%%@dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/Font @dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/Encoding @dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/Decoding @dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/ColorSpace diff -ru ghostscript-gpl.orig/scripts/configure ghostscript-gpl/scripts/configure --- ghostscript-gpl.orig/scripts/configure 2008-01-12 00:56:16.000000000 +0900 +++ ghostscript-gpl/scripts/configure 2008-02-04 06:47:38.000000000 +0900 @@ -106,7 +106,7 @@ done if [ -z "${BATCH}" ]; then - /usr/bin/dialog --title "GPL Ghostscript driver configuration" --clear \ + ${DIALOG} --title "GPL Ghostscript driver configuration" --clear \ --checklist "\n\ This new ghostscript driver configuration dialog allows you to choose \n\ only those gs drivers, you really need. Don't think too economical, since \n\ Only in ghostscript-gpl/scripts: configure.orig --------------050603000909050301050002--