diff options
author | jlam <jlam> | 2005-11-28 06:41:20 +0000 |
---|---|---|
committer | jlam <jlam> | 2005-11-28 06:41:20 +0000 |
commit | 9db6c646b68577a8922b10f4abbca7b50dbfb641 (patch) | |
tree | 97d106419153be05872243d53d0c35426e7d6dc6 /print | |
parent | 5ddc900951e951816aa20985beed2a888ead76f0 (diff) | |
download | pkgsrc-9db6c646b68577a8922b10f4abbca7b50dbfb641.tar.gz |
Change all instances of including mk/ghostscript.mk into asking for
the appropriate tool via USE_TOOLS (usually "gs:run"), and remove
ghostscript.mk. This change removes a rather out-dated file from
pkgsrc and switches packages to use the more compact implementation
of the Ghostcript-handling inside the tools framework.
Diffstat (limited to 'print')
-rw-r--r-- | print/advi/Makefile | 5 | ||||
-rw-r--r-- | print/apsfilter/Makefile | 5 | ||||
-rw-r--r-- | print/cupsomatic/Makefile | 5 | ||||
-rw-r--r-- | print/dvipdfm/Makefile | 4 | ||||
-rw-r--r-- | print/dvipdfmx/Makefile | 4 | ||||
-rw-r--r-- | print/foomatic-filters/Makefile | 5 | ||||
-rw-r--r-- | print/foomatic-gswrapper/Makefile | 5 | ||||
-rw-r--r-- | print/gnome-print/Makefile | 4 | ||||
-rw-r--r-- | print/gv/Makefile | 5 | ||||
-rw-r--r-- | print/html2ps/Makefile | 5 | ||||
-rw-r--r-- | print/if-psprint/Makefile | 5 | ||||
-rw-r--r-- | print/ja-dvipdfm/Makefile | 4 | ||||
-rw-r--r-- | print/lilypond/Makefile | 5 | ||||
-rw-r--r-- | print/magicfilter/Makefile | 7 | ||||
-rw-r--r-- | print/mgv/Makefile | 4 | ||||
-rw-r--r-- | print/stylewriter/Makefile | 4 |
16 files changed, 33 insertions, 43 deletions
diff --git a/print/advi/Makefile b/print/advi/Makefile index 3ed295d364d..5829053828e 100644 --- a/print/advi/Makefile +++ b/print/advi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/11/11 18:50:24 tonio Exp $ +# $NetBSD: Makefile,v 1.16 2005/11/28 06:41:21 jlam Exp $ DISTNAME= advi-1.6.0 CATEGORIES= print @@ -14,7 +14,7 @@ BUILD_DEPENDS+= ocaml>=3.04:../../lang/ocaml TEX_ACCEPTED= teTeX1 teTeX2 teTeX3 USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -USE_TOOLS+= gmake +USE_TOOLS+= gmake gs:run post-extract: @${CP} ${WRKSRC}/tex/*.eps ${WRKSRC}/doc @@ -50,5 +50,4 @@ post-install: .include "../../x11/lablgtk/buildlink3.mk" .include "../../x11/ocaml-graphics/buildlink3.mk" .include "../../mk/tex.buildlink3.mk" -.include "../../mk/ghostscript.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile index d92a8101cb5..59bb42d3644 100644 --- a/print/apsfilter/Makefile +++ b/print/apsfilter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/10/10 20:10:37 reed Exp $ +# $NetBSD: Makefile,v 1.20 2005/11/28 06:41:21 jlam Exp $ # DISTNAME= apsfilter-7.2.5 @@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}/apsfilter HAS_CONFIGURE= YES USE_BZIP2= YES USE_PKGINSTALL= YES -USE_TOOLS+= awk +USE_TOOLS+= awk gs:run CONFIGURE_ARGS+=--prefix=${PREFIX} CONFIGURE_ARGS+=--with-shell=${SH} @@ -43,5 +43,4 @@ post-patch: ${MV} ${WRKSRC}/$$i.done ${WRKSRC}/$$i; \ done -.include "../../mk/ghostscript.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/cupsomatic/Makefile b/print/cupsomatic/Makefile index b2210f08764..ad0bf053532 100644 --- a/print/cupsomatic/Makefile +++ b/print/cupsomatic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/07/16 01:19:18 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2005/11/28 06:41:21 jlam Exp $ DISTNAME= cupsomatic PKGNAME= ${DISTNAME}-2.2 @@ -31,7 +31,7 @@ DEPENDS+= cups>=1.1.14nb1:../../print/cups DEPENDS+= foomatic-gswrapper>=1.2:../../print/foomatic-gswrapper DEPENDS+= mpage-[0-9]*:../../print/mpage -USE_TOOLS+= perl:run +USE_TOOLS+= perl:run gs:run EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}/${DISTNAME} FILTERDIR= ${PREFIX}/libexec/cups/filter @@ -53,5 +53,4 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/$${file} ${FILTERDIR}; \ done -.include "../../mk/ghostscript.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/dvipdfm/Makefile b/print/dvipdfm/Makefile index f580c67dca4..1f3287ae65b 100644 --- a/print/dvipdfm/Makefile +++ b/print/dvipdfm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/11/13 05:30:11 minskim Exp $ +# $NetBSD: Makefile,v 1.22 2005/11/28 06:41:21 jlam Exp $ DISTNAME= dvipdfm-0.13.2c PKGREVISION= 5 @@ -15,6 +15,7 @@ CONFLICTS+= teTeX-bin>=2.0 # Part of teTeX>=2.0 TEX_ACCEPTED= teTeX1 WRKSRC= ${WRKDIR}/dvipdfm +USE_TOOLS+= gs:run GNU_CONFIGURE= yes CONFIGURE_ARGS+= --datadir=${PREFIX}/share # needed to get the stdarg.h version of kpathsea/c-varargs.h instead of the @@ -32,6 +33,5 @@ post-patch: .endif .include "../../graphics/png/buildlink3.mk" -.include "../../mk/ghostscript.mk" .include "../../print/teTeX/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/dvipdfmx/Makefile b/print/dvipdfmx/Makefile index 6e35dda0463..eecfbbbdbbf 100644 --- a/print/dvipdfmx/Makefile +++ b/print/dvipdfmx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/11/20 19:14:50 minskim Exp $ +# $NetBSD: Makefile,v 1.19 2005/11/28 06:41:21 jlam Exp $ DISTNAME= dvipdfmx-20050627 PKGNAME= ${DISTNAME:S/-/-0.0.0./} @@ -14,12 +14,12 @@ DEPENDS+= adobe-cmaps>=20051109:../../fonts/adobe-cmaps CONFLICTS+= dvipdfm-[0-9]* CONFLICTS+= ja-dvipdfm-[0-9]* +USE_TOOLS+= gs:run GNU_CONFIGURE= YES MAKE_ENV+= PKG_LOCALTEXMFPREFIX=${PKG_LOCALTEXMFPREFIX} .include "../../graphics/png/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../mk/ghostscript.mk" .include "../../print/dvipdfmx/map.mk" .include "../../print/teTeX/module.mk" diff --git a/print/foomatic-filters/Makefile b/print/foomatic-filters/Makefile index d27edf55e8e..e1c465933bc 100644 --- a/print/foomatic-filters/Makefile +++ b/print/foomatic-filters/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/10/10 20:30:07 reed Exp $ +# $NetBSD: Makefile,v 1.6 2005/11/28 06:41:21 jlam Exp $ DISTNAME= foomatic-filters-3.0.2 PKGREVISION= 1 @@ -27,7 +27,7 @@ CONFIGURE_ENV+= CUPS_FILTERS=${LOCALBASE}/lib/cups/filter CONFIGURE_ENV+= PRINTCAP=/etc/printcap CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} -USE_TOOLS+= gmake perl:run +USE_TOOLS+= gmake gs:run perl:run USE_PKGINSTALL= yes INSTALL_TARGET= install-bin install-man @@ -39,5 +39,4 @@ post-install: ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKSRC}/filter.conf ${EGDIR} -.include "../../mk/ghostscript.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/foomatic-gswrapper/Makefile b/print/foomatic-gswrapper/Makefile index b4fe4145638..80940056ee5 100644 --- a/print/foomatic-gswrapper/Makefile +++ b/print/foomatic-gswrapper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/09/28 20:52:25 rillig Exp $ +# $NetBSD: Makefile,v 1.16 2005/11/28 06:41:21 jlam Exp $ DISTNAME= foomatic-gswrapper PKGNAME= foomatic-gswrapper-1.2 @@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR} DIST_SUBDIR= ${PKGNAME_NOREV} EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}/${DISTNAME} -USE_TOOLS+= perl:run +USE_TOOLS+= gs:run perl:run NO_BUILD= yes REPLACE_PERL= ${DISTNAME} @@ -32,5 +32,4 @@ INSTALLATION_DIRS= bin do-install: ${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${PREFIX}/bin -.include "../../mk/ghostscript.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile index 1b5f7943518..31d3ac07e9f 100644 --- a/print/gnome-print/Makefile +++ b/print/gnome-print/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.68 2005/06/01 18:03:09 jlam Exp $ +# $NetBSD: Makefile,v 1.69 2005/11/28 06:41:21 jlam Exp $ DISTNAME= gnome-print-0.37 CATEGORIES= print gnome @@ -11,6 +11,7 @@ COMMENT= Prototype implementation of the Gnome Printing Architecture USE_DIRS+= gnome1-1.5 USE_PKGLOCALEDIR= YES USE_LIBTOOL= YES +USE_TOOLS+= gs:run GNU_CONFIGURE= YES CONFIGURE_ARGS+= --without-admin # currently unstable @@ -22,5 +23,4 @@ MAKE_ENV+= HOME=${WRKSRC} .include "../../graphics/gdk-pixbuf-gnome/buildlink3.mk" .include "../../textproc/libunicode/buildlink3.mk" .include "../../textproc/libxml/buildlink3.mk" -.include "../../mk/ghostscript.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/gv/Makefile b/print/gv/Makefile index 1fb9650d317..4d98858f845 100644 --- a/print/gv/Makefile +++ b/print/gv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2005/06/01 19:23:26 wiz Exp $ +# $NetBSD: Makefile,v 1.56 2005/11/28 06:41:21 jlam Exp $ DISTNAME= gv-3.6.1 CATEGORIES= print @@ -9,7 +9,7 @@ HOMEPAGE= http://www.gnu.org/software/gv/ COMMENT= PostScript and PDF previewer GNU_CONFIGURE= yes -USE_TOOLS+= gmake +USE_TOOLS+= gmake gs:run USE_MAKEINFO= yes TEXINFO_REQD= 4.2 @@ -23,5 +23,4 @@ post-extract: .endif .include "../../x11/Xaw3d/buildlink3.mk" -.include "../../mk/ghostscript.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/html2ps/Makefile b/print/html2ps/Makefile index beb2649886d..3a34fa12998 100644 --- a/print/html2ps/Makefile +++ b/print/html2ps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/11/11 18:50:24 tonio Exp $ +# $NetBSD: Makefile,v 1.18 2005/11/28 06:41:21 jlam Exp $ # DISTNAME= html2ps-1.0b4 @@ -16,7 +16,7 @@ DEPENDS+= p5-PerlMagick-[0-9]*:../../graphics/p5-PerlMagick DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww DEPENDS+= weblint-[0-9]*:../../www/weblint -USE_TOOLS+= perl:run +USE_TOOLS+= gs:run perl:run TEX_ACCEPTED= teTeX1 teTeX2 teTeX3 NO_CONFIGURE= yes @@ -27,6 +27,5 @@ do-install: @cd ${WRKSRC} && ./install ${PREFIX} @${INSTALL_DATA} ${WRKSRC}/sample ${PREFIX}/lib/html2ps/sample.rc -.include "../../mk/ghostscript.mk" .include "../../mk/tex.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/if-psprint/Makefile b/print/if-psprint/Makefile index a165e0a5e20..3074ca75705 100644 --- a/print/if-psprint/Makefile +++ b/print/if-psprint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/07/16 01:19:18 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/11/28 06:41:22 jlam Exp $ # DISTNAME= if-psprint-1.7 @@ -12,7 +12,7 @@ COMMENT= Print text or postscript to arbitrary printer, can use smb DEPENDS+= enscript>=1.6.3nb1:../../print/enscript -USE_TOOLS+= perl:run +USE_TOOLS+= gs:run perl:run INSTALLATION_DIRS= libexec man/man1 @@ -26,5 +26,4 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/if-psprint ${PREFIX}/libexec/if-psprint ${INSTALL_MAN} ${WRKSRC}/if-psprint.1 ${PREFIX}/man/man1/if-psprint.1 -.include "../../mk/ghostscript.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/ja-dvipdfm/Makefile b/print/ja-dvipdfm/Makefile index 3735cd90a46..173c4d92af0 100644 --- a/print/ja-dvipdfm/Makefile +++ b/print/ja-dvipdfm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/11/13 05:30:11 minskim Exp $ +# $NetBSD: Makefile,v 1.17 2005/11/28 06:41:22 jlam Exp $ DISTNAME= dvipdfm-0.13.2c PKGNAME= ja-${DISTNAME} @@ -19,6 +19,7 @@ CONFLICTS+= dvipdfmx-[0-9]* TEX_ACCEPTED= teTeX1 WRKSRC= ${WRKDIR}/dvipdfm +USE_TOOLS+= gs:run GNU_CONFIGURE= yes CONFIGURE_ARGS+=--datadir=${PREFIX}/share @@ -33,5 +34,4 @@ post-patch: .include "../../graphics/png/buildlink3.mk" .include "../../print/teTeX/module.mk" -.include "../../mk/ghostscript.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile index d0ddedb5588..a439f47fc4c 100644 --- a/print/lilypond/Makefile +++ b/print/lilypond/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2005/11/08 20:48:32 tonio Exp $ +# $NetBSD: Makefile,v 1.36 2005/11/28 06:41:22 jlam Exp $ # DISTNAME= lilypond-2.4.3 @@ -18,7 +18,7 @@ BUILDLINK_DEPENDS.mftrace+= mftrace>=1.1.0 GNU_CONFIGURE= YES USE_PKGLOCALEDIR= YES USE_LANGUAGES= c c++ -USE_TOOLS+= gmake +USE_TOOLS+= gmake gs:run MAKEFILE= GNUmakefile USE_MAKEINFO= YES @@ -49,5 +49,4 @@ post-install: .include "../../textproc/scrollkeeper/omf.mk" .include "../../mk/tex.buildlink3.mk" .include "../../mk/emacs.mk" -.include "../../mk/ghostscript.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/magicfilter/Makefile b/print/magicfilter/Makefile index c93571a2ee9..33292abb9ed 100644 --- a/print/magicfilter/Makefile +++ b/print/magicfilter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2005/11/11 18:50:25 tonio Exp $ +# $NetBSD: Makefile,v 1.45 2005/11/28 06:41:22 jlam Exp $ DISTNAME= magicfilter-1.2 PKGREVISION= 4 @@ -14,9 +14,9 @@ DEPENDS+= a2ps-[0-9]*:../../print/a2ps DEPENDS+= netpbm-[0-9]*:../../graphics/netpbm DEPENDS+= papersize-[0-9]*:../../print/papersize -USE_TOOLS+= gmake gzip +USE_TOOLS+= gmake gs:run gzip GNU_CONFIGURE= yes -CONFIGURE_ENV+= GHOSTSCRIPT=${LOCALBASE}/bin/gs +CONFIGURE_ENV+= GHOSTSCRIPT=${TOOLS_PATH.gs} CONFIGURE_ENV+= GZIP=${TOOLS_GZIP_CMD:Q} TEX_ACCEPTED= teTeX1 teTeX2 teTeX3 @@ -44,6 +44,5 @@ post-install: done) @${ECHO} "@dirrm ${FILTER_DIR}" >>${PLIST_SRC} -.include "../../mk/ghostscript.mk" .include "../../mk/tex.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/mgv/Makefile b/print/mgv/Makefile index 1fe94e8ef5a..61f672813e9 100644 --- a/print/mgv/Makefile +++ b/print/mgv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:08 tv Exp $ +# $NetBSD: Makefile,v 1.16 2005/11/28 06:41:22 jlam Exp $ DISTNAME= mgv-3.1.5 PKGREVISION= 2 @@ -11,6 +11,7 @@ COMMENT= Motif/LessTif user interface for Ghostscript GNU_CONFIGURE= yes USE_X11BASE= yes +USE_TOOLS+= gs:run CONFIGURE_ARGS+= --with-motif-includes=${MOTIFBASE}/include CONFIGURE_ARGS+= --with-motif-libs=${MOTIFBASE}/lib @@ -23,5 +24,4 @@ post-install: .include "../../graphics/xpm/buildlink3.mk" .include "../../mk/motif.buildlink3.mk" -.include "../../mk/ghostscript.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/stylewriter/Makefile b/print/stylewriter/Makefile index 2923aed77cf..d934ddb4481 100644 --- a/print/stylewriter/Makefile +++ b/print/stylewriter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/03/17 12:44:42 salo Exp $ +# $NetBSD: Makefile,v 1.17 2005/11/28 06:41:22 jlam Exp $ # DISTNAME= stylewriter @@ -13,6 +13,7 @@ COMMENT= Apple StyleWriter driver for un*x DEPENDS+= enscript>=1.6.3nb1:../../print/enscript +USE_TOOLS+= gs:run NO_CONFIGURE= yes PLIST_SRC= ${WRKDIR}/PLIST @@ -58,5 +59,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/styl.ppd ${PREFIX}/share/examples/stylewriter ${INSTALL_DATA_DIR} /var/spool/lpd/stylps -.include "../../mk/ghostscript.mk" .include "../../mk/bsd.pkg.mk" |