Sun Sep 21 17:04:13 2008 UTC ()
Rework libXdamage support in native X11:
- provide a builtin.mk files instead of using x11.buildlink3.mk
- split files into a package-specific file
- update list of files for native X.Org.
(cube)
diff -r1.9.8.18 -r1.9.8.19 pkgsrc/pkgtools/x11-links/xorg.mk
diff -r1.7 -r1.7.2.1 pkgsrc/pkgtools/x11-links/files/xorg
diff -r0 -r1.1.2.1 pkgsrc/pkgtools/x11-links/files/xorg.libXdamage
diff -r1.2 -r1.2.18.1 pkgsrc/x11/libXdamage/buildlink3.mk
diff -r0 -r1.1.2.1 pkgsrc/x11/libXdamage/builtin.mk
--- pkgsrc/pkgtools/x11-links/xorg.mk 2008/09/18 19:30:37 1.9.8.18
+++ pkgsrc/pkgtools/x11-links/xorg.mk 2008/09/21 17:04:13 1.9.8.19
--- pkgsrc/pkgtools/x11-links/files/xorg 2008/08/22 13:34:39 1.7
+++ pkgsrc/pkgtools/x11-links/files/xorg 2008/09/21 17:04:13 1.7.2.1
# $NetBSD: xorg.libXdamage,v 1.1.2.1 2008/09/21 17:04:13 cube Exp $
#
include/X11/extensions/Xdamage.h
lib/libXdamage.1.0.0.dylib
lib/libXdamage.1.dylib
lib/libXdamage.a
lib/libXdamage.dylib
lib/libXdamage.so
lib/libXdamage.so.1
lib/libXdamage.so.1.0
lib/libXdamage.so.1.1
lib/pkgconfig/xdamage.pc
--- pkgsrc/x11/libXdamage/buildlink3.mk 2006/12/17 23:02:25 1.2
+++ pkgsrc/x11/libXdamage/buildlink3.mk 2008/09/21 17:04:13 1.2.18.1
@@ -1,11 +1,7 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/12/17 23:02:25 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2.18.1 2008/09/21 17:04:13 cube Exp $
.include "../../mk/bsd.fast.prefs.mk"
-.if ${X11_TYPE} != "modular"
-.include "../../mk/x11.buildlink3.mk"
-.else
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXDAMAGE_BUILDLINK3_MK:= ${LIBXDAMAGE_BUILDLINK3_MK}+
@@ -28,5 +24,3 @@
.include "../../x11/xproto/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
-
-.endif
# $NetBSD: builtin.mk,v 1.1.2.1 2008/09/21 17:04:13 cube Exp $
BUILTIN_PKG:= libXdamage
PKGCONFIG_FILE.libXdamage= ${X11BASE}/lib/pkgconfig/xdamage.pc \
${X11BASE}/lib/libXdamage.so
.include "../../mk/buildlink3/pkgconfig-builtin.mk"