Fri Apr 9 09:06:52 2010 UTC ()
Guard against multiple inclusion. Bump rev.


(tnn)
diff -r1.8 -r1.9 pkgsrc/x11/xextproto/Makefile
diff -r1.1 -r1.2 pkgsrc/x11/xextproto/files/shmstr.h
cvs diff -r1.8 -r1.9 pkgsrc/x11/xextproto/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xextproto/Attic/Makefile 2010/04/09 08:33:38 1.8
+++ pkgsrc/x11/xextproto/Attic/Makefile 2010/04/09 09:06:52 1.9
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.8 2010/04/09 08:33:38 tnn Exp $ 1# $NetBSD: Makefile,v 1.9 2010/04/09 09:06:52 tnn Exp $
2# 2#
3 3
4DISTNAME= xextproto-7.1.1 4DISTNAME= xextproto-7.1.1
 5PKGREVISION= 1
5CATEGORIES= x11 6CATEGORIES= x11
6MASTER_SITES= ${MASTER_SITE_XORG:=proto/} 7MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
7EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
8 9
9MAINTAINER= joerg@NetBSD.org 10MAINTAINER= joerg@NetBSD.org
10HOMEPAGE= http://xorg.freedesktop.org/ 11HOMEPAGE= http://xorg.freedesktop.org/
11COMMENT= XExt extension headers from X.org 12COMMENT= XExt extension headers from X.org
12 13
13PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
15CONFLICTS+= xextensions-[0-9]* 16CONFLICTS+= xextensions-[0-9]*
16 17
17GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
cvs diff -r1.1 -r1.2 pkgsrc/x11/xextproto/files/Attic/shmstr.h (expand / switch to unified diff)

--- pkgsrc/x11/xextproto/files/Attic/shmstr.h 2010/04/09 08:33:38 1.1
+++ pkgsrc/x11/xextproto/files/Attic/shmstr.h 2010/04/09 09:06:52 1.2
@@ -1,14 +1,17 @@ @@ -1,14 +1,17 @@
1/* $NetBSD: shmstr.h,v 1.1 2010/04/09 08:33:38 tnn Exp $ */ 1/* $NetBSD: shmstr.h,v 1.2 2010/04/09 09:06:52 tnn Exp $ */
 2
 3#ifndef _SHMSTR_H_
 4#define _SHMSTR_H_
2 5
3#warning this file is deprecated and provided only for source compatibility 6#warning this file is deprecated and provided only for source compatibility
4 7
5#include "shmproto.h" 8#include "shmproto.h"
6  9
7#define XSHM_PUT_IMAGE_ARGS \ 10#define XSHM_PUT_IMAGE_ARGS \
8 DrawablePtr /* dst */, \ 11 DrawablePtr /* dst */, \
9 GCPtr /* pGC */, \ 12 GCPtr /* pGC */, \
10 int /* depth */, \ 13 int /* depth */, \
11 unsigned int /* format */, \ 14 unsigned int /* format */, \
12 int /* w */, \ 15 int /* w */, \
13 int /* h */, \ 16 int /* h */, \
14 int /* sx */, \ 17 int /* sx */, \
@@ -20,13 +23,15 @@ @@ -20,13 +23,15 @@
20 char * /* data */ 23 char * /* data */
21 24
22#define XSHM_CREATE_PIXMAP_ARGS \ 25#define XSHM_CREATE_PIXMAP_ARGS \
23 ScreenPtr /* pScreen */, \ 26 ScreenPtr /* pScreen */, \
24 int /* width */, \ 27 int /* width */, \
25 int /* height */, \ 28 int /* height */, \
26 int /* depth */, \ 29 int /* depth */, \
27 char * /* addr */ 30 char * /* addr */
28 31
29typedef struct _ShmFuncs { 32typedef struct _ShmFuncs {
30 PixmapPtr (* CreatePixmap)(XSHM_CREATE_PIXMAP_ARGS); 33 PixmapPtr (* CreatePixmap)(XSHM_CREATE_PIXMAP_ARGS);
31 void (* PutImage)(XSHM_PUT_IMAGE_ARGS); 34 void (* PutImage)(XSHM_PUT_IMAGE_ARGS);
32} ShmFuncs, *ShmFuncsPtr; 35} ShmFuncs, *ShmFuncsPtr;
 36
 37#endif