pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Merge cube-native-xorg, so that pkgsrc-current can be ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/711ec62d431a
branches: trunk
changeset: 547946:711ec62d431a
user: cube <cube%pkgsrc.org@localhost>
date: Sun Oct 05 21:36:32 2008 +0000
description:
Merge cube-native-xorg, so that pkgsrc-current can be used with the native
X.Org found in NetBSD-current.
Thanks a lot to all who helped, especially Matthias Scheler who did
repeated tests on Mac OS X and older versions of NetBSD to make sure the
support for those platforms wouldn't be broken (or at least, not fatally,
as I would still expect a few hiccups here and there, because there is
only so much one can test in such limited time).
On the infrastructure side, this branch brings pkgconfig-builtin.mk, in
order to write very easily new builtin.mk files. It can actually handle
more than just pkgconfig files, but it will provide a version if it finds
such a file. x11.builtin.mk has also been made more useful and now all
existing (and future!) native-X11-related builtin.mk files should include
it.
diffstat:
fonts/Xft2/builtin.mk | 10 +-
fonts/fontconfig/builtin.mk | 8 +-
fonts/libfontenc/builtin.mk | 7 ++
graphics/MesaLib/builtin.mk | 8 +-
graphics/freetype2/builtin.mk | 11 +--
graphics/glu/builtin.mk | 11 +--
graphics/xpm/builtin.mk | 12 +---
misc/openoffice2/Makefile.NetBSD | 11 +-
mk/bsd.prefs.mk | 4 +-
mk/buildlink3/pkgconfig-builtin.mk | 57 ++++++++++++++++++
mk/defaults/mk.conf | 9 +-
mk/x11.builtin.mk | 23 ++++++-
pkgtools/x11-links/files/xfree.MesaLib | 5 +-
pkgtools/x11-links/files/xfree.Xft2 | 4 +-
pkgtools/x11-links/files/xfree.xpm | 3 +-
pkgtools/x11-links/files/xorg | 22 +-----
pkgtools/x11-links/files/xorg.Xcomposite | 4 +-
pkgtools/x11-links/files/xorg.Xfixes | 3 +-
pkgtools/x11-links/files/xorg.bigreqsproto | 3 +
pkgtools/x11-links/files/xorg.compositeproto | 3 +-
pkgtools/x11-links/files/xorg.damageproto | 3 +
pkgtools/x11-links/files/xorg.evieext | 3 +
pkgtools/x11-links/files/xorg.expat | 6 +-
pkgtools/x11-links/files/xorg.fixesproto | 4 +-
pkgtools/x11-links/files/xorg.fontcacheproto | 3 +
pkgtools/x11-links/files/xorg.fontconfig | 7 +-
pkgtools/x11-links/files/xorg.fontsproto | 6 +
pkgtools/x11-links/files/xorg.freetype2 | 5 +-
pkgtools/x11-links/files/xorg.glproto | 7 ++
pkgtools/x11-links/files/xorg.libFS | 3 +
pkgtools/x11-links/files/xorg.libXScrnSaver | 3 +
pkgtools/x11-links/files/xorg.libXTrap | 3 +
pkgtools/x11-links/files/xorg.libXdamage | 12 +++
pkgtools/x11-links/files/xorg.libXevie | 3 +
pkgtools/x11-links/files/xorg.libXfont | 20 ++++++
pkgtools/x11-links/files/xorg.libXprintUtil | 6 +
pkgtools/x11-links/files/xorg.libXrandr | 6 +-
pkgtools/x11-links/files/xorg.libXrender | 6 +-
pkgtools/x11-links/files/xorg.libXres | 11 +++
pkgtools/x11-links/files/xorg.libdrm | 9 ++
pkgtools/x11-links/files/xorg.libfontenc | 3 +
pkgtools/x11-links/files/xorg.liblbxutil | 6 +
pkgtools/x11-links/files/xorg.pixman | 17 +++++-
pkgtools/x11-links/files/xorg.printproto | 3 +
pkgtools/x11-links/files/xorg.recordproto | 3 +
pkgtools/x11-links/files/xorg.resourceproto | 3 +
pkgtools/x11-links/files/xorg.scrnsaverproto | 3 +
pkgtools/x11-links/files/xorg.trapproto | 3 +
pkgtools/x11-links/files/xorg.videoproto | 4 +
pkgtools/x11-links/files/xorg.xcmiscproto | 3 +
pkgtools/x11-links/files/xorg.xcursor | 6 +-
pkgtools/x11-links/files/xorg.xextensions | 54 -----------------
pkgtools/x11-links/files/xorg.xextproto | 6 +-
pkgtools/x11-links/files/xorg.xf86bigfontproto | 3 +
pkgtools/x11-links/files/xorg.xf86dgaproto | 3 +
pkgtools/x11-links/files/xorg.xf86driproto | 5 +
pkgtools/x11-links/files/xorg.xf86miscproto | 3 +
pkgtools/x11-links/files/xorg.xf86vidmodeproto | 3 +
pkgtools/x11-links/files/xorg.xproxymanagementprotocol | 3 +
pkgtools/x11-links/files/xorg.xtrans | 13 ++++
pkgtools/x11-links/xorg.mk | 38 +++++++++++-
textproc/expat/builtin.mk | 12 +--
x11/Xcomposite/builtin.mk | 4 +-
x11/Xfixes/builtin.mk | 4 +-
x11/Xrender/builtin.mk | 5 +-
x11/bigreqsproto/builtin.mk | 7 ++
x11/compositeproto/builtin.mk | 4 +-
x11/damageproto/builtin.mk | 7 ++
x11/evieext/builtin.mk | 7 ++
x11/fixesproto/builtin.mk | 4 +-
x11/fontcacheproto/builtin.mk | 7 ++
x11/fontsproto/builtin.mk | 7 ++
x11/glproto/builtin.mk | 7 ++
x11/inputproto/builtin.mk | 4 +-
x11/kbproto/builtin.mk | 4 +-
x11/libFS/builtin.mk | 7 ++
x11/libICE/builtin.mk | 4 +-
x11/libSM/builtin.mk | 4 +-
x11/libX11/builtin.mk | 7 +-
x11/libXScrnSaver/buildlink3.mk | 10 +--
x11/libXScrnSaver/builtin.mk | 8 ++
x11/libXTrap/builtin.mk | 7 ++
x11/libXau/builtin.mk | 4 +-
x11/libXdamage/buildlink3.mk | 8 +--
x11/libXdamage/builtin.mk | 8 ++
x11/libXdmcp/builtin.mk | 4 +-
x11/libXevie/builtin.mk | 7 ++
x11/libXext/builtin.mk | 6 +-
x11/libXfont/builtin.mk | 7 ++
x11/libXinerama/builtin.mk | 50 +--------------
x11/libXmu/builtin.mk | 4 +-
x11/libXprintUtil/builtin.mk | 7 ++
x11/libXrandr/builtin.mk | 4 +-
x11/libXrender/builtin.mk | 4 +-
x11/libXres/buildlink3.mk | 8 +--
x11/libXres/builtin.mk | 8 ++
x11/libXt/builtin.mk | 4 +-
x11/libdrm/builtin.mk | 7 ++
x11/liblbxutil/builtin.mk | 7 ++
x11/liboldXrandr/builtin.mk | 5 +-
x11/pixman/builtin.mk | 7 ++
x11/printproto/builtin.mk | 7 ++
x11/randrproto/builtin.mk | 11 +--
x11/recordproto/builtin.mk | 7 ++
x11/renderproto/builtin.mk | 11 +--
x11/resourceproto/builtin.mk | 7 ++
x11/scrnsaverproto/builtin.mk | 7 ++
x11/trapproto/builtin.mk | 7 ++
x11/videoproto/builtin.mk | 7 ++
x11/xcmiscproto/builtin.mk | 7 ++
x11/xcursor/builtin.mk | 5 +-
x11/xextproto/builtin.mk | 11 +--
x11/xf86bigfontproto/builtin.mk | 7 ++
x11/xf86dgaproto/builtin.mk | 7 ++
x11/xf86driproto/builtin.mk | 7 ++
x11/xf86miscproto/builtin.mk | 7 ++
x11/xf86vidmodeproto/builtin.mk | 7 ++
x11/xineramaproto/builtin.mk | 4 +-
x11/xproto/builtin.mk | 4 +-
x11/xproxymanagementprotocol/builtin.mk | 7 ++
x11/xtrans/builtin.mk | 7 ++
121 files changed, 696 insertions(+), 266 deletions(-)
diffs (truncated from 2012 to 300 lines):
diff -r 1b088cb0de55 -r 711ec62d431a fonts/Xft2/builtin.mk
--- a/fonts/Xft2/builtin.mk Sun Oct 05 17:49:04 2008 +0000
+++ b/fonts/Xft2/builtin.mk Sun Oct 05 21:36:32 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.16 2008/01/05 17:24:12 tron Exp $
+# $NetBSD: builtin.mk,v 1.17 2008/10/05 21:36:35 cube Exp $
BUILTIN_PKG:= Xft2
@@ -86,6 +86,9 @@
### The section below only applies if we are not including this file
### solely to determine whether a built-in implementation exists.
###
+
+.include "../../mk/x11.builtin.mk"
+
CHECK_BUILTIN.Xft2?= no
.if !empty(CHECK_BUILTIN.Xft2:M[nN][oO])
@@ -93,9 +96,4 @@
BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1nb2
. endif
-. if !empty(USE_BUILTIN.Xft2:M[yY][eE][sS])
-BUILDLINK_PREFIX.Xft2= ${X11BASE}
-BUILDLINK_FILES.Xft2+= lib/pkgconfig/xft.pc
-. endif
-
.endif # CHECK_BUILTIN.Xft2
diff -r 1b088cb0de55 -r 711ec62d431a fonts/fontconfig/builtin.mk
--- a/fonts/fontconfig/builtin.mk Sun Oct 05 17:49:04 2008 +0000
+++ b/fonts/fontconfig/builtin.mk Sun Oct 05 21:36:32 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.9 2006/04/06 06:21:59 reed Exp $
+# $NetBSD: builtin.mk,v 1.10 2008/10/05 21:36:35 cube Exp $
BUILTIN_PKG:= fontconfig
@@ -85,6 +85,9 @@
### The section below only applies if we are not including this file
### solely to determine whether a built-in implementation exists.
###
+
+.include "../../mk/x11.builtin.mk"
+
CHECK_BUILTIN.fontconfig?= no
.if !empty(CHECK_BUILTIN.fontconfig:M[nN][oO])
@@ -94,9 +97,6 @@
. endif
. if !empty(USE_BUILTIN.fontconfig:M[yY][eE][sS])
-BUILDLINK_PREFIX.fontconfig= ${X11BASE}
-BUILDLINK_FILES.fontconfig+= lib/pkgconfig/fontconfig.pc
-
USE_BUILTIN.expat= yes
USE_BUILTIN.freetype2= yes
USE_BUILTIN.zlib= yes
diff -r 1b088cb0de55 -r 711ec62d431a fonts/libfontenc/builtin.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fonts/libfontenc/builtin.mk Sun Oct 05 21:36:32 2008 +0000
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:35 cube Exp $
+
+BUILTIN_PKG:= libfontenc
+PKGCONFIG_FILE.libfontenc= ${X11BASE}/lib/pkgconfig/fontenc.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
diff -r 1b088cb0de55 -r 711ec62d431a graphics/MesaLib/builtin.mk
--- a/graphics/MesaLib/builtin.mk Sun Oct 05 17:49:04 2008 +0000
+++ b/graphics/MesaLib/builtin.mk Sun Oct 05 21:36:32 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.14 2006/04/06 06:22:00 reed Exp $
+# $NetBSD: builtin.mk,v 1.15 2008/10/05 21:36:35 cube Exp $
BUILTIN_PKG:= MesaLib
@@ -74,12 +74,8 @@
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
. endif
-. if !empty(USE_BUILTIN.MesaLib:M[yY][eE][sS])
-BUILDLINK_PREFIX.MesaLib= ${X11BASE}
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-. include "../../mk/x11.buildlink3.mk"
-. include "../../mk/x11.builtin.mk"
+. include "../../mk/x11.builtin.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
-. endif
.endif # CHECK_BUILTIN.MesaLib
diff -r 1b088cb0de55 -r 711ec62d431a graphics/freetype2/builtin.mk
--- a/graphics/freetype2/builtin.mk Sun Oct 05 17:49:04 2008 +0000
+++ b/graphics/freetype2/builtin.mk Sun Oct 05 21:36:32 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.11 2008/04/24 11:18:13 tron Exp $
+# $NetBSD: builtin.mk,v 1.12 2008/10/05 21:36:35 cube Exp $
BUILTIN_PKG:= freetype2
@@ -70,6 +70,9 @@
### The section below only applies if we are not including this file
### solely to determine whether a built-in implementation exists.
###
+
+.include "../../mk/x11.builtin.mk"
+
CHECK_BUILTIN.freetype2?= no
.if !empty(CHECK_BUILTIN.freetype2:M[nN][oO])
@@ -77,10 +80,4 @@
BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.3
. endif
-. if !empty(USE_BUILTIN.freetype2:M[yY][eE][sS])
-BUILDLINK_PREFIX.freetype2= ${X11BASE}
-. include "../../mk/x11.buildlink3.mk"
-. include "../../mk/x11.builtin.mk"
-. endif
-
.endif # CHECK_BUILTIN.freetype2
diff -r 1b088cb0de55 -r 711ec62d431a graphics/glu/builtin.mk
--- a/graphics/glu/builtin.mk Sun Oct 05 17:49:04 2008 +0000
+++ b/graphics/glu/builtin.mk Sun Oct 05 21:36:32 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.11 2006/04/06 06:22:02 reed Exp $
+# $NetBSD: builtin.mk,v 1.12 2008/10/05 21:36:36 cube Exp $
BUILTIN_PKG:= glu
@@ -64,6 +64,9 @@
### The section below only applies if we are not including this file
### solely to determine whether a built-in implementation exists.
###
+
+.include "../../mk/x11.builtin.mk"
+
CHECK_BUILTIN.glu?= no
.if !empty(CHECK_BUILTIN.glu:M[nN][oO])
@@ -71,10 +74,4 @@
BUILDLINK_API_DEPENDS.glu+= glu>=6.0
. endif
-. if !empty(USE_BUILTIN.glu:M[yY][eE][sS])
-BUILDLINK_PREFIX.glu= ${X11BASE}
-. include "../../mk/x11.buildlink3.mk"
-. include "../../mk/x11.builtin.mk"
-. endif
-
.endif # CHECK_BUILTIN.glu
diff -r 1b088cb0de55 -r 711ec62d431a graphics/xpm/builtin.mk
--- a/graphics/xpm/builtin.mk Sun Oct 05 17:49:04 2008 +0000
+++ b/graphics/xpm/builtin.mk Sun Oct 05 21:36:32 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.15 2007/09/21 15:17:14 rillig Exp $
+# $NetBSD: builtin.mk,v 1.16 2008/10/05 21:36:36 cube Exp $
BUILTIN_PKG:= xpm
@@ -84,13 +84,5 @@
### The section below only applies if we are not including this file
### solely to determine whether a built-in implementation exists.
###
-CHECK_BUILTIN.xpm?= no
-.if !empty(CHECK_BUILTIN.xpm:M[nN][oO])
-. if !empty(USE_BUILTIN.xpm:M[yY][eE][sS])
-BUILDLINK_PREFIX.xpm= ${X11BASE}
-. include "../../mk/x11.buildlink3.mk"
-. include "../../mk/x11.builtin.mk"
-. endif
-
-.endif # CHECK_BUILTIN.xpm
+.include "../../mk/x11.builtin.mk"
diff -r 1b088cb0de55 -r 711ec62d431a misc/openoffice2/Makefile.NetBSD
--- a/misc/openoffice2/Makefile.NetBSD Sun Oct 05 17:49:04 2008 +0000
+++ b/misc/openoffice2/Makefile.NetBSD Sun Oct 05 21:36:32 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.NetBSD,v 1.1 2008/02/05 19:17:24 hira Exp $
+# $NetBSD: Makefile.NetBSD,v 1.2 2008/10/05 21:36:35 cube Exp $
#
# systray quickstarter is broken with mutex handling?
@@ -6,10 +6,11 @@
# *.pc files are required, but these don't exist on NetBSD.
.if defined(X11_TYPE) && !empty(X11_TYPE:Mnative)
-USE_BUILTIN.freetype2= no
-USE_BUILTIN.Xfixes= no
-USE_BUILTIN.Xrandr= no
-USE_BUILTIN.Xrender= no
+. for _pkg_ in freetype2 Xfixes Xrandr Xrender
+. if !exists(${X11BASE}/lib/pkgconfig/${_pkg_:tl}.pc)
+USE_BUILTIN.${_pkg_}= no
+. endif
+. endfor
.endif
.if ${MACHINE_ARCH} == "i386"
diff -r 1b088cb0de55 -r 711ec62d431a mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk Sun Oct 05 17:49:04 2008 +0000
+++ b/mk/bsd.prefs.mk Sun Oct 05 21:36:32 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.287 2008/09/16 11:40:10 tron Exp $
+# $NetBSD: bsd.prefs.mk,v 1.288 2008/10/05 21:36:34 cube Exp $
#
# This file includes the mk.conf file, which contains the user settings.
#
@@ -493,6 +493,8 @@
X11BASE?= /usr
. elif !empty(MACHINE_PLATFORM:MDarwin-9.*-*)
X11BASE?= /usr/X11
+. elif exists(/usr/X11R7/lib/libX11.so)
+X11BASE?= /usr/X11R7
. else
X11BASE?= /usr/X11R6
. endif
diff -r 1b088cb0de55 -r 711ec62d431a mk/buildlink3/pkgconfig-builtin.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mk/buildlink3/pkgconfig-builtin.mk Sun Oct 05 21:36:32 2008 +0000
@@ -0,0 +1,57 @@
+# $NetBSD: pkgconfig-builtin.mk,v 1.2 2008/10/05 21:36:35 cube Exp $
+
+# This file is used to factor out a common pattern in builtin.mk files backed
+# up by the existence of a pkgconfig file.
+#
+# Caller has to define BUILTIN_PKG and PKGCONFIG_FILE.<BUILTIN_PKG>.
+#
+# Optionally, caller may define PKGCONFIG_BASE.<BUILTIN_PKG> as the base
+# location for a native implementation of the package. It conveniently
+# defaults to X11BASE.
+
+BUILTIN_FIND_FILES_VAR:= FIND_FILES_${BUILTIN_PKG}
+BUILTIN_FIND_FILES.FIND_FILES_${BUILTIN_PKG}= ${PKGCONFIG_FILE.${BUILTIN_PKG}}
+
+.include "../../mk/buildlink3/bsd.builtin.mk"
+
+.if ${PKGCONFIG_BASE.${BUILTIN_PKG}:U${X11BASE}} == ${LOCALBASE}
+IS_BUILTIN.${BUILTIN_PKG}= no
+.elif !defined(IS_BUILTIN.${BUILTIN_PKG})
+IS_BUILTIN.${BUILTIN_PKG}= no
+. if empty(FIND_FILES_${BUILTIN_PKG}:M__nonexistent__)
+IS_BUILTIN.${BUILTIN_PKG}= yes
+. endif
+.endif
+MAKEVARS:= ${MAKEVARS} IS_BUILTIN.${BUILTIN_PKG}
+
+.if !defined(BUILTIN_PKG.${BUILTIN_PKG}) && \
+ !empty(IS_BUILTIN.${BUILTIN_PKG}:M[yY][eE][sS]) && \
+ !empty(FIND_FILES_${BUILTIN_PKG}:M*.pc)
+BUILTIN_VERSION.${BUILTIN_PKG}!= \
+ ${SED} -n -e 's/Version: //p' ${FIND_FILES_${BUILTIN_PKG}}
+BUILTIN_PKG.${BUILTIN_PKG}:= ${BUILTIN_PKG}-${BUILTIN_VERSION.${BUILTIN_PKG}}
+.endif
+MAKEVARS:= ${MAKEVARS} BUILTIN_PKG.${BUILTIN_PKG}
+
+.if !defined(USE_BUILTIN.${BUILTIN_PKG})
+. if ${PREFER.${BUILTIN_PKG}} == "pkgsrc"
+USE_BUILTIN.${BUILTIN_PKG}= no
+. else
+USE_BUILTIN.${BUILTIN_PKG}:= ${IS_BUILTIN.${BUILTIN_PKG}}
+. if defined(BUILTIN_PKG.${BUILTIN_PKG}) && \
+ !empty(IS_BUILTIN.${BUILTIN_PKG}:M[Yy][Ee][Ss])
+USE_BUILTIN.${BUILTIN_PKG}= yes
+. for _dep_ in ${BUILDLINK_API_DEPENDS.${BUILTIN_PKG}}
+. if !empty(USE_BUILTIN.${BUILTIN_PKG}:M[Yy][Ee][Ss])
+USE_BUILTIN.${BUILTIN_PKG}!= \
+ if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.${BUILTIN_PKG}}; then \
+ ${ECHO} yes; \
+ else \
+ ${ECHO} no; \
+ fi
+. endif
+. endfor
+. endif
+. endif
+.endif
+MAKEVARS:= ${MAKEVARS} USE_BUILTIN.${BUILTIN_PKG}
diff -r 1b088cb0de55 -r 711ec62d431a mk/defaults/mk.conf
--- a/mk/defaults/mk.conf Sun Oct 05 17:49:04 2008 +0000
+++ b/mk/defaults/mk.conf Sun Oct 05 21:36:32 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.176 2008/05/22 20:11:55 joerg Exp $
+# $NetBSD: mk.conf,v 1.177 2008/10/05 21:36:35 cube Exp $
#
# This file provides default values for variables that may be overridden
@@ -203,8 +203,11 @@
# Possible: yes, no
# Default: no
-.if empty(MACHINE_PLATFORM:MDarwin-9.*-*) || \
- (defined(X11_TYPE) && ${X11_TYPE} != "native")
+.if (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && \
+ exists(/usr/X11R7/lib/libX11.so))
+PREFER_PKGSRC?=
+.elif empty(MACHINE_PLATFORM:MDarwin-9.*-*) || \
+ (defined(X11_TYPE) && ${X11_TYPE} != "native")
Home |
Main Index |
Thread Index |
Old Index