diff options
Diffstat (limited to 'wm')
-rw-r--r-- | wm/xfce4-wm-themes/Makefile | 4 | ||||
-rw-r--r-- | wm/xfce4-wm-themes/buildlink3.mk | 22 | ||||
-rw-r--r-- | wm/xfce4-wm/Makefile | 9 | ||||
-rw-r--r-- | wm/xfce4-wm/buildlink3.mk | 24 |
4 files changed, 52 insertions, 7 deletions
diff --git a/wm/xfce4-wm-themes/Makefile b/wm/xfce4-wm-themes/Makefile index e3fef31338c..524f354bf2f 100644 --- a/wm/xfce4-wm-themes/Makefile +++ b/wm/xfce4-wm-themes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/01/08 08:11:41 martti Exp $ +# $NetBSD: Makefile,v 1.7 2004/03/10 11:53:37 xtraeme Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" @@ -7,5 +7,5 @@ PKGNAME= xfce4-wm-themes-${XFCE4_VERSION} CATEGORIES= wm COMMENT= XFce4 window manager themes -.include "../../wm/xfce4-wm/buildlink2.mk" +.include "../../wm/xfce4-wm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/xfce4-wm-themes/buildlink3.mk b/wm/xfce4-wm-themes/buildlink3.mk new file mode 100644 index 00000000000..24750671bc3 --- /dev/null +++ b/wm/xfce4-wm-themes/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_WM_THEMES_BUILDLINK3_MK:= ${XFCE4_WM_THEMES_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= xfce4-wm-themes +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-wm-themes} +BUILDLINK_PACKAGES+= xfce4-wm-themes + +.if !empty(XFCE4_WM_THEMES_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.xfce4-wm-themes+= xfce4-wm-themes>=4.0.4nb1 +BUILDLINK_PKGSRCDIR.xfce4-wm-themes?= ../../wm/xfce4-wm-themes + +.include "../../wm/xfce4-wm/buildlink3.mk" +.include "../../devel/glib2/buildlink3.mk" + +.endif # XFCE4_WM_THEMES_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/wm/xfce4-wm/Makefile b/wm/xfce4-wm/Makefile index ea43e9e548d..b35c79cf49f 100644 --- a/wm/xfce4-wm/Makefile +++ b/wm/xfce4-wm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/03/10 07:41:16 martti Exp $ +# $NetBSD: Makefile,v 1.8 2004/03/10 11:53:37 xtraeme Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" @@ -7,8 +7,7 @@ PKGNAME= xfce4-wm-${XFCE4_VERSION} CATEGORIES= wm COMMENT= XFce4 window manager -.include "../../devel/pkgconfig/buildlink2.mk" -.include "../../graphics/xpm/buildlink2.mk" -.include "../../x11/xfce4-mcs-plugins/buildlink2.mk" -.include "../../x11/startup-notification/buildlink2.mk" +.include "../../graphics/xpm/buildlink3.mk" +.include "../../x11/xfce4-mcs-plugins/buildlink3.mk" +.include "../../x11/startup-notification/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/xfce4-wm/buildlink3.mk b/wm/xfce4-wm/buildlink3.mk new file mode 100644 index 00000000000..3804c520bb0 --- /dev/null +++ b/wm/xfce4-wm/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_WM_BUILDLINK3_MK:= ${XFCE4_WM_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= xfce4-wm +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-wm} +BUILDLINK_PACKAGES+= xfce4-wm + +.if !empty(XFCE4_WM_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.xfce4-wm+= xfce4-wm>=4.0.4nb1 +BUILDLINK_PKGSRCDIR.xfce4-wm?= ../../wm/xfce4-wm + +.include "../../graphics/xpm/buildlink3.mk" +.include "../../x11/xfce4-mcs-plugins/buildlink3.mk" +.include "../../x11/startup-notification/buildlink3.mk" +.include "../../devel/glib2/buildlink3.mk" + +.endif # XFCE4_WM_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |