Date: Wed, 27 Dec 2006 18:00:41 GMT From: Frank Mayhar <frank@exit.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/107207: cups-pstoraster misses PostScript fonts Message-ID: <200612271800.kBRI0fUm067482@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/107207; it has been noted by GNATS. From: Frank Mayhar <frank@exit.com> To: bug-followup@FreeBSD.org, rea-fbsd@codelabs.ru Cc: Subject: Re: ports/107207: cups-pstoraster misses PostScript fonts Date: Wed, 27 Dec 2006 09:50:28 -0800 Thanks Eygene. I've taken your patch and massaged it a bit to remove the PLIST_FILES from the Makefile entirely and to bump the portrevision, since the port now installs its files in a different place. The new patch is below; I've tested it and it seems to work fine, although further feedback is always good. Eygene, if you want to take maintainership of cups-pstoraster, by the way, that would be fine with me. I only took it because it had been orphaned and I wanted to update it. You definitely seem interested, though, and if you will be following the release cycle and continuing to update it, I urge you to consider taking maintainership. Regardless, thanks for your work. --- cups-pstoraster.diff begins here --- Index: cups-pstoraster/Makefile =================================================================== RCS file: /cvs/repos/ports/print/cups-pstoraster/Makefile,v retrieving revision 1.24 diff -u -r1.24 Makefile --- cups-pstoraster/Makefile 6 Dec 2006 07:46:57 -0000 1.24 +++ cups-pstoraster/Makefile 27 Dec 2006 17:36:22 -0000 @@ -7,6 +7,7 @@ PORTNAME= cups-pstoraster PORTVERSION= 8.15.3 +PORTREVISION= 1 CATEGORIES= print MASTER_SITES= \ ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/%SUBDIR%/ \ @@ -28,10 +29,12 @@ DISTNAME= espgs-${ESPGS_VER}-source WRKSRC= ${WRKDIR}/espgs-${PORTVERSION} -DATADIR= ${TARGETDIR}/share/ghostscript +DATADIR= ${TARGETDIR}/share/espgs USE_BZIP2= yes USE_GMAKE= yes +# We just need the ghostscript fonts, nothing more +USE_GHOSTSCRIPT_RUN= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ @@ -40,13 +43,6 @@ MAKE_ARGS= CFLAGS_STANDARD="${CFLAGS} -DUPD_SIGNAL=0" \ DEVICE_DEVS="\$$(DD)cups.dev \$$(DD)pxlcolor.dev \$$(DD)pxlmono.dev" PLIST_SUB= GS_VERSION="${GS_VERSION}" -PLIST_FILES= bin/espgs etc/cups/pstoraster.convs \ - libexec/cups/filter/pstopxl libexec/cups/filter/pstoraster \ - share/cups/model/pxlcolor.ppd share/cups/model/pxlmono.ppd - -.ifdef(WITH_GHOSTSCRIPT_AFPL) -IGNORE= doesn't build with AFPL version of Ghostscript; please use gnu ghostscript instead -.endif pre-configure: ${RM} -f ${WRKSRC}/ijs/config.guess ${WRKSRC}/ijs/missing ${WRKSRC}/ijs/config.sub ${WRKSRC}/ijs/install-sh ${WRKSRC}/ijs/ltmain.sh @@ -56,15 +52,19 @@ ${LN} -sf ${WRKSRC}/pstoraster/gdevcups.c ${WRKSRC}/src ${CAT} ${FILESDIR}/cups.contrib.mak >> ${WRKSRC}/src/contrib.mak .for file in pstopxl pstoraster - ${SED} -e 's:@prefix@:${PREFIX}:g ; \ + ${REINPLACE_CMD} -e 's:@prefix@:${PREFIX}:g ; \ s:@exec_prefix@:${PREFIX}:g ; \ s:@bindir@:${PREFIX}/bin:g ; \ - s:@GS@:espgs:g' \ - ${WRKSRC}/pstoraster/${file}.in > ${WRKSRC}/pstoraster/${file} + s:@GS@:espgs:g ; \ + s|^GS_LIB="|GS_LIB="${PREFIX}/share/ghostscript/fonts:|' \ + ${WRKSRC}/pstoraster/${file}.in .endfor ${REINPLACE_CMD} -e 's|^CFLAGS=|CFLAGS=@CPPFLAGS@ |g ; \ s|^LDFLAGS=|LDFLAGS=@LDFLAGS@ |g ; \ - s|^DEVICE_DEVS|#DEVICE_DEVS|g' ${WRKSRC}/Makefile.in + s|^DEVICE_DEVS|#DEVICE_DEVS|g ; \ + s|^gssharedir = @libdir@/ghostscript|gssharedir = @libdir@/espgs| ; \ + s|^gsdir = @datadir@/ghostscript|gsdir = @datadir@/espgs|' \ + ${WRKSRC}/Makefile.in pre-build: ${MKDIR} ${WRKSRC}/bin Index: cups-pstoraster/pkg-plist =================================================================== RCS file: /cvs/repos/ports/print/cups-pstoraster/pkg-plist,v retrieving revision 1.3 diff -u -r1.3 pkg-plist --- cups-pstoraster/pkg-plist 6 Dec 2006 07:46:57 -0000 1.3 +++ cups-pstoraster/pkg-plist 27 Dec 2006 17:39:07 -0000 @@ -63,8 +63,6 @@ %%DATADIR%%/%%GS_VERSION%%/lib/wftopfa.ps %%DATADIR%%/%%GS_VERSION%%/lib/wrfont.ps %%DATADIR%%/%%GS_VERSION%%/lib/zeroline.ps -%%DATADIR%%/%%GS_VERSION%%/lib/pdf2dsc.ps -%%DATADIR%%/%%GS_VERSION%%/lib/pdfopt.ps %%DATADIR%%/%%GS_VERSION%%/lib/gs_agl.ps %%DATADIR%%/%%GS_VERSION%%/lib/gs_btokn.ps %%DATADIR%%/%%GS_VERSION%%/lib/gs_ccfnt.ps @@ -470,14 +468,13 @@ etc/cups/pstoraster.convs share/cups/model/pxlcolor.ppd share/cups/model/pxlmono.ppd -@dirrm %%DATADIR%%/%%GS_VERSION%%/lib/cjkv/ -@dirrm %%DATADIR%%/%%GS_VERSION%%/lib/ +@dirrm %%DATADIR%%/%%GS_VERSION%%/lib/cjkv @dirrm %%DATADIR%%/%%GS_VERSION%%/lib @dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/Decoding @dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/ColorSpace @dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/CMap @dirrm %%DATADIR%%/%%GS_VERSION%%/Resource -@dirrmtry %%DATADIR%%/%%GS_VERSION%% +@dirrm %%DATADIR%%/%%GS_VERSION%% @dirrmtry %%DATADIR%% @dirrmtry libexec/cups/filter @dirrmtry libexec/cups --- cups-pstoraster.diff ends here --- -- Frank Mayhar frank@exit.com http://www.exit.com/ Exit Consulting http://www.gpsclock.com/ http://www.exit.com/blog/frank/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200612271800.kBRI0fUm067482>