Fri Mar 7 15:27:32 2014 UTC ()
x11-links-0.84: Add support for newer Red Hat Linux.

Newer RHEL distributions have pkgconfig files split across three locations,
so add support for both share/pkgconfig and lib${LIBABISUFFIX}/pkgconfig if
LIBABISUFFIX is defined.


(jperkin)
diff -r1.151 -r1.152 pkgsrc/pkgtools/x11-links/Makefile
diff -r1.52 -r1.53 pkgsrc/pkgtools/x11-links/buildlink3.mk
diff -r1.3 -r1.4 pkgsrc/pkgtools/x11-links/files/xorg.bigreqsproto
diff -r1.3 -r1.4 pkgsrc/pkgtools/x11-links/files/xorg.evieext
diff -r1.3 -r1.4 pkgsrc/pkgtools/x11-links/files/xorg.recordproto
diff -r1.3 -r1.4 pkgsrc/pkgtools/x11-links/files/xorg.xcmiscproto
diff -r1.3 -r1.4 pkgsrc/pkgtools/x11-links/files/xorg.xf86bigfontproto
diff -r1.3 -r1.4 pkgsrc/pkgtools/x11-links/files/xorg.xf86driproto
diff -r1.3 -r1.4 pkgsrc/pkgtools/x11-links/files/xorg.xf86vidmodeproto
diff -r1.2 -r1.3 pkgsrc/pkgtools/x11-links/files/xorg.compositeproto
diff -r1.2 -r1.3 pkgsrc/pkgtools/x11-links/files/xorg.damageproto
diff -r1.2 -r1.3 pkgsrc/pkgtools/x11-links/files/xorg.fixesproto
diff -r1.2 -r1.3 pkgsrc/pkgtools/x11-links/files/xorg.fontsproto
diff -r1.2 -r1.3 pkgsrc/pkgtools/x11-links/files/xorg.glproto
diff -r1.2 -r1.3 pkgsrc/pkgtools/x11-links/files/xorg.inputproto
diff -r1.2 -r1.3 pkgsrc/pkgtools/x11-links/files/xorg.resourceproto
diff -r1.2 -r1.3 pkgsrc/pkgtools/x11-links/files/xorg.scrnsaverproto
diff -r1.2 -r1.3 pkgsrc/pkgtools/x11-links/files/xorg.videoproto
diff -r1.2 -r1.3 pkgsrc/pkgtools/x11-links/files/xorg.xf86miscproto
diff -r1.2 -r1.3 pkgsrc/pkgtools/x11-links/files/xorg.xproxymanagementprotocol
diff -r1.1 -r1.2 pkgsrc/pkgtools/x11-links/files/xorg.kbproto
diff -r1.1 -r1.2 pkgsrc/pkgtools/x11-links/files/xorg.randrproto
diff -r1.1 -r1.2 pkgsrc/pkgtools/x11-links/files/xorg.renderproto
diff -r1.1 -r1.2 pkgsrc/pkgtools/x11-links/files/xorg.xineramaproto
diff -r1.1 -r1.2 pkgsrc/pkgtools/x11-links/files/xorg.xproto
diff -r1.4 -r1.5 pkgsrc/pkgtools/x11-links/files/xorg.xextproto
diff -r1.4 -r1.5 pkgsrc/pkgtools/x11-links/files/xorg.xf86dgaproto
cvs diff -r1.151 -r1.152 pkgsrc/pkgtools/x11-links/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/Makefile 2014/03/03 02:18:41 1.151
+++ pkgsrc/pkgtools/x11-links/Makefile 2014/03/07 15:27:32 1.152
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.151 2014/03/03 02:18:41 obache Exp $ 1# $NetBSD: Makefile,v 1.152 2014/03/07 15:27:32 jperkin Exp $
2# 2#
3# NOTE: If you update this package, then you'll likely need to also update 3# NOTE: If you update this package, then you'll likely need to also update
4# the x11-links dependency in buildlink3.mk to the correct version, 4# the x11-links dependency in buildlink3.mk to the correct version,
5# usually the most recent. 5# usually the most recent.
6 6
7PKGNAME= x11-links-0.83 7PKGNAME= x11-links-0.84
8CATEGORIES= pkgtools x11 8CATEGORIES= pkgtools x11
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html 11HOMEPAGE= http://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
12COMMENT= Shadow tree of links to native X11 headers and libraries 12COMMENT= Shadow tree of links to native X11 headers and libraries
13LICENSE= original-bsd 13LICENSE= original-bsd
14 14
15.include "../../mk/bsd.prefs.mk" 15.include "../../mk/bsd.prefs.mk"
16.if ${OPSYS} == "OpenBSD" 16.if ${OPSYS} == "OpenBSD"
17CHECK_SHLIBS_SUPPORTED= no 17CHECK_SHLIBS_SUPPORTED= no
18.endif 18.endif
19 19
20PKG_INSTALLATION_TYPES= overwrite pkgviews 20PKG_INSTALLATION_TYPES= overwrite pkgviews
@@ -46,38 +46,44 @@ PKG_FAIL_REASON+= "pkgsrc installations  @@ -46,38 +46,44 @@ PKG_FAIL_REASON+= "pkgsrc installations
46.endif 46.endif
47 47
48.if ${OPSYS} == "IRIX" 48.if ${OPSYS} == "IRIX"
49. include "xsgi.mk" 49. include "xsgi.mk"
50.elif ${OPSYS} == "OSF1" 50.elif ${OPSYS} == "OSF1"
51. include "xdec.mk" 51. include "xdec.mk"
52.elif !empty(X11BASE:M*openwin) 52.elif !empty(X11BASE:M*openwin)
53. include "openwin.mk" 53. include "openwin.mk"
54.elif exists(${X11BASE}/lib/X11/config/xorgversion.def) || \ 54.elif exists(${X11BASE}/lib/X11/config/xorgversion.def) || \
55 (exists(${X11BASE}/lib/X11/config/xorg.cf) && \ 55 (exists(${X11BASE}/lib/X11/config/xorg.cf) && \
56 exists(${X11BASE}/lib/X11/config/version.def)) || \ 56 exists(${X11BASE}/lib/X11/config/version.def)) || \
57 exists(${X11BASE}/lib/pkgconfig/xorg-server.pc) || \ 57 exists(${X11BASE}/lib/pkgconfig/xorg-server.pc) || \
58 exists(${X11BASE}/lib/pkgconfig/x11.pc) || \ 58 exists(${X11BASE}/lib/pkgconfig/x11.pc) || \
 59 exists(${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xorg-server.pc) || \
 60 exists(${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/x11.pc) || \
59 exists(${X11BASE}/bin/Xquartz) 61 exists(${X11BASE}/bin/Xquartz)
60. include "xorg.mk" 62. include "xorg.mk"
61.else 63.else
62. include "xfree.mk" 64. include "xfree.mk"
63.endif 65.endif
64 66
65X11_LINKS_SUBDIR= share/x11-links 67X11_LINKS_SUBDIR= share/x11-links
66X11_LINKS_BUILD_DIR= ${WRKSRC}/${X11_LINKS_SUBDIR} 68X11_LINKS_BUILD_DIR= ${WRKSRC}/${X11_LINKS_SUBDIR}
67X11_LINKS_DIR= ${PREFIX}/${X11_LINKS_SUBDIR} 69X11_LINKS_DIR= ${PREFIX}/${X11_LINKS_SUBDIR}
68 70
69FILES_LIST_CMD= ${SED} -e "s/@ABI@/${ABI}/" ${FILES_LIST} | ${GREP} -v "^\#" 71FILES_LIST_CMD= ${SED} -e "s/@ABI@/${ABI}/" ${FILES_LIST} | ${GREP} -v "^\#"
70 72
 73.if ${OPSYS} == "Linux" && !empty(LIBABISUFFIX)
 74FILES_LIST_CMD+= | awk '{print;} /^lib\// { sub(/^lib\//, "lib${LIBABISUFFIX}/"); print; }'
 75.endif
 76
71CREATE_X11LINK?= ${LN} -fs $$src $$dest 77CREATE_X11LINK?= ${LN} -fs $$src $$dest
72 78
73.include "../../mk/x11.buildlink3.mk" 79.include "../../mk/x11.buildlink3.mk"
74 80
75do-build: 81do-build:
76 ${MKDIR} ${X11_LINKS_BUILD_DIR} 82 ${MKDIR} ${X11_LINKS_BUILD_DIR}
77 ${CHMOD} ${PKGDIRMODE} ${X11_LINKS_BUILD_DIR} 83 ${CHMOD} ${PKGDIRMODE} ${X11_LINKS_BUILD_DIR}
78 ${FILES_LIST_CMD} | ${SED} -e "s,/[^/]*$$,," | ${SORT} -u | \ 84 ${FILES_LIST_CMD} | ${SED} -e "s,/[^/]*$$,," | ${SORT} -u | \
79 while read dir; do \ 85 while read dir; do \
80 if [ -d ${X11BASE}/$$dir ]; then \ 86 if [ -d ${X11BASE}/$$dir ]; then \
81 ${MKDIR} ${X11_LINKS_BUILD_DIR}/$$dir; \ 87 ${MKDIR} ${X11_LINKS_BUILD_DIR}/$$dir; \
82 ${CHMOD} ${PKGDIRMODE} ${X11_LINKS_BUILD_DIR}/$$dir; \ 88 ${CHMOD} ${PKGDIRMODE} ${X11_LINKS_BUILD_DIR}/$$dir; \
83 elif [ -d /usr/$$dir ]; then \ 89 elif [ -d /usr/$$dir ]; then \
cvs diff -r1.52 -r1.53 pkgsrc/pkgtools/x11-links/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/buildlink3.mk 2014/02/21 17:45:08 1.52
+++ pkgsrc/pkgtools/x11-links/buildlink3.mk 2014/03/07 15:27:32 1.53
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1# $NetBSD: buildlink3.mk,v 1.52 2014/02/21 17:45:08 jperkin Exp $ 1# $NetBSD: buildlink3.mk,v 1.53 2014/03/07 15:27:32 jperkin Exp $
2# 2#
3# Don't include this file manually! It will be included as necessary 3# Don't include this file manually! It will be included as necessary
4# by bsd.buildlink3.mk. 4# by bsd.buildlink3.mk.
5 5
6# x11-links is sorted first in mk/buildlink3/bsd.buildlink3.mk, 6# x11-links is sorted first in mk/buildlink3/bsd.buildlink3.mk,
7# so that symlinks created from it can be overriden by other packages. 7# so that symlinks created from it can be overriden by other packages.
8# 8#
9 9
10BUILDLINK_TREE+= x11-links 10BUILDLINK_TREE+= x11-links
11 11
12.if !defined(X11_LINKS_BUILDLINK3_MK) 12.if !defined(X11_LINKS_BUILDLINK3_MK)
13X11_LINKS_BUILDLINK3_MK:= 13X11_LINKS_BUILDLINK3_MK:=
14 14
15BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.83 15BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.84
16BUILDLINK_PKGSRCDIR.x11-links?= ../../pkgtools/x11-links 16BUILDLINK_PKGSRCDIR.x11-links?= ../../pkgtools/x11-links
17BUILDLINK_DEPMETHOD.x11-links?= build 17BUILDLINK_DEPMETHOD.x11-links?= build
18 18
19# Force all of the helper programs, headers and libraries to be symlinked 19# Force all of the helper programs, headers and libraries to be symlinked
20# into ${BUILDLINK_X11_DIR}, even in the "pkgviews" case. 20# into ${BUILDLINK_X11_DIR}, even in the "pkgviews" case.
21# 21#
22BUILDLINK_CONTENTS_FILTER.x11-links= \ 22BUILDLINK_CONTENTS_FILTER.x11-links= \
23 ${EGREP} '(bin/.*|include.*/|\.h$$|\.pc$$|/lib[^/]*$$)' 23 ${EGREP} '(bin/.*|include.*/|\.h$$|\.pc$$|/lib[^/]*$$)'
24 24
25# Rename the symlinks so that they appear in ${BUILDLINK_X11_DIR}/include 25# Rename the symlinks so that they appear in ${BUILDLINK_X11_DIR}/include
26# and ${BUILDLINK_X11_DIR}/lib. 26# and ${BUILDLINK_X11_DIR}/lib.
27# 27#
28BUILDLINK_FNAME_TRANSFORM.x11-links+= -e "s|/share/x11-links/|/|" 28BUILDLINK_FNAME_TRANSFORM.x11-links+= -e "s|/share/x11-links/|/|"
cvs diff -r1.3 -r1.4 pkgsrc/pkgtools/x11-links/files/xorg.bigreqsproto (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg.bigreqsproto 2010/05/31 21:20:02 1.3
+++ pkgsrc/pkgtools/x11-links/files/xorg.bigreqsproto 2014/03/07 15:27:32 1.4
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1# $NetBSD: xorg.bigreqsproto,v 1.3 2010/05/31 21:20:02 wiz Exp $ 1# $NetBSD: xorg.bigreqsproto,v 1.4 2014/03/07 15:27:32 jperkin Exp $
2# 2#
3include/X11/extensions/bigreqsproto.h 3include/X11/extensions/bigreqsproto.h
4include/X11/extensions/bigreqstr.h 4include/X11/extensions/bigreqstr.h
5lib/pkgconfig/bigreqsproto.pc 5lib/pkgconfig/bigreqsproto.pc
 6share/pkgconfig/bigreqsproto.pc
cvs diff -r1.3 -r1.4 pkgsrc/pkgtools/x11-links/files/Attic/xorg.evieext (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/Attic/xorg.evieext 2010/05/31 21:20:02 1.3
+++ pkgsrc/pkgtools/x11-links/files/Attic/xorg.evieext 2014/03/07 15:27:32 1.4
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1# $NetBSD: xorg.evieext,v 1.3 2010/05/31 21:20:02 wiz Exp $ 1# $NetBSD: xorg.evieext,v 1.4 2014/03/07 15:27:32 jperkin Exp $
2# 2#
3include/X11/extensions/Xeviestr.h 3include/X11/extensions/Xeviestr.h
4include/X11/extensions/evieproto.h 4include/X11/extensions/evieproto.h
5lib/pkgconfig/evieproto.pc 5lib/pkgconfig/evieproto.pc
 6share/pkgconfig/evieproto.pc
cvs diff -r1.3 -r1.4 pkgsrc/pkgtools/x11-links/files/xorg.recordproto (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg.recordproto 2010/05/31 21:20:02 1.3
+++ pkgsrc/pkgtools/x11-links/files/xorg.recordproto 2014/03/07 15:27:32 1.4
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1# $NetBSD: xorg.recordproto,v 1.3 2010/05/31 21:20:02 wiz Exp $ 1# $NetBSD: xorg.recordproto,v 1.4 2014/03/07 15:27:32 jperkin Exp $
2# 2#
3include/X11/extensions/recordconst.h 3include/X11/extensions/recordconst.h
4include/X11/extensions/recordproto.h 4include/X11/extensions/recordproto.h
5include/X11/extensions/recordstr.h 5include/X11/extensions/recordstr.h
6lib/pkgconfig/recordproto.pc 6lib/pkgconfig/recordproto.pc
 7share/pkgconfig/recordproto.pc
cvs diff -r1.3 -r1.4 pkgsrc/pkgtools/x11-links/files/xorg.xcmiscproto (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg.xcmiscproto 2010/05/31 21:20:02 1.3
+++ pkgsrc/pkgtools/x11-links/files/xorg.xcmiscproto 2014/03/07 15:27:32 1.4
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1# $NetBSD: xorg.xcmiscproto,v 1.3 2010/05/31 21:20:02 wiz Exp $ 1# $NetBSD: xorg.xcmiscproto,v 1.4 2014/03/07 15:27:32 jperkin Exp $
2# 2#
3include/X11/extensions/xcmiscproto.h 3include/X11/extensions/xcmiscproto.h
4include/X11/extensions/xcmiscstr.h 4include/X11/extensions/xcmiscstr.h
5lib/pkgconfig/xcmiscproto.pc 5lib/pkgconfig/xcmiscproto.pc
 6share/pkgconfig/xcmiscproto.pc
cvs diff -r1.3 -r1.4 pkgsrc/pkgtools/x11-links/files/xorg.xf86bigfontproto (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg.xf86bigfontproto 2010/05/31 21:20:02 1.3
+++ pkgsrc/pkgtools/x11-links/files/xorg.xf86bigfontproto 2014/03/07 15:27:32 1.4
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1# $NetBSD: xorg.xf86bigfontproto,v 1.3 2010/05/31 21:20:02 wiz Exp $ 1# $NetBSD: xorg.xf86bigfontproto,v 1.4 2014/03/07 15:27:32 jperkin Exp $
2# 2#
3include/X11/extensions/xf86bigfont.h 3include/X11/extensions/xf86bigfont.h
4include/X11/extensions/xf86bigfproto.h 4include/X11/extensions/xf86bigfproto.h
5include/X11/extensions/xf86bigfstr.h 5include/X11/extensions/xf86bigfstr.h
6lib/pkgconfig/xf86bigfontproto.pc 6lib/pkgconfig/xf86bigfontproto.pc
 7share/pkgconfig/xf86bigfontproto.pc
cvs diff -r1.3 -r1.4 pkgsrc/pkgtools/x11-links/files/xorg.xf86driproto (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg.xf86driproto 2010/05/31 21:20:02 1.3
+++ pkgsrc/pkgtools/x11-links/files/xorg.xf86driproto 2014/03/07 15:27:32 1.4
@@ -1,9 +1,11 @@ @@ -1,9 +1,11 @@
1# $NetBSD: xorg.xf86driproto,v 1.3 2010/05/31 21:20:02 wiz Exp $ 1# $NetBSD: xorg.xf86driproto,v 1.4 2014/03/07 15:27:32 jperkin Exp $
2# 2#
3include/X11/dri/xf86dri.h 3include/X11/dri/xf86dri.h
4include/X11/dri/xf86driproto.h 4include/X11/dri/xf86driproto.h
5include/X11/dri/xf86dristr.h 5include/X11/dri/xf86dristr.h
6include/X11/extensions/dri2proto.h 6include/X11/extensions/dri2proto.h
7include/X11/extensions/dri2tokens.h 7include/X11/extensions/dri2tokens.h
8lib/pkgconfig/dri2proto.pc 8lib/pkgconfig/dri2proto.pc
9lib/pkgconfig/xf86driproto.pc 9lib/pkgconfig/xf86driproto.pc
 10share/pkgconfig/dri2proto.pc
 11share/pkgconfig/xf86driproto.pc
cvs diff -r1.3 -r1.4 pkgsrc/pkgtools/x11-links/files/xorg.xf86vidmodeproto (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg.xf86vidmodeproto 2010/05/31 21:20:02 1.3
+++ pkgsrc/pkgtools/x11-links/files/xorg.xf86vidmodeproto 2014/03/07 15:27:32 1.4
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1# $NetBSD: xorg.xf86vidmodeproto,v 1.3 2010/05/31 21:20:02 wiz Exp $ 1# $NetBSD: xorg.xf86vidmodeproto,v 1.4 2014/03/07 15:27:32 jperkin Exp $
2# 2#
3include/X11/extensions/xf86vm.h 3include/X11/extensions/xf86vm.h
4include/X11/extensions/xf86vmstr.h 4include/X11/extensions/xf86vmstr.h
5include/X11/extensions/xf86vmproto.h 5include/X11/extensions/xf86vmproto.h
6lib/pkgconfig/xf86vidmode.pc 6lib/pkgconfig/xf86vidmode.pc
7lib/pkgconfig/xf86vidmodeproto.pc 7lib/pkgconfig/xf86vidmodeproto.pc
 8share/pkgconfig/xf86vidmodeproto.pc
cvs diff -r1.2 -r1.3 pkgsrc/pkgtools/x11-links/files/xorg.compositeproto (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg.compositeproto 2008/10/05 21:36:35 1.2
+++ pkgsrc/pkgtools/x11-links/files/xorg.compositeproto 2014/03/07 15:27:32 1.3
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1# $NetBSD: xorg.compositeproto,v 1.2 2008/10/05 21:36:35 cube Exp $ 1# $NetBSD: xorg.compositeproto,v 1.3 2014/03/07 15:27:32 jperkin Exp $
2include/X11/extensions/composite.h 2include/X11/extensions/composite.h
3include/X11/extensions/compositeproto.h 3include/X11/extensions/compositeproto.h
4lib/pkgconfig/compositeext.pc 4lib/pkgconfig/compositeext.pc
5lib/pkgconfig/compositeproto.pc 5lib/pkgconfig/compositeproto.pc
 6share/pkgconfig/compositeproto.pc
cvs diff -r1.2 -r1.3 pkgsrc/pkgtools/x11-links/files/xorg.damageproto (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg.damageproto 2008/10/05 21:36:35 1.2
+++ pkgsrc/pkgtools/x11-links/files/xorg.damageproto 2014/03/07 15:27:32 1.3
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
1# $NetBSD: xorg.damageproto,v 1.2 2008/10/05 21:36:35 cube Exp $ 1# $NetBSD: xorg.damageproto,v 1.3 2014/03/07 15:27:32 jperkin Exp $
2# 2#
3lib/pkgconfig/damageproto.pc 3lib/pkgconfig/damageproto.pc
 4share/pkgconfig/damageproto.pc
cvs diff -r1.2 -r1.3 pkgsrc/pkgtools/x11-links/files/xorg.fixesproto (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg.fixesproto 2008/10/05 21:36:35 1.2
+++ pkgsrc/pkgtools/x11-links/files/xorg.fixesproto 2014/03/07 15:27:32 1.3
@@ -1,4 +1,5 @@ @@ -1,4 +1,5 @@
1# $NetBSD: xorg.fixesproto,v 1.2 2008/10/05 21:36:35 cube Exp $ 1# $NetBSD: xorg.fixesproto,v 1.3 2014/03/07 15:27:32 jperkin Exp $
2include/X11/extensions/xfixesproto.h 2include/X11/extensions/xfixesproto.h
3include/X11/extensions/xfixeswire.h 3include/X11/extensions/xfixeswire.h
4lib/pkgconfig/fixesproto.pc 4lib/pkgconfig/fixesproto.pc
 5share/pkgconfig/fixesproto.pc
cvs diff -r1.2 -r1.3 pkgsrc/pkgtools/x11-links/files/xorg.fontsproto (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg.fontsproto 2008/10/05 21:36:35 1.2
+++ pkgsrc/pkgtools/x11-links/files/xorg.fontsproto 2014/03/07 15:27:32 1.3
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1# $NetBSD: xorg.fontsproto,v 1.2 2008/10/05 21:36:35 cube Exp $ 1# $NetBSD: xorg.fontsproto,v 1.3 2014/03/07 15:27:32 jperkin Exp $
2# 2#
3include/X11/fonts/font.h 3include/X11/fonts/font.h
4include/X11/fonts/fontproto.h 4include/X11/fonts/fontproto.h
5include/X11/fonts/fontstruct.h 5include/X11/fonts/fontstruct.h
6lib/pkgconfig/fontsproto.pc 6lib/pkgconfig/fontsproto.pc
 7share/pkgconfig/fontsproto.pc
cvs diff -r1.2 -r1.3 pkgsrc/pkgtools/x11-links/files/xorg.glproto (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg.glproto 2008/10/05 21:36:35 1.2
+++ pkgsrc/pkgtools/x11-links/files/xorg.glproto 2014/03/07 15:27:32 1.3
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1# $NetBSD: xorg.glproto,v 1.2 2008/10/05 21:36:35 cube Exp $ 1# $NetBSD: xorg.glproto,v 1.3 2014/03/07 15:27:32 jperkin Exp $
2# 2#
3include/GL/glxint.h 3include/GL/glxint.h
4include/GL/glxmd.h 4include/GL/glxmd.h
5include/GL/glxproto.h 5include/GL/glxproto.h
6include/GL/glxtokens.h 6include/GL/glxtokens.h
7lib/pkgconfig/glproto.pc 7lib/pkgconfig/glproto.pc
 8share/pkgconfig/glproto.pc
cvs diff -r1.2 -r1.3 pkgsrc/pkgtools/x11-links/files/xorg.inputproto (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg.inputproto 2010/05/31 21:20:02 1.2
+++ pkgsrc/pkgtools/x11-links/files/xorg.inputproto 2014/03/07 15:27:32 1.3
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1# $NetBSD: xorg.inputproto,v 1.2 2010/05/31 21:20:02 wiz Exp $ 1# $NetBSD: xorg.inputproto,v 1.3 2014/03/07 15:27:32 jperkin Exp $
2# 2#
3include/X11/extensions/XI.h 3include/X11/extensions/XI.h
4include/X11/extensions/XI2.h 4include/X11/extensions/XI2.h
5include/X11/extensions/XI2proto.h 5include/X11/extensions/XI2proto.h
6include/X11/extensions/XInput.h 6include/X11/extensions/XInput.h
7include/X11/extensions/XInput2.h 7include/X11/extensions/XInput2.h
8include/X11/extensions/XIproto.h 8include/X11/extensions/XIproto.h
9lib/pkgconfig/inputproto.pc 9lib/pkgconfig/inputproto.pc
 10share/pkgconfig/inputproto.pc
cvs diff -r1.2 -r1.3 pkgsrc/pkgtools/x11-links/files/xorg.resourceproto (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg.resourceproto 2008/10/05 21:36:35 1.2
+++ pkgsrc/pkgtools/x11-links/files/xorg.resourceproto 2014/03/07 15:27:32 1.3
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
1# $NetBSD: xorg.resourceproto,v 1.2 2008/10/05 21:36:35 cube Exp $ 1# $NetBSD: xorg.resourceproto,v 1.3 2014/03/07 15:27:32 jperkin Exp $
2# 2#
3lib/pkgconfig/resourceproto.pc 3lib/pkgconfig/resourceproto.pc
 4share/pkgconfig/resourceproto.pc
cvs diff -r1.2 -r1.3 pkgsrc/pkgtools/x11-links/files/xorg.scrnsaverproto (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg.scrnsaverproto 2008/10/05 21:36:35 1.2
+++ pkgsrc/pkgtools/x11-links/files/xorg.scrnsaverproto 2014/03/07 15:27:32 1.3
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
1# $NetBSD: xorg.scrnsaverproto,v 1.2 2008/10/05 21:36:35 cube Exp $ 1# $NetBSD: xorg.scrnsaverproto,v 1.3 2014/03/07 15:27:32 jperkin Exp $
2# 2#
3lib/pkgconfig/scrnsaverproto.pc 3lib/pkgconfig/scrnsaverproto.pc
 4share/pkgconfig/scrnsaverproto.pc
cvs diff -r1.2 -r1.3 pkgsrc/pkgtools/x11-links/files/xorg.videoproto (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg.videoproto 2008/10/05 21:36:35 1.2
+++ pkgsrc/pkgtools/x11-links/files/xorg.videoproto 2014/03/07 15:27:32 1.3
@@ -1,4 +1,5 @@ @@ -1,4 +1,5 @@
1# $NetBSD: xorg.videoproto,v 1.2 2008/10/05 21:36:35 cube Exp $ 1# $NetBSD: xorg.videoproto,v 1.3 2014/03/07 15:27:32 jperkin Exp $
2# 2#
3include/X11/extensions/vldXvMC.h 3include/X11/extensions/vldXvMC.h
4lib/pkgconfig/videoproto.pc 4lib/pkgconfig/videoproto.pc
 5share/pkgconfig/videoproto.pc
cvs diff -r1.2 -r1.3 pkgsrc/pkgtools/x11-links/files/xorg.xf86miscproto (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg.xf86miscproto 2008/10/05 21:36:35 1.2
+++ pkgsrc/pkgtools/x11-links/files/xorg.xf86miscproto 2014/03/07 15:27:32 1.3
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
1# $NetBSD: xorg.xf86miscproto,v 1.2 2008/10/05 21:36:35 cube Exp $ 1# $NetBSD: xorg.xf86miscproto,v 1.3 2014/03/07 15:27:32 jperkin Exp $
2# 2#
3lib/pkgconfig/xf86miscproto.pc 3lib/pkgconfig/xf86miscproto.pc
 4share/pkgconfig/xf86miscproto.pc
cvs diff -r1.2 -r1.3 pkgsrc/pkgtools/x11-links/files/xorg.xproxymanagementprotocol (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg.xproxymanagementprotocol 2008/10/05 21:36:35 1.2
+++ pkgsrc/pkgtools/x11-links/files/xorg.xproxymanagementprotocol 2014/03/07 15:27:32 1.3
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
1# $NetBSD: xorg.xproxymanagementprotocol,v 1.2 2008/10/05 21:36:35 cube Exp $ 1# $NetBSD: xorg.xproxymanagementprotocol,v 1.3 2014/03/07 15:27:32 jperkin Exp $
2# 2#
3lib/pkgconfig/xproxymngproto.pc 3lib/pkgconfig/xproxymngproto.pc
 4share/pkgconfig/xproxymngproto.pc
cvs diff -r1.1 -r1.2 pkgsrc/pkgtools/x11-links/files/xorg.kbproto (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg.kbproto 2007/12/15 17:53:40 1.1
+++ pkgsrc/pkgtools/x11-links/files/xorg.kbproto 2014/03/07 15:27:32 1.2
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1# $NetBSD: xorg.kbproto,v 1.1 2007/12/15 17:53:40 tron Exp $ 1# $NetBSD: xorg.kbproto,v 1.2 2014/03/07 15:27:32 jperkin Exp $
2# 2#
3include/X11/extensions/XKB.h 3include/X11/extensions/XKB.h
4include/X11/extensions/XKBgeom.h 4include/X11/extensions/XKBgeom.h
5include/X11/extensions/XKBproto.h 5include/X11/extensions/XKBproto.h
6include/X11/extensions/XKBsrv.h 6include/X11/extensions/XKBsrv.h
7include/X11/extensions/XKBstr.h 7include/X11/extensions/XKBstr.h
8lib/pkgconfig/kbproto.pc 8lib/pkgconfig/kbproto.pc
 9share/pkgconfig/kbproto.pc
cvs diff -r1.1 -r1.2 pkgsrc/pkgtools/x11-links/files/xorg.randrproto (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg.randrproto 2008/01/05 16:08:53 1.1
+++ pkgsrc/pkgtools/x11-links/files/xorg.randrproto 2014/03/07 15:27:32 1.2
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1# $NetBSD: xorg.randrproto,v 1.1 2008/01/05 16:08:53 tron Exp $ 1# $NetBSD: xorg.randrproto,v 1.2 2014/03/07 15:27:32 jperkin Exp $
2# 2#
3include/X11/extensions/randr.h 3include/X11/extensions/randr.h
4include/X11/extensions/randrproto.h 4include/X11/extensions/randrproto.h
5lib/pkgconfig/randrproto.pc 5lib/pkgconfig/randrproto.pc
6share/doc/randrproto/randrproto.txt 6share/doc/randrproto/randrproto.txt
 7share/pkgconfig/randrproto.pc
cvs diff -r1.1 -r1.2 pkgsrc/pkgtools/x11-links/files/xorg.renderproto (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg.renderproto 2007/12/15 17:53:41 1.1
+++ pkgsrc/pkgtools/x11-links/files/xorg.renderproto 2014/03/07 15:27:32 1.2
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1# $NetBSD: xorg.renderproto,v 1.1 2007/12/15 17:53:41 tron Exp $ 1# $NetBSD: xorg.renderproto,v 1.2 2014/03/07 15:27:32 jperkin Exp $
2# 2#
3include/X11/extensions/render.h 3include/X11/extensions/render.h
4include/X11/extensions/renderproto.h 4include/X11/extensions/renderproto.h
5lib/pkgconfig/renderproto.pc 5lib/pkgconfig/renderproto.pc
 6share/pkgconfig/renderproto.pc
cvs diff -r1.1 -r1.2 pkgsrc/pkgtools/x11-links/files/xorg.xineramaproto (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg.xineramaproto 2008/01/05 16:08:53 1.1
+++ pkgsrc/pkgtools/x11-links/files/xorg.xineramaproto 2014/03/07 15:27:32 1.2
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1# $NetBSD: xorg.xineramaproto,v 1.1 2008/01/05 16:08:53 tron Exp $ 1# $NetBSD: xorg.xineramaproto,v 1.2 2014/03/07 15:27:32 jperkin Exp $
2# 2#
3include/X11/extensions/Xinerama.h 3include/X11/extensions/Xinerama.h
4include/X11/extensions/panoramiXext.h 4include/X11/extensions/panoramiXext.h
5include/X11/extensions/panoramiXproto.h 5include/X11/extensions/panoramiXproto.h
6lib/pkgconfig/xineramaproto.pc 6lib/pkgconfig/xineramaproto.pc
 7share/pkgconfig/xineramaproto.pc
cvs diff -r1.1 -r1.2 pkgsrc/pkgtools/x11-links/files/xorg.xproto (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg.xproto 2007/12/15 17:53:41 1.1
+++ pkgsrc/pkgtools/x11-links/files/xorg.xproto 2014/03/07 15:27:32 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: xorg.xproto,v 1.1 2007/12/15 17:53:41 tron Exp $ 1# $NetBSD: xorg.xproto,v 1.2 2014/03/07 15:27:32 jperkin Exp $
2include/X11/DECkeysym.h 2include/X11/DECkeysym.h
3include/X11/HPkeysym.h 3include/X11/HPkeysym.h
4include/X11/Sunkeysym.h 4include/X11/Sunkeysym.h
5include/X11/X.h 5include/X11/X.h
6include/X11/XF86keysym.h 6include/X11/XF86keysym.h
7include/X11/XWDFile.h 7include/X11/XWDFile.h
8include/X11/Xalloca.h 8include/X11/Xalloca.h
9include/X11/Xarch.h 9include/X11/Xarch.h
10include/X11/Xatom.h 10include/X11/Xatom.h
11include/X11/Xdefs.h 11include/X11/Xdefs.h
12include/X11/Xfuncproto.h 12include/X11/Xfuncproto.h
13include/X11/Xfuncs.h 13include/X11/Xfuncs.h
14include/X11/Xmd.h 14include/X11/Xmd.h
@@ -16,13 +16,14 @@ include/X11/Xos.h @@ -16,13 +16,14 @@ include/X11/Xos.h
16include/X11/Xos_r.h 16include/X11/Xos_r.h
17include/X11/Xosdefs.h 17include/X11/Xosdefs.h
18include/X11/Xpoll.h 18include/X11/Xpoll.h
19include/X11/Xproto.h 19include/X11/Xproto.h
20include/X11/Xprotostr.h 20include/X11/Xprotostr.h
21include/X11/Xthreads.h 21include/X11/Xthreads.h
22include/X11/Xw32defs.h 22include/X11/Xw32defs.h
23include/X11/Xwindows.h 23include/X11/Xwindows.h
24include/X11/Xwinsock.h 24include/X11/Xwinsock.h
25include/X11/ap_keysym.h 25include/X11/ap_keysym.h
26include/X11/keysym.h 26include/X11/keysym.h
27include/X11/keysymdef.h 27include/X11/keysymdef.h
28lib/pkgconfig/xproto.pc 28lib/pkgconfig/xproto.pc
 29share/pkgconfig/xproto.pc
cvs diff -r1.4 -r1.5 pkgsrc/pkgtools/x11-links/files/xorg.xextproto (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg.xextproto 2010/05/31 21:20:02 1.4
+++ pkgsrc/pkgtools/x11-links/files/xorg.xextproto 2014/03/07 15:27:32 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: xorg.xextproto,v 1.4 2010/05/31 21:20:02 wiz Exp $ 1# $NetBSD: xorg.xextproto,v 1.5 2014/03/07 15:27:32 jperkin Exp $
2# 2#
3include/X11/extensions/EVI.h 3include/X11/extensions/EVI.h
4include/X11/extensions/EVIproto.h 4include/X11/extensions/EVIproto.h
5include/X11/extensions/XEVIstr.h 5include/X11/extensions/XEVIstr.h
6include/X11/extensions/XI.h 6include/X11/extensions/XI.h
7include/X11/extensions/XInput.h 7include/X11/extensions/XInput.h
8include/X11/extensions/XIproto.h 8include/X11/extensions/XIproto.h
9include/X11/extensions/XKB.h 9include/X11/extensions/XKB.h
10include/X11/extensions/XKBgeom.h 10include/X11/extensions/XKBgeom.h
11include/X11/extensions/XKBproto.h 11include/X11/extensions/XKBproto.h
12include/X11/extensions/XKBsrv.h 12include/X11/extensions/XKBsrv.h
13include/X11/extensions/XKBstr.h 13include/X11/extensions/XKBstr.h
14include/X11/extensions/XTest.h 14include/X11/extensions/XTest.h
@@ -54,13 +54,14 @@ include/X11/extensions/shapestr.h @@ -54,13 +54,14 @@ include/X11/extensions/shapestr.h
54include/X11/extensions/shm.h 54include/X11/extensions/shm.h
55include/X11/extensions/shmproto.h 55include/X11/extensions/shmproto.h
56include/X11/extensions/shmstr.h 56include/X11/extensions/shmstr.h
57include/X11/extensions/syncconst.h 57include/X11/extensions/syncconst.h
58include/X11/extensions/syncproto.h 58include/X11/extensions/syncproto.h
59include/X11/extensions/syncstr.h 59include/X11/extensions/syncstr.h
60include/X11/extensions/xtestconst.h 60include/X11/extensions/xtestconst.h
61include/X11/extensions/xteststr.h 61include/X11/extensions/xteststr.h
62include/X11/extensions/xtestext1const.h 62include/X11/extensions/xtestext1const.h
63include/X11/extensions/xtestext1proto.h 63include/X11/extensions/xtestext1proto.h
64include/X11/extensions/xtestproto.h 64include/X11/extensions/xtestproto.h
65lib/pkgconfig/xextensions.pc 65lib/pkgconfig/xextensions.pc
66lib/pkgconfig/xextproto.pc 66lib/pkgconfig/xextproto.pc
 67share/pkgconfig/xextproto.pc
cvs diff -r1.4 -r1.5 pkgsrc/pkgtools/x11-links/files/xorg.xf86dgaproto (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg.xf86dgaproto 2012/04/08 05:55:48 1.4
+++ pkgsrc/pkgtools/x11-links/files/xorg.xf86dgaproto 2014/03/07 15:27:32 1.5
@@ -1,22 +1,23 @@ @@ -1,22 +1,23 @@
1# $NetBSD: xorg.xf86dgaproto,v 1.4 2012/04/08 05:55:48 obache Exp $ 1# $NetBSD: xorg.xf86dgaproto,v 1.5 2014/03/07 15:27:32 jperkin Exp $
2# 2#
3include/X11/extensions/Xxf86dga.h 3include/X11/extensions/Xxf86dga.h
4include/X11/extensions/xf86dga.h 4include/X11/extensions/xf86dga.h
5include/X11/extensions/xf86dga1.h 5include/X11/extensions/xf86dga1.h
6include/X11/extensions/xf86dga1const.h 6include/X11/extensions/xf86dga1const.h
7include/X11/extensions/xf86dga1proto.h 7include/X11/extensions/xf86dga1proto.h
8include/X11/extensions/xf86dga1str.h 8include/X11/extensions/xf86dga1str.h
9include/X11/extensions/xf86dgaconst.h 9include/X11/extensions/xf86dgaconst.h
10include/X11/extensions/xf86dgaproto.h 10include/X11/extensions/xf86dgaproto.h
11include/X11/extensions/xf86dgastr.h 11include/X11/extensions/xf86dgastr.h
12lib/libXxf86dga.a 12lib/libXxf86dga.a
13lib/libXxf86dga.la 13lib/libXxf86dga.la
14lib/libXxf86dga.so 14lib/libXxf86dga.so
15lib/libXxf86dga.so.1 15lib/libXxf86dga.so.1
16lib/libXxf86dga.so.1.0 16lib/libXxf86dga.so.1.0
17lib/libXxf86dga.so.1.1 17lib/libXxf86dga.so.1.1
18lib/libXxf86dga.so.2 18lib/libXxf86dga.so.2
19lib/libXxf86dga.so.2.0 19lib/libXxf86dga.so.2.0
20lib/libXxf86dga.so.5.0 20lib/libXxf86dga.so.5.0
21lib/pkgconfig/xf86dgaproto.pc 21lib/pkgconfig/xf86dgaproto.pc
22lib/pkgconfig/xxf86dga.pc 22lib/pkgconfig/xxf86dga.pc
 23share/pkgconfig/xf86dgaproto.pc