From 46b16a383f23033f939cc3128d60886ea0d509a5 Mon Sep 17 00:00:00 2001 From: jlam Date: Mon, 10 Apr 2000 00:04:28 +0000 Subject: Adapt to gstty/gs --- graphics/xv/files/patch-sum | 4 ++-- graphics/xv/patches/patch-ac | 4 ++-- print/ggv/files/patch-sum | 3 +-- print/ggv/patches/patch-ab | 13 ------------- print/gnome-print/Makefile | 34 +++++++++++++++++++--------------- print/gv/files/patch-sum | 4 ++-- print/gv/patches/patch-ae | 15 +-------------- print/magicfilter/Makefile | 3 ++- print/stylewriter/Makefile | 4 ++-- 9 files changed, 31 insertions(+), 53 deletions(-) delete mode 100644 print/ggv/patches/patch-ab diff --git a/graphics/xv/files/patch-sum b/graphics/xv/files/patch-sum index 17bd341933c..c7f489d3453 100644 --- a/graphics/xv/files/patch-sum +++ b/graphics/xv/files/patch-sum @@ -1,8 +1,8 @@ -$NetBSD: patch-sum,v 1.5 2000/01/04 16:55:33 bouyer Exp $ +$NetBSD: patch-sum,v 1.6 2000/04/10 00:04:28 jlam Exp $ MD5 (patch-aa) = 77f91c256a0b0f6cbac5673684c8d585 MD5 (patch-ab) = 1da2c2fd872eb392a48f132bbd4bf63c -MD5 (patch-ac) = 340ef04fe230197887ec7d7c2616b521 +MD5 (patch-ac) = 48961ab63ea148716b51ace68a13b0f0 MD5 (patch-ad) = bb5894cc304cf79a79c236eaf035547c MD5 (patch-ae) = 5836b41c1360daf8c29dc25bc32473a7 MD5 (patch-af) = 3c86698cb2642bcb2cbac7402d5d60cd diff --git a/graphics/xv/patches/patch-ac b/graphics/xv/patches/patch-ac index 1870ea4651b..d3c924b95ef 100644 --- a/graphics/xv/patches/patch-ac +++ b/graphics/xv/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.5 1999/11/19 09:38:19 agc Exp $ +$NetBSD: patch-ac,v 1.6 2000/04/10 00:04:29 jlam Exp $ --- config.h.orig Fri Nov 19 09:32:02 1999 +++ config.h Fri Nov 19 09:32:57 1999 @@ -18,7 +18,7 @@ $NetBSD: patch-ac,v 1.5 1999/11/19 09:38:19 agc Exp $ -/* #define GS_PATH "/usr/local/bin/gs" */ -/* #define GS_LIB "." */ -/* #define GS_DEV "ppmraw" */ -+#define GS_PATH "@LOCALBASE@/bin/gs" ++#define GS_PATH "@LOCALBASE@/bin/gstty" +#define GS_LIB "@LOCALBASE@/share/ghostscript" +#define GS_DEV "ppmraw" diff --git a/print/ggv/files/patch-sum b/print/ggv/files/patch-sum index 48c6611079a..8c609514988 100644 --- a/print/ggv/files/patch-sum +++ b/print/ggv/files/patch-sum @@ -1,5 +1,4 @@ -$NetBSD: patch-sum,v 1.2 2000/03/24 18:26:45 jlam Exp $ +$NetBSD: patch-sum,v 1.3 2000/04/10 00:05:19 jlam Exp $ MD5 (patch-aa) = 29170ed4ec9d1e553b65704503b67197 -MD5 (patch-ab) = 528282c2dbb02d1ec67ba649ab185f87 MD5 (patch-ac) = 8b39e83733862cf46aaf0e7dd23630ad diff --git a/print/ggv/patches/patch-ab b/print/ggv/patches/patch-ab deleted file mode 100644 index 28969abd9e3..00000000000 --- a/print/ggv/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2000/03/24 18:27:14 jlam Exp $ - ---- configure.in.orig Fri Aug 20 17:38:37 1999 -+++ configure.in Fri Mar 24 09:07:39 2000 -@@ -31,7 +31,7 @@ - AM_CONDITIONAL(BONOBO, $have_bonobo) - - AC_CHECK_HEADER(paths.h) --AC_PATH_PROG(GS_PROG, gs) -+AC_PATH_PROG(GS_PROG, gsx11) - AC_PATH_PROG(LPR_PROG, lpr) - AC_DEFINE_UNQUOTED(GS_PATH, "$GS_PROG") - AC_DEFINE_UNQUOTED(LPR_PATH, "$LPR_PROG") diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile index ffe00343a8c..254bae7a0ed 100644 --- a/print/gnome-print/Makefile +++ b/print/gnome-print/Makefile @@ -1,22 +1,26 @@ -# $NetBSD: Makefile,v 1.17 2000/04/07 08:43:01 rh Exp $ +# $NetBSD: Makefile,v 1.18 2000/04/10 00:05:53 jlam Exp $ # -DISTNAME= gnome-print-0.16 -CATEGORIES= print gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gnome-print/} +DISTNAME= gnome-print-0.16 +CATEGORIES= print gnome +MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gnome-print/} -MAINTAINER= rh@netbsd.org -HOMEPAGE= http://www.levien.com/gnome/print-arch.html +MAINTAINER= rh@netbsd.org +HOMEPAGE= http://www.levien.com/gnome/print-arch.html -DEPENDS+= gnome-libs>=1.0.56:../../x11/gnome-libs -DEPENDS+= libxml>=1.8.5:../../textproc/libxml -DEPENDS+= ghostscript-5.*:../../print/ghostscript5 +DEPENDS+= gnome-libs>=1.0.56:../../x11/gnome-libs +DEPENDS+= libxml>=1.8.5:../../textproc/libxml +DEPENDS+= ghostscript-5.*:../../print/ghostscript5 -GNU_CONFIGURE= YES -USE_LIBTOOL= YES -USE_X11BASE= YES -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" -LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig +USE_LIBTOOL= # defined +USE_X11BASE= # defined + +GNU_CONFIGURE= # defined +CONFIGURE_ENV+= GHOSTSCRIPT=${LOCALBASE}/bin/gstty +CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" + +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib +LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig .include "../../mk/bsd.pkg.mk" diff --git a/print/gv/files/patch-sum b/print/gv/files/patch-sum index 32bff746e09..40937b5cfb5 100644 --- a/print/gv/files/patch-sum +++ b/print/gv/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.2 2000/03/24 18:27:55 jlam Exp $ +$NetBSD: patch-sum,v 1.3 2000/04/10 00:06:11 jlam Exp $ MD5 (patch-aa) = 02c1e58d4e1a363525bb0f2387e24412 MD5 (patch-ab) = 58d7eb2947154b064b8a94917dea314e -MD5 (patch-ae) = af2dad531d97ea4036744afeb04eb119 +MD5 (patch-ae) = d7a3d75beab5e22a40317e6424a80e1a MD5 (patch-af) = 933e6c31e18d915bda649e7b2634f13d diff --git a/print/gv/patches/patch-ae b/print/gv/patches/patch-ae index 5f9e997a956..3dcdb15ba89 100644 --- a/print/gv/patches/patch-ae +++ b/print/gv/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.4 2000/03/24 18:27:55 jlam Exp $ +$NetBSD: patch-ae,v 1.5 2000/04/10 00:06:11 jlam Exp $ --- source/Imakefile.orig Fri Jun 20 15:00:00 1997 +++ source/Imakefile Fri Mar 24 01:25:44 2000 @@ -10,16 +10,3 @@ $NetBSD: patch-ae,v 1.4 2000/03/24 18:27:55 jlam Exp $ ComplexProgramTarget(gv) InstallNonExec($(GV_SYSTEM_AD),$(GV_LIBDIR)) InstallNonExec($(GV_USER_AD),$(GV_LIBDIR)) -@@ -310,9 +309,9 @@ - @echo "" > $(GV_INTERN_RES_DAT) - @echo "!########## gv_intern_res.dat (generated by makefile)" >> $(GV_INTERN_RES_DAT) - @echo "" >> $(GV_INTERN_RES_DAT) -- @echo "GV.gsInterpreter: gs" >> $(GV_INTERN_RES_DAT) -- @echo "GV.gsCmdScanPDF: gs -dNODISPLAY -dQUIET -sPDFname=%s -sDSCname=%s pdf2dsc.ps -c quit" >> $(GV_INTERN_RES_DAT) -- @echo "GV.gsCmdConvPDF: gs -dNODISPLAY -dQUIET $(PS_LEVEL) -dNOPAUSE -sPSFile=%s %s -c quit" >> $(GV_INTERN_RES_DAT) -+ @echo "GV.gsInterpreter: gsx11" >> $(GV_INTERN_RES_DAT) -+ @echo "GV.gsCmdScanPDF: gsx11 -dNODISPLAY -dQUIET -sPDFname=%s -sDSCname=%s pdf2dsc.ps -c quit" >> $(GV_INTERN_RES_DAT) -+ @echo "GV.gsCmdConvPDF: gsx11 -dNODISPLAY -dQUIET $(PS_LEVEL) -dNOPAUSE -sPSFile=%s %s -c quit" >> $(GV_INTERN_RES_DAT) - @echo "GV.gsX11Device: -sDEVICE=x11" >> $(GV_INTERN_RES_DAT) - @echo "GV.gsX11AlphaDevice: -dNOPLATFONTS -sDEVICE=x11alpha" >> $(GV_INTERN_RES_DAT) - @echo "GV.gsSafer: True" >> $(GV_INTERN_RES_DAT) diff --git a/print/magicfilter/Makefile b/print/magicfilter/Makefile index 31c210ec64a..04247697f95 100644 --- a/print/magicfilter/Makefile +++ b/print/magicfilter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2000/03/30 05:50:13 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2000/04/10 00:06:28 jlam Exp $ DISTNAME= magicfilter-1.2 CATEGORIES= print @@ -14,6 +14,7 @@ DEPENDS+= papersize-*:../../print/papersize USE_GMAKE= yes GNU_CONFIGURE= yes +CONFIGURE_ENV+= GHOSTSCRIPT=${LOCALBASE}/bin/gstty PLIST_SRC= ${WRKDIR}/PLIST diff --git a/print/stylewriter/Makefile b/print/stylewriter/Makefile index 8a1a9340ff2..e59de673798 100644 --- a/print/stylewriter/Makefile +++ b/print/stylewriter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 1999/11/24 10:35:28 agc Exp $ +# $NetBSD: Makefile,v 1.4 2000/04/10 00:06:41 jlam Exp $ # DISTNAME= stylewriter @@ -19,7 +19,7 @@ FILTER_DIR= libexec/stylewriter FILTERS= direct_stylpbm direct_stylps \ stylascii stylascii.a4 \ stylps stylps-color stylps-color.a4 stylps.a4 -FILTER_SED= -e "s,/usr/local/gnu,${LOCALBASE},g" \ +FILTER_SED= -e "s,/usr/local/gnu/bin/gs,${LOCALBASE}/bin/gstty,g" \ -e "s,/usr/local,${PREFIX},g" PRINTCAP_SED= -e "s,/var/spool/stylps,/var/spool/lpd/stylps,g" \ -e "s,/usr/local/sbin,${PREFIX}/libexec/stylewriter,g" -- cgit v1.2.3