Sun Apr 27 09:43:12 2008 UTC ()
The "pkgsrc-i386" target doesn't seem to work on SunOS, so for now fall back
to the "pkgsrc" target which is intended to be portable.


(tnn)
diff -r1.8 -r1.9 pkgsrc/graphics/Mesa/Makefile.lib
diff -r1.2 -r1.3 pkgsrc/graphics/MesaLib/options.mk
cvs diff -r1.8 -r1.9 pkgsrc/graphics/Mesa/Attic/Makefile.lib (expand / switch to unified diff)

--- pkgsrc/graphics/Mesa/Attic/Makefile.lib 2008/04/26 20:38:49 1.8
+++ pkgsrc/graphics/Mesa/Attic/Makefile.lib 2008/04/27 09:43:12 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.lib,v 1.8 2008/04/26 20:38:49 tnn Exp $ 1# $NetBSD: Makefile.lib,v 1.9 2008/04/27 09:43:12 tnn Exp $
2# 2#
3# This Makefile fragment is included by all packages that build libraries 3# This Makefile fragment is included by all packages that build libraries
4# from the Mesa sources. 4# from the Mesa sources.
5# 5#
6 6
7.include "../../graphics/Mesa/Makefile.common" 7.include "../../graphics/Mesa/Makefile.common"
8 8
9DISTFILES+= MesaLib-${MESA_VERSION}${EXTRACT_SUFX} 9DISTFILES+= MesaLib-${MESA_VERSION}${EXTRACT_SUFX}
10DISTFILES+= MesaGLUT-${MESA_VERSION}${EXTRACT_SUFX} 10DISTFILES+= MesaGLUT-${MESA_VERSION}${EXTRACT_SUFX}
11DISTFILES+= MesaDemos-${MESA_VERSION}${EXTRACT_SUFX} 11DISTFILES+= MesaDemos-${MESA_VERSION}${EXTRACT_SUFX}
12 12
13PKG_INSTALLATION_TYPES= overwrite pkgviews 13PKG_INSTALLATION_TYPES= overwrite pkgviews
14 14
@@ -41,37 +41,27 @@ MAKE_ENV+= USE_XCB=no @@ -41,37 +41,27 @@ MAKE_ENV+= USE_XCB=no
41MESA_HZ?= 100 41MESA_HZ?= 100
42MAKE_ENV+= MESA_HZ=${MESA_HZ:Q} 42MAKE_ENV+= MESA_HZ=${MESA_HZ:Q}
43.if ${OPSYS} == "NetBSD" && exists(/sbin/sysctl) 43.if ${OPSYS} == "NetBSD" && exists(/sbin/sysctl)
44tmphz=\ 44tmphz=\
45 ${/sbin/sysctl kern.clockrate || ${TRUE}\ 45 ${/sbin/sysctl kern.clockrate || ${TRUE}\
46 :L:sh:ts,:S/,//gW:C/([^[0-9]]*)(=|[^ hz])*([^[0-9])//g:M[0-9]*} 46 :L:sh:ts,:S/,//gW:C/([^[0-9]]*)(=|[^ hz])*([^[0-9])//g:M[0-9]*}
47. if !empty(tmphz) && (${tmphz} > 50) && (${tmphz} < 2001) 47. if !empty(tmphz) && (${tmphz} > 50) && (${tmphz} < 2001)
48MESA_HZ= ${tmphz} 48MESA_HZ= ${tmphz}
49. endif 49. endif
50.endif 50.endif
51### 51###
52### XXX do we still want this? 52### XXX do we still want this?
53### 53###
54.if ${OPSYS} == "SunOS" 54.if ${OPSYS} == "Interix"
55. if ${MACHINE_ARCH} == "sparc" 
56. if !empty(PKGSRC_COMPILER:Msunpro) 
57BUILD_TARGET= sunos5 
58. else 
59BUILD_TARGET= sunos5-gcc 
60. endif 
61. else 
62BUILD_TARGET?= pkgsrc 
63. endif 
64.elif ${OPSYS} == "Interix" 
65BUILD_TARGET= interix3 55BUILD_TARGET= interix3
66.else 56.else
67BUILD_TARGET?= pkgsrc 57BUILD_TARGET?= pkgsrc
68.endif 58.endif
69 59
70RM_PATCH_BACKUP_DIRS= docs src/mesa src/glut/glx \ 60RM_PATCH_BACKUP_DIRS= docs src/mesa src/glut/glx \
71 progs/demos progs/xdemos progs/glsl 61 progs/demos progs/xdemos progs/glsl
72pre-patch: 62pre-patch:
73 @ for fn in ${RM_PATCH_BACKUP_DIRS}; do \ 63 @ for fn in ${RM_PATCH_BACKUP_DIRS}; do \
74 ${RM} -f ${WRKSRC}/$${fn}/*.orig; \ 64 ${RM} -f ${WRKSRC}/$${fn}/*.orig; \
75 done 65 done
76 66
77post-patch: 67post-patch:
cvs diff -r1.2 -r1.3 pkgsrc/graphics/MesaLib/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/options.mk 2008/04/25 20:33:08 1.2
+++ pkgsrc/graphics/MesaLib/options.mk 2008/04/27 09:43:12 1.3
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1# $NetBSD: options.mk,v 1.2 2008/04/25 20:33:08 bjs Exp $ 1# $NetBSD: options.mk,v 1.3 2008/04/27 09:43:12 tnn Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib 3PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib
4PKG_SUPPORTED_OPTIONS= mesa-execmem-mmap 4PKG_SUPPORTED_OPTIONS= mesa-execmem-mmap
5 5
6# Assembler code build configurations 6# Assembler code build configurations
7.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 7.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \
 8 ${OPSYS} != "SunOS"
8PKG_SUPPORTED_OPTIONS+= ${MACHINE_ARCH} 9PKG_SUPPORTED_OPTIONS+= ${MACHINE_ARCH}
9PKG_SUGGESTED_OPTIONS+= ${MACHINE_ARCH} 10PKG_SUGGESTED_OPTIONS+= ${MACHINE_ARCH}
10.endif 11.endif
11### 12###
12### XXX Prior to this patch, Mesa only allocated executable memory 13### XXX Prior to this patch, Mesa only allocated executable memory
13### with mmap(2) and PROT_EXEC on linux. On e.g. OpenBSD and NetBSD, 14### with mmap(2) and PROT_EXEC on linux. On e.g. OpenBSD and NetBSD,
14### pages which absolutely required PROT_EXEC were allocated using 15### pages which absolutely required PROT_EXEC were allocated using
15### malloc(3). You may wonder why it only worked on Linux. Answer: 16### malloc(3). You may wonder why it only worked on Linux. Answer:
16### the code was excluded with '#ifdef __linux__'! "Porting" this 17### the code was excluded with '#ifdef __linux__'! "Porting" this
17### [to BSD platforms] involved adding three lines of [preprocessor] 18### [to BSD platforms] involved adding three lines of [preprocessor]
18### code (see patch-ap if you're curious). 19### code (see patch-ap if you're curious).
19### 20###
20### Please do note hack (NetBSD-only for now) I added to wire down 21### Please do note hack (NetBSD-only for now) I added to wire down
@@ -53,27 +54,28 @@ PKG_SUPPORTED_OPTIONS+= dri @@ -53,27 +54,28 @@ PKG_SUPPORTED_OPTIONS+= dri
53### I think this is a good way to see which bugs surface before the 54### I think this is a good way to see which bugs surface before the
54### next release branch. Upgrading the X server to the 1.4 branch 55### next release branch. Upgrading the X server to the 1.4 branch
55### is advised given that it's glx/glcore modules are built from 56### is advised given that it's glx/glcore modules are built from
56### Mesa 6.5.3 (a development release).  57### Mesa 6.5.3 (a development release).
57### 58###
58.if !empty(MACHINE_PLATFORM:MNetBSD-[4-9]*-[ix]86*) 59.if !empty(MACHINE_PLATFORM:MNetBSD-[4-9]*-[ix]86*)
59PKG_SUGGESTED_OPTIONS+= dri 60PKG_SUGGESTED_OPTIONS+= dri
60.endif 61.endif
61 62
62.include "../../mk/bsd.options.mk" 63.include "../../mk/bsd.options.mk"
63### 64###
64### XXX Yes, this is a bit overly verbose; with Mesa, that can't hurt much. 65### XXX Yes, this is a bit overly verbose; with Mesa, that can't hurt much.
65### 66###
66.if !empty(PKG_OPTIONS:Mi386) || !empty(PKG_OPTIONS:Mx86_64) 67.if (!empty(PKG_OPTIONS:Mi386) || !empty(PKG_OPTIONS:Mx86_64)) && \
 68 ${OPSYS} != "SunOS"
67BUILD_TARGET_SUFFIX= -${MACHINE_ARCH} 69BUILD_TARGET_SUFFIX= -${MACHINE_ARCH}
68.else 70.else
69BUILD_TARGET_SUFFIX= # empty 71BUILD_TARGET_SUFFIX= # empty
70.endif 72.endif
71 73
72.if !empty(PKG_OPTIONS:Mdri) 74.if !empty(PKG_OPTIONS:Mdri)
73BUILD_TARGET= pkgsrc-dri${BUILD_TARGET_SUFFIX} 75BUILD_TARGET= pkgsrc-dri${BUILD_TARGET_SUFFIX}
74PLIST.dri= # empty 76PLIST.dri= # empty
75. include "../../graphics/MesaLib/dri.mk" 77. include "../../graphics/MesaLib/dri.mk"
76.else 78.else
77BUILD_TARGET= pkgsrc${BUILD_TARGET_SUFFIX} 79BUILD_TARGET= pkgsrc${BUILD_TARGET_SUFFIX}
78PLIST.nodri= # empty 80PLIST.nodri= # empty
79.endif 81.endif