From 57556cbca8cbbd01959e497d126d13e708565fc7 Mon Sep 17 00:00:00 2001 From: recht Date: Sat, 26 Jun 2004 20:51:19 +0000 Subject: 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 --- print/ghostscript-esp/Makefile.common | 11 ++++++----- print/ghostscript-esp/PLIST | 7 +++++-- print/ghostscript-esp/distinfo | 3 +-- print/ghostscript-esp/patches/patch-ae | 35 ---------------------------------- 4 files changed, 12 insertions(+), 44 deletions(-) delete mode 100644 print/ghostscript-esp/patches/patch-ae (limited to 'print/ghostscript-esp') diff --git a/print/ghostscript-esp/Makefile.common b/print/ghostscript-esp/Makefile.common index a803986cb68..cf9605a0b97 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.17 2004/06/26 20:51:19 recht 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..6fd487054a6 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.5 2004/06/26 20:51:19 recht 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..2cb17f8b42f 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.6 2004/06/26 20:51:19 recht 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