pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Change all instances of including mk/ghostscript.mk in...
details: https://anonhg.NetBSD.org/pkgsrc/rev/068a8aefa7a0
branches: trunk
changeset: 503747:068a8aefa7a0
user: jlam <jlam%pkgsrc.org@localhost>
date: Mon Nov 28 06:41:20 2005 +0000
description:
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:
cad/xcircuit/Makefile | 4 +-
comms/hylafax/Makefile | 4 +-
converters/doc2html/Makefile | 5 +-
devel/doxygen/Makefile | 5 +-
doc/guide/Makefile.common | 9 +-
fonts/ghostscript-cidfonts/Makefile | 4 +-
fonts/ghostscript-cmaps/Makefile | 4 +-
graphics/gri/Makefile | 5 +-
graphics/iGMT/Makefile | 4 +-
graphics/kbarcode/Makefile | 5 +-
graphics/kdegraphics3/Makefile | 4 +-
graphics/pstoedit/Makefile | 7 +-
graphics/ruby-RMagick/Makefile | 5 +-
mail/sylpheed-claws-ghostscript-viewer/Makefile | 6 +-
meta-pkgs/netbsd-doc-print/Makefile | 4 +-
mk/ghostscript.mk | 105 ------------------------
print/advi/Makefile | 5 +-
print/apsfilter/Makefile | 5 +-
print/cupsomatic/Makefile | 5 +-
print/dvipdfm/Makefile | 4 +-
print/dvipdfmx/Makefile | 4 +-
print/foomatic-filters/Makefile | 5 +-
print/foomatic-gswrapper/Makefile | 5 +-
print/gnome-print/Makefile | 4 +-
print/gv/Makefile | 5 +-
print/html2ps/Makefile | 5 +-
print/if-psprint/Makefile | 5 +-
print/ja-dvipdfm/Makefile | 4 +-
print/lilypond/Makefile | 5 +-
print/magicfilter/Makefile | 7 +-
print/mgv/Makefile | 4 +-
print/stylewriter/Makefile | 4 +-
sysutils/gworkspace/Makefile | 4 +-
textproc/groff/Makefile | 5 +-
textproc/latex2html/Makefile | 5 +-
35 files changed, 75 insertions(+), 195 deletions(-)
diffs (truncated from 914 to 300 lines):
diff -r 08b3766a9561 -r 068a8aefa7a0 cad/xcircuit/Makefile
--- a/cad/xcircuit/Makefile Mon Nov 28 06:06:16 2005 +0000
+++ b/cad/xcircuit/Makefile Mon Nov 28 06:41:20 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:45:03 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/11/28 06:41:20 jlam Exp $
DISTNAME= xcircuit-3.3.0
CATEGORIES= cad graphics
@@ -10,6 +10,7 @@
COMMENT= Drawing program for X11 (especially for circuits)
WRKSRC= ${WRKDIR}/${DISTNAME}
+USE_TOOLS+= gs:run
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-tcl
CONFIGURE_ARGS+=--with-tclincls=${BUILDLINK_PREFIX.tcl}/include
@@ -32,5 +33,4 @@
.include "../../graphics/xpm/buildlink3.mk"
.include "../../lang/tcl/buildlink3.mk"
.include "../../x11/tk/buildlink3.mk"
-.include "../../mk/ghostscript.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 08b3766a9561 -r 068a8aefa7a0 comms/hylafax/Makefile
--- a/comms/hylafax/Makefile Mon Nov 28 06:06:16 2005 +0000
+++ b/comms/hylafax/Makefile Mon Nov 28 06:41:20 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2005/11/13 22:50:26 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2005/11/28 06:41:20 jlam Exp $
VERS= 4.2.2
DISTNAME= hylafax-${VERS}
@@ -18,6 +18,7 @@
USE_PKGINSTALL= yes
USE_LANGUAGES= c c++
+USE_TOOLS+= gs:run
HAS_CONFIGURE= yes
CONFIGURE_ARGS+= --with-MAKE=${MAKE_PROGRAM}
CONFIGURE_ARGS+= --with-INSTALL="" --nointeractive
@@ -54,5 +55,4 @@
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
-.include "../../mk/ghostscript.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 08b3766a9561 -r 068a8aefa7a0 converters/doc2html/Makefile
--- a/converters/doc2html/Makefile Mon Nov 28 06:06:16 2005 +0000
+++ b/converters/doc2html/Makefile Mon Nov 28 06:41:20 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/16 01:19:08 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/11/28 06:41:20 jlam Exp $
#
DISTNAME= doc2html
@@ -16,7 +16,7 @@
DEPENDS+= xpdf-[0-9]*:../../print/xpdf
DEPENDS+= catdoc-[0-9]*:../../textproc/catdoc
-USE_TOOLS+= perl:run
+USE_TOOLS+= gs:run perl:run
INSTALLATION_DIRS= bin
@@ -33,5 +33,4 @@
${INSTALL_SCRIPT} ${WRKSRC}/doc2html ${PREFIX}/bin/doc2html
${INSTALL_SCRIPT} ${WRKSRC}/pdf2html ${PREFIX}/bin/pdf2html
-.include "../../mk/ghostscript.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 08b3766a9561 -r 068a8aefa7a0 devel/doxygen/Makefile
--- a/devel/doxygen/Makefile Mon Nov 28 06:06:16 2005 +0000
+++ b/devel/doxygen/Makefile Mon Nov 28 06:41:20 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/11/11 18:50:24 tonio Exp $
+# $NetBSD: Makefile,v 1.40 2005/11/28 06:41:20 jlam Exp $
DISTNAME= doxygen-1.4.5.src
PKGNAME= doxygen-1.4.5
@@ -12,7 +12,7 @@
TEX_ACCEPTED= teTeX1 teTeX2 teTeX3
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-USE_TOOLS+= gmake perl flex
+USE_TOOLS+= gmake gs:run perl flex
USE_LANGUAGES= c c++
HAS_CONFIGURE= yes
CONFIGURE_ARGS+= --make ${GMAKE}
@@ -36,6 +36,5 @@
.include "../../graphics/graphviz/buildlink3.mk"
.include "../../lang/python/application.mk"
-.include "../../mk/ghostscript.mk"
.include "../../mk/tex.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 08b3766a9561 -r 068a8aefa7a0 doc/guide/Makefile.common
--- a/doc/guide/Makefile.common Mon Nov 28 06:06:16 2005 +0000
+++ b/doc/guide/Makefile.common Mon Nov 28 06:41:20 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2005/11/03 01:57:15 tv Exp $
+# $NetBSD: Makefile.common,v 1.2 2005/11/28 06:41:20 jlam Exp $
#
# This is included by doc/guide and meta-pkgs/pkgsrc-guide-tools.
#
@@ -30,9 +30,12 @@
.if !empty(_GUIDE_OUTPUTS:Mps) || !empty(_GUIDE_OUTPUTS:Mpdf)
_GUIDE_DEPENDS+= openjade>=1.3.2:../../textproc/openjade
_GUIDE_DEPENDS+= tex-jadetex>=3.13:../../print/tex-jadetex
-USE_GHOSTSCRIPT?= ${_GUIDE_DEPTYPE}
GHOSTSCRIPT_REQD= 7.05
-. include "../../mk/ghostscript.mk"
+. if ${_GUIDE_DEPTYPE} == "run"
+USE_TOOLS+= gs:run
+. else
+USE_TOOLS+= gs
+. endif
.endif
.if ${_GUIDE_DEPTYPE} == "run"
diff -r 08b3766a9561 -r 068a8aefa7a0 fonts/ghostscript-cidfonts/Makefile
--- a/fonts/ghostscript-cidfonts/Makefile Mon Nov 28 06:06:16 2005 +0000
+++ b/fonts/ghostscript-cidfonts/Makefile Mon Nov 28 06:41:20 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/08/20 19:16:21 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/11/28 06:41:20 jlam Exp $
DISTNAME= ghostscript-cidfonts-20000901
PKGREVISION= 1
@@ -19,6 +19,7 @@
EXTRACT_ONLY= # empty
NO_CONFIGURE= yes
NO_BUILD= yes
+USE_TOOLS+= gs:run
USE_PKGINSTALL= yes
DEINSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL
@@ -32,5 +33,4 @@
do-install: # nothing
-.include "../../mk/ghostscript.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 08b3766a9561 -r 068a8aefa7a0 fonts/ghostscript-cmaps/Makefile
--- a/fonts/ghostscript-cmaps/Makefile Mon Nov 28 06:06:16 2005 +0000
+++ b/fonts/ghostscript-cmaps/Makefile Mon Nov 28 06:41:20 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/08/20 19:16:21 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/11/28 06:41:20 jlam Exp $
DISTNAME= ghostscript-cmaps-20020913
PKGREVISION= 1
@@ -17,6 +17,7 @@
GS_RESOURCEDIR= ${PREFIX}/share/ghostscript/Resource
EXTRACT_ONLY= # empty
+USE_TOOLS+= gs:run
NO_CONFIGURE= yes
NO_BUILD= yes
USE_PKGINSTALL= yes
@@ -32,5 +33,4 @@
do-install: # nothing
-.include "../../mk/ghostscript.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 08b3766a9561 -r 068a8aefa7a0 graphics/gri/Makefile
--- a/graphics/gri/Makefile Mon Nov 28 06:06:16 2005 +0000
+++ b/graphics/gri/Makefile Mon Nov 28 06:41:20 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/07/16 01:19:11 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/11/28 06:41:20 jlam Exp $
DISTNAME= gri-2.12.5
PKGREVISION= 1
@@ -13,13 +13,12 @@
BUILD_DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake perl
+USE_TOOLS+= gmake gs:run perl
REPLACE_PERL= gri_merge gri_unpage
USE_MAKEINFO= yes
INFO_FILES= gri.info
.include "../../devel/netcdf/buildlink3.mk"
-.include "../../mk/ghostscript.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 08b3766a9561 -r 068a8aefa7a0 graphics/iGMT/Makefile
--- a/graphics/iGMT/Makefile Mon Nov 28 06:06:16 2005 +0000
+++ b/graphics/iGMT/Makefile Mon Nov 28 06:41:20 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/06/16 06:57:58 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/11/28 06:41:20 jlam Exp $
DISTNAME= igmt_v1.2
PKGNAME= iGMT-1.2
@@ -19,6 +19,7 @@
WRKSRC= ${WRKDIR}/igmt_1.2
NO_BUILD= yes
+USE_TOOLS= gs:run
GMT_PREFIX_DEFAULT= ${LOCALBASE}
EVAL_PREFIX+= GMT_PREFIX=GMT
EVAL_PREFIX+= TK_PREFIX=tk
@@ -53,5 +54,4 @@
cd ${WRKSRC} && ${INSTALL_DATA} example*.ps.gz \
${WRKSRC}/example*.dat ${PREFIX}/share/examples/igmt/
-.include "../../mk/ghostscript.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 08b3766a9561 -r 068a8aefa7a0 graphics/kbarcode/Makefile
--- a/graphics/kbarcode/Makefile Mon Nov 28 06:06:16 2005 +0000
+++ b/graphics/kbarcode/Makefile Mon Nov 28 06:41:20 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:06 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/11/28 06:41:20 jlam Exp $
DISTNAME= kbarcode-1.8.1
PKGREVISION= 2
@@ -10,7 +10,7 @@
COMMENT= KDE barcode and label printing application
USE_DIRS+= xdg-1.1
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake gs:run
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
@@ -21,5 +21,4 @@
.include "../../meta-pkgs/kde3/kde3.mk"
.include "../../x11/kdelibs3/buildlink3.mk"
-.include "../../mk/ghostscript.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 08b3766a9561 -r 068a8aefa7a0 graphics/kdegraphics3/Makefile
--- a/graphics/kdegraphics3/Makefile Mon Nov 28 06:06:16 2005 +0000
+++ b/graphics/kdegraphics3/Makefile Mon Nov 28 06:41:20 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2005/10/13 13:17:59 markd Exp $
+# $NetBSD: Makefile,v 1.51 2005/11/28 06:41:21 jlam Exp $
DISTNAME= kdegraphics-${_KDE_VERSION}
CATEGORIES= graphics
@@ -7,6 +7,7 @@
.include "../../meta-pkgs/kde3/Makefile.kde3"
USE_DIRS+= xdg-1.1
+USE_TOOLS+= gs:run
BUILDLINK_DEPENDS.lcms= lcms>=1.12
@@ -27,5 +28,4 @@
.include "../../graphics/tiff/buildlink3.mk"
.include "../../x11/kdebase3/buildlink3.mk"
.include "../../x11/kdelibs3/buildlink3.mk"
-.include "../../mk/ghostscript.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 08b3766a9561 -r 068a8aefa7a0 graphics/pstoedit/Makefile
--- a/graphics/pstoedit/Makefile Mon Nov 28 06:06:16 2005 +0000
+++ b/graphics/pstoedit/Makefile Mon Nov 28 06:41:20 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/08/19 15:49:52 drochner Exp $
+# $NetBSD: Makefile,v 1.31 2005/11/28 06:41:21 jlam Exp $
DISTNAME= pstoedit-3.41
CATEGORIES= converters graphics print
@@ -12,6 +12,9 @@
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
+# XXX Avoid hard dependency on Ghostscript
+#USE_TOOLS+= gs:run
+
USE_LIBTOOL= yes
USE_LANGUAGES= c++
GNU_CONFIGURE= yes
@@ -37,6 +40,4 @@
.include "../../graphics/plotutils/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
-# XXX avoid hard dependency
-#.include "../../mk/ghostscript.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 08b3766a9561 -r 068a8aefa7a0 graphics/ruby-RMagick/Makefile
--- a/graphics/ruby-RMagick/Makefile Mon Nov 28 06:06:16 2005 +0000
+++ b/graphics/ruby-RMagick/Makefile Mon Nov 28 06:41:20 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/11/03 07:20:28 taca Exp $
+# $NetBSD: Makefile,v 1.13 2005/11/28 06:41:21 jlam Exp $
DISTNAME= RMagick-1.9.3
PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME}
@@ -12,7 +12,7 @@
RUBY_HAS_ARCHLIB= yes
GNU_CONFIGURE= yes
-USE_GHOSTSCRIPT= build
+USE_TOOLS+= gs
Home |
Main Index |
Thread Index |
Old Index