[pkgsrc/trunk]: pkgsrc/x11 First step to making modular transparent:

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4566bc446308
branches:  trunk
changeset: 521141:4566bc446308
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Nov 05 16:55:28 2006 +0000

description:
First step to making modular transparent:
Redirect from the individual modular libraries to the old libs or
mk/x11.buildlink3.mk.

diffstat:

 x11/libICE/buildlink3.mk      |  10 +++++++++-
 x11/libSM/buildlink3.mk       |  10 +++++++++-
 x11/libX11/buildlink3.mk      |  10 +++++++++-
 x11/libXcursor/buildlink3.mk  |  10 +++++++++-
 x11/libXext/buildlink3.mk     |  10 +++++++++-
 x11/libXfixes/buildlink3.mk   |  10 +++++++++-
 x11/libXft/buildlink3.mk      |  10 +++++++++-
 x11/libXi/buildlink3.mk       |  10 +++++++++-
 x11/libXinerama/buildlink3.mk |  10 +++++++++-
 x11/libXrandr/buildlink3.mk   |  10 +++++++++-
 x11/libXrender/buildlink3.mk  |  10 +++++++++-
 x11/libXt/buildlink3.mk       |  10 +++++++++-
 12 files changed, 108 insertions(+), 12 deletions(-)

diffs (252 lines):

diff -r 8537faa7a092 -r 4566bc446308 x11/libICE/buildlink3.mk
--- a/x11/libICE/buildlink3.mk  Sun Nov 05 16:40:39 2006 +0000
+++ b/x11/libICE/buildlink3.mk  Sun Nov 05 16:55:28 2006 +0000
@@ -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 @@
 .endif # LIBICE_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
+
+.endif
diff -r 8537faa7a092 -r 4566bc446308 x11/libSM/buildlink3.mk
--- a/x11/libSM/buildlink3.mk   Sun Nov 05 16:40:39 2006 +0000
+++ b/x11/libSM/buildlink3.mk   Sun Nov 05 16:55:28 2006 +0000
@@ -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 @@
 .include "../../x11/libICE/buildlink3.mk"
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
+
+.endif
diff -r 8537faa7a092 -r 4566bc446308 x11/libX11/buildlink3.mk
--- a/x11/libX11/buildlink3.mk  Sun Nov 05 16:40:39 2006 +0000
+++ b/x11/libX11/buildlink3.mk  Sun Nov 05 16:55:28 2006 +0000
@@ -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 @@
 .include "../../x11/xproto/buildlink3.mk"
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
+
+.endif
diff -r 8537faa7a092 -r 4566bc446308 x11/libXcursor/buildlink3.mk
--- a/x11/libXcursor/buildlink3.mk      Sun Nov 05 16:40:39 2006 +0000
+++ b/x11/libXcursor/buildlink3.mk      Sun Nov 05 16:55:28 2006 +0000
@@ -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 @@
 .include "../../x11/xproto/buildlink3.mk"
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH:S/+$//}
+
+.endif
diff -r 8537faa7a092 -r 4566bc446308 x11/libXext/buildlink3.mk
--- a/x11/libXext/buildlink3.mk Sun Nov 05 16:40:39 2006 +0000
+++ b/x11/libXext/buildlink3.mk Sun Nov 05 16:55:28 2006 +0000
@@ -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 @@
 .include "../../x11/libX11/buildlink3.mk"
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
+
+.endif
diff -r 8537faa7a092 -r 4566bc446308 x11/libXfixes/buildlink3.mk
--- a/x11/libXfixes/buildlink3.mk       Sun Nov 05 16:40:39 2006 +0000
+++ b/x11/libXfixes/buildlink3.mk       Sun Nov 05 16:55:28 2006 +0000
@@ -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 @@
 .include "../../x11/libX11/buildlink3.mk"
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH:S/+$//}
+
+.endif
diff -r 8537faa7a092 -r 4566bc446308 x11/libXft/buildlink3.mk
--- a/x11/libXft/buildlink3.mk  Sun Nov 05 16:40:39 2006 +0000
+++ b/x11/libXft/buildlink3.mk  Sun Nov 05 16:55:28 2006 +0000
@@ -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 @@
 .include "../../x11/xproto/buildlink3.mk"
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
+
+.endif
diff -r 8537faa7a092 -r 4566bc446308 x11/libXi/buildlink3.mk
--- a/x11/libXi/buildlink3.mk   Sun Nov 05 16:40:39 2006 +0000
+++ b/x11/libXi/buildlink3.mk   Sun Nov 05 16:55:28 2006 +0000
@@ -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 @@
 .include "../../x11/xproto/buildlink3.mk"
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
+
+.endif
diff -r 8537faa7a092 -r 4566bc446308 x11/libXinerama/buildlink3.mk
--- a/x11/libXinerama/buildlink3.mk     Sun Nov 05 16:40:39 2006 +0000
+++ b/x11/libXinerama/buildlink3.mk     Sun Nov 05 16:55:28 2006 +0000
@@ -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 @@
 .include "../../x11/xineramaproto/buildlink3.mk"
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH:S/+$//}
+
+.endif
diff -r 8537faa7a092 -r 4566bc446308 x11/libXrandr/buildlink3.mk
--- a/x11/libXrandr/buildlink3.mk       Sun Nov 05 16:40:39 2006 +0000
+++ b/x11/libXrandr/buildlink3.mk       Sun Nov 05 16:55:28 2006 +0000
@@ -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 @@
 .include "../../x11/randrproto/buildlink3.mk"
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH:S/+$//}
+
+.endif
diff -r 8537faa7a092 -r 4566bc446308 x11/libXrender/buildlink3.mk
--- a/x11/libXrender/buildlink3.mk      Sun Nov 05 16:40:39 2006 +0000
+++ b/x11/libXrender/buildlink3.mk      Sun Nov 05 16:55:28 2006 +0000
@@ -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 @@
 .include "../../x11/libX11/buildlink3.mk"
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH:S/+$//}
+
+.endif
diff -r 8537faa7a092 -r 4566bc446308 x11/libXt/buildlink3.mk
--- a/x11/libXt/buildlink3.mk   Sun Nov 05 16:40:39 2006 +0000
+++ b/x11/libXt/buildlink3.mk   Sun Nov 05 16:55:28 2006 +0000
@@ -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 @@
 .include "../../x11/xproto/buildlink3.mk"
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
+
+.endif