From 04c06236f45adcf7892179a29cddececf541a347 Mon Sep 17 00:00:00 2001 From: agc Date: Mon, 26 Jul 2004 16:45:26 +0000 Subject: Pullup ticket 73 to the pkgsrc-2004Q2 branch, requested by Grant Beattie Build fixes, bump PKGREVISION for ghostscript-esp Module Name: pkgsrc Committed By: grant Date: Sun Jun 27 08:29:20 UTC 2004 Modified Files: pkgsrc/print/ghostscript-esp: Makefile Log Message: bump PKGREVISION for dependency change + new files install (hi, recht!) and Module Name: pkgsrc Committed By: recht Date: Sat Jun 26 20:51:19 UTC 2004 Modified Files: pkgsrc/print/ghostscript-esp: Makefile.common PLIST distinfo Removed Files: pkgsrc/print/ghostscript-esp/patches: patch-ae Log Message: Remove dependency on autoconf it isn't needed anymore and Also install pstopxl, pxlcolor.ppd and pxlmono.ppd. Also: don't try to @dirrm share/ghostscript - it belongs to ghostscript-fonts. ok'd by jlam --- doc/CHANGES-pkgsrc-2004Q2 | 4 +++- print/ghostscript-esp/Makefile | 4 ++-- print/ghostscript-esp/Makefile.common | 11 ++++++----- print/ghostscript-esp/PLIST | 7 +++++-- print/ghostscript-esp/distinfo | 3 +-- print/ghostscript-esp/patches/patch-ae | 35 ---------------------------------- 6 files changed, 17 insertions(+), 47 deletions(-) delete mode 100644 print/ghostscript-esp/patches/patch-ae diff --git a/doc/CHANGES-pkgsrc-2004Q2 b/doc/CHANGES-pkgsrc-2004Q2 index 7d83175ed98..1d80ce8fce4 100644 --- a/doc/CHANGES-pkgsrc-2004Q2 +++ b/doc/CHANGES-pkgsrc-2004Q2 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.36 2004/07/26 16:33:41 agc Exp $ +$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.37 2004/07/26 16:45:26 agc Exp $ Changes to the packages collection and infrastructure on the pkgsrc-2004Q2 branch: @@ -68,4 +68,6 @@ Pullup ticket 71, requested by Grant Beattie [agc 2004-07-26] Solaris fix for libpcap Pullup ticket 72, requested by Grant Beattie [agc 2004-07-26] Build fix for scanssh +Pullup ticket 73, requested by Grant Beattie [agc 2004-07-26] + Build fix for ghostscript-esp diff --git a/print/ghostscript-esp/Makefile b/print/ghostscript-esp/Makefile index 6781b6dcce5..bc2357438eb 100644 --- a/print/ghostscript-esp/Makefile +++ b/print/ghostscript-esp/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2004/03/26 02:27:51 wiz Exp $ +# $NetBSD: Makefile,v 1.5.4.1 2004/07/26 16:45:26 agc Exp $ PKGNAME= ghostscript-esp-${GS_VERS} -PKGREVISION= 1 +PKGREVISION= 2 COMMENT= ESP/CUPS Postscript interpreter USE_X11= # defined diff --git a/print/ghostscript-esp/Makefile.common b/print/ghostscript-esp/Makefile.common index a803986cb68..58bd358333c 100644 --- a/print/ghostscript-esp/Makefile.common +++ b/print/ghostscript-esp/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.16 2004/05/05 02:26:41 snj Exp $ +# $NetBSD: Makefile.common,v 1.16.2.1 2004/07/26 16:45:26 agc Exp $ DISTNAME= espgs-${GS_VERS}-source BASEGS_VERS= 7.07 @@ -65,6 +65,7 @@ REPLACE_PERL= lib/fixmswrd.pl CUPS_CONFDIR?= ${PKG_SYSCONFBASEDIR}/cups CUPS_EGDIR= ${PREFIX}/share/examples/cups +CUPS_MODEL_DIR= ${PREFIX}/share/cups/model DOCDIR= ${PREFIX}/share/doc/ghostscript HTMLDIR= ${PREFIX}/share/doc/html/ghostscript @@ -78,14 +79,15 @@ post-extract: ${RM} -f ${WRKSRC}/jpeg ${LN} -s ${JPEG_WRKSRC} ${WRKSRC}/jpeg -pre-configure: - cd ${WRKSRC} && ${AUTOCONF} - # Reinstall the gs binary so that it's properly stripped. post-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/gs ${PREFIX}/bin/gs + ${INSTALL_SCRIPT} ${WRKSRC}/pstoraster/pstopxl \ + ${PREFIX}/libexec/cups/filter ${INSTALL_SCRIPT} ${WRKSRC}/pstoraster/pstoraster \ ${PREFIX}/libexec/cups/filter + ${INSTALL_DATA} ${WRKSRC}/pstoraster/pxlcolor.ppd ${CUPS_MODEL_DIR} + ${INSTALL_DATA} ${WRKSRC}/pstoraster/pxlmono.ppd ${CUPS_MODEL_DIR} ${INSTALL_DATA} ${WRKSRC}/pstoraster/pstoraster.convs ${CUPS_EGDIR} .include "../../security/openssl/buildlink3.mk" @@ -94,5 +96,4 @@ post-install: .include "../../print/cups/buildlink3.mk" .include "../../print/gimp-print-lib/buildlink3.mk" -.include "../../mk/autoconf.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/ghostscript-esp/PLIST b/print/ghostscript-esp/PLIST index 43faf0f88e7..4663fcbf6a6 100644 --- a/print/ghostscript-esp/PLIST +++ b/print/ghostscript-esp/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2003/12/19 12:07:43 recht Exp $ +@comment $NetBSD: PLIST,v 1.4.4.1 2004/07/26 16:45:26 agc Exp $ bin/bdftops bin/dvipdf bin/eps2eps @@ -31,6 +31,7 @@ bin/pv.sh bin/sysvlp.sh bin/unix-lpr.sh bin/wftopfa +libexec/cups/filter/pstopxl libexec/cups/filter/pstoraster man/de/man1/ansi2knr.1 man/de/man1/dvipdf.1 @@ -72,6 +73,8 @@ man/man1/ps2pdf13.1 man/man1/ps2pdfwr.1 man/man1/ps2ps.1 man/man1/wftopfa.1 +share/cups/model/pxlcolor.ppd +share/cups/model/pxlmono.ppd share/doc/html/ghostscript/API.htm share/doc/html/ghostscript/Bug-form.htm share/doc/html/ghostscript/Bug-info.htm @@ -384,7 +387,7 @@ share/ghostscript/7.07/lib/wrfont.ps share/ghostscript/7.07/lib/zeroline.ps @dirrm share/ghostscript/7.07/lib @dirrm share/ghostscript/7.07 -@dirrm share/ghostscript +@comment in ghostscript-fonts: @dirrm share/ghostscript @dirrm share/examples/ghostscript/cjk @dirrm share/examples/ghostscript @dirrm share/doc/html/ghostscript diff --git a/print/ghostscript-esp/distinfo b/print/ghostscript-esp/distinfo index 62a74b61d7c..7ded8a25a97 100644 --- a/print/ghostscript-esp/distinfo +++ b/print/ghostscript-esp/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2003/12/19 12:07:43 recht Exp $ +$NetBSD: distinfo,v 1.5.4.1 2004/07/26 16:45:26 agc Exp $ SHA1 (ghostscript/espgs-7.07.1-source.tar.bz2) = 9d5653d674a074ef6b803ceed4a2aeb40fed852f Size (ghostscript/espgs-7.07.1-source.tar.bz2) = 5400198 bytes @@ -7,4 +7,3 @@ Size (ghostscript/jpegsrc.v6b.tar.gz) = 613261 bytes SHA1 (patch-aa) = bbc381631bfd7ec47254cf229ebef138ac593b66 SHA1 (patch-ab) = df324d501a92cce882264900dabafe8be5f9d352 SHA1 (patch-ac) = 67308cde89fcfb7ae40220bc9b8d7cc24c0cebe2 -SHA1 (patch-ae) = 96ea0de519c0e6fddfd31b87b39ce76b0afb2d7d diff --git a/print/ghostscript-esp/patches/patch-ae b/print/ghostscript-esp/patches/patch-ae deleted file mode 100644 index 6f134d595bc..00000000000 --- a/print/ghostscript-esp/patches/patch-ae +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-ae,v 1.2 2003/05/28 03:28:07 jlam Exp $ - ---- src/configure.ac.orig Thu Dec 12 17:44:07 2002 -+++ src/configure.ac -@@ -405,7 +405,7 @@ if test -d pstoraster; then - if test "x$CUPSCONFIG" != x; then - dnl Use values from CUPS config... - # LIBS="`$CUPSCONFIG --ldflags` `$CUPSCONFIG --static --image --libs | sed -e '1,$s/-lssl//'` $LIBS" -- LIBS="`$CUPSCONFIG --ldflags` `$CUPSCONFIG --image --libs` $LIBS" -+ LIBS="`$CUPSCONFIG --image --libs` $LIBS" - CFLAGS="`$CUPSCONFIG --cflags` $CFLAGS" - cups_serverroot="`$CUPSCONFIG --serverroot`" - cups_serverbin="`$CUPSCONFIG --serverbin`" -@@ -537,6 +537,8 @@ if test x$no_x != xyes; then - - SAVELIBS="$LIBS" - -+ AC_CHECK_LIB(ICE,IceConnectionNumber) -+ AC_CHECK_LIB(SM,SmcClientID) - AC_CHECK_LIB(X11,XOpenDisplay) - AC_CHECK_LIB(Xext,XdbeQueryExtension) - AC_CHECK_LIB(Xt,XtAppCreateShell) -@@ -545,7 +547,11 @@ if test x$no_x != xyes; then - - if test "$ac_cv_lib_Xt_XtAppCreateShell" = yes; then - X_DEVS="\$(DD)x11.dev \$(DD)x11alpha.dev \$(DD)x11cmyk.dev \$(DD)x11mono.dev \$(DD)x11_.dev \$(DD)x11alt_.dev \$(DD)x11cmyk2.dev \$(DD)x11cmyk4.dev \$(DD)x11cmyk8.dev \$(DD)x11rg16x.dev \$(DD)x11rg32x.dev \$(DD)x11gray2.dev \$(DD)x11gray4.dev" -- X_LIBS="-lXt -lXext -lX11" -+ if test "$ac_cv_lib_SM_SmcClientID" = yes; then -+ X_LIBS="-lXt -lXext -lX11 -lSM -lICE" -+ else -+ X_LIBS="-lXt -lXext -lX11" -+ fi - fi - fi - -- cgit v1.2.3