summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2006-11-05 16:55:28 +0000
committerjoerg <joerg@pkgsrc.org>2006-11-05 16:55:28 +0000
commit68ff4729c634f9143cb04d864c3cbc4e334737c8 (patch)
tree35746cb478d49e17c7087daa84a9ec1946cced8b
parent02c7dcd4c2db5bd1fa96b3a3754654fdb558ecbb (diff)
downloadpkgsrc-68ff4729c634f9143cb04d864c3cbc4e334737c8.tar.gz
First step to making modular transparent:
Redirect from the individual modular libraries to the old libs or mk/x11.buildlink3.mk.
-rw-r--r--x11/libICE/buildlink3.mk10
-rw-r--r--x11/libSM/buildlink3.mk10
-rw-r--r--x11/libX11/buildlink3.mk10
-rw-r--r--x11/libXcursor/buildlink3.mk10
-rw-r--r--x11/libXext/buildlink3.mk10
-rw-r--r--x11/libXfixes/buildlink3.mk10
-rw-r--r--x11/libXft/buildlink3.mk10
-rw-r--r--x11/libXi/buildlink3.mk10
-rw-r--r--x11/libXinerama/buildlink3.mk10
-rw-r--r--x11/libXrandr/buildlink3.mk10
-rw-r--r--x11/libXrender/buildlink3.mk10
-rw-r--r--x11/libXt/buildlink3.mk10
12 files changed, 108 insertions, 12 deletions
diff --git a/x11/libICE/buildlink3.mk b/x11/libICE/buildlink3.mk
index 03dc77dfcc7..e00e63ad8c2 100644
--- a/x11/libICE/buildlink3.mk
+++ b/x11/libICE/buildlink3.mk
@@ -1,4 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/11/03 17:31:12 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/11/05 16:55:28 joerg Exp $
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${X11_TYPE} != "modular"
+.include "../../mk/x11.buildlink3.mk"
+.else
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBICE_BUILDLINK3_MK:= ${LIBICE_BUILDLINK3_MK}+
@@ -17,3 +23,5 @@ BUILDLINK_PKGSRCDIR.libICE?= ../../x11/libICE
.endif # LIBICE_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+
+.endif
diff --git a/x11/libSM/buildlink3.mk b/x11/libSM/buildlink3.mk
index 4f967da8fad..ccb24dac15a 100644
--- a/x11/libSM/buildlink3.mk
+++ b/x11/libSM/buildlink3.mk
@@ -1,4 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 17:33:21 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/11/05 16:55:28 joerg Exp $
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${X11_TYPE} != "modular"
+.include "../../mk/x11.buildlink3.mk"
+.else
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSM_BUILDLINK3_MK:= ${LIBSM_BUILDLINK3_MK}+
@@ -19,3 +25,5 @@ BUILDLINK_PKGSRCDIR.libSM?= ../../x11/libSM
.include "../../x11/libICE/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+
+.endif
diff --git a/x11/libX11/buildlink3.mk b/x11/libX11/buildlink3.mk
index e98586afda3..69c56e1dbc5 100644
--- a/x11/libX11/buildlink3.mk
+++ b/x11/libX11/buildlink3.mk
@@ -1,4 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 18:11:18 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/11/05 16:55:28 joerg Exp $
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${X11_TYPE} != "modular"
+.include "../../mk/x11.buildlink3.mk"
+.else
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBX11_BUILDLINK3_MK:= ${LIBX11_BUILDLINK3_MK}+
@@ -23,3 +29,5 @@ BUILDLINK_PKGSRCDIR.libX11?= ../../x11/libX11
.include "../../x11/xproto/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+
+.endif
diff --git a/x11/libXcursor/buildlink3.mk b/x11/libXcursor/buildlink3.mk
index d181889afd9..2d5dbbe662c 100644
--- a/x11/libXcursor/buildlink3.mk
+++ b/x11/libXcursor/buildlink3.mk
@@ -1,4 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 22:27:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/11/05 16:55:28 joerg Exp $
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${X11_TYPE} != "modular"
+.include "../../x11/xcursor/buildlink3.mk"
+.else
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXCURSOR_BUILDLINK3_MK:= ${LIBXCURSOR_BUILDLINK3_MK}+
@@ -22,3 +28,5 @@ BUILDLINK_PKGSRCDIR.libXcursor?= ../../x11/libXcursor
.include "../../x11/xproto/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+
+.endif
diff --git a/x11/libXext/buildlink3.mk b/x11/libXext/buildlink3.mk
index 84b16268b9e..ebe6c8659df 100644
--- a/x11/libXext/buildlink3.mk
+++ b/x11/libXext/buildlink3.mk
@@ -1,4 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 18:19:58 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/11/05 16:55:28 joerg Exp $
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${X11_TYPE} != "modular"
+.include "../../mk/x11.buildlink3.mk"
+.else
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXEXT_BUILDLINK3_MK:= ${LIBXEXT_BUILDLINK3_MK}+
@@ -19,3 +25,5 @@ BUILDLINK_PKGSRCDIR.libXext?= ../../x11/libXext
.include "../../x11/libX11/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+
+.endif
diff --git a/x11/libXfixes/buildlink3.mk b/x11/libXfixes/buildlink3.mk
index bb785a8cd6c..9f1781996e7 100644
--- a/x11/libXfixes/buildlink3.mk
+++ b/x11/libXfixes/buildlink3.mk
@@ -1,4 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 21:31:40 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/11/05 16:55:28 joerg Exp $
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${X11_TYPE} != "modular"
+.include "../../x11/Xfixes/buildlink3.mk"
+.else
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXFIXES_BUILDLINK3_MK:= ${LIBXFIXES_BUILDLINK3_MK}+
@@ -20,3 +26,5 @@ BUILDLINK_PKGSRCDIR.libXfixes?= ../../x11/libXfixes
.include "../../x11/libX11/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+
+.endif
diff --git a/x11/libXft/buildlink3.mk b/x11/libXft/buildlink3.mk
index 017cfca9761..14b5adaec1a 100644
--- a/x11/libXft/buildlink3.mk
+++ b/x11/libXft/buildlink3.mk
@@ -1,4 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 21:26:36 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/11/05 16:55:28 joerg Exp $
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${X11_TYPE} != "modular"
+.include "../../fonts/Xft2/buildlink3.mk"
+.else
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXFT_BUILDLINK3_MK:= ${LIBXFT_BUILDLINK3_MK}+
@@ -23,3 +29,5 @@ BUILDLINK_PKGSRCDIR.libXft?= ../../x11/libXft
.include "../../x11/xproto/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+
+.endif
diff --git a/x11/libXi/buildlink3.mk b/x11/libXi/buildlink3.mk
index df82ce5bb80..72463994d56 100644
--- a/x11/libXi/buildlink3.mk
+++ b/x11/libXi/buildlink3.mk
@@ -1,4 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 18:24:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/11/05 16:55:28 joerg Exp $
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${X11_TYPE} != "modular"
+.include "../../mk/x11.buildlink3.mk"
+.else
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXI_BUILDLINK3_MK:= ${LIBXI_BUILDLINK3_MK}+
@@ -21,3 +27,5 @@ BUILDLINK_PKGSRCDIR.libXi?= ../../x11/libXi
.include "../../x11/xproto/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+
+.endif
diff --git a/x11/libXinerama/buildlink3.mk b/x11/libXinerama/buildlink3.mk
index beab4956b13..428f393be99 100644
--- a/x11/libXinerama/buildlink3.mk
+++ b/x11/libXinerama/buildlink3.mk
@@ -1,4 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 20:56:24 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/11/05 16:55:28 joerg Exp $
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${X11_TYPE} != "modular"
+.include "../../mk/x11.buildlink3.mk"
+.else
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXINERAMA_BUILDLINK3_MK:= ${LIBXINERAMA_BUILDLINK3_MK}+
@@ -22,3 +28,5 @@ BUILDLINK_PKGSRCDIR.libXinerama?= ../../x11/libXinerama
.include "../../x11/xineramaproto/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+
+.endif
diff --git a/x11/libXrandr/buildlink3.mk b/x11/libXrandr/buildlink3.mk
index ad8f1ecbd05..e08ca1bf2e9 100644
--- a/x11/libXrandr/buildlink3.mk
+++ b/x11/libXrandr/buildlink3.mk
@@ -1,4 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 21:22:58 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/11/05 16:55:28 joerg Exp $
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${X11_TYPE} != "modular"
+.include "../../x11/Xrandr/buildlink3.mk"
+.else
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXRANDR_BUILDLINK3_MK:= ${LIBXRANDR_BUILDLINK3_MK}+
@@ -21,3 +27,5 @@ BUILDLINK_PKGSRCDIR.libXrandr?= ../../x11/libXrandr
.include "../../x11/randrproto/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+
+.endif
diff --git a/x11/libXrender/buildlink3.mk b/x11/libXrender/buildlink3.mk
index 135ed8f71b2..b923956110c 100644
--- a/x11/libXrender/buildlink3.mk
+++ b/x11/libXrender/buildlink3.mk
@@ -1,4 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 21:18:51 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/11/05 16:55:28 joerg Exp $
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${X11_TYPE} != "modular"
+.include "../../x11/Xrender/buildlink3.mk"
+.else
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXRENDER_BUILDLINK3_MK:= ${LIBXRENDER_BUILDLINK3_MK}+
@@ -20,3 +26,5 @@ BUILDLINK_PKGSRCDIR.libXrender?= ../../x11/libXrender
.include "../../x11/libX11/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+
+.endif
diff --git a/x11/libXt/buildlink3.mk b/x11/libXt/buildlink3.mk
index c1b9bd03195..f21c6dea313 100644
--- a/x11/libXt/buildlink3.mk
+++ b/x11/libXt/buildlink3.mk
@@ -1,4 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/03 20:50:11 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/11/05 16:55:28 joerg Exp $
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${X11_TYPE} != "modular"
+.include "../../mk/x11.buildlink3.mk"
+.else
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXT_BUILDLINK3_MK:= ${LIBXT_BUILDLINK3_MK}+
@@ -21,3 +27,5 @@ BUILDLINK_PKGSRCDIR.libXt?= ../../x11/libXt
.include "../../x11/xproto/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+
+.endif