kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix the build of xorg-server on NetBSD/amd64. Bump revision of

Browse source 
xorg-imake, since the installed files changed.
This commit is contained in:
joerg 2006-02-27 22:58:57 +00:00
parent c790805864
commit c9f4cbd071
3 changed files with 42 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
x11/xorg-imake/Makefile
View file

@ -1,7 +1,8 @@
# $NetBSD: Makefile,v 1.25 2006/02/12 15:29:19 xtraeme Exp $
# $NetBSD: Makefile,v 1.26 2006/02/27 22:58:57 joerg Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-imake-${XORG_VER}
PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG}
DISTFILES= X11R${XORG_VER}-src1.tar.gz X11R${XORG_VER}-src3.tar.gz

4
x11/xorg-libs/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.35 2006/02/27 18:59:05 joerg Exp $
$NetBSD: distinfo,v 1.36 2006/02/27 22:58:57 joerg Exp $
SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef
RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8
@ -11,7 +11,7 @@ RMD160 (X11R6.9.0-src3.tar.gz) = 1a2d1855f7b204012627a6c6bf0eaf5245fff414
Size (X11R6.9.0-src3.tar.gz) = 10872474 bytes
SHA1 (patch-aa) = 009b7a2679ae98ebd7071e4fa6169c3401273ca1
SHA1 (patch-ab) = 45f06a7d1ac2316621c5707bb202b7f6042699be
SHA1 (patch-ac) = 682191f790eddb94917c486ec63818756fee8e8e
SHA1 (patch-ac) = 3fee8b29343e40f81abfc3df7d4ff417efbcaacc
SHA1 (patch-ad) = f6bff42193905fd3158b3de52bf925b5fb5f002a
SHA1 (patch-ae) = 4d4e00a8f9e226323975596070a8fb3f59c34b4d
SHA1 (patch-af) = 62127e39c829cba6b01bd9f3aaaea682eec52c9e

45
x11/xorg-libs/patches/patch-ac
View file

@ -1,8 +1,8 @@
$NetBSD: patch-ac,v 1.7 2006/01/18 23:53:06 xtraeme Exp $
$NetBSD: patch-ac,v 1.8 2006/02/27 22:58:57 joerg Exp $
--- config/cf/NetBSD.cf.in.orig 2005-12-06 10:56:30.000000000 +0100
+++ config/cf/NetBSD.cf.in 2005-12-06 11:01:02.000000000 +0100
@@ -126,7 +126,7 @@
@@ -126,7 +126,7 @@ XCOMM operating system: OSName (OSMajor
# if ((OSMajorVersion == 2 && OSMinorVersion == 99 && OSTeenyVersion < 11) || \
(OSMajorVersion == 2 && OSMinorVersion < 99) || \
(OSMajorVersion < 2))
@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.7 2006/01/18 23:53:06 xtraeme Exp $
# endif
# define SystemMTDefines -D_REENTRANT
# define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
@@ -150,7 +150,7 @@
@@ -150,7 +150,7 @@ XCOMM operating system: OSName (OSMajor
#define MkdirHierCmd mkdir -p
#undef CcCmd
@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.7 2006/01/18 23:53:06 xtraeme Exp $
#ifndef DefaultCCOptions
#if defined(UseInstalled)
#define DefaultCCOptions /**/
@@ -166,7 +166,7 @@
@@ -166,7 +166,7 @@ XCOMM operating system: OSName (OSMajor
#endif
#endif
@ -29,7 +29,7 @@ $NetBSD: patch-ac,v 1.7 2006/01/18 23:53:06 xtraeme Exp $
#define StandardCppOptions -traditional
#define StandardCppDefines /**/
#define PreProcessCmd CcCmd -E
@@ -195,7 +195,7 @@
@@ -195,7 +195,7 @@ XCOMM operating system: OSName (OSMajor
* Disabled for NetBSD/vax until I figure out the scheme. --CS
*/
#if ((OSMajorVersion > 0) && defined(i386Architecture)) || \
@ -38,7 +38,29 @@ $NetBSD: patch-ac,v 1.7 2006/01/18 23:53:06 xtraeme Exp $
# ifndef DoLoadableServer
# define DoLoadableServer YES
# endif
@@ -404,6 +404,10 @@
@@ -240,16 +240,19 @@ XCOMM operating system: OSName (OSMajor
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
# elif defined(PpcArchitecture)
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DDDXOSINIT
+# elif defined(AMD64Architecture)
+# define ServerOSDefines XFree86ServerOSDefines
+# define ServerExtraSysLibs -lx86_64
# else
# define ServerOSDefines /**/
# endif
# if defined(AlphaArchitecture)
# define ServerExtraSysLibs -lalpha
-# else
+# elif !defined(ServerExtraSysLibs)
# define ServerExtraSysLibs /**/
# endif
#endif
-#ifdef i386Architecture
+#if defined(i386Architecture) || defined(AMD64Architecture)
# define ServerExtraDefines GccGasOption XFree86ServerDefines
# ifndef XFree86ConsoleDefines
# if (OSMajorVersion == 1 && ((OSMinorVersion == 3 && OSTeenyVersion >= 6) \
@@ -404,6 +407,10 @@ XCOMM operating system: OSName (OSMajor
# endif /* MTRRBuiltin */
#endif /* i386Architecture */
@ -49,7 +71,16 @@ $NetBSD: patch-ac,v 1.7 2006/01/18 23:53:06 xtraeme Exp $
/*
* agpgart support (NetBSD 1.5Y and up)
*/
@@ -590,7 +594,7 @@
@@ -420,7 +427,7 @@ XCOMM operating system: OSName (OSMajor
* MMX, SSE and 3DNow will be autodetected. NetBSD 1.6 and up have the
* necessary kernel and toolchain support.
*/
-#if defined(i386Architecture) && \
+#if (defined(i386Architecture) || defined(AMD64Architecture)) && \
((OSMajorVersion > 1) || (OSMajorVersion == 1 && OSMinorVersion > 5))
# define HasX86Support YES
# define HasMMXSupport YES
@@ -590,7 +597,7 @@ InstallManPageAliasesBase(file,destdir,a
# define BuildXInputLib YES
#endif