From 1cfdcf5701a7b828278f7870f21c23a46b6e9924 Mon Sep 17 00:00:00 2001 From: sbd Date: Thu, 25 Apr 2013 03:53:11 +0000 Subject: For all packages include ghostscript.buildlink3.mk: s/ghostscript.buildlink3.mk/buildlink3.mk/ Bump PKGREVISIONs --- graphics/GraphicsMagick/Makefile | 4 ++-- graphics/GraphicsMagick/buildlink3.mk | 4 ++-- graphics/GraphicsMagick/options.mk | 4 ++-- graphics/ImageMagick/Makefile | 4 ++-- graphics/ImageMagick/buildlink3.mk | 4 ++-- graphics/ImageMagick/options.mk | 4 ++-- graphics/camlimages/Makefile | 6 +++--- graphics/graphviz/Makefile | 4 ++-- graphics/graphviz/options.mk | 4 ++-- math/R-CGIwithR/Makefile | 4 ++-- print/hplip/Makefile | 5 +++-- print/libspectre/Makefile | 6 +++--- print/libspectre/buildlink3.mk | 4 ++-- 13 files changed, 29 insertions(+), 28 deletions(-) diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile index 210554551a1..f37a968c8fd 100644 --- a/graphics/GraphicsMagick/Makefile +++ b/graphics/GraphicsMagick/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.59 2013/04/24 10:06:48 sbd Exp $ +# $NetBSD: Makefile,v 1.60 2013/04/25 03:53:11 sbd Exp $ .include "Makefile.common" -PKGREVISION= 2 +PKGREVISION= 3 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.graphicsmagick.org/ COMMENT= X application for displaying and manipulating images diff --git a/graphics/GraphicsMagick/buildlink3.mk b/graphics/GraphicsMagick/buildlink3.mk index d514612c1be..27be7242b38 100644 --- a/graphics/GraphicsMagick/buildlink3.mk +++ b/graphics/GraphicsMagick/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.30 2013/03/16 22:39:20 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.31 2013/04/25 03:53:11 sbd Exp $ BUILDLINK_TREE+= GraphicsMagick @@ -13,7 +13,7 @@ pkgbase := GraphicsMagick .include "../../mk/pkg-build-options.mk" .if !empty(PKG_BUILD_OPTIONS.GraphicsMagick:Mghostscript) -.include "../../print/ghostscript/ghostscript.buildlink3.mk" +.include "../../print/ghostscript/buildlink3.mk" .endif .if !empty(PKG_BUILD_OPTIONS.GraphicsMagick:Mx11) .include "../../x11/libSM/buildlink3.mk" diff --git a/graphics/GraphicsMagick/options.mk b/graphics/GraphicsMagick/options.mk index 1a79490a848..2a79a016e9c 100755 --- a/graphics/GraphicsMagick/options.mk +++ b/graphics/GraphicsMagick/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2013/03/16 22:39:20 dholland Exp $ +# $NetBSD: options.mk,v 1.6 2013/04/25 03:53:11 sbd Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.GraphicsMagick PKG_SUPPORTED_OPTIONS= bzip2 lzma x11 jasper ghostscript wmf @@ -39,7 +39,7 @@ CONFIGURE_ARGS+= --without-jp2 .endif .if !empty(PKG_OPTIONS:Mghostscript) -.include "../../print/ghostscript/ghostscript.buildlink3.mk" +.include "../../print/ghostscript/buildlink3.mk" CONFIGURE_ARGS+= --with-gslib .else CONFIGURE_ARGS+= --without-gslib diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index ef48e685db1..3ee599e844b 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.192 2013/03/16 22:40:25 dholland Exp $ +# $NetBSD: Makefile,v 1.193 2013/04/25 03:53:11 sbd Exp $ .include "Makefile.common" PKGNAME= ImageMagick-${DISTVERSION} -PKGREVISION= 1 +PKGREVISION= 2 MAINTAINER= adam@NetBSD.org COMMENT= Package for display and interactive manipulation of images diff --git a/graphics/ImageMagick/buildlink3.mk b/graphics/ImageMagick/buildlink3.mk index e68a50e7fbb..6c7ead6c8fe 100644 --- a/graphics/ImageMagick/buildlink3.mk +++ b/graphics/ImageMagick/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.47 2013/03/16 22:40:25 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.48 2013/04/25 03:53:11 sbd Exp $ BUILDLINK_TREE+= ImageMagick @@ -16,7 +16,7 @@ pkgbase := ImageMagick .include "../../graphics/djvulibre-lib/buildlink3.mk" .endif .if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mghostscript) -.include "../../print/ghostscript/ghostscript.buildlink3.mk" +.include "../../print/ghostscript/buildlink3.mk" .endif .if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mjasper) .include "../../graphics/jasper/buildlink3.mk" diff --git a/graphics/ImageMagick/options.mk b/graphics/ImageMagick/options.mk index 4cdb11951a3..36ad31410aa 100644 --- a/graphics/ImageMagick/options.mk +++ b/graphics/ImageMagick/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.13 2013/03/16 22:40:25 dholland Exp $ +# $NetBSD: options.mk,v 1.14 2013/04/25 03:53:11 sbd Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ImageMagick PKG_SUPPORTED_OPTIONS= x11 jasper djvu ghostscript wmf @@ -30,7 +30,7 @@ CONFIGURE_ARGS+= --without-djvu .endif .if !empty(PKG_OPTIONS:Mghostscript) -.include "../../print/ghostscript/ghostscript.buildlink3.mk" +.include "../../print/ghostscript/buildlink3.mk" CONFIGURE_ARGS+= --with-gslib .else CONFIGURE_ARGS+= --without-gslib diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile index f55f63bb898..4437c7751ad 100644 --- a/graphics/camlimages/Makefile +++ b/graphics/camlimages/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.55 2013/03/16 22:52:56 dholland Exp $ +# $NetBSD: Makefile,v 1.56 2013/04/25 03:53:11 sbd Exp $ VERSION= 4.0.1 PKGNAME= camlimages-${VERSION} -PKGREVISION= 21 +PKGREVISION= 22 CATEGORIES= graphics MASTER_SITES= https://bitbucket.org/camlspotter/camlimages/get/ DISTNAME= v${VERSION} @@ -51,7 +51,7 @@ BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.11.0 .include "../../mk/giflib.buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" -.include "../../print/ghostscript/ghostscript.buildlink3.mk" +.include "../../print/ghostscript/buildlink3.mk" .include "../../x11/lablgtk/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index ade81e40b93..1d0651edc5a 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.115 2013/04/09 05:50:39 dholland Exp $ +# $NetBSD: Makefile,v 1.116 2013/04/25 03:53:11 sbd Exp $ DISTNAME= graphviz-2.26.3 -PKGREVISION= 22 +PKGREVISION= 23 CATEGORIES= graphics MASTER_SITES= http://www.graphviz.org/pub/graphviz/stable/SOURCES/ diff --git a/graphics/graphviz/options.mk b/graphics/graphviz/options.mk index cfd3bb8063a..0ccd5ef9bb7 100644 --- a/graphics/graphviz/options.mk +++ b/graphics/graphviz/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.17 2013/03/16 22:41:50 dholland Exp $ +# $NetBSD: options.mk,v 1.18 2013/04/25 03:53:11 sbd Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.graphviz PKG_SUPPORTED_OPTIONS= gd ghostscript gtk guile lua ocaml pangocairo rsvg tcl x11 perl @@ -30,7 +30,7 @@ PLIST.x11= yes PLIST.pangocairo= yes . if !empty(PKG_OPTIONS:Mghostscript) -. include "../../print/ghostscript/ghostscript.buildlink3.mk" +. include "../../print/ghostscript/buildlink3.mk" PLIST.ghostscript= yes . else CONFIGURE_ARGS+= --without-ghostscript diff --git a/math/R-CGIwithR/Makefile b/math/R-CGIwithR/Makefile index 3b423e5e817..097ccb293e6 100644 --- a/math/R-CGIwithR/Makefile +++ b/math/R-CGIwithR/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2013/03/16 22:54:29 dholland Exp $ +# $NetBSD: Makefile,v 1.11 2013/04/25 03:53:11 sbd Exp $ # PKGREVISION= 6 @@ -24,5 +24,5 @@ SUBST_FILES.fix-paths= inst/cgi-bin/R.cgi SUBST_SED.fix-paths= -e 's,/usr/local,${PREFIX},g' .include "../../math/R/Makefile.extension" -.include "../../print/ghostscript/ghostscript.buildlink3.mk" +.include "../../print/ghostscript/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/hplip/Makefile b/print/hplip/Makefile index cc5fc19df05..a3afb5e2a43 100644 --- a/print/hplip/Makefile +++ b/print/hplip/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.18 2013/04/12 03:47:30 schnoebe Exp $ +# $NetBSD: Makefile,v 1.19 2013/04/25 03:53:11 sbd Exp $ # DISTNAME= hplip-3.13.4 +PKGREVISION= 1 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hplip/} @@ -175,7 +176,7 @@ post-install: .include "../../mk/jpeg.buildlink3.mk" .include "../../net/net-snmp/buildlink3.mk" .include "../../print/cups/buildlink3.mk" -.include "../../print/ghostscript/ghostscript.buildlink3.mk" +.include "../../print/ghostscript/buildlink3.mk" .include "../../devel/libusb1/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../textproc/py-xml/buildlink3.mk" diff --git a/print/libspectre/Makefile b/print/libspectre/Makefile index 8922ae01f08..df5ad04be64 100644 --- a/print/libspectre/Makefile +++ b/print/libspectre/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.19 2013/03/16 22:35:46 dholland Exp $ +# $NetBSD: Makefile,v 1.20 2013/04/25 03:53:12 sbd Exp $ DISTNAME= libspectre-0.2.7 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= print MASTER_SITES= http://libspectre.freedesktop.org/releases/ @@ -15,5 +15,5 @@ USE_LIBTOOL= yes PKGCONFIG_OVERRIDE+= libspectre.pc.in -.include "../../print/ghostscript/ghostscript.buildlink3.mk" +.include "../../print/ghostscript/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/libspectre/buildlink3.mk b/print/libspectre/buildlink3.mk index bae5f5ce8b0..a4173d21d26 100644 --- a/print/libspectre/buildlink3.mk +++ b/print/libspectre/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2013/03/16 22:36:55 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2013/04/25 03:53:12 sbd Exp $ BUILDLINK_TREE+= libspectre @@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.libspectre+= libspectre>=0.2.1 BUILDLINK_ABI_DEPENDS.libspectre+= libspectre>=0.2.7nb4 BUILDLINK_PKGSRCDIR.libspectre?= ../../print/libspectre -.include "../../print/ghostscript/ghostscript.buildlink3.mk" +.include "../../print/ghostscript/buildlink3.mk" .endif # LIBSPECTRE_BUILDLINK3_MK BUILDLINK_TREE+= -libspectre -- cgit v1.2.3