head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.24 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.22 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.20 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.18 pkgsrc-2011Q2-base:1.4 pkgsrc-2009Q4:1.4.0.16 pkgsrc-2009Q4-base:1.4 pkgsrc-2008Q4:1.4.0.14 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.12 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.10 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.8 pkgsrc-2008Q2-base:1.4 pkgsrc-2008Q1:1.4.0.6 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.4 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.2 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.3.0.6 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.4 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.2 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.2.0.6 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.4 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.2 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.1.0.6 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.4 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.2 pkgsrc-2005Q2-base:1.1; locks; strict; comment @# @; 1.4 date 2007.08.17.20.25.17; author joerg; state dead; branches; next 1.3; 1.3 date 2006.10.30.10.14.17; author dsainty; state Exp; branches; next 1.2; 1.2 date 2006.01.18.23.53.06; author xtraeme; state dead; branches; next 1.1; 1.1 date 2005.05.23.19.14.14; author xtraeme; state Exp; branches; next ; desc @@ 1.4 log @To quote Johnny Lam: "In modular-xorg we trust" Remove xorg 6.9 packages from pkgsrc. @ text @$NetBSD: patch-al,v 1.3 2006/10/30 10:14:17 dsainty Exp $ Run-time path fix for Solaris for the X client libraries. Without this patch, libraries such as libXext.so will not contain a run-time link path to /usr/pkg/xorg/lib, causing run time link failures or possibly linking with other (non-Pkgsrc) X libraries on the system! --- config/cf/sun.cf.orig 2005-12-04 06:20:48.000000000 +1300 +++ config/cf/sun.cf 2006-10-26 13:11:56.535497000 +1300 @@@@ -688,10 +688,10 @@@@ /* This is to work around what appears to be a PIC bug in some gcc/egcs versions that shows up with the Solaris 7/x86 . */ # define SharedLibraryLdCmd $(LD) -# define SharedLibraryLoadFlags -G -z textwarn +# define SharedLibraryLoadFlags -G -z textwarn LibraryRpathLoadFlags # else # define SharedLibraryLdCmd $(CC) -# define SharedLibraryLoadFlags -shared -z text +# define SharedLibraryLoadFlags -shared -z text LibraryRpathLoadFlags # endif # endif # else @ 1.3 log @Run-time path fix for Solaris for the X client libraries. Without this patch, libraries such as libXext.so will not contain a run-time link path to /usr/pkg/xorg/lib, causing run time link failures or possibly linking with other (non-Pkgsrc) X libraries on the system! Note: This is the same as x11/xorg-libs/patches/patch-cu Discussed with joerg@@ @ text @d1 1 a1 1 $NetBSD: patch-cu,v 1.1 2006/10/30 09:33:32 dsainty Exp $ @ 1.2 log @Update meta-pkgs/xorg to 6.9.0. The full list of changes: http://ftp.x.org/pub/X11R7.0/doc/html/RELNOTES2.html Thanks to joerg@@ and reed@@ for testing on DragonFlyBSD. Tested on NetBSD/i386 3.0/-current and DragonFlyBSD-1.4/i386. @ text @d1 1 a1 1 $NetBSD: patch-al,v 1.1 2005/05/23 19:14:14 xtraeme Exp $ d3 20 a22 57 --- config/imake/imakemdep.h.orig 2004-08-09 09:54:09.000000000 +0000 +++ config/imake/imakemdep.h 2004-08-09 09:55:07.000000000 +0000 @@@@ -285,7 +285,7 @@@@ #if defined(__386BSD__) #define DEFAULT_CPP "/usr/libexec/cpp" #endif -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) #define USE_CC_E #endif #if defined(__sgi) && defined(__ANSI_CPP__) @@@@ -348,7 +348,7 @@@@ #endif #endif #if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \ - defined(__FreeBSD__) || defined(MACH) || defined(linux) || \ + defined(__FreeBSD__) || defined(__DragonFly__) || defined(MACH) || defined(linux) || \ defined(__GNU__) || defined(__bsdi__) || defined(__GNUC__) # ifdef __i386__ "-D__i386__", @@@@ -807,14 +807,14 @@@@ # define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]" # define DEFAULT_OS_TEENY_REV "v %[0-9]" /* # define DEFAULT_OS_NAME "srm %[^\n]" */ /* Not useful on ISC */ -# elif defined(__FreeBSD__) || defined(__OpenBSD__) +# elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) /* BSD/OS too? */ /* uname -r returns "x.y[.z]-mumble", e.g. "2.1.5-RELEASE" or "2.2-0801SNAP" */ # define DEFAULT_OS_MAJOR_REV "r %[0-9]" # define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]" # define DEFAULT_OS_TEENY_REV "r %*d.%*d.%[0-9]" # define DEFAULT_OS_NAME "srm %[^\n]" -# if defined(__FreeBSD__) +# if defined(__FreeBSD__) || defined(__DragonFly__) /* Use an alternate way to find the teeny version for -STABLE, -SNAP versions */ # ifndef CROSSCOMPILE_CPP # define DEFAULT_OS_TEENY_REV_FROB(buf, size) \ @@@@ -1228,7 +1228,9 @@@@ #ifdef _MIPS_SZPTR {"_MIPS_SZPTR", DEF_STRINGIFY(_MIPS_SZPTR)}, #endif -#ifdef __FreeBSD__ +#ifdef __DragonFly__ + {"__DragonFly__", "1"}, +#elif defined(__FreeBSD__) {"__FreeBSD__", "1"}, #endif #ifdef __OpenBSD__ @@@@ -1395,7 +1397,7 @@@@ # ifdef linux System sys = LinuX; -# elif defined __FreeBSD__ +# elif defined __FreeBSD__ || defined(__DragonFly__) System sys = freebsd; # elif defined __NetBSD__ System sys = netBSD; @ 1.1 log @Apply patches from Joerg Sonnenberger for DragonFlyBSD and GCC 3.x.x, while I'm here remove redundant DragonFly.cf from xorg-imake/files, we'll use the same file from xorg-libs. @ text @d1 1 a1 1 $NetBSD$ @