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

3 files changed, 59 insertions, 21 deletions

diff --git a/meta-pkgs/xfce4/Makefile b/meta-pkgs/xfce4/Makefile
index 0099f586be2..4cfc91825f5 100644
--- a/meta-pkgs/xfce4/Makefile
+++ b/meta-pkgs/xfce4/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2004/03/10 07:41:16 martti Exp $
+# $NetBSD: Makefile,v 1.12 2004/03/10 11:53:37 xtraeme Exp $
 
 .include "Makefile.common"
 
 DISTNAME=	xfce4-${XFCE4_VERSION}
+PKGREVISION=	1
 DISTFILES=	# empty
 CATEGORIES=	meta-pkgs
 COMMENT=	XFce4
@@ -15,22 +16,22 @@ NO_MTREE=	# defined
 do-install:	# empty
 
 # Basic stuff
-.include "../../graphics/xfce4-iconbox/buildlink2.mk"
-.include "../../print/xfce4-print/buildlink2.mk"
-.include "../../sysutils/xfce4-fm/buildlink2.mk"
-.include "../../wm/xfce4-wm/buildlink2.mk"
-.include "../../x11/xfce4-desktop/buildlink2.mk"
-.include "../../x11/xfce4-gtk2-engines/buildlink2.mk"
-.include "../../x11/xfce4-utils/buildlink2.mk"
-.include "../../x11/xfce4-panel/buildlink2.mk"
+.include "../../graphics/xfce4-iconbox/buildlink3.mk"
+.include "../../print/xfce4-print/buildlink3.mk"
+.include "../../sysutils/xfce4-fm/buildlink3.mk"
+.include "../../wm/xfce4-wm/buildlink3.mk"
+.include "../../x11/xfce4-desktop/buildlink3.mk"
+.include "../../x11/xfce4-gtk2-engines/buildlink3.mk"
+.include "../../x11/xfce4-utils/buildlink3.mk"
+.include "../../x11/xfce4-panel/buildlink3.mk"
 
 # Extras
-.include "../../audio/xfce4-mixer/buildlink2.mk"
-.include "../../sysutils/xfce4-fm-icons/buildlink2.mk"
-.include "../../sysutils/xfce4-systray/buildlink2.mk"
-.include "../../wm/xfce4-wm-themes/buildlink2.mk"
-.include "../../x11/xfce4-themes/buildlink2.mk"
-.include "../../x11/xfce4-toys/buildlink2.mk"
-.include "../../x11/xfce4-trigger-launcher/buildlink2.mk"
+.include "../../audio/xfce4-mixer/buildlink3.mk"
+.include "../../sysutils/xfce4-fm-icons/buildlink3.mk"
+.include "../../sysutils/xfce4-systray/buildlink3.mk"
+.include "../../wm/xfce4-wm-themes/buildlink3.mk"
+.include "../../x11/xfce4-themes/buildlink3.mk"
+.include "../../x11/xfce4-toys/buildlink3.mk"
+.include "../../x11/xfce4-trigger-launcher/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/xfce4/Makefile.common b/meta-pkgs/xfce4/Makefile.common
index a44f732fad1..2204ac85d0b 100644
--- a/meta-pkgs/xfce4/Makefile.common
+++ b/meta-pkgs/xfce4/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2004/03/10 07:41:16 martti Exp $
+# $NetBSD: Makefile.common,v 1.11 2004/03/10 11:53:37 xtraeme Exp $
 
 MASTER_SITES=		http://www.xfce.org/archive/xfce-4.0.4/src/ \
 			http://linux.imp.mx/xfce4/xfce_4.0.4/src/
@@ -7,9 +7,10 @@ MAINTAINER=		martti@NetBSD.org
 HOMEPAGE=		http://www.xfce.org/
 
 XFCE4_VERSION=		4.0.4
+PKGREVISION=		1
 
-USE_BUILDLINK2=		# defined
-USE_X11BASE=		# defined
+USE_BUILDLINK3=		# defined
+USE_X11=		# defined
 USE_PKGLOCALEDIR=	# defined
 USE_LIBTOOL=		# defined
 GNU_CONFIGURE=		# defined
@@ -23,5 +24,5 @@ MESSAGE_SRC?=		${.CURDIR}/../../fonts/fontconfig/MESSAGE
 
 PKG_CONFIG_PATH=	${BUILDLINK_DIR}/lib/pkgconfig
 
-.include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
diff --git a/meta-pkgs/xfce4/buildlink3.mk b/meta-pkgs/xfce4/buildlink3.mk
new file mode 100644
index 00000000000..d06ee3b6b8f
--- /dev/null
+++ b/meta-pkgs/xfce4/buildlink3.mk
@@ -0,0 +1,36 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+XFCE4_BUILDLINK3_MK:=	${XFCE4_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4}
+BUILDLINK_PACKAGES+=	xfce4
+
+.if !empty(XFCE4_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.xfce4+=	xfce4>=4.0.4nb1
+BUILDLINK_PKGSRCDIR.xfce4?=	../../meta-pkgs/xfce4
+
+.include "../../graphics/xfce4-iconbox/buildlink3.mk"
+.include "../../print/xfce4-print/buildlink3.mk"
+.include "../../sysutils/xfce4-fm/buildlink3.mk"
+.include "../../wm/xfce4-wm/buildlink3.mk"
+.include "../../x11/xfce4-desktop/buildlink3.mk"
+.include "../../x11/xfce4-gtk2-engines/buildlink3.mk"
+.include "../../x11/xfce4-utils/buildlink3.mk"
+.include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../audio/xfce4-mixer/buildlink3.mk"
+.include "../../sysutils/xfce4-fm-icons/buildlink3.mk"
+.include "../../sysutils/xfce4-systray/buildlink3.mk"
+.include "../../wm/xfce4-wm-themes/buildlink3.mk"
+.include "../../x11/xfce4-themes/buildlink3.mk"
+.include "../../x11/xfce4-toys/buildlink3.mk"
+.include "../../x11/xfce4-trigger-launcher/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+
+.endif	# XFCE4_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}