pkg/45220: Please add support of MacOSX Lion(Darwin 11.0.1) with Xcode 4.1.1 to pkgtools/x11-links

To: pkg-manager%netbsd.org@localhost,gnats-admin%netbsd.org@localhost,pkgsrc-bugs%netbsd.org@localhost
Subject: pkg/45220: Please add support of MacOSX Lion(Darwin 11.0.1) with Xcode 4.1.1 to pkgtools/x11-links
From: ryoon%NetBSD.org@localhost
Date: Sat, 6 Aug 2011 16:50:01 +0000 (UTC)
>Number:         45220
>Category:       pkg
>Synopsis:       Please add support of MacOSX Lion(Darwin 11.0.1) with Xcode 
>4.1.1 to pkgtools/x11-links
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Aug 06 16:50:00 +0000 2011
>Originator:     Ryo ONODERA
>Release:        NetBSD 5.99.55
>Organization:
        
>Environment:
        
        
System: NetBSD hydrogen.elements.tetera.org 5.99.55 NetBSD 5.99.55 (LEAFGIRL4) 
#12: Sat Jul 30 05:03:44 JST 2011 
root%hydrogen.elements.tetera.org@localhost:/usr/obj/sys/arch/i386/compile/LEAFGIRL4
 i386
Architecture: i386
Machine: i386
>Description:
Please support MacOSX Lion(Darwin 11.0.1) with Xcode 4.1.1.
I do not know former Darwin, but this version does not have cf files at all.
        
>How-To-Repeat:
        
>Fix:
        
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/x11-links/Makefile,v
retrieving revision 1.128
diff -u -r1.128 Makefile
--- Makefile    1 Aug 2011 15:09:28 -0000       1.128
+++ Makefile    6 Aug 2011 16:42:20 -0000
@@ -4,7 +4,7 @@
 #      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 @@
 .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"
Index: xorg-version.mk
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/x11-links/xorg-version.mk,v
retrieving revision 1.1
diff -u -r1.1 xorg-version.mk
--- xorg-version.mk     30 Jan 2011 17:26:32 -0000      1.1
+++ xorg-version.mk     6 Aug 2011 16:42:20 -0000
@@ -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 @@
 .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 @@
                      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
Index: files/xorg
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/x11-links/files/xorg,v
retrieving revision 1.18
diff -u -r1.18 xorg
--- files/xorg  19 Jan 2011 16:33:51 -0000      1.18
+++ files/xorg  6 Aug 2011 16:42:20 -0000
@@ -290,6 +290,9 @@
 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/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.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.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.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.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.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.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
Index: files/xorg.fontconfig
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/x11-links/files/xorg.fontconfig,v
retrieving revision 1.5
diff -u -r1.5 xorg.fontconfig
--- files/xorg.fontconfig       18 Feb 2010 12:32:19 -0000      1.5
+++ files/xorg.fontconfig       6 Aug 2011 16:42:21 -0000
@@ -4,6 +4,7 @@
 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
Index: files/xorg.glut
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/x11-links/files/xorg.glut,v
retrieving revision 1.2
diff -u -r1.2 xorg.glut
--- files/xorg.glut     30 Dec 2009 17:10:33 -0000      1.2
+++ files/xorg.glut     6 Aug 2011 16:42:21 -0000
@@ -8,4 +8,7 @@
 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
Index: files/xorg.libSM
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/x11-links/files/xorg.libSM,v
retrieving revision 1.3
diff -u -r1.3 xorg.libSM
--- files/xorg.libSM    18 Feb 2010 12:32:19 -0000      1.3
+++ files/xorg.libSM    6 Aug 2011 16:42:21 -0000
@@ -3,6 +3,7 @@
 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
Index: files/xorg.libX11
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/x11-links/files/xorg.libX11,v
retrieving revision 1.9
diff -u -r1.9 xorg.libX11
--- files/xorg.libX11   5 Mar 2011 08:36:54 -0000       1.9
+++ files/xorg.libX11   6 Aug 2011 16:42:21 -0000
@@ -14,12 +14,16 @@
 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
Index: files/xorg.libXdamage
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/x11-links/files/xorg.libXdamage,v
retrieving revision 1.4
diff -u -r1.4 xorg.libXdamage
--- files/xorg.libXdamage       18 Feb 2010 12:32:19 -0000      1.4
+++ files/xorg.libXdamage       6 Aug 2011 16:42:21 -0000
@@ -1,6 +1,7 @@
 # $NetBSD: xorg.libXdamage,v 1.4 2010/02/18 12:32:19 obache 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
Index: files/xorg.libXpm
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/x11-links/files/xorg.libXpm,v
retrieving revision 1.2
diff -u -r1.2 xorg.libXpm
--- files/xorg.libXpm   18 Feb 2010 12:32:19 -0000      1.2
+++ files/xorg.libXpm   6 Aug 2011 16:42:21 -0000
@@ -11,4 +11,5 @@
 lib/libXpm.dylib
 lib/libXpm.4.dylib
 lib/libXpm.4.11.dylib
+lib/libXpm.4.11.0.dylib
 lib/pkgconfig/xpm.pc
Index: files/xorg.libXrandr
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/x11-links/files/xorg.libXrandr,v
retrieving revision 1.6
diff -u -r1.6 xorg.libXrandr
--- files/xorg.libXrandr        18 Feb 2010 12:32:19 -0000      1.6
+++ files/xorg.libXrandr        6 Aug 2011 16:42:21 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: xorg.libXrandr,v 1.6 2010/02/18 12:32:19 obache 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
Index: files/xorg.libxcb
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/x11-links/files/xorg.libxcb,v
retrieving revision 1.3
diff -u -r1.3 xorg.libxcb
--- files/xorg.libxcb   11 Sep 2010 20:15:20 -0000      1.3
+++ files/xorg.libxcb   6 Aug 2011 16:42:21 -0000
@@ -53,6 +53,9 @@
 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.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
Index: files/xorg.pixman
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/x11-links/files/xorg.pixman,v
retrieving revision 1.6
diff -u -r1.6 xorg.pixman
--- files/xorg.pixman   31 May 2010 21:20:02 -0000      1.6
+++ files/xorg.pixman   6 Aug 2011 16:42:21 -0000
@@ -3,6 +3,7 @@
 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


>Unformatted:
Prev by Date: Re: pkg/44001 (htop won't build on linux systems / several versions behind)
Next by Date: Re: pkg/37544 (multimedia/xawtv -- Patch to fix build errors on Linux)
Previous by Thread: PR/44001 CVS commit: pkgsrc/sysutils/htop
Next by Thread: Re: pkg/45161 (devel/bison file collision with devel/byacc on man/man1/yacc.1)
Indexes:
Home | Main Index | Thread Index | Old Index