summaryrefslogtreecommitdiff
path: root/chat
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-03-18 09:12:08 +0000
committerjlam <jlam@pkgsrc.org>2004-03-18 09:12:08 +0000
commit7db11b582a4d621362622fad99df1da62e930ffa (patch)
tree98bc5d9451729f031998fd23ac3319a5618c75b0 /chat
parent46cf8098c1fdcd3f6e05f41ed78671dfaa7ae192 (diff)
downloadpkgsrc-7db11b582a4d621362622fad99df1da62e930ffa.tar.gz
Fix serious bug where BUILDLINK_PACKAGES wasn't being ordered properly
by moving the inclusion of buildlink3.mk files outside of the protected region. This bug would be seen by users that have set PREFER_PKGSRC or PREFER_NATIVE to non-default values. BUILDLINK_PACKAGES should be ordered so that for any package in the list, that package doesn't depend on any packages to the left of it in the list. This ordering property is used to check for builtin packages in the correct order. The problem was that including a buildlink3.mk file for <pkg> correctly ensured that <pkg> was removed from BUILDLINK_PACKAGES and appended to the end. However, since the inclusion of any other buildlink3.mk files within that buildlink3.mk was in a region that was protected against multiple inclusion, those dependencies weren't also moved to the end of BUILDLINK_PACKAGES.
Diffstat (limited to 'chat')
-rw-r--r--chat/ekg/buildlink3.mk5
-rw-r--r--chat/jabberd/buildlink3.mk5
-rw-r--r--chat/loudmouth/buildlink3.mk7
3 files changed, 6 insertions, 11 deletions
diff --git a/chat/ekg/buildlink3.mk b/chat/ekg/buildlink3.mk
index f83769314da..8418065b766 100644
--- a/chat/ekg/buildlink3.mk
+++ b/chat/ekg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:09 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
EKG_BUILDLINK3_MK:= ${EKG_BUILDLINK3_MK}+
@@ -13,12 +13,11 @@ BUILDLINK_PACKAGES+= ekg
.if !empty(EKG_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.ekg+= ekg>=1.1
BUILDLINK_PKGSRCDIR.ekg?= ../../chat/ekg
+.endif # EKG_BUILDLINK3_MK
.include "../../devel/ncurses/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
-.endif # EKG_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/chat/jabberd/buildlink3.mk b/chat/jabberd/buildlink3.mk
index e2f4567b73a..8ae72a01805 100644
--- a/chat/jabberd/buildlink3.mk
+++ b/chat/jabberd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:09 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
JABBERD_BUILDLINK3_MK:= ${JABBERD_BUILDLINK3_MK}+
@@ -13,9 +13,8 @@ BUILDLINK_PACKAGES+= jabberd
.if !empty(JABBERD_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.jabberd+= jabberd>=1.4.2
BUILDLINK_PKGSRCDIR.jabberd?= ../../chat/jabberd
+.endif # JABBERD_BUILDLINK3_MK
.include "../../security/openssl/buildlink3.mk"
-.endif # JABBERD_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/chat/loudmouth/buildlink3.mk b/chat/loudmouth/buildlink3.mk
index 5dfdd1da418..e56d740e941 100644
--- a/chat/loudmouth/buildlink3.mk
+++ b/chat/loudmouth/buildlink3.mk
@@ -1,10 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/07 22:45:44 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:09 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LOUDMOUTH_BUILDLINK3_MK:= ${LOUDMOUTH_BUILDLINK3_MK}+
-.include "../../mk/bsd.prefs.mk"
-
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= loudmouth
.endif
@@ -15,11 +13,10 @@ BUILDLINK_PACKAGES+= loudmouth
.if !empty(LOUDMOUTH_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.loudmouth+= loudmouth>=0.15.1nb3
BUILDLINK_PKGSRCDIR.loudmouth?= ../../chat/loudmouth
+.endif # LOUDMOUTH_BUILDLINK3_MK
.include "../../devel/glib2/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../security/gnutls/buildlink3.mk"
-.endif # LOUDMOUTH_BUILDLINK3_MK
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}