Mon Aug 13 14:25:00 2012 UTC ()
Correct dependencies in buildlink3.mk:
Does not forward libcroco dependency
DOES forward cairo dependency (see .pc file)

Bump PKGREVISION so that the upcoming revbump makes sense.


(wiz)
diff -r1.58 -r1.59 pkgsrc/graphics/librsvg/Makefile
diff -r1.24 -r1.25 pkgsrc/graphics/librsvg/buildlink3.mk
cvs diff -r1.58 -r1.59 pkgsrc/graphics/librsvg/Makefile (switch to unified diff)

--- pkgsrc/graphics/librsvg/Makefile 2012/06/14 07:43:24 1.58
+++ pkgsrc/graphics/librsvg/Makefile 2012/08/13 14:25:00 1.59
@@ -1,49 +1,49 @@ @@ -1,49 +1,49 @@
1# $NetBSD: Makefile,v 1.58 2012/06/14 07:43:24 sbd Exp $ 1# $NetBSD: Makefile,v 1.59 2012/08/13 14:25:00 wiz Exp $
2 2
3DISTNAME= librsvg-2.36.1 3DISTNAME= librsvg-2.36.1
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= graphics gnome 5CATEGORIES= graphics gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/librsvg/2.36/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/librsvg/2.36/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://librsvg.sourceforge.net/ 10HOMEPAGE= http://librsvg.sourceforge.net/
11COMMENT= SVG library for GNOME2 11COMMENT= SVG library for GNOME2
12LICENSE= gnu-lgpl-v2 12LICENSE= gnu-lgpl-v2
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16CONFLICTS+= librsvg2-gtk-[0-9]* librsvg2-[0-9]* 16CONFLICTS+= librsvg2-gtk-[0-9]* librsvg2-[0-9]*
17MAKE_JOBS_SAFE= NO 17MAKE_JOBS_SAFE= NO
18 18
19USE_LIBTOOL= yes 19USE_LIBTOOL= yes
20USE_TOOLS+= pkg-config 20USE_TOOLS+= pkg-config
21USE_LANGUAGES+= c c++ 21USE_LANGUAGES+= c c++
22GNU_CONFIGURE= yes 22GNU_CONFIGURE= yes
23CONFIGURE_ARGS+= --disable-gtk-theme --disable-tools 23CONFIGURE_ARGS+= --disable-gtk-theme --disable-tools
24CONFIGURE_ARGS+= --disable-introspection 24CONFIGURE_ARGS+= --disable-introspection
25CONFIGURE_ARGS+= --enable-Bsymbolic=auto 25CONFIGURE_ARGS+= --enable-Bsymbolic=auto
26 26
27PKGCONFIG_OVERRIDE= librsvg.pc.in 27PKGCONFIG_OVERRIDE= librsvg.pc.in
28 28
29TEST_TARGET= check 29TEST_TARGET= check
30 30
31BUILDLINK_API_DEPENDS.cairo+= cairo>=1.2.0 31BUILDLINK_API_DEPENDS.cairo+= cairo>=1.2.0
32BUILDLINK_API_DEPENDS.glib2+= glib2>=2.24.0 32BUILDLINK_API_DEPENDS.glib2+= glib2>=2.24.0
33 33
34.include "../../mk/bsd.prefs.mk" 34.include "../../mk/bsd.prefs.mk"
35 35
36.if ${OPSYS} == "Darwin" 36.if ${OPSYS} == "Darwin"
37CONFIGURE_ARGS+= --disable-Bsymbolic 37CONFIGURE_ARGS+= --disable-Bsymbolic
38.endif 38.endif
39 39
40.include "../../devel/glib2/buildlink3.mk" 40.include "../../devel/glib2/buildlink3.mk"
41.include "../../devel/pango/buildlink3.mk" 41.include "../../devel/pango/buildlink3.mk"
42.include "../../graphics/cairo/buildlink3.mk" 42.include "../../graphics/cairo/buildlink3.mk"
43.include "../../graphics/freetype2/buildlink3.mk" 43.include "../../graphics/freetype2/buildlink3.mk"
44.include "../../fonts/fontconfig/buildlink3.mk" 44.include "../../fonts/fontconfig/buildlink3.mk"
45BUILDLINK_API_DEPENDS.libcroco+= libcroco>=0.6.1 45BUILDLINK_API_DEPENDS.libcroco+= libcroco>=0.6.1
46.include "../../textproc/libcroco/buildlink3.mk" 46.include "../../textproc/libcroco/buildlink3.mk"
47.include "../../textproc/libxml2/buildlink3.mk" 47.include "../../textproc/libxml2/buildlink3.mk"
48.include "../../graphics/gdk-pixbuf2/loaders.mk" 48.include "../../graphics/gdk-pixbuf2/loaders.mk"
49.include "../../mk/bsd.pkg.mk" 49.include "../../mk/bsd.pkg.mk"
cvs diff -r1.24 -r1.25 pkgsrc/graphics/librsvg/buildlink3.mk (switch to unified diff)

--- pkgsrc/graphics/librsvg/buildlink3.mk 2012/06/14 07:43:24 1.24
+++ pkgsrc/graphics/librsvg/buildlink3.mk 2012/08/13 14:25:00 1.25
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: buildlink3.mk,v 1.24 2012/06/14 07:43:24 sbd Exp $ 1# $NetBSD: buildlink3.mk,v 1.25 2012/08/13 14:25:00 wiz Exp $
2 2
3BUILDLINK_TREE+= librsvg 3BUILDLINK_TREE+= librsvg
4 4
5.if !defined(LIBRSVG_BUILDLINK3_MK) 5.if !defined(LIBRSVG_BUILDLINK3_MK)
6LIBRSVG_BUILDLINK3_MK:= 6LIBRSVG_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.librsvg+= librsvg>=2.12.6nb1 8BUILDLINK_API_DEPENDS.librsvg+= librsvg>=2.12.6nb1
9BUILDLINK_ABI_DEPENDS.librsvg+= librsvg>=2.36.1nb1 9BUILDLINK_ABI_DEPENDS.librsvg+= librsvg>=2.36.1nb2
10BUILDLINK_PKGSRCDIR.librsvg?= ../../graphics/librsvg 10BUILDLINK_PKGSRCDIR.librsvg?= ../../graphics/librsvg
11 11
12.include "../../textproc/libcroco/buildlink3.mk" 12.include "../../graphics/cairo/buildlink3.mk"
13.include "../../graphics/gdk-pixbuf2/buildlink3.mk" 13.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
14.endif # LIBRSVG_BUILDLINK3_MK 14.endif # LIBRSVG_BUILDLINK3_MK
15 15
16BUILDLINK_TREE+= -librsvg 16BUILDLINK_TREE+= -librsvg