From 07e8ac467b78106bc8e340ba2c02dd702cf04762 Mon Sep 17 00:00:00 2001 From: Ion-Mihai Tetcu Date: Thu, 28 Dec 2006 19:00:15 +0000 Subject: - RUN_DEPEND on Ghostscript which besides bringing in some needed fonts also takes care of the breakage with AFL Ghostscript version. - take care to make espgs and ghostscript-gpl not install files into the same places - bump PORTREVISION for above - pass maintianership to submitter, Eygene Ryabinkin. PR: ports/107207 Submitted by: Eygene Ryabinkin Approved by: Frank Mayhar (formaer maintaner) --- print/cups-pstoraster/Makefile | 41 ++++++++++++++++++----------------------- print/cups-pstoraster/pkg-plist | 7 ++----- 2 files changed, 20 insertions(+), 28 deletions(-) (limited to 'print') diff --git a/print/cups-pstoraster/Makefile b/print/cups-pstoraster/Makefile index b0e113dea78d..0694b8cacdb2 100644 --- a/print/cups-pstoraster/Makefile +++ b/print/cups-pstoraster/Makefile @@ -7,17 +7,14 @@ 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%/ \ - ftp://ftp2.easysw.com/pub/%SUBDIR%/ \ - ftp://ftp3.easysw.com/pub/%SUBDIR%/ \ - http://ftp.easysw.com/pub/%SUBDIR%/ \ - http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/%SUBDIR%/ +MASTER_SITES= ${MASTER_SITE_EASYSW} MASTER_SITE_SUBDIR= ghostscript/${PORTVERSION} +DISTNAME= espgs-${ESPGS_VER}-source DIST_SUBDIR= ghostscript -MAINTAINER= frank@exit.com +MAINTAINER= rea-fbsd@codelabs.ru COMMENT= Postscript interpreter for CUPS printing to non-PS printers LIB_DEPENDS= cups.2:${PORTSDIR}/print/cups-base @@ -25,28 +22,22 @@ LIB_DEPENDS= cups.2:${PORTSDIR}/print/cups-base ESPGS_VER= ${PORTVERSION} GS_VERSION= 8.15 -DISTNAME= espgs-${ESPGS_VER}-source WRKSRC= ${WRKDIR}/espgs-${PORTVERSION} -DATADIR= ${TARGETDIR}/share/ghostscript +DATADIR= ${TARGETDIR}/share/espgs USE_BZIP2= yes USE_GMAKE= yes -GNU_CONFIGURE= 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" \ - LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --without-x --with-gs=espgs 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 +47,19 @@ post-patch: ${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 diff --git a/print/cups-pstoraster/pkg-plist b/print/cups-pstoraster/pkg-plist index f05e450d3d3f..1ac5ff2de462 100644 --- a/print/cups-pstoraster/pkg-plist +++ b/print/cups-pstoraster/pkg-plist @@ -63,8 +63,6 @@ bin/espgs %%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 @@ libexec/cups/filter/pstopxl 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 -- cgit v1.2.3