summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorabs <abs@pkgsrc.org>2011-09-09 09:08:07 +0000
committerabs <abs@pkgsrc.org>2011-09-09 09:08:07 +0000
commit591fed608a655ebca4a4100194f9b18d966c66f1 (patch)
tree63a90c1ee1410ef55eba04eef846c05a928464e3 /pkgtools
parent70e5ecb2840351804810361a4f78d6364b6ce547 (diff)
downloadpkgsrc-591fed608a655ebca4a4100194f9b18d966c66f1.tar.gz
PR/45220 add support of MacOSX Lion(Darwin 11.0.1) with Xcode 4.1.1
to pkgtools/x11-links Many thanks to Ryo ONODERA
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/x11-links/Makefile7
-rw-r--r--pkgtools/x11-links/files/xorg18
-rw-r--r--pkgtools/x11-links/files/xorg.fontconfig3
-rw-r--r--pkgtools/x11-links/files/xorg.glut5
-rw-r--r--pkgtools/x11-links/files/xorg.libSM3
-rw-r--r--pkgtools/x11-links/files/xorg.libX116
-rw-r--r--pkgtools/x11-links/files/xorg.libXdamage3
-rw-r--r--pkgtools/x11-links/files/xorg.libXpm3
-rw-r--r--pkgtools/x11-links/files/xorg.libXrandr4
-rw-r--r--pkgtools/x11-links/files/xorg.libxcb6
-rw-r--r--pkgtools/x11-links/files/xorg.pixman3
-rw-r--r--pkgtools/x11-links/xorg-version.mk14
12 files changed, 57 insertions, 18 deletions
diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index d7924af6b61..8175f5c2298 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.128 2011/08/01 15:09:28 wiz Exp $
+# $NetBSD: Makefile,v 1.129 2011/09/09 09:08:07 abs Exp $
#
# NOTE: If you update this package, then you'll likely need to also update
# the x11-links dependency in buildlink3.mk to the correct version,
# usually the most recent.
-DISTNAME= x11-links-0.66
+DISTNAME= x11-links-0.67
CATEGORIES= pkgtools x11
MASTER_SITES= # empty
DISTFILES= # empty
@@ -50,7 +50,8 @@ PKG_FAIL_REASON+= "pkgsrc installations is not supported!"
.elif exists(${X11BASE}/lib/X11/config/xorgversion.def) || \
(exists(${X11BASE}/lib/X11/config/xorg.cf) && \
exists(${X11BASE}/lib/X11/config/version.def)) || \
- exists(${X11BASE}/lib/pkgconfig/xorg-server.pc)
+ exists(${X11BASE}/lib/pkgconfig/xorg-server.pc) || \
+ exists(${X11BASE}/bin/Xquartz)
. include "xorg.mk"
.else
. include "xfree.mk"
diff --git a/pkgtools/x11-links/files/xorg b/pkgtools/x11-links/files/xorg
index b0ae5463f6b..57e61f89424 100644
--- a/pkgtools/x11-links/files/xorg
+++ b/pkgtools/x11-links/files/xorg
@@ -1,4 +1,4 @@
-# $NetBSD: xorg,v 1.18 2011/01/19 16:33:51 jmcneill Exp $
+# $NetBSD: xorg,v 1.19 2011/09/09 09:08:07 abs Exp $
#
# The files listed below are the union of the sets of files installed by
# the supported Xorg (and some XFree) distributions, minus the set of files
@@ -290,6 +290,9 @@ lib/libFS.so.7
lib/libFS.so.7.0
lib/libFS.so.8.0
lib/libFS.so.9.0
+lib/libGL.1.2.dylib
+lib/libGL.1.dylib
+lib/libGL.dylib
lib/libGL.so.2
lib/libGL.so.2.0
lib/libGL.so.9.0
@@ -297,6 +300,9 @@ lib/libGL.so.9.1
lib/libGLw.so.2
lib/libGLw.so.2.0
lib/libGLw.so.5.1
+lib/libOSMesa.7.8.dylib
+lib/libOSMesa.7.dylib
+lib/libOSMesa.dylib
lib/libOSMesa.so.7
lib/libOSMesa.so.7.0
lib/libPEX5.6.0.dylib
@@ -330,6 +336,7 @@ lib/libXaw.6.dylib
lib/libXaw.7.0.dylib
lib/libXaw.7.dylib
lib/libXaw.8.dylib
+lib/libXaw6.6.0.1.dylib
lib/libXaw6.6.dylib
lib/libXaw6.so.6
lib/libXaw6.so.6.1
@@ -343,6 +350,7 @@ lib/libXaw7.so.7.0
lib/libXaw7.so.10
lib/libXaw7.so.10.0
lib/libXaw7.so.12.0
+lib/libXaw7.7.0.0.dylib
lib/libXaw7.7.dylib
lib/libXaw8.a
lib/libXaw8.la
@@ -350,6 +358,7 @@ lib/libXaw8.so
lib/libXaw8.so.8
lib/libXaw8.so.8.0
lib/libXaw8.so.13.0
+lib/libXaw8.8.0.0.dylib
lib/libXaw8.8.dylib
lib/libXaw.a
lib/libXaw.dylib
@@ -390,6 +399,7 @@ lib/libXft.so.3
lib/libXft.so.3.0
lib/libXft.so.7.0
lib/libXft.so.8.0
+lib/libXi.6.1.0.dylib
lib/libXi.6.0.0.dylib
lib/libXi.6.0.dylib
lib/libXi.6.0.0.dylib
@@ -531,6 +541,9 @@ lib/libpsres.so
lib/libpsres.so.1
lib/libpsres.so.1.0
lib/libxf86config.a
+lib/libxkbfile.1.0.2.dylib
+lib/libxkbfile.1.dylib
+lib/libxkbfile.dylib
lib/libxkbfile.a
lib/libxkbfile.la
lib/libxkbfile.so
@@ -540,6 +553,9 @@ lib/libxkbfile.so.1.0.2
lib/libxkbfile.so.2
lib/libxkbfile.so.2.0
lib/libxkbfile.so.4.0
+lib/libxkbui.1.0.0.dylib
+lib/libxkbui.1.dylib
+lib/libxkbui.dylib
lib/libxkbui.a
lib/libxkbui.la
lib/libxkbui.so
diff --git a/pkgtools/x11-links/files/xorg.fontconfig b/pkgtools/x11-links/files/xorg.fontconfig
index 28927577bbe..639764c07cf 100644
--- a/pkgtools/x11-links/files/xorg.fontconfig
+++ b/pkgtools/x11-links/files/xorg.fontconfig
@@ -1,9 +1,10 @@
-# $NetBSD: xorg.fontconfig,v 1.5 2010/02/18 12:32:19 obache Exp $
+# $NetBSD: xorg.fontconfig,v 1.6 2011/09/09 09:08:07 abs Exp $
#
include/fontconfig/fcfreetype.h
include/fontconfig/fcprivate.h
include/fontconfig/fontconfig.h
lib/libfontconfig.a
+lib/libfontconfig.1.4.4.dylib
lib/libfontconfig.1.3.0.dylib
lib/libfontconfig.1.1.0.dylib
lib/libfontconfig.1.dylib
diff --git a/pkgtools/x11-links/files/xorg.glut b/pkgtools/x11-links/files/xorg.glut
index 47d87acd0b9..81e8cce65aa 100644
--- a/pkgtools/x11-links/files/xorg.glut
+++ b/pkgtools/x11-links/files/xorg.glut
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.glut,v 1.2 2009/12/30 17:10:33 tron Exp $
+# $NetBSD: xorg.glut,v 1.3 2011/09/09 09:08:07 abs Exp $
#
include/GL/glut.h
include/GL/glutf90.h
@@ -8,4 +8,7 @@ lib/libglut.so.3
lib/libglut.so.3.7.1
lib/libglut.so.4
lib/libglut.so.4.0
+lib/libglut.3.7.dylib
+lib/libglut.3.dylib
+lib/libglut.dylib
lib/pkgconfig/glut.pc
diff --git a/pkgtools/x11-links/files/xorg.libSM b/pkgtools/x11-links/files/xorg.libSM
index 37667ce854f..42e844f91e6 100644
--- a/pkgtools/x11-links/files/xorg.libSM
+++ b/pkgtools/x11-links/files/xorg.libSM
@@ -1,8 +1,9 @@
-# $NetBSD: xorg.libSM,v 1.3 2010/02/18 12:32:19 obache Exp $
+# $NetBSD: xorg.libSM,v 1.4 2011/09/09 09:08:07 abs Exp $
#
include/X11/SM/SM.h
include/X11/SM/SMlib.h
include/X11/SM/SMproto.h
+lib/libSM.6.0.1.dylib
lib/libSM.6.0.0.dylib
lib/libSM.6.0.dylib
lib/libSM.6.dylib
diff --git a/pkgtools/x11-links/files/xorg.libX11 b/pkgtools/x11-links/files/xorg.libX11
index 917c8967464..60cbe5a3d45 100644
--- a/pkgtools/x11-links/files/xorg.libX11
+++ b/pkgtools/x11-links/files/xorg.libX11
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.libX11,v 1.9 2011/03/05 08:36:54 wiz Exp $
+# $NetBSD: xorg.libX11,v 1.10 2011/09/09 09:08:07 abs Exp $
#
include/X11/ImUtil.h
include/X11/XKBlib.h
@@ -14,12 +14,16 @@ include/X11/Xregion.h
include/X11/Xresource.h
include/X11/Xutil.h
include/X11/cursorfont.h
+lib/libX11-xcb.1.0.0.dylib
+lib/libX11-xcb.1.dylib
+lib/libX11-xcb.dylib
lib/libX11-xcb.so
lib/libX11-xcb.so.1
lib/libX11-xcb.so.1.0
lib/libX11.6.1.dylib
lib/libX11.6.2.0.dylib
lib/libX11.6.2.dylib
+lib/libX11.6.3.0.dylib
lib/libX11.6.dylib
lib/libX11.a
lib/libX11.dylib
diff --git a/pkgtools/x11-links/files/xorg.libXdamage b/pkgtools/x11-links/files/xorg.libXdamage
index fd5989acefc..1fa81ea2f44 100644
--- a/pkgtools/x11-links/files/xorg.libXdamage
+++ b/pkgtools/x11-links/files/xorg.libXdamage
@@ -1,6 +1,7 @@
-# $NetBSD: xorg.libXdamage,v 1.4 2010/02/18 12:32:19 obache Exp $
+# $NetBSD: xorg.libXdamage,v 1.5 2011/09/09 09:08:07 abs Exp $
#
include/X11/extensions/Xdamage.h
+lib/libXdamage.1.1.0.dylib
lib/libXdamage.1.0.0.dylib
lib/libXdamage.1.dylib
lib/libXdamage.a
diff --git a/pkgtools/x11-links/files/xorg.libXpm b/pkgtools/x11-links/files/xorg.libXpm
index d95b5f9d370..f6f3b21d0e2 100644
--- a/pkgtools/x11-links/files/xorg.libXpm
+++ b/pkgtools/x11-links/files/xorg.libXpm
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.libXpm,v 1.2 2010/02/18 12:32:19 obache Exp $
+# $NetBSD: xorg.libXpm,v 1.3 2011/09/09 09:08:07 abs Exp $
#
include/X11/xpm.h
lib/libXpm.a
@@ -11,4 +11,5 @@ lib/libXpm.so.8.0
lib/libXpm.dylib
lib/libXpm.4.dylib
lib/libXpm.4.11.dylib
+lib/libXpm.4.11.0.dylib
lib/pkgconfig/xpm.pc
diff --git a/pkgtools/x11-links/files/xorg.libXrandr b/pkgtools/x11-links/files/xorg.libXrandr
index 74571e9fab3..404ea7a535b 100644
--- a/pkgtools/x11-links/files/xorg.libXrandr
+++ b/pkgtools/x11-links/files/xorg.libXrandr
@@ -1,7 +1,7 @@
-# $NetBSD: xorg.libXrandr,v 1.6 2010/02/18 12:32:19 obache Exp $
+# $NetBSD: xorg.libXrandr,v 1.7 2011/09/09 09:08:07 abs Exp $
#
include/X11/extensions/Xrandr.h
-lib/libXrandr.2.1.0.dylib
+lib/libXrandr.2.2.0.dylib
lib/libXrandr.2.0.0.dylib
lib/libXrandr.2.1.0.dylib
lib/libXrandr.2.dylib
diff --git a/pkgtools/x11-links/files/xorg.libxcb b/pkgtools/x11-links/files/xorg.libxcb
index a19c63a6e76..883ed3254dd 100644
--- a/pkgtools/x11-links/files/xorg.libxcb
+++ b/pkgtools/x11-links/files/xorg.libxcb
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.libxcb,v 1.3 2010/09/11 20:15:20 wiz Exp $
+# $NetBSD: xorg.libxcb,v 1.4 2011/09/09 09:08:07 abs Exp $
#
include/xcb/bigreq.h
include/xcb/composite.h
@@ -53,6 +53,9 @@ lib/libxcb-dpms.la
lib/libxcb-dpms.so
lib/libxcb-dpms.so.0
lib/libxcb-dpms.so.0.0
+lib/libxcb-dri2.0.0.0.dylib
+lib/libxcb-dri2.0.dylib
+lib/libxcb-dri2.dylib
lib/libxcb-dri2.a
lib/libxcb-dri2.la
lib/libxcb-dri2.so
@@ -66,6 +69,7 @@ lib/libxcb-glx.la
lib/libxcb-glx.so
lib/libxcb-glx.so.0
lib/libxcb-glx.so.0.0
+lib/libxcb-randr.0.1.0.dylib
lib/libxcb-randr.0.0.0.dylib
lib/libxcb-randr.0.dylib
lib/libxcb-randr.a
diff --git a/pkgtools/x11-links/files/xorg.pixman b/pkgtools/x11-links/files/xorg.pixman
index 9956116bcb6..84dc5d3d319 100644
--- a/pkgtools/x11-links/files/xorg.pixman
+++ b/pkgtools/x11-links/files/xorg.pixman
@@ -1,8 +1,9 @@
-# $NetBSD: xorg.pixman,v 1.6 2010/05/31 21:20:02 wiz Exp $
+# $NetBSD: xorg.pixman,v 1.7 2011/09/09 09:08:07 abs Exp $
#
include/pixman-1/pixman.h
include/pixman-1/pixman-version.h
lib/libpixman-1.a
+lib/libpixman-1.0.20.2.dylib
lib/libpixman-1.0.11.8.dylib
lib/libpixman-1.0.dylib
lib/libpixman-1.dylib
diff --git a/pkgtools/x11-links/xorg-version.mk b/pkgtools/x11-links/xorg-version.mk
index 252468a3f95..519217ea9dd 100644
--- a/pkgtools/x11-links/xorg-version.mk
+++ b/pkgtools/x11-links/xorg-version.mk
@@ -1,4 +1,4 @@
-# $NetBSD: xorg-version.mk,v 1.1 2011/01/30 17:26:32 wiz Exp $
+# $NetBSD: xorg-version.mk,v 1.2 2011/09/09 09:08:07 abs Exp $
#
# This Makefile fragment is included by Makefiles that need to access
# the X11_TYPE and version number of an X.org distribution.
@@ -14,10 +14,11 @@
BUILTIN_X11_TYPE.xorg= xorg
-BUILTIN_FIND_FILES_VAR:= CF_XORG CF_XORG_VERSION CF_VERSION_OLD
+BUILTIN_FIND_FILES_VAR:= CF_XORG CF_XORG_VERSION CF_VERSION_OLD XQUARTZ
BUILTIN_FIND_FILES.CF_XORG= ${X11BASE}/lib/X11/config/xorg.cf
BUILTIN_FIND_FILES.CF_XORG_VERSION= ${X11BASE}/lib/X11/config/xorgversion.def
BUILTIN_FIND_FILES.CF_VERSION_OLD= ${X11BASE}/lib/X11/config/version.def
+BUILTIN_FIND_FILES.XQUARTZ= ${X11BASE}/bin/Xquartz
.include "../../mk/buildlink3/find-files.mk"
.if !defined(BUILTIN_XORG_VERSION_FILE)
@@ -30,8 +31,12 @@ BUILTIN_XORG_VERSION_FILE= ${CF_VERSION_OLD}
.endif
MAKEVARS+= BUILTIN_XORG_VERSION_FILE
-.if !defined(BUILTIN_X11_VERSION.xorg) && \
- exists(${BUILTIN_XORG_VERSION_FILE})
+.if !defined(BUILTIN_X11_VERSION.xorg)
+. if exists(${XQUARTZ})
+BUILTIN_X11_VERSION.xorg!= \
+ ${XQUARTZ} -version 2>&1 | \
+ ${AWK} '/X.org Release / { print $$3 }'
+. elif exists(${BUILTIN_XORG_VERSION_FILE})
BUILTIN_X11_VERSION.xorg!= \
${AWK} '/\#define[ ]*XORG_VERSION_MAJOR/ { M = $$3 } \
/\#define[ ]*XORG_VERSION_MINOR/ { m = "."$$3 } \
@@ -41,5 +46,6 @@ BUILTIN_X11_VERSION.xorg!= \
if (p == ".0" && s == "") p = ""; \
printf "%s%s%s%s\n", M, m, p, s }' \
${BUILTIN_XORG_VERSION_FILE}
+. endif
.endif
MAKEVARS+= BUILTIN_X11_VERSION.xorg