From 7fbfd9dbf83cf7b41b190e572ad1dbb802d617e8 Mon Sep 17 00:00:00 2001 From: drochner Date: Thu, 10 Aug 2006 14:28:53 +0000 Subject: two pkgsrc related changes which I wanted to piggyback on the next update: -remove dependency on libpixman which was stale for ages -don't bother setting the gtk-doc installation path to share/doc, the new "devhelp" will find it at the default location (and the previous versions didn't find it at share/doc either) --- graphics/cairo/Makefile | 5 +-- graphics/cairo/PLIST | 102 ++++++++++++++++++++++++------------------------ 2 files changed, 52 insertions(+), 55 deletions(-) diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index 534471ae5ec..1784a41d15a 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2006/08/10 13:50:37 wiz Exp $ +# $NetBSD: Makefile,v 1.44 2006/08/10 14:28:53 drochner Exp $ DISTNAME= cairo-1.2.2 CATEGORIES= graphics @@ -17,7 +17,6 @@ CONFIGURE_ARGS+= --disable-xcb CONFIGURE_ARGS+= --enable-glitz CONFIGURE_ARGS+= --enable-pdf CONFIGURE_ARGS+= --enable-ps -CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc .if exists(/System/Library/Frameworks/Carbon.framework) CONFIGURE_ARGS+= --enable-quartz @@ -30,7 +29,6 @@ PLIST_SUBST+= CARBON="@comment " .include "options.mk" BUILDLINK_API_DEPENDS.glitz+= glitz>=0.5.1 -BUILDLINK_API_DEPENDS.libpixman+= libpixman>=0.1.5 .include "../../mk/compiler.mk" @@ -44,7 +42,6 @@ TEST_TARGET= check .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/glitz/buildlink3.mk" -.include "../../graphics/libpixman/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/cairo/PLIST b/graphics/cairo/PLIST index 8afa95f690e..6755693ef5c 100644 --- a/graphics/cairo/PLIST +++ b/graphics/cairo/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2006/08/10 13:50:37 wiz Exp $ +@comment $NetBSD: PLIST,v 1.14 2006/08/10 14:28:53 drochner Exp $ ${CARBON}include/cairo/cairo-atsui.h include/cairo/cairo-features.h include/cairo/cairo-ft.h @@ -22,54 +22,54 @@ lib/pkgconfig/cairo-svg.pc ${X11}lib/pkgconfig/cairo-xlib-xrender.pc ${X11}lib/pkgconfig/cairo-xlib.pc lib/pkgconfig/cairo.pc -share/doc/cairo/Drawing.html -share/doc/cairo/Fonts.html -share/doc/cairo/Support.html -share/doc/cairo/Surfaces.html -share/doc/cairo/bindings-errors.html -share/doc/cairo/bindings-fonts.html -share/doc/cairo/bindings-memory.html -share/doc/cairo/bindings-overloading.html -share/doc/cairo/bindings-path.html -share/doc/cairo/bindings-patterns.html -share/doc/cairo/bindings-return-values.html -share/doc/cairo/bindings-streams.html -share/doc/cairo/bindings-surfaces.html -share/doc/cairo/cairo-Error-handling.html -share/doc/cairo/cairo-Font-Options.html -share/doc/cairo/cairo-FreeType-Fonts.html -share/doc/cairo/cairo-Image-Surfaces.html -share/doc/cairo/cairo-PDF-Surfaces.html -share/doc/cairo/cairo-PNG-Support.html -share/doc/cairo/cairo-Paths.html -share/doc/cairo/cairo-Patterns.html -share/doc/cairo/cairo-PostScript-Surfaces.html -share/doc/cairo/cairo-SVG-Surfaces.html -share/doc/cairo/cairo-Scaled-Fonts.html -share/doc/cairo/cairo-Text.html -share/doc/cairo/cairo-Transformations.html -share/doc/cairo/cairo-Types.html -share/doc/cairo/cairo-Version-Information.html -share/doc/cairo/cairo-Win32-Fonts.html -share/doc/cairo/cairo-Win32-Surfaces.html -share/doc/cairo/cairo-XLib-Surfaces.html -share/doc/cairo/cairo-cairo-font-face-t.html -share/doc/cairo/cairo-cairo-matrix-t.html -share/doc/cairo/cairo-cairo-surface-t.html -share/doc/cairo/cairo-cairo-t.html -share/doc/cairo/cairo.devhelp -share/doc/cairo/cairo.devhelp2 -share/doc/cairo/home.png -share/doc/cairo/index.html -share/doc/cairo/index.sgml -share/doc/cairo/ix01.html -share/doc/cairo/ix02.html -share/doc/cairo/language-bindings.html -share/doc/cairo/left.png -share/doc/cairo/pt01.html -share/doc/cairo/pt02.html -share/doc/cairo/right.png -share/doc/cairo/style.css -share/doc/cairo/up.png -@dirrm share/doc/cairo +share/gtk-doc/html/cairo/Drawing.html +share/gtk-doc/html/cairo/Fonts.html +share/gtk-doc/html/cairo/Support.html +share/gtk-doc/html/cairo/Surfaces.html +share/gtk-doc/html/cairo/bindings-errors.html +share/gtk-doc/html/cairo/bindings-fonts.html +share/gtk-doc/html/cairo/bindings-memory.html +share/gtk-doc/html/cairo/bindings-overloading.html +share/gtk-doc/html/cairo/bindings-path.html +share/gtk-doc/html/cairo/bindings-patterns.html +share/gtk-doc/html/cairo/bindings-return-values.html +share/gtk-doc/html/cairo/bindings-streams.html +share/gtk-doc/html/cairo/bindings-surfaces.html +share/gtk-doc/html/cairo/cairo-Error-handling.html +share/gtk-doc/html/cairo/cairo-Font-Options.html +share/gtk-doc/html/cairo/cairo-FreeType-Fonts.html +share/gtk-doc/html/cairo/cairo-Image-Surfaces.html +share/gtk-doc/html/cairo/cairo-PDF-Surfaces.html +share/gtk-doc/html/cairo/cairo-PNG-Support.html +share/gtk-doc/html/cairo/cairo-Paths.html +share/gtk-doc/html/cairo/cairo-Patterns.html +share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html +share/gtk-doc/html/cairo/cairo-SVG-Surfaces.html +share/gtk-doc/html/cairo/cairo-Scaled-Fonts.html +share/gtk-doc/html/cairo/cairo-Text.html +share/gtk-doc/html/cairo/cairo-Transformations.html +share/gtk-doc/html/cairo/cairo-Types.html +share/gtk-doc/html/cairo/cairo-Version-Information.html +share/gtk-doc/html/cairo/cairo-Win32-Fonts.html +share/gtk-doc/html/cairo/cairo-Win32-Surfaces.html +share/gtk-doc/html/cairo/cairo-XLib-Surfaces.html +share/gtk-doc/html/cairo/cairo-cairo-font-face-t.html +share/gtk-doc/html/cairo/cairo-cairo-matrix-t.html +share/gtk-doc/html/cairo/cairo-cairo-surface-t.html +share/gtk-doc/html/cairo/cairo-cairo-t.html +share/gtk-doc/html/cairo/cairo.devhelp +share/gtk-doc/html/cairo/cairo.devhelp2 +share/gtk-doc/html/cairo/home.png +share/gtk-doc/html/cairo/index.html +share/gtk-doc/html/cairo/index.sgml +share/gtk-doc/html/cairo/ix01.html +share/gtk-doc/html/cairo/ix02.html +share/gtk-doc/html/cairo/language-bindings.html +share/gtk-doc/html/cairo/left.png +share/gtk-doc/html/cairo/pt01.html +share/gtk-doc/html/cairo/pt02.html +share/gtk-doc/html/cairo/right.png +share/gtk-doc/html/cairo/style.css +share/gtk-doc/html/cairo/up.png +@dirrm share/gtk-doc/html/cairo @dirrm include/cairo -- cgit v1.2.3