DEPEND on netpbm instead of including its buildlink3.mk file, if you're

not linking against it.
Bump PKGREVISION for packages that (might be|are) changed.

11 files changed, 27 insertions, 31 deletions

diff --git a/graphics/aview/Makefile b/graphics/aview/Makefile
index 9833b3ce912..75aca73629c 100644
--- a/graphics/aview/Makefile
+++ b/graphics/aview/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2013/02/16 11:21:39 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.31 2014/09/08 20:40:29 wiz Exp $
 
 DISTNAME=	aview-1.3.0rc1
 PKGNAME=	aview-1.3.0.1
-PKGREVISION=	15
+PKGREVISION=	16
 CATEGORIES=	graphics converters
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=aa-project/}
 
@@ -12,6 +11,8 @@ HOMEPAGE=	http://aa-project.sourceforge.net/aview/
 COMMENT=	ASCII Art image viewer
 LICENSE=	gnu-gpl-v2
 
+DEPENDS+=	netpbm-[0-9]*:../../graphics/netpbm
+
 CONFLICTS+=	aview-x11-[0-9]*
 
 PLIST_SRC=	${WRKDIR}/PLIST
@@ -54,6 +55,5 @@ post-install:
 .endif
 
 .include "../../graphics/aalib/buildlink3.mk"
-.include "../../graphics/netpbm/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/cnxtview/Makefile b/graphics/cnxtview/Makefile
index cb3afd9441a..b54824b890e 100644
--- a/graphics/cnxtview/Makefile
+++ b/graphics/cnxtview/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2014/05/15 14:41:51 adam Exp $
-#
+# $NetBSD: Makefile,v 1.27 2014/09/08 20:40:29 wiz Exp $
 
 DISTNAME=	cnxtutil-0.00-alpha
 PKGNAME=	cnxtview-0.00a
-PKGREVISION=	14
+PKGREVISION=	15
 CATEGORIES=	graphics x11
 MASTER_SITES=	http://home.384.jp/takam/bsd/
 
diff --git a/graphics/cpia2view/Makefile b/graphics/cpia2view/Makefile
index 35b507f1aaf..3c93d15c46f 100644
--- a/graphics/cpia2view/Makefile
+++ b/graphics/cpia2view/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2014/05/15 14:41:51 adam Exp $
-#
+# $NetBSD: Makefile,v 1.28 2014/09/08 20:40:29 wiz Exp $
 
 DISTNAME=	cpia2_driver-1.0
 PKGNAME=	cpia2view-0.03
-PKGREVISION=	15
+PKGREVISION=	16
 CATEGORIES=	graphics x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cpia2/}
 EXTRACT_SUFX=	.tgz
diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index 1fe34e70d53..a06065ddb71 100644
--- a/graphics/fnlib/Makefile
+++ b/graphics/fnlib/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2014/05/15 14:41:51 adam Exp $
-#
+# $NetBSD: Makefile,v 1.52 2014/09/08 20:40:30 wiz Exp $
 
 DISTNAME=		fnlib-0.5
-PKGREVISION=		21
+PKGREVISION=		22
 CATEGORIES=		x11 graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=enlightenment/}
 
diff --git a/graphics/imlib-gtk/Makefile b/graphics/imlib-gtk/Makefile
index 255845e3d68..49b1bb44d7f 100644
--- a/graphics/imlib-gtk/Makefile
+++ b/graphics/imlib-gtk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2014/05/15 14:41:51 adam Exp $
+# $NetBSD: Makefile,v 1.9 2014/09/08 20:40:30 wiz Exp $
 
 DISTNAME=	imlib-1.9.15
 PKGNAME=	imlib-gtk-1.9.15
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/imlib/1.9/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 125c75e98e0..476e338954a 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.119 2014/05/31 15:56:27 wiz Exp $
+# $NetBSD: Makefile,v 1.120 2014/09/08 20:40:30 wiz Exp $
 
 DISTNAME=	imlib-1.9.15
-PKGREVISION=	18
+PKGREVISION=	19
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/imlib/1.9/}
 EXTRACT_SUFX=	.tar.bz2
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.nl.rasterman.com/imlib.html
 COMMENT=	Image manipulation library for X11
 
+DEPENDS+=	netpbm-[0-9]*:../../graphics/netpbm
+
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_TOOLS+=		gmake
@@ -61,7 +63,6 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/giflib/buildlink3.mk"
-.include "../../graphics/netpbm/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/graphics/imlib/buildlink3.mk b/graphics/imlib/buildlink3.mk
index f544070f5f7..466bf96f23c 100644
--- a/graphics/imlib/buildlink3.mk
+++ b/graphics/imlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.29 2014/05/31 15:56:27 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2014/09/08 20:40:30 wiz Exp $
 
 BUILDLINK_TREE+=	imlib
 
@@ -12,7 +12,6 @@ BUILDLINK_PKGSRCDIR.imlib?=	../../graphics/imlib
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/giflib/buildlink3.mk"
-.include "../../graphics/netpbm/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index 134affa8905..09eb472cd6c 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.126 2014/08/22 11:24:25 wiz Exp $
+# $NetBSD: Makefile,v 1.127 2014/09/08 20:40:30 wiz Exp $
 
 DISTNAME=	kdegraphics-${_KDE_VERSION}
-PKGREVISION=	41
+PKGREVISION=	42
 CATEGORIES=	graphics
 COMMENT=	Graphics programs for the KDE integrated X11 desktop
 
diff --git a/graphics/magicpoint/Makefile b/graphics/magicpoint/Makefile
index 8b2935ab6cf..50d973db003 100644
--- a/graphics/magicpoint/Makefile
+++ b/graphics/magicpoint/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.93 2014/05/31 15:56:27 wiz Exp $
+# $NetBSD: Makefile,v 1.94 2014/09/08 20:40:30 wiz Exp $
 
 DISTNAME=		magicpoint-1.13a
-PKGREVISION=		24
+PKGREVISION=		25
 CATEGORIES=		x11 graphics
 MASTER_SITES=		ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/
 
@@ -10,6 +10,8 @@ HOMEPAGE=		http://member.wide.ad.jp/wg/mgp/
 COMMENT=		X11 based presentation tool
 LICENSE=		modified-bsd
 
+DEPENDS+=		netpbm-[0-9]*:../../graphics/netpbm
+
 CONFLICTS=		mgp-[0-9]*
 
 GNU_CONFIGURE=		yes
@@ -73,7 +75,6 @@ post-install:
 
 .include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
-.include "../../graphics/netpbm/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
diff --git a/graphics/rayshade/Makefile b/graphics/rayshade/Makefile
index 44888de41ee..b5e2414fa60 100644
--- a/graphics/rayshade/Makefile
+++ b/graphics/rayshade/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2013/02/16 11:22:26 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2014/09/08 20:40:30 wiz Exp $
 
 DISTNAME=	rayshade.4.0.6
 PKGNAME=	rayshade-4.0.6
-#KGREVISION=	8
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://graphics.stanford.edu/pub/rayshade/
 EXTRACT_SUFX=	.tar.Z
diff --git a/graphics/spcaview/Makefile b/graphics/spcaview/Makefile
index 59f679a77e2..0e7fff2ab2e 100644
--- a/graphics/spcaview/Makefile
+++ b/graphics/spcaview/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2014/05/15 14:41:53 adam Exp $
-#
+# $NetBSD: Makefile,v 1.24 2014/09/08 20:40:30 wiz Exp $
 
 DISTNAME=	spca5xx-20060402
 PKGNAME=	spcaview-0.6b
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	graphics x11
 MASTER_SITES=	http://mxhaard.free.fr/spca50x/Download/oldrelease/