[pkgsrc/trunk]: pkgsrc/graphics bl3ify

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8e5db31f6512
branches:  trunk
changeset: 468605:8e5db31f6512
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Feb 15 12:47:35 2004 +0000

description:
bl3ify

diffstat:

 graphics/gdk-pixbuf-gnome/Makefile  |  15 +++++++--------
 graphics/gdk-pixbuf/Makefile.common |  13 ++++++-------
 graphics/gdk-pixbuf/buildlink3.mk   |  21 +++++++++++++++++++++
 3 files changed, 34 insertions(+), 15 deletions(-)

diffs (92 lines):

diff -r 18a8cf921564 -r 8e5db31f6512 graphics/gdk-pixbuf-gnome/Makefile
--- a/graphics/gdk-pixbuf-gnome/Makefile        Sun Feb 15 12:35:11 2004 +0000
+++ b/graphics/gdk-pixbuf-gnome/Makefile        Sun Feb 15 12:47:35 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/01/03 18:49:42 reed Exp $
+# $NetBSD: Makefile,v 1.25 2004/02/15 12:47:35 jlam Exp $
 
 .include "../../graphics/gdk-pixbuf/Makefile.common"
 
@@ -8,12 +8,14 @@
 
 CONFLICTS+=    gdk-pixbuf<0.10.1
 
-USE_X11=       # defined
-# don't enable the next line -- else the package will conflict
-# with gtk2!
-# CONFIGURE_ARGS+=     --with-html-dir=${PREFIX}/share/doc/html
+# Don't enable the next line or we'll conflict with gtk2!
+#CONFIGURE_ARGS+=      --with-html-dir=${PREFIX}/share/doc/html
+
 CONFIGURE_ARGS+=       --enable-gtk-doc=no
 
+.include "../../graphics/gdk-pixbuf/buildlink3.mk"
+.include "../../x11/gnome-libs/buildlink3.mk"
+
 do-install:
        ${INSTALL_DATA} ${WRKSRC}/gdk-pixbuf/gnome-canvas-pixbuf.h \
          ${PREFIX}/include/gdk-pixbuf-1.0/gdk-pixbuf
@@ -26,7 +28,4 @@
        ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} \
          ${INSTALL_TARGET}
 
-.include "../../graphics/gdk-pixbuf/buildlink2.mk"
-.include "../../x11/gnome-libs/buildlink2.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff -r 18a8cf921564 -r 8e5db31f6512 graphics/gdk-pixbuf/Makefile.common
--- a/graphics/gdk-pixbuf/Makefile.common       Sun Feb 15 12:35:11 2004 +0000
+++ b/graphics/gdk-pixbuf/Makefile.common       Sun Feb 15 12:47:35 2004 +0000
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2004/02/14 17:21:41 jlam Exp $
-#
+# $NetBSD: Makefile.common,v 1.36 2004/02/15 12:47:35 jlam Exp $
 
 DISTNAME=              gdk-pixbuf-${VER}.0
 PKGREVISION=           1
@@ -12,7 +11,7 @@
 
 VER=                   0.22
 
-USE_BUILDLINK2=                YES
+USE_BUILDLINK3=                YES
 USE_GNU_TOOLS+=                make
 USE_X11BASE=           YES
 USE_LIBTOOL=           YES
@@ -26,7 +25,7 @@
 DISTINFO_FILE=         ${.CURDIR}/../gdk-pixbuf/distinfo
 PATCHDIR=              ${.CURDIR}/../gdk-pixbuf/patches
 
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/tiff/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
diff -r 18a8cf921564 -r 8e5db31f6512 graphics/gdk-pixbuf/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/gdk-pixbuf/buildlink3.mk Sun Feb 15 12:47:35 2004 +0000
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/15 12:47:35 jlam Exp $
+
+BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
+GDK_PIXBUF_BUILDLINK3_MK:=     ${GDK_PIXBUF_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=    gdk-pixbuf
+.endif
+
+.if !empty(GDK_PIXBUF_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=                   gdk-pixbuf
+BUILDLINK_DEPENDS.gdk-pixbuf+=         gdk-pixbuf>=0.22.0nb2
+BUILDLINK_PKGSRCDIR.gdk-pixbuf?=       ../../graphics/gdk-pixbuf
+
+.  include "../../graphics/jpeg/buildlink3.mk"
+.  include "../../graphics/png/buildlink3.mk"
+.  include "../../graphics/tiff/buildlink3.mk"
+.  include "../../x11/gtk/buildlink3.mk"
+.endif # GDK_PIXBUF_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}