bl3ify, s,USE_X11BASE,USE_X11,g. Welcome to 4.0.4nb1, ok'ed by martti@

6 files changed, 78 insertions, 11 deletions

diff --git a/sysutils/xfce4-fm-icons/Makefile b/sysutils/xfce4-fm-icons/Makefile
index aa37956e449..0218ca661e4 100644
--- a/sysutils/xfce4-fm-icons/Makefile
+++ b/sysutils/xfce4-fm-icons/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/03/10 07:41:16 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/03/10 11:53:37 xtraeme Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -7,5 +7,5 @@ DISTNAME=	xffm-icons-${XFCE4_VERSION}
 CATEGORIES=	sysutils
 COMMENT=	XFce4 filemanager icons
 
-.include "../../sysutils/xfce4-fm/buildlink2.mk"
+.include "../../sysutils/xfce4-fm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfce4-fm-icons/buildlink3.mk b/sysutils/xfce4-fm-icons/buildlink3.mk
new file mode 100644
index 00000000000..18c0aabf2b8
--- /dev/null
+++ b/sysutils/xfce4-fm-icons/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+XFCE4_FM_ICONS_BUILDLINK3_MK:=	${XFCE4_FM_ICONS_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4-fm-icons
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-fm-icons}
+BUILDLINK_PACKAGES+=	xfce4-fm-icons
+
+.if !empty(XFCE4_FM_ICONS_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.xfce4-fm-icons+=	xfce4-fm-icons>=4.0.4nb1
+BUILDLINK_PKGSRCDIR.xfce4-fm-icons?=	../../sysutils/xfce4-fm-icons
+
+.include "../../sysutils/xfce4-fm/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+
+.endif	# XFCE4_FM_ICONS_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/xfce4-fm/Makefile b/sysutils/xfce4-fm/Makefile
index 00395042042..d7be4c9df9e 100644
--- a/sysutils/xfce4-fm/Makefile
+++ b/sysutils/xfce4-fm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/03/10 07:41:16 martti Exp $
+# $NetBSD: Makefile,v 1.10 2004/03/10 11:53:37 xtraeme Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -13,8 +13,7 @@ PKGCONFIG_OVERRIDE=	src/xffm-1.0.pc.in
 
 UNLIMIT_RESOURCES+=     datasize
 
-.include "../../databases/dbh/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../textproc/libxml2/buildlink2.mk"
-.include "../../x11/xfce4-mcs-plugins/buildlink2.mk"
+.include "../../databases/dbh/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfce4-fm/buildlink3.mk b/sysutils/xfce4-fm/buildlink3.mk
new file mode 100644
index 00000000000..81edcf5414f
--- /dev/null
+++ b/sysutils/xfce4-fm/buildlink3.mk
@@ -0,0 +1,24 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+XFCE4_FM_BUILDLINK3_MK:=	${XFCE4_FM_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4-fm
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-fm}
+BUILDLINK_PACKAGES+=	xfce4-fm
+
+.if !empty(XFCE4_FM_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.xfce4-fm+=	xfce4-fm>=4.0.4nb1
+BUILDLINK_PKGSRCDIR.xfce4-fm?=	../../sysutils/xfce4-fm
+
+.include "../../databases/dbh/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+
+.endif	# XFCE4_FM_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/xfce4-systray/Makefile b/sysutils/xfce4-systray/Makefile
index d29b4fea34a..562ba2a5f1e 100644
--- a/sysutils/xfce4-systray/Makefile
+++ b/sysutils/xfce4-systray/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/03/10 07:41:16 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/03/10 11:53:37 xtraeme Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -6,7 +6,6 @@ DISTNAME=	xfce4-systray-${XFCE4_VERSION}
 CATEGORIES=	sysutils
 COMMENT=	XFce4 systray plugin
 
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../textproc/libxml2/buildlink2.mk"
-.include "../../x11/xfce4-panel/buildlink2.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfce4-systray/buildlink3.mk b/sysutils/xfce4-systray/buildlink3.mk
new file mode 100644
index 00000000000..30b6c9ce048
--- /dev/null
+++ b/sysutils/xfce4-systray/buildlink3.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+XFCE4_SYSTRAY_BUILDLINK3_MK:=	${XFCE4_SYSTRAY_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4-systray
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-systray}
+BUILDLINK_PACKAGES+=	xfce4-systray
+
+.if !empty(XFCE4_SYSTRAY_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.xfce4-systray+=	xfce4-systray>=4.0.4nb1
+BUILDLINK_PKGSRCDIR.xfce4-systray?=	../../sysutils/xfce4-systray
+
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+
+.endif	# XFCE4_SYSTRAY_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}