summaryrefslogtreecommitdiff
path: root/x11/wxGTK
diff options
context:
space:
mode:
authorjlam <jlam>2004-03-05 19:25:06 +0000
committerjlam <jlam>2004-03-05 19:25:06 +0000
commit13ac0c7964868b82b344e8e1434ee3e5b3cd05be (patch)
treea3daf9a5fb572d8089372ce24f3f353d4bac8d47 /x11/wxGTK
parentd79544a4b17cd7522102497daa0a175432c0dbea (diff)
downloadpkgsrc-13ac0c7964868b82b344e8e1434ee3e5b3cd05be.tar.gz
Reorder location and setting of BUILDLINK_PACKAGES to match template
buildlink3.mk file in revision 1.101 of bsd.buildlink3.mk.
Diffstat (limited to 'x11/wxGTK')
-rw-r--r--x11/wxGTK/buildlink3.mk29
1 files changed, 15 insertions, 14 deletions
diff --git a/x11/wxGTK/buildlink3.mk b/x11/wxGTK/buildlink3.mk
index 45d24738cda..0ecb00f6fdc 100644
--- a/x11/wxGTK/buildlink3.mk
+++ b/x11/wxGTK/buildlink3.mk
@@ -1,25 +1,20 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/15 20:38:37 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:43 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
WXGTK_BUILDLINK3_MK:= ${WXGTK_BUILDLINK3_MK}+
+.include "../../mk/bsd.prefs.mk"
+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= wxGTK
.endif
-.if !empty(WXGTK_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= wxGTK
-BUILDLINK_DEPENDS.wxGTK+= wxGTK>=2.4.2
-BUILDLINK_PKGSRCDIR.wxGTK?= ../../x11/wxGTK
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NwxGTK}
+BUILDLINK_PACKAGES+= wxGTK
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(WXGTK_USE_GTK1:M[Yy][Ee][Ss])
-.include "../../x11/gtk/buildlink3.mk"
-.else
-.include "../../x11/gtk2/buildlink3.mk"
-.endif
+.if !empty(WXGTK_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.wxGTK+= wxGTK>=2.4.2
+BUILDLINK_PKGSRCDIR.wxGTK?= ../../x11/wxGTK
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
@@ -27,6 +22,12 @@ BUILDLINK_PKGSRCDIR.wxGTK?= ../../x11/wxGTK
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
-.endif # WXGTK_BUILDLINK3_MK
+.if !empty(WXGTK_USE_GTK1:M[Yy][Ee][Ss])
+. include "../../x11/gtk/buildlink3.mk"
+.else
+. include "../../x11/gtk2/buildlink3.mk"
+.endif
+
+.endif # WXGTK_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}