Attachment #208389 for bug #241314




# $FreeBSD$

PORTNAME=	libX11
PORTVERSION=	1.6.9
PORTEPOCH=	1
CATEGORIES=	x11



LICENSE=	MIT

USES=		cpe perl5 xorg xorg-cat:lib
USE_XORG=	xau xcb xdmcp xtrans xorgproto
USE_XORG=	xau xdmcp xtrans xorgproto xcb
USE_PERL5=	build
CPE_VENDOR=	x


Lines 1-3 Link Here

(-)x11/libX11/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1560786095	1	TIMESTAMP = 1571332179
2	SHA256 (xorg/lib/libX11-1.6.8.tar.bz2) = b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5	2	SHA256 (xorg/lib/libX11-1.6.9.tar.bz2) = 9cc7e8d000d6193fa5af580d50d689380b8287052270f5bb26a5fb6b58b2bed1
3	SIZE (xorg/lib/libX11-1.6.8.tar.bz2) = 2395911	3	SIZE (xorg/lib/libX11-1.6.9.tar.bz2) = 2283814




--- src/util/makekeys.c.orig	2019-06-17 14:47:35 UTC
+++ src/util/makekeys.c
@@ -35,8 +35,10 @@ from The Open Group.
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdint.h>
+#include <inttypes.h>
 
-#include "../Xresinternal.h"
+typedef uint32_t Signature;
 
 #define KTNUM 4000
 

Lines 10-15 include/X11/Xregion.h Link Here

(-)x11/libX11/pkg-plist (+1 lines)
10	include/X11/Xresource.h	10	include/X11/Xresource.h
11	include/X11/Xutil.h	11	include/X11/Xutil.h
12	include/X11/cursorfont.h	12	include/X11/cursorfont.h
		13	include/X11/extensions/XKBgeom.h
13	lib/X11/XErrorDB	14	lib/X11/XErrorDB
14	lib/X11/Xcms.txt	15	lib/X11/Xcms.txt
15	lib/X11/locale/C/Compose	16	lib/X11/locale/C/Compose




# $FreeBSD$

PORTNAME=	libXvMC
PORTVERSION=	1.0.12
CATEGORIES=	x11

MAINTAINER=	x11@FreeBSD.org

LICENSE=	MIT
LICENSE_FILE=	${WRKSRC}/COPYING

USES=		cpe xorg xorg-cat:lib
USE_XORG=	x11 xext xorgproto xv 
USE_XORG=	x11 xext xv xorgproto
CPE_VENDOR=	x
CPE_PRODUCT=	libxvmc


Lines 1-3 Link Here

(-)x11/libXvMC/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1560363169	1	TIMESTAMP = 1569372181
2	SHA256 (xorg/lib/libXvMC-1.0.11.tar.bz2) = 4a2e34d444a683a7c010b01b23cefe2b8043a063ce4dc6a9b855836b5262622d	2	SHA256 (xorg/lib/libXvMC-1.0.12.tar.bz2) = 6b3da7977b3f7eaf4f0ac6470ab1e562298d82c4e79077765787963ab7966dcd
3	SIZE (xorg/lib/libXvMC-1.0.11.tar.bz2) = 303516	3	SIZE (xorg/lib/libXvMC-1.0.12.tar.bz2) = 306581

Lines 1-3 Link Here

(-)x11/libXvMC/pkg-plist (+2 lines)
		1	include/X11/extensions/vldXvMC.h
1	include/X11/extensions/XvMClib.h	2	include/X11/extensions/XvMClib.h
2	lib/libXvMC.a	3	lib/libXvMC.a
3	lib/libXvMC.so	4	lib/libXvMC.so
Lines 8-11 lib/libXvMCW.so Link Here
8	lib/libXvMCW.so.1	9	lib/libXvMCW.so.1
9	lib/libXvMCW.so.1.0.0	10	lib/libXvMCW.so.1.0.0
10	libdata/pkgconfig/xvmc.pc	11	libdata/pkgconfig/xvmc.pc
		12	libdata/pkgconfig/xvmc-wrapper.pc
11	%%DOCSDIR%%/XvMC_API.txt	13	%%DOCSDIR%%/XvMC_API.txt




# $FreeBSD$

PORTNAME=	xorgproto
PORTVERSION=	2019.2
CATEGORIES=	x11

MAINTAINER=	x11@FreeBSD.org
COMMENT=	xorg protocol headers

USES=		xorg-cat:proto

CONFIGURE_ARGS= --without-fop \
		--without-xmlto \
		--without-xsltproc \
		--disable-specs
		--enable-legacy

pre-patch:
	@${MKDIR} ${WRKSRC}/man

Lines 1-3 Link Here

(-)x11/xorgproto/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1561020414	1	TIMESTAMP = 1571331081
2	SHA256 (xorg/proto/xorgproto-2019.1.tar.bz2) = a6daaa7a6cbc8e374032d83ff7f47d41be98f1e0f4475d66a4da3aa766a0d49b	2	SHA256 (xorg/proto/xorgproto-2019.2.tar.bz2) = 46ecd0156c561d41e8aa87ce79340910cdf38373b759e737fcbba5df508e7b8e
3	SIZE (xorg/proto/xorgproto-2019.1.tar.bz2) = 865840	3	SIZE (xorg/proto/xorgproto-2019.2.tar.bz2) = 847374




include/GL/internal/glcore.h
include/X11/DECkeysym.h
include/X11/HPkeysym.h
include/X11/PM/PM.h
include/X11/PM/PMproto.h
include/X11/Sunkeysym.h
include/X11/X.h
include/X11/XF86keysym.h

include/X11/dri/xf86dristr.h
include/X11/extensions/EVI.h
include/X11/extensions/EVIproto.h
include/X11/extensions/Print.h
include/X11/extensions/Printstr.h
include/X11/extensions/Xeviestr.h
include/X11/extensions/XI.h
include/X11/extensions/XI2.h
include/X11/extensions/XI2proto.h
include/X11/extensions/XIproto.h
include/X11/extensions/XKB.h
include/X11/extensions/XKBgeom.h
include/X11/extensions/XKBproto.h
include/X11/extensions/XKBsrv.h
include/X11/extensions/XKBstr.h

include/X11/extensions/dri2proto.h
include/X11/extensions/dri2tokens.h
include/X11/extensions/dri3proto.h
include/X11/extensions/evieproto.h
include/X11/extensions/fontcache.h
include/X11/extensions/fontcacheP.h
include/X11/extensions/fontcachstr.h
include/X11/extensions/ge.h
include/X11/extensions/geproto.h
include/X11/extensions/lbx.h
include/X11/extensions/lbxproto.h
include/X11/extensions/lgewire.h
include/X11/extensions/mitmiscconst.h
include/X11/extensions/mitmiscproto.h
include/X11/extensions/multibufconst.h

include/X11/extensions/syncconst.h
include/X11/extensions/syncproto.h
include/X11/extensions/syncstr.h
include/X11/extensions/vldXvMC.h
include/X11/extensions/windowswm.h
include/X11/extensions/windowswmstr.h
include/X11/extensions/xcalibrateproto.h
include/X11/extensions/xcalibratewire.h
include/X11/extensions/xcmiscproto.h
include/X11/extensions/xcmiscstr.h
include/X11/extensions/xf86bigfont.h

include/X11/extensions/xf86dgaconst.h
include/X11/extensions/xf86dgaproto.h
include/X11/extensions/xf86dgastr.h
include/X11/extensions/xf86misc.h
include/X11/extensions/xf86mscstr.h
include/X11/extensions/xf86rush.h
include/X11/extensions/xf86rushstr.h
include/X11/extensions/xf86vm.h
include/X11/extensions/xf86vmproto.h
include/X11/extensions/xf86vmstr.h

include/X11/extensions/xtestext1const.h
include/X11/extensions/xtestext1proto.h
include/X11/extensions/xtestproto.h
include/X11/extensions/xtrapbits.h
include/X11/extensions/xtrapddmi.h
include/X11/extensions/xtrapdi.h
include/X11/extensions/xtrapemacros.h
include/X11/extensions/xtraplib.h
include/X11/extensions/xtraplibp.h
include/X11/extensions/xtrapproto.h
include/X11/fonts/FS.h
include/X11/fonts/FSproto.h
include/X11/fonts/font.h

libdata/pkgconfig/dmxproto.pc
libdata/pkgconfig/dri2proto.pc
libdata/pkgconfig/dri3proto.pc
libdata/pkgconfig/evieproto.pc
libdata/pkgconfig/fixesproto.pc
libdata/pkgconfig/fontcacheproto.pc
libdata/pkgconfig/fontsproto.pc
libdata/pkgconfig/glproto.pc
libdata/pkgconfig/inputproto.pc
libdata/pkgconfig/kbproto.pc
libdata/pkgconfig/lg3dproto.pc
libdata/pkgconfig/presentproto.pc
libdata/pkgconfig/printproto.pc
libdata/pkgconfig/randrproto.pc
libdata/pkgconfig/recordproto.pc
libdata/pkgconfig/renderproto.pc
libdata/pkgconfig/resourceproto.pc
libdata/pkgconfig/scrnsaverproto.pc
libdata/pkgconfig/trapproto.pc
libdata/pkgconfig/videoproto.pc
libdata/pkgconfig/windowswmproto.pc
libdata/pkgconfig/xcalibrateproto.pc
libdata/pkgconfig/xcmiscproto.pc
libdata/pkgconfig/xextproto.pc
libdata/pkgconfig/xf86bigfontproto.pc
libdata/pkgconfig/xf86dgaproto.pc
libdata/pkgconfig/xf86driproto.pc
libdata/pkgconfig/xf86rushproto.pc
libdata/pkgconfig/xf86miscproto.pc
libdata/pkgconfig/xf86vidmodeproto.pc
libdata/pkgconfig/xineramaproto.pc
libdata/pkgconfig/xproto.pc
libdata/pkgconfig/xproxymngproto.pc
man/man7/Xprint.7.gz
%%DOCSDIR%%/PM_spec
%%DOCSDIR%%/compositeproto.txt
%%DOCSDIR%%/damageproto.txt

Return to bug 241314

Lines 2-8 Link Here

(-)x11/libX11/Makefile (-4 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libX11	4	PORTNAME= libX11
5	PORTVERSION= 1.6.8	5	PORTVERSION= 1.6.9
6	PORTEPOCH= 1	6	PORTEPOCH= 1
7	CATEGORIES= x11	7	CATEGORIES= x11
8		8
Lines 11-19 COMMENT= X11 library Link Here
11		11
12	LICENSE= MIT	12	LICENSE= MIT
13		13
14	USES= cpe perl5	14	USES= cpe perl5 xorg xorg-cat:lib
15	XORG_CAT= lib	15	USE_XORG= xau xcb xdmcp xtrans xorgproto
16	USE_XORG= xau xdmcp xtrans xorgproto xcb
17	USE_PERL5= build	16	USE_PERL5= build
18	CPE_VENDOR= x	17	CPE_VENDOR= x
19		18

Removed Link Here

(-)x11/libX11/files/patch-src_util_makekeys.c (-14 lines)
1	--- src/util/makekeys.c.orig 2019-06-17 14:47:35 UTC
2	+++ src/util/makekeys.c
3	@@ -35,8 +35,10 @@ from The Open Group.
4	#include <stdio.h>
5	#include <stdlib.h>
6	#include <string.h>
7	+#include <stdint.h>
8	+#include <inttypes.h>
9
10	-#include "../Xresinternal.h"
11	+typedef uint32_t Signature;
12
13	#define KTNUM 4000
14

Lines 2-8 Link Here

(-)x11/libXvMC/Makefile (-4 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libXvMC	4	PORTNAME= libXvMC
5	PORTVERSION= 1.0.11	5	PORTVERSION= 1.0.12
6	CATEGORIES= x11	6	CATEGORIES= x11
7		7
8	MAINTAINER= x11@FreeBSD.org	8	MAINTAINER= x11@FreeBSD.org
Lines 11-19 COMMENT= X Video Extension Motion Compensation library Link Here
11	LICENSE= MIT	11	LICENSE= MIT
12	LICENSE_FILE= ${WRKSRC}/COPYING	12	LICENSE_FILE= ${WRKSRC}/COPYING
13		13
14	USES= cpe	14	USES= cpe xorg xorg-cat:lib
15	XORG_CAT= lib	15	USE_XORG= x11 xext xorgproto xv
16	USE_XORG= x11 xext xv xorgproto
17	CPE_VENDOR= x	16	CPE_VENDOR= x
18	CPE_PRODUCT= libxvmc	17	CPE_PRODUCT= libxvmc
19		18

Lines 1-19 Link Here

(-)x11/xorgproto/Makefile (-4 / +3 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= xorgproto	3	PORTNAME= xorgproto
4	PORTVERSION= 2019.1	4	PORTVERSION= 2019.2
5	CATEGORIES= x11	5	CATEGORIES= x11
6		6
7	MAINTAINER= x11@FreeBSD.org	7	MAINTAINER= x11@FreeBSD.org
8	COMMENT= xorg protocol headers	8	COMMENT= xorg protocol headers
9		9
10	XORG_CAT= proto	10	USES= xorg-cat:proto
11		11
12	CONFIGURE_ARGS= --without-fop \	12	CONFIGURE_ARGS= --without-fop \
13	--without-xmlto \	13	--without-xmlto \
14	--without-xsltproc \	14	--without-xsltproc \
15	--disable-specs \	15	--disable-specs
16	--enable-legacy
17		16
18	pre-patch:	17	pre-patch:
19	@${MKDIR} ${WRKSRC}/man	18	@${MKDIR} ${WRKSRC}/man

Lines 5-12 include/GL/glxtokens.h Link Here

(-)x11/xorgproto/pkg-plist (-38 lines)
5	include/GL/internal/glcore.h	5	include/GL/internal/glcore.h
6	include/X11/DECkeysym.h	6	include/X11/DECkeysym.h
7	include/X11/HPkeysym.h	7	include/X11/HPkeysym.h
8	include/X11/PM/PM.h
9	include/X11/PM/PMproto.h
10	include/X11/Sunkeysym.h	8	include/X11/Sunkeysym.h
11	include/X11/X.h	9	include/X11/X.h
12	include/X11/XF86keysym.h	10	include/X11/XF86keysym.h
Lines 34-48 include/X11/dri/xf86driproto.h Link Here
34	include/X11/dri/xf86dristr.h	32	include/X11/dri/xf86dristr.h
35	include/X11/extensions/EVI.h	33	include/X11/extensions/EVI.h
36	include/X11/extensions/EVIproto.h	34	include/X11/extensions/EVIproto.h
37	include/X11/extensions/Print.h
38	include/X11/extensions/Printstr.h
39	include/X11/extensions/Xeviestr.h
40	include/X11/extensions/XI.h	35	include/X11/extensions/XI.h
41	include/X11/extensions/XI2.h	36	include/X11/extensions/XI2.h
42	include/X11/extensions/XI2proto.h	37	include/X11/extensions/XI2proto.h
43	include/X11/extensions/XIproto.h	38	include/X11/extensions/XIproto.h
44	include/X11/extensions/XKB.h	39	include/X11/extensions/XKB.h
45	include/X11/extensions/XKBgeom.h
46	include/X11/extensions/XKBproto.h	40	include/X11/extensions/XKBproto.h
47	include/X11/extensions/XKBsrv.h	41	include/X11/extensions/XKBsrv.h
48	include/X11/extensions/XKBstr.h	42	include/X11/extensions/XKBstr.h
Lines 72-86 include/X11/extensions/dpmsproto.h Link Here
72	include/X11/extensions/dri2proto.h	66	include/X11/extensions/dri2proto.h
73	include/X11/extensions/dri2tokens.h	67	include/X11/extensions/dri2tokens.h
74	include/X11/extensions/dri3proto.h	68	include/X11/extensions/dri3proto.h
75	include/X11/extensions/evieproto.h
76	include/X11/extensions/fontcache.h
77	include/X11/extensions/fontcacheP.h
78	include/X11/extensions/fontcachstr.h
79	include/X11/extensions/ge.h	69	include/X11/extensions/ge.h
80	include/X11/extensions/geproto.h	70	include/X11/extensions/geproto.h
81	include/X11/extensions/lbx.h	71	include/X11/extensions/lbx.h
82	include/X11/extensions/lbxproto.h	72	include/X11/extensions/lbxproto.h
83	include/X11/extensions/lgewire.h
84	include/X11/extensions/mitmiscconst.h	73	include/X11/extensions/mitmiscconst.h
85	include/X11/extensions/mitmiscproto.h	74	include/X11/extensions/mitmiscproto.h
86	include/X11/extensions/multibufconst.h	75	include/X11/extensions/multibufconst.h
Lines 108-118 include/X11/extensions/shmstr.h Link Here
108	include/X11/extensions/syncconst.h	97	include/X11/extensions/syncconst.h
109	include/X11/extensions/syncproto.h	98	include/X11/extensions/syncproto.h
110	include/X11/extensions/syncstr.h	99	include/X11/extensions/syncstr.h
111	include/X11/extensions/vldXvMC.h
112	include/X11/extensions/windowswm.h
113	include/X11/extensions/windowswmstr.h
114	include/X11/extensions/xcalibrateproto.h
115	include/X11/extensions/xcalibratewire.h
116	include/X11/extensions/xcmiscproto.h	100	include/X11/extensions/xcmiscproto.h
117	include/X11/extensions/xcmiscstr.h	101	include/X11/extensions/xcmiscstr.h
118	include/X11/extensions/xf86bigfont.h	102	include/X11/extensions/xf86bigfont.h
Lines 125-134 include/X11/extensions/xf86dga1str.h Link Here
125	include/X11/extensions/xf86dgaconst.h	109	include/X11/extensions/xf86dgaconst.h
126	include/X11/extensions/xf86dgaproto.h	110	include/X11/extensions/xf86dgaproto.h
127	include/X11/extensions/xf86dgastr.h	111	include/X11/extensions/xf86dgastr.h
128	include/X11/extensions/xf86misc.h
129	include/X11/extensions/xf86mscstr.h
130	include/X11/extensions/xf86rush.h
131	include/X11/extensions/xf86rushstr.h
132	include/X11/extensions/xf86vm.h	112	include/X11/extensions/xf86vm.h
133	include/X11/extensions/xf86vmproto.h	113	include/X11/extensions/xf86vmproto.h
134	include/X11/extensions/xf86vmstr.h	114	include/X11/extensions/xf86vmstr.h
Lines 138-150 include/X11/extensions/xtestconst.h Link Here
138	include/X11/extensions/xtestext1const.h	118	include/X11/extensions/xtestext1const.h
139	include/X11/extensions/xtestext1proto.h	119	include/X11/extensions/xtestext1proto.h
140	include/X11/extensions/xtestproto.h	120	include/X11/extensions/xtestproto.h
141	include/X11/extensions/xtrapbits.h
142	include/X11/extensions/xtrapddmi.h
143	include/X11/extensions/xtrapdi.h
144	include/X11/extensions/xtrapemacros.h
145	include/X11/extensions/xtraplib.h
146	include/X11/extensions/xtraplibp.h
147	include/X11/extensions/xtrapproto.h
148	include/X11/fonts/FS.h	121	include/X11/fonts/FS.h
149	include/X11/fonts/FSproto.h	122	include/X11/fonts/FSproto.h
150	include/X11/fonts/font.h	123	include/X11/fonts/font.h
Lines 160-196 libdata/pkgconfig/damageproto.pc Link Here
160	libdata/pkgconfig/dmxproto.pc	133	libdata/pkgconfig/dmxproto.pc
161	libdata/pkgconfig/dri2proto.pc	134	libdata/pkgconfig/dri2proto.pc
162	libdata/pkgconfig/dri3proto.pc	135	libdata/pkgconfig/dri3proto.pc
163	libdata/pkgconfig/evieproto.pc
164	libdata/pkgconfig/fixesproto.pc	136	libdata/pkgconfig/fixesproto.pc
165	libdata/pkgconfig/fontcacheproto.pc
166	libdata/pkgconfig/fontsproto.pc	137	libdata/pkgconfig/fontsproto.pc
167	libdata/pkgconfig/glproto.pc	138	libdata/pkgconfig/glproto.pc
168	libdata/pkgconfig/inputproto.pc	139	libdata/pkgconfig/inputproto.pc
169	libdata/pkgconfig/kbproto.pc	140	libdata/pkgconfig/kbproto.pc
170	libdata/pkgconfig/lg3dproto.pc
171	libdata/pkgconfig/presentproto.pc	141	libdata/pkgconfig/presentproto.pc
172	libdata/pkgconfig/printproto.pc
173	libdata/pkgconfig/randrproto.pc	142	libdata/pkgconfig/randrproto.pc
174	libdata/pkgconfig/recordproto.pc	143	libdata/pkgconfig/recordproto.pc
175	libdata/pkgconfig/renderproto.pc	144	libdata/pkgconfig/renderproto.pc
176	libdata/pkgconfig/resourceproto.pc	145	libdata/pkgconfig/resourceproto.pc
177	libdata/pkgconfig/scrnsaverproto.pc	146	libdata/pkgconfig/scrnsaverproto.pc
178	libdata/pkgconfig/trapproto.pc
179	libdata/pkgconfig/videoproto.pc	147	libdata/pkgconfig/videoproto.pc
180	libdata/pkgconfig/windowswmproto.pc
181	libdata/pkgconfig/xcalibrateproto.pc
182	libdata/pkgconfig/xcmiscproto.pc	148	libdata/pkgconfig/xcmiscproto.pc
183	libdata/pkgconfig/xextproto.pc	149	libdata/pkgconfig/xextproto.pc
184	libdata/pkgconfig/xf86bigfontproto.pc	150	libdata/pkgconfig/xf86bigfontproto.pc
185	libdata/pkgconfig/xf86dgaproto.pc	151	libdata/pkgconfig/xf86dgaproto.pc
186	libdata/pkgconfig/xf86driproto.pc	152	libdata/pkgconfig/xf86driproto.pc
187	libdata/pkgconfig/xf86rushproto.pc
188	libdata/pkgconfig/xf86miscproto.pc
189	libdata/pkgconfig/xf86vidmodeproto.pc	153	libdata/pkgconfig/xf86vidmodeproto.pc
190	libdata/pkgconfig/xineramaproto.pc	154	libdata/pkgconfig/xineramaproto.pc
191	libdata/pkgconfig/xproto.pc	155	libdata/pkgconfig/xproto.pc
192	libdata/pkgconfig/xproxymngproto.pc
193	man/man7/Xprint.7.gz
194	%%DOCSDIR%%/PM_spec	156	%%DOCSDIR%%/PM_spec
195	%%DOCSDIR%%/compositeproto.txt	157	%%DOCSDIR%%/compositeproto.txt
196	%%DOCSDIR%%/damageproto.txt	158	%%DOCSDIR%%/damageproto.txt