Revbump after updating graphics/cairo

3 files changed, 36 insertions, 69 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 137d35ab862..7f5483e34b8 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.101 2012/08/21 21:44:00 marino Exp $
+# $NetBSD: Makefile,v 1.102 2012/09/07 19:16:47 adam Exp $
 
 DISTNAME=	graphviz-2.26.3
-PKGREVISION=	12
+PKGREVISION=	13
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/stable/SOURCES/
 
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index 7ec56e05131..95f9dfc7cc2 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.39 2012/05/05 22:14:39 joerg Exp $
+$NetBSD: distinfo,v 1.40 2012/09/07 19:16:47 adam Exp $
 
-SHA1 (graphviz-2.26.3.tar.gz) = 04503ac5a9eaa579859f0d017811fa245717edec
-RMD160 (graphviz-2.26.3.tar.gz) = b2fbaf03b2006b43ed70e2a710363d7efbcfda77
-Size (graphviz-2.26.3.tar.gz) = 17092429 bytes
+SHA1 (graphviz-2.28.0.tar.gz) = 4725d88a13e071ee22e632de551d4a55ca08ee7d
+RMD160 (graphviz-2.28.0.tar.gz) = 5a5fae7cb1128d4e863b954bee5f2491ff23ada0
+Size (graphviz-2.28.0.tar.gz) = 19620087 bytes
 SHA1 (patch-aa) = 301ce5e8bfe68bab47ffdf513e2decbb52aff2c9
 SHA1 (patch-ab) = 00472c4299983e64f79e483ebcd705138401fc5d
 SHA1 (patch-ag) = 1eb3aab33f132b019a3faaa80bb68d44daa58f61
diff --git a/graphics/graphviz/options.mk b/graphics/graphviz/options.mk
index bbf1cd4f13e..e214c63f767 100644
--- a/graphics/graphviz/options.mk
+++ b/graphics/graphviz/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.14 2012/08/21 21:44:00 marino Exp $
+# $NetBSD: options.mk,v 1.15 2012/09/07 19:16:47 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.graphviz
 PKG_SUPPORTED_OPTIONS=	gd ghostscript gtk guile lua ocaml pangocairo rsvg tcl x11 perl
@@ -23,84 +23,51 @@ PLIST_VARS+=		gd ghostscript gtk guile lua ocaml pangocairo perl rsvg tcl x11
 .include "../../mk/xaw.buildlink3.mk"
 CONFIGURE_ENV+=		X11PREFIX=${X11PREFIX} X11BASE=${X11BASE}
 PLIST.x11=		yes
+.else
+CONFIGURE_ARGS+=	--without-x
+.endif
 
-.  if !empty(PKG_OPTIONS:Mpangocairo)
-.  include "../../devel/pango/buildlink3.mk"
-.  include "../../graphics/cairo/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mpangocairo)
+.include "../../devel/pango/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
 PLIST.pangocairo=	yes
+.else
+CONFIGURE_ARGS+=	--without-pangocairo
+.endif
 
-.    if !empty(PKG_OPTIONS:Mghostscript)
-.    include "../../print/ghostscript/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mghostscript)
+.include "../../print/ghostscript/buildlink3.mk"
 PLIST.ghostscript=	yes
-.    else
+.else
 CONFIGURE_ARGS+=	--without-ghostscript
-.    endif
+.endif
 
-.    if !empty(PKG_OPTIONS:Mgtk)
-.    include "../../x11/gtk2/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mgtk)
+.include "../../x11/gtk2/buildlink3.mk"
 PLIST.gtk=		yes
-.    else
+.else
 CONFIGURE_ARGS+=	--without-gdk-pixbuf
 CONFIGURE_ARGS+=	--without-gtk
 CONFIGURE_ARGS+=	--without-gnomeui
-.    endif
+.endif
 
-.    if !empty(PKG_OPTIONS:Mrsvg)
-.    include "../../graphics/librsvg/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mrsvg)
+.include "../../graphics/librsvg/buildlink3.mk"
 PLIST.rsvg=		yes
-.    else
-CONFIGURE_ARGS+=	--without-rsvg
-.    endif
-
-.  else
-# + x11, -pangocairo
-CONFIGURE_ARGS+=	--without-pangocairo
-
-.    if !empty(PKG_OPTIONS:Mghostscript)
-PKG_FAIL_REASON+=	"option ghostscript needs option pangocairo"
-.    endif
-CONFIGURE_ARGS+=	--without-ghostscript
-
-.    if !empty(PKG_OPTIONS:Mgtk)
-PKG_FAIL_REASON+=	"option gtk needs option pangocairo"
-.    endif
-CONFIGURE_ARGS+=	--without-gdk-pixbuf
-CONFIGURE_ARGS+=	--without-gtk
-CONFIGURE_ARGS+=	--without-gnomeui
-
-.    if !empty(PKG_OPTIONS:Mrsvg)
-PKG_FAIL_REASON+=	"option rsvg needs option pangocairo"
-.    endif
-CONFIGURE_ARGS+=	--without-rsvg
-.  endif
-
 .else
-# - x11
-CONFIGURE_ARGS+=	--without-x
-
-.  if !empty(PKG_OPTIONS:Mpangocairo)
-PKG_FAIL_REASON+=	"option pangocairo needs option x11"
-.  endif
-CONFIGURE_ARGS+=	--without-pangocairo
-
-.  if !empty(PKG_OPTIONS:Mghostscript)
-PKG_FAIL_REASON+=	"option ghostscript needs option pangocairo and x11"
-.  endif
-CONFIGURE_ARGS+=	--without-ghostscript
-
-.  if !empty(PKG_OPTIONS:Mgtk)
-PKG_FAIL_REASON+=	"option gtk needs option pangocairo and x11"
-.  endif
-CONFIGURE_ARGS+=	--without-gdk-pixbuf
-CONFIGURE_ARGS+=	--without-gtk
-CONFIGURE_ARGS+=	--without-gnomeui
-
-.  if !empty(PKG_OPTIONS:Mrsvg)
-PKG_FAIL_REASON+=	"option rsvg needs option pangocairo and x11"
-.  endif
 CONFIGURE_ARGS+=	--without-rsvg
 .endif
 
+#.  if !empty(PKG_OPTIONS:Mghostscript)
+#PKG_FAIL_REASON+=	"option ghostscript needs option pangocairo and x11"
+#.  endif
+#.  if !empty(PKG_OPTIONS:Mgtk)
+#PKG_FAIL_REASON+=	"option gtk needs option pangocairo and x11"
+#.  endif
+#.  if !empty(PKG_OPTIONS:Mrsvg)
+#PKG_FAIL_REASON+=	"option rsvg needs option pangocairo and x11"
+#.  endif
+
 .if !empty(PKG_OPTIONS:Mgd)
 .include "../../graphics/gd/buildlink3.mk"
 PLIST.gd=		yes