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.12
	pkgsrc-2007Q2-base:1.4
	pkgsrc-2007Q1:1.4.0.10
	pkgsrc-2007Q1-base:1.4
	pkgsrc-2006Q4:1.4.0.8
	pkgsrc-2006Q4-base:1.4
	pkgsrc-2006Q3:1.4.0.6
	pkgsrc-2006Q3-base:1.4
	pkgsrc-2006Q2:1.4.0.4
	pkgsrc-2006Q2-base:1.4
	pkgsrc-2006Q1:1.4.0.2
	pkgsrc-2006Q1-base:1.4
	pkgsrc-2005Q4:1.2.0.6
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.2.0.4
	pkgsrc-2005Q3-base:1.2
	pkgsrc-2005Q2:1.2.0.2
	pkgsrc-2005Q2-base:1.2;
locks; strict;
comment	@# @;


1.5
date	2007.08.17.20.25.30;	author joerg;	state dead;
branches;
next	1.4;

1.4
date	2006.01.23.21.13.16;	author joerg;	state Exp;
branches;
next	1.3;

1.3
date	2006.01.18.23.53.06;	author xtraeme;	state dead;
branches;
next	1.2;

1.2
date	2005.04.16.03.48.47;	author reed;	state Exp;
branches;
next	1.1;

1.1
date	2005.04.14.21.35.51;	author xtraeme;	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-ba,v 1.4 2006/01/23 21:13:16 joerg Exp $

--- programs/Xserver/hw/dmx/Imakefile.orig	2006-01-23 20:51:46.000000000 +0000
+++ programs/Xserver/hw/dmx/Imakefile
@@@@ -82,7 +82,7 @@@@ OBJS =	dmxinit.o \
 
 #ifdef XVendorRelease
     VENDORRELEASE = XVendorRelease
-   VENDOR_RELEASE = -DVENDOR_RELEASE="$(VENDORRELEASE)"
+   VENDOR_RELEASE = -DVENDOR_RELEASE=102040630
 #endif
 
 VENDOR_DEFINES = $(VENDOR_STRING) $(VENDOR_RELEASE)
@


1.4
log
@From the "Did-anyone-ever-try-this-at-all" department:
Give up with trying to find ingenious ways to ensure that the
version expression gets correctly quoted to cc, it somehow differes
between direct invocations and runs from pkgsrc. Just hard-code the value
for now.
@
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-ba,v 1.2 2005/04/16 03:48:47 reed Exp $
d3 3
a5 17
Index: extras/Xpm/lib/scan.c
===================================================================
RCS file: /cvs/OpenBSD/XF4/xc/extras/Xpm/lib/scan.c,v
retrieving revision 1.4
diff -u -r1.4 scan.c
--- scan.c	17 Nov 2004 20:22:05 -0000	1.4
+++ extras/Xpm/lib/scan.c	15 Feb 2005 21:34:05 -0000
@@@@ -621,8 +621,8 @@@@
     char *dst;
     unsigned int *iptr;
     char *data;
-    unsigned int x, y, i;
-    int bits, depth, ibu, ibpp, offset;
+    unsigned int x, y;
+    int bits, depth, ibu, ibpp, offset, i;
     unsigned long lbt;
     Pixel pixel, px;
d7 5
a11 7
@@@@ -632,6 +632,9 @@@@
     lbt = low_bits_table[depth];
     ibpp = image->bits_per_pixel;
     offset = image->xoffset;
+
+    if (image->bitmap_unit < 0)
+	    return (XpmNoMemory);
d13 1
a13 22
     if ((image->bits_per_pixel | image->depth) == 1) {
 	ibu = image->bitmap_unit;
Index: extras/Xpm/lib/create.c
===================================================================
RCS file: /cvs/OpenBSD/XF4/xc/extras/Xpm/lib/create.c,v
retrieving revision 1.7
diff -u -r1.7 create.c
--- create.c	19 Dec 2004 17:45:01 -0000	1.7
+++ extras/Xpm/lib/create.c	15 Feb 2005 21:39:53 -0000
@@@@ -1215,10 +1215,10 @@@@
     register char *src;
     register char *dst;
     register unsigned int *iptr;
-    register unsigned int x, y, i;
+    register unsigned int x, y;
     register char *data;
     Pixel pixel, px;
-    int nbytes, depth, ibu, ibpp;
+    int nbytes, depth, ibu, ibpp, i;
 
     data = image->data;
     iptr = pixelindex;
@


1.2
log
@Patch was missing path (extras/Xpm/lib) to the files to patch.

Problem noticed by Reid Thompson under DragonFly and reported
to tech-pkg list. I verified also under Linux.
@
text
@d1 1
a1 1
$NetBSD: patch-ba,v 1.1 2005/04/14 21:35:51 xtraeme Exp $
@


1.1
log
@* Apply patch from OpenBSD CVS to fix libXpm vulnerability:
	http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2005-0605
* Apply patch from FreeBSD/ports to fix the problem with the radeon
  driver switching from graphics to text mode.

Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD$
d9 1
a9 1
+++ scan.c	15 Feb 2005 21:34:05 -0000
d37 1
a37 1
+++ create.c	15 Feb 2005 21:39:53 -0000
@