head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.24 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.22 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.20 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.18 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.5.0.16 pkgsrc-2009Q4-base:1.5 pkgsrc-2008Q4:1.5.0.14 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.12 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.10 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.8 pkgsrc-2008Q2-base:1.5 pkgsrc-2008Q1:1.5.0.6 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.4 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.2 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.4.0.10 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.8 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.6 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.4 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.2 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.3.0.2 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.2.0.2 pkgsrc-2005Q4-base:1.2; locks; strict; comment @# @; 1.5 date 2007.08.17.20.25.34; author joerg; state dead; branches; next 1.4; 1.4 date 2006.04.12.21.53.58; author joerg; state Exp; branches; next 1.3; 1.3 date 2006.01.18.23.53.06; author xtraeme; state dead; branches 1.3.2.1; next 1.2; 1.2 date 2005.10.23.20.00.06; author rillig; state Exp; branches; next 1.1; 1.1 date 2005.10.16.18.14.31; author augustss; state Exp; branches; next ; 1.3.2.1 date 2006.05.09.15.09.25; author salo; state Exp; branches; next ; desc @@ 1.5 log @To quote Johnny Lam: "In modular-xorg we trust" Remove xorg 6.9 packages from pkgsrc. @ text @$NetBSD: patch-bn,v 1.4 2006/04/12 21:53:58 joerg Exp $ --- programs/xfs/Imakefile.orig 2006-04-12 21:45:29.000000000 +0000 +++ programs/xfs/Imakefile @@@@ -51,8 +51,6 @@@@ ServerTarget(xfs,$(FSDIRS),NullParameter ServerTarget(xfs,$(FSDIRS),difs/main.o,$(FSLIBS),$(FSSYSLIBS) $(EXTRA_LIBRARIES)) #endif -LinkConfDirectory(fs,.,fs,.) - CppFileTarget(config,config.cpp,$(SITE_CONFIG),$(ICONFIGFILES)) InstallManPage(xfs,$(MANDIR)) @ 1.4 log @Don't create xorg/lib/X11/fs as symlink to the config directory, it prevents the default config from being included correctly in the package. Add a random imake dependency to xorg-fontserver while here and bump the revision. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 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-bn,v 1.2 2005/10/23 20:00:06 rillig Exp $ d3 11 a13 51 diff -c -r work.x86_64/xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h work.x86_64.la/xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h *** old/programs/Xserver/hw/xfree86/common/xf86PciInfo.h Sat Jul 31 00:20:21 2004 --- programs/Xserver/hw/xfree86/common/xf86PciInfo.h Fri Jul 1 16:01:28 2005 *************** *** 313,318 **** --- 313,319 ---- #define PCI_CHIP_RV280_5964 0x5964 #define PCI_CHIP_RV280_5C61 0x5C61 #define PCI_CHIP_RV280_5C63 0x5C63 + #define PCI_CHIP_R480_5D52 0x5D52 #define PCI_CHIP_R423_5D57 0x5D57 #define PCI_CHIP_RS350_7834 0x7834 #define PCI_CHIP_RS350_7835 0x7835 diff -c -r work.x86_64/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_chipset.h work.x86_64.la/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_chipset.h *** old/programs/Xserver/hw/xfree86/drivers/ati/radeon_chipset.h Thu Aug 12 04:23:46 2004 --- programs/Xserver/hw/xfree86/drivers/ati/radeon_chipset.h Fri Jul 1 15:58:35 2005 *************** *** 91,96 **** --- 91,97 ---- { PCI_CHIP_R423_UR, "ATI FireGL V5100 (R423) UR (PCIE)" }, { PCI_CHIP_R423_UT, "ATI FireGL V7100 (R423) UT (PCIE)" }, { PCI_CHIP_R423_5D57, "ATI Radeon X800XT (R423) 5D57 (PCIE)" }, + { PCI_CHIP_R480_5D52, "ATI Radeon X850XT (R480) 5D52 (PCIE)" }, { -1, NULL } }; diff -c -r work.x86_64/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c work.x86_64.la/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c *** old/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c Fri Dec 17 01:13:18 2004 --- programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c Fri Jul 1 15:59:59 2005 *************** *** 2309,2314 **** --- 2309,2315 ---- case PCI_CHIP_R423_UR: case PCI_CHIP_R423_UT: case PCI_CHIP_R423_5D57: + case PCI_CHIP_R480_5D52: info->ChipFamily = CHIP_FAMILY_R420; break; *** old/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.c Thu Aug 12 03:03:06 2004 --- programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.c Fri Jul 1 16:00:32 2005 *************** *** 144,149 **** --- 144,150 ---- { PCI_CHIP_R423_UR, PCI_CHIP_R423_UR, RES_SHARED_VGA }, { PCI_CHIP_R423_UT, PCI_CHIP_R423_UT, RES_SHARED_VGA }, { PCI_CHIP_R423_5D57, PCI_CHIP_R423_5D57, RES_SHARED_VGA }, + { PCI_CHIP_R480_5D52, PCI_CHIP_R480_5D52, RES_SHARED_VGA }, { -1, -1, RES_UNDEFINED } }; @ 1.3.2.1 log @Pullup ticket 1538 - requested by tron security fix for xorg Patch provided by the submitter. Module Name: pkgsrc Committed By: tron Date: Wed May 3 12:23:48 UTC 2006 Modified Files: pkgsrc/x11/xorg-libs: distinfo pkgsrc/x11/xorg-server: Makefile Added Files: pkgsrc/x11/xorg-libs/patches: patch-bh Log Message: Apply patch to fix vulnerability reported in CVE-2006-1526. Bump package revision because of this fix. @ text @d1 1 a1 1 $NetBSD: patch-bn,v 1.4 2006/04/12 21:53:58 joerg Exp $ d3 51 a53 11 --- programs/xfs/Imakefile.orig 2006-04-12 21:45:29.000000000 +0000 +++ programs/xfs/Imakefile @@@@ -51,8 +51,6 @@@@ ServerTarget(xfs,$(FSDIRS),NullParameter ServerTarget(xfs,$(FSDIRS),difs/main.o,$(FSLIBS),$(FSSYSLIBS) $(EXTRA_LIBRARIES)) #endif -LinkConfDirectory(fs,.,fs,.) - CppFileTarget(config,config.cpp,$(SITE_CONFIG),$(ICONFIGFILES)) InstallManPage(xfs,$(MANDIR)) @ 1.2 log @Removed trailing empty lines from patch-bl and patch-bn. Added RCS Id to patch-bn. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Recognize ATI Radeon X850XT. @ text @d1 2 a53 1 @