Sun Jun 16 13:34:30 2013 UTC ()
preprocessor is a tool.


(obache)
diff -r1.32 -r1.33 pkgsrc/x11/libX11/Makefile
diff -r1.18 -r1.19 pkgsrc/x11/libXext/Makefile
diff -r1.79 -r1.80 pkgsrc/x11/modular-xorg-server/Makefile
diff -r1.24 -r1.25 pkgsrc/x11/xdm/Makefile
diff -r1.16 -r1.17 pkgsrc/x11/xf86-video-sis/Makefile
diff -r1.18 -r1.19 pkgsrc/x11/xinit/Makefile
cvs diff -r1.32 -r1.33 pkgsrc/x11/libX11/Makefile (switch to unified diff)

--- pkgsrc/x11/libX11/Makefile 2013/06/13 22:30:41 1.32
+++ pkgsrc/x11/libX11/Makefile 2013/06/16 13:34:30 1.33
@@ -1,61 +1,61 @@ @@ -1,61 +1,61 @@
1# $NetBSD: Makefile,v 1.32 2013/06/13 22:30:41 joerg Exp $ 1# $NetBSD: Makefile,v 1.33 2013/06/16 13:34:30 obache Exp $
2 2
3DISTNAME= libX11-1.6.0 3DISTNAME= libX11-1.6.0
4CATEGORIES= x11 devel 4CATEGORIES= x11 devel
5MASTER_SITES= ${MASTER_SITE_XORG:=lib/} 5MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
7 7
8MAINTAINER= joerg@NetBSD.org 8MAINTAINER= joerg@NetBSD.org
9HOMEPAGE= http://xorg.freedesktop.org/ 9HOMEPAGE= http://xorg.freedesktop.org/
10COMMENT= Base X libraries from modular Xorg X11 10COMMENT= Base X libraries from modular Xorg X11
11LICENSE= mit 11LICENSE= mit
12 12
13PKG_INSTALLATION_TYPES= overwrite pkgviews 13PKG_INSTALLATION_TYPES= overwrite pkgviews
14 14
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17USE_TOOLS+= gmake pkg-config 17USE_TOOLS+= gmake pkg-config
18 18
19CONFIGURE_ARGS+= --enable-man-pages=3 19CONFIGURE_ARGS+= --enable-man-pages=3
20CONFIGURE_ARGS+= --with-xcb 20CONFIGURE_ARGS+= --with-xcb
21CONFIGURE_ARGS+= --disable-specs 21CONFIGURE_ARGS+= --disable-specs
22PKGCONFIG_OVERRIDE+= x11.pc.in 22PKGCONFIG_OVERRIDE+= x11.pc.in
23 23
24CONFIGURE_ENV+= FILE_MAN_SUFFIX=5 24CONFIGURE_ENV+= FILE_MAN_SUFFIX=5
25 25
26.include "../../mk/bsd.prefs.mk" 26.include "../../mk/bsd.prefs.mk"
27 27
28.if ${OPSYS} == "NetBSD" 28.if ${OPSYS} == "NetBSD"
29CONFIGURE_ARGS+= --disable-malloc0returnsnull 29CONFIGURE_ARGS+= --disable-malloc0returnsnull
30.endif 30.endif
31 31
32CPPFLAGS.OSF1+= -pthread # Required by compiler if including pthread.h 32CPPFLAGS.OSF1+= -pthread # Required by compiler if including pthread.h
33CPPFLAGS.MirBSD+= -pthread 33CPPFLAGS.MirBSD+= -pthread
34LDFLAGS.MirBSD+= -pthread 34LDFLAGS.MirBSD+= -pthread
35 35
36BUILDLINK_API_DEPENDS.libxcb+=libxcb>=1.8.1 36BUILDLINK_API_DEPENDS.libxcb+=libxcb>=1.8.1
37 37
38BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp 38TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
39CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" 39CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
40 40
41.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 41.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
42CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} 42CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q}
43 43
44# XXX This needs to match the version of xcb-proto we get for the 44# XXX This needs to match the version of xcb-proto we get for the
45# target by buildlink3. 45# target by buildlink3.
46TOOL_DEPENDS+= xproto-[0-9]*:../../x11/xproto 46TOOL_DEPENDS+= xproto-[0-9]*:../../x11/xproto
47.endif 47.endif
48 48
49.include "../../x11/bigreqsproto/buildlink3.mk" 49.include "../../x11/bigreqsproto/buildlink3.mk"
50.include "../../x11/inputproto/buildlink3.mk" 50.include "../../x11/inputproto/buildlink3.mk"
51.include "../../x11/kbproto/buildlink3.mk" 51.include "../../x11/kbproto/buildlink3.mk"
52.include "../../x11/libXau/buildlink3.mk" 52.include "../../x11/libXau/buildlink3.mk"
53.include "../../x11/libXdmcp/buildlink3.mk" 53.include "../../x11/libXdmcp/buildlink3.mk"
54.include "../../x11/libxcb/buildlink3.mk" 54.include "../../x11/libxcb/buildlink3.mk"
55.include "../../x11/xcmiscproto/buildlink3.mk" 55.include "../../x11/xcmiscproto/buildlink3.mk"
56.include "../../x11/xextproto/buildlink3.mk" 56.include "../../x11/xextproto/buildlink3.mk"
57.include "../../x11/xf86bigfontproto/buildlink3.mk" 57.include "../../x11/xf86bigfontproto/buildlink3.mk"
58.include "../../x11/xproto/buildlink3.mk" 58.include "../../x11/xproto/buildlink3.mk"
59.include "../../x11/xtrans/buildlink3.mk" 59.include "../../x11/xtrans/buildlink3.mk"
60 60
61.include "../../mk/bsd.pkg.mk" 61.include "../../mk/bsd.pkg.mk"
cvs diff -r1.18 -r1.19 pkgsrc/x11/libXext/Makefile (switch to unified diff)

--- pkgsrc/x11/libXext/Makefile 2013/06/13 22:30:41 1.18
+++ pkgsrc/x11/libXext/Makefile 2013/06/16 13:34:30 1.19
@@ -1,40 +1,40 @@ @@ -1,40 +1,40 @@
1# $NetBSD: Makefile,v 1.18 2013/06/13 22:30:41 joerg Exp $ 1# $NetBSD: Makefile,v 1.19 2013/06/16 13:34:30 obache Exp $
2 2
3DISTNAME= libXext-1.3.2 3DISTNAME= libXext-1.3.2
4CATEGORIES= x11 devel 4CATEGORIES= x11 devel
5MASTER_SITES= ${MASTER_SITE_XORG:=lib/} 5MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
7 7
8MAINTAINER= joerg@NetBSD.org 8MAINTAINER= joerg@NetBSD.org
9HOMEPAGE= http://xorg.freedesktop.org/ 9HOMEPAGE= http://xorg.freedesktop.org/
10COMMENT= X Extension library 10COMMENT= X Extension library
11 11
12PKG_INSTALLATION_TYPES= overwrite pkgviews 12PKG_INSTALLATION_TYPES= overwrite pkgviews
13 13
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
17 17
18PKGCONFIG_OVERRIDE+= xext.pc.in 18PKGCONFIG_OVERRIDE+= xext.pc.in
19 19
20.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
21 21
22.if ${OPSYS} == "NetBSD" 22.if ${OPSYS} == "NetBSD"
23CONFIGURE_ARGS+= --disable-malloc0returnsnull 23CONFIGURE_ARGS+= --disable-malloc0returnsnull
24.endif 24.endif
25 25
26.include "../../mk/compiler.mk" 26.include "../../mk/compiler.mk"
27 27
28BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp 28TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
29CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" 29CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
30 30
31.include "../../meta-pkgs/modular-xorg/hacks.mk" 31.include "../../meta-pkgs/modular-xorg/hacks.mk"
32 32
33BUILDLINK_API_DEPENDS.libX11+= libX11>=1.2 33BUILDLINK_API_DEPENDS.libX11+= libX11>=1.2
34.include "../../x11/libX11/buildlink3.mk" 34.include "../../x11/libX11/buildlink3.mk"
35BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.0.99.2 35BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.0.99.2
36.include "../../x11/xextproto/buildlink3.mk" 36.include "../../x11/xextproto/buildlink3.mk"
37BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.13 37BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.13
38.include "../../x11/xproto/buildlink3.mk" 38.include "../../x11/xproto/buildlink3.mk"
39 39
40.include "../../mk/bsd.pkg.mk" 40.include "../../mk/bsd.pkg.mk"
cvs diff -r1.79 -r1.80 pkgsrc/x11/modular-xorg-server/Makefile (switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/Makefile 2013/06/13 22:30:41 1.79
+++ pkgsrc/x11/modular-xorg-server/Makefile 2013/06/16 13:34:30 1.80
@@ -1,183 +1,183 @@ @@ -1,183 +1,183 @@
1# $NetBSD: Makefile,v 1.79 2013/06/13 22:30:41 joerg Exp $ 1# $NetBSD: Makefile,v 1.80 2013/06/16 13:34:30 obache Exp $
2# 2#
3 3
4DISTNAME= xorg-server-1.12.4 4DISTNAME= xorg-server-1.12.4
5PKGNAME= modular-${DISTNAME} 5PKGNAME= modular-${DISTNAME}
6PKGREVISION= 2 6PKGREVISION= 2
7CATEGORIES= x11 7CATEGORIES= x11
8MASTER_SITES= ${MASTER_SITE_XORG:=xserver/} 8MASTER_SITES= ${MASTER_SITE_XORG:=xserver/}
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://xorg.freedesktop.org/ 12HOMEPAGE= http://xorg.freedesktop.org/
13COMMENT= Modular X11 server from modular X.org 13COMMENT= Modular X11 server from modular X.org
14 14
15SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS} 15SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS}
16 16
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
19USE_TOOLS+= gmake pkg-config 19USE_TOOLS+= gmake pkg-config
20USE_LANGUAGES+= c99 20USE_LANGUAGES+= c99
21 21
22PKGCONFIG_OVERRIDE+= xorg-server.pc.in 22PKGCONFIG_OVERRIDE+= xorg-server.pc.in
23SHLIBTOOL_OVERRIDE= # empty 23SHLIBTOOL_OVERRIDE= # empty
24 24
25BUILD_DEFS+= VARBASE 25BUILD_DEFS+= VARBASE
26BUILD_DEFS_EFFECTS+= XKB_OUTPUT_DIR 26BUILD_DEFS_EFFECTS+= XKB_OUTPUT_DIR
27 27
28OWN_DIRS+= ${VARBASE}/log 28OWN_DIRS+= ${VARBASE}/log
29OWN_DIRS+= ${XKB_OUTPUT_DIR} 29OWN_DIRS+= ${XKB_OUTPUT_DIR}
30XKB_OUTPUT_DIR?= ${VARBASE}/db/xkb # XXX sync with xkeyboard-config 30XKB_OUTPUT_DIR?= ${VARBASE}/db/xkb # XXX sync with xkeyboard-config
31 31
32CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} 32CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
33CONFIGURE_ARGS+= --with-xkb-output=${XKB_OUTPUT_DIR:Q} 33CONFIGURE_ARGS+= --with-xkb-output=${XKB_OUTPUT_DIR:Q}
34 34
35.if !empty(USE_TOOLS:Mauto*) 35.if !empty(USE_TOOLS:Mauto*)
36BUILD_DEPENDS+= xorg-util-macros>=1.1.5:../../devel/xorg-util-macros 36TOOLS_DEPENDS+= xorg-util-macros>=1.1.5:../../devel/xorg-util-macros
37.endif 37.endif
38 38
39DEPENDS+= xkbcomp-[0-9]*:../../x11/xkbcomp 39DEPENDS+= xkbcomp-[0-9]*:../../x11/xkbcomp
40DEPENDS+= xkeyboard-config-[0-9]*:../../x11/xkeyboard-config 40DEPENDS+= xkeyboard-config-[0-9]*:../../x11/xkeyboard-config
41 41
42.include "../../mk/bsd.prefs.mk" 42.include "../../mk/bsd.prefs.mk"
43 43
44.if ${OPSYS} == "NetBSD" 44.if ${OPSYS} == "NetBSD"
45CONFIGURE_ARGS+= --with-builder-addr="tech-x11@NetBSD.org" 45CONFIGURE_ARGS+= --with-builder-addr="tech-x11@NetBSD.org"
46CONFIGURE_ARGS+= --with-os-vendor="The NetBSD Foundation" 46CONFIGURE_ARGS+= --with-os-vendor="The NetBSD Foundation"
47# TLS is not supported by NetBSD<6 47# TLS is not supported by NetBSD<6
48. if !empty(OS_VERSION:M[0-5].*) 48. if !empty(OS_VERSION:M[0-5].*)
49CONFIGURE_ENV+= ac_cv_tls=no 49CONFIGURE_ENV+= ac_cv_tls=no
50CONFIGURE_ARGS+= --disable-glx-tls 50CONFIGURE_ARGS+= --disable-glx-tls
51. endif 51. endif
52.endif 52.endif
53CONFIGURE_ARGS+= --with-os-name=${MACHINE_PLATFORM:Q} 53CONFIGURE_ARGS+= --with-os-name=${MACHINE_PLATFORM:Q}
54 54
55CONFIGURE_ARGS+= --enable-xorg 55CONFIGURE_ARGS+= --enable-xorg
56 56
57CONFIGURE_ARGS+= --with-fontrootdir=${PREFIX}/share/fonts/X11 57CONFIGURE_ARGS+= --with-fontrootdir=${PREFIX}/share/fonts/X11
58 58
59LEGACY_FONT_PATH= 59LEGACY_FONT_PATH=
60DEFAULT_FONT_PATH= 60DEFAULT_FONT_PATH=
61.for f in misc TTF OTF Type1 100dpi 75dpi cyrillic 61.for f in misc TTF OTF Type1 100dpi 75dpi cyrillic
62DEFAULT_FONT_PATH+= ${PREFIX}/share/fonts/X11/${f} 62DEFAULT_FONT_PATH+= ${PREFIX}/share/fonts/X11/${f}
63LEGACY_FONT_PATH+= ${PREFIX}/lib/X11/fonts/${f} 63LEGACY_FONT_PATH+= ${PREFIX}/lib/X11/fonts/${f}
64.endfor 64.endfor
65FONT_PATH= ${DEFAULT_FONT_PATH} ${LEGACY_FONT_PATH} 65FONT_PATH= ${DEFAULT_FONT_PATH} ${LEGACY_FONT_PATH}
66 66
67CONFIGURE_ARGS+= --with-default-font-path=${FONT_PATH:ts,:Q} 67CONFIGURE_ARGS+= --with-default-font-path=${FONT_PATH:ts,:Q}
68 68
69CONFIGURE_ARGS+= --disable-config-hal 69CONFIGURE_ARGS+= --disable-config-hal
70CONFIGURE_ARGS+= --disable-dmx 70CONFIGURE_ARGS+= --disable-dmx
71CONFIGURE_ARGS+= --disable-xwin 71CONFIGURE_ARGS+= --disable-xwin
72CONFIGURE_ARGS+= --disable-xephyr 72CONFIGURE_ARGS+= --disable-xephyr
73CONFIGURE_ARGS+= --disable-kdrive 73CONFIGURE_ARGS+= --disable-kdrive
74#CONFIGURE_ARGS+= --disable-kdrive-vesa 74#CONFIGURE_ARGS+= --disable-kdrive-vesa
75CONFIGURE_ARGS+= --disable-xfake 75CONFIGURE_ARGS+= --disable-xfake
76CONFIGURE_ARGS+= --disable-xfbdev 76CONFIGURE_ARGS+= --disable-xfbdev
77 77
78CONFIGURE_ARGS+= --with-int10=x86emu 78CONFIGURE_ARGS+= --with-int10=x86emu
79 79
80CONFIGURE_ENV+= APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5 80CONFIGURE_ENV+= APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5
81CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 81CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4
82 82
83PLIST_VARS+= sunos 83PLIST_VARS+= sunos
84PLIST_SUBST+= SUNOS_ARCH=${SUNOS_ARCH} 84PLIST_SUBST+= SUNOS_ARCH=${SUNOS_ARCH}
85 85
86.if ${OPSYS} == "SunOS" 86.if ${OPSYS} == "SunOS"
87PLIST.sunos= yes 87PLIST.sunos= yes
88. if ${MACHINE_ARCH} == "i386" 88. if ${MACHINE_ARCH} == "i386"
89SUNOS_ARCH= ia32 89SUNOS_ARCH= ia32
90. elif ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "x86_64" 90. elif ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "x86_64"
91SUNOS_ARCH= amd64 91SUNOS_ARCH= amd64
92. elif ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64" 92. elif ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
93SUNOS_ARCH= sparcv8plus 93SUNOS_ARCH= sparcv8plus
94. endif 94. endif
95.endif 95.endif
96 96
97# Workaround for PR#41556. 97# Workaround for PR#41556.
98# Avoid to use bsd_kqueue_apm, force to use bsd_apm instead. 98# Avoid to use bsd_kqueue_apm, force to use bsd_apm instead.
99.if ${OPSYS} == "NetBSD" 99.if ${OPSYS} == "NetBSD"
100CONFIGURE_ENV+= ac_cv_header_sys_event_h=no 100CONFIGURE_ENV+= ac_cv_header_sys_event_h=no
101.endif 101.endif
102 102
103INSTALLATION_DIRS+= lib/xorg/modules/drivers lib/xorg/modules/input 103INSTALLATION_DIRS+= lib/xorg/modules/drivers lib/xorg/modules/input
104 104
105BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=7.8.0 105BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=7.8.0
106BUILDLINK_API_DEPENDS.compositeproto+= compositeproto>=0.4 106BUILDLINK_API_DEPENDS.compositeproto+= compositeproto>=0.4
107BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=5.0 107BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=5.0
108BUILDLINK_API_DEPENDS.damageproto+= damageproto>=1.1 108BUILDLINK_API_DEPENDS.damageproto+= damageproto>=1.1
109BUILDLINK_API_DEPENDS.xcmiscproto+= xcmiscproto>=1.2.0 109BUILDLINK_API_DEPENDS.xcmiscproto+= xcmiscproto>=1.2.0
110BUILDLINK_API_DEPENDS.xtrans+= xtrans>=1.2.2 110BUILDLINK_API_DEPENDS.xtrans+= xtrans>=1.2.2
111BUILDLINK_API_DEPENDS.bigreqsproto+= bigreqsproto>=1.1.0 111BUILDLINK_API_DEPENDS.bigreqsproto+= bigreqsproto>=1.1.0
112BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.22 112BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.22
113BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.1.99 113BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.1.99
114BUILDLINK_API_DEPENDS.recordproto+= recordproto>=1.13.99.1 114BUILDLINK_API_DEPENDS.recordproto+= recordproto>=1.13.99.1
115BUILDLINK_API_DEPENDS.scrnsaverproto+= scrnsaverproto>=1.1 115BUILDLINK_API_DEPENDS.scrnsaverproto+= scrnsaverproto>=1.1
116BUILDLINK_API_DEPENDS.resourceproto+= resourceproto>=1.2.0 116BUILDLINK_API_DEPENDS.resourceproto+= resourceproto>=1.2.0
117BUILDLINK_API_DEPENDS.dri+= dri>=7.8 117BUILDLINK_API_DEPENDS.dri+= dri>=7.8
118BUILDLINK_API_DEPENDS.xfont+= xfont>=1.4.2 118BUILDLINK_API_DEPENDS.xfont+= xfont>=1.4.2
119BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.16 119BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.16
120BUILDLINK_API_DEPENDS.inputproto+= inputproto>=2.1.99.6 120BUILDLINK_API_DEPENDS.inputproto+= inputproto>=2.1.99.6
121BUILDLINK_API_DEPENDS.kbproto+= kbproto>=1.0.3 121BUILDLINK_API_DEPENDS.kbproto+= kbproto>=1.0.3
122BUILDLINK_API_DEPENDS.pixman+= pixman>=0.21.8 122BUILDLINK_API_DEPENDS.pixman+= pixman>=0.21.8
123BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.4.0 123BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.4.0
124BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.11 124BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.11
125BUILDLINK_API_DEPENDS.xf86dgaproto+= xf86dgaproto>=2.0.3 125BUILDLINK_API_DEPENDS.xf86dgaproto+= xf86dgaproto>=2.0.3
126BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.1.0 126BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.1.0
127 127
128BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp 128BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
129CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" 129CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
130 130
131.include "options.mk" 131.include "options.mk"
132 132
133.include "../../devel/ncurses/buildlink3.mk" 133.include "../../devel/ncurses/buildlink3.mk"
134.include "../../devel/zlib/buildlink3.mk" 134.include "../../devel/zlib/buildlink3.mk"
135.include "../../fonts/libfontenc/buildlink3.mk" 135.include "../../fonts/libfontenc/buildlink3.mk"
136.include "../../graphics/MesaLib/buildlink3.mk" 136.include "../../graphics/MesaLib/buildlink3.mk"
137.include "../../security/openssl/buildlink3.mk" 137.include "../../security/openssl/buildlink3.mk"
138BUILDLINK_API_DEPENDS.libpciaccess+= libpciaccess>=0.11.0 138BUILDLINK_API_DEPENDS.libpciaccess+= libpciaccess>=0.11.0
139.include "../../sysutils/libpciaccess/buildlink3.mk" 139.include "../../sysutils/libpciaccess/buildlink3.mk"
140.include "../../x11/bigreqsproto/buildlink3.mk" 140.include "../../x11/bigreqsproto/buildlink3.mk"
141.include "../../x11/compositeproto/buildlink3.mk" 141.include "../../x11/compositeproto/buildlink3.mk"
142.include "../../x11/damageproto/buildlink3.mk" 142.include "../../x11/damageproto/buildlink3.mk"
143.include "../../x11/dri2proto/buildlink3.mk" 143.include "../../x11/dri2proto/buildlink3.mk"
144.include "../../x11/evieext/buildlink3.mk" 144.include "../../x11/evieext/buildlink3.mk"
145.include "../../x11/fixesproto/buildlink3.mk" 145.include "../../x11/fixesproto/buildlink3.mk"
146.include "../../x11/fontsproto/buildlink3.mk" 146.include "../../x11/fontsproto/buildlink3.mk"
147.include "../../x11/glproto/buildlink3.mk" 147.include "../../x11/glproto/buildlink3.mk"
148.include "../../x11/inputproto/buildlink3.mk" 148.include "../../x11/inputproto/buildlink3.mk"
149.include "../../x11/libX11/buildlink3.mk" 149.include "../../x11/libX11/buildlink3.mk"
150.include "../../x11/libXau/buildlink3.mk" 150.include "../../x11/libXau/buildlink3.mk"
151.include "../../x11/libXaw/buildlink3.mk" 151.include "../../x11/libXaw/buildlink3.mk"
152BUILDLINK_API_DEPENDS.libXext+= libXext>=1.1.1 152BUILDLINK_API_DEPENDS.libXext+= libXext>=1.1.1
153.include "../../x11/libXext/buildlink3.mk" 153.include "../../x11/libXext/buildlink3.mk"
154.include "../../x11/libXfixes/buildlink3.mk" 154.include "../../x11/libXfixes/buildlink3.mk"
155.include "../../x11/libXfont/buildlink3.mk" 155.include "../../x11/libXfont/buildlink3.mk"
156.include "../../x11/libXt/buildlink3.mk" 156.include "../../x11/libXt/buildlink3.mk"
157.include "../../x11/libXxf86misc/buildlink3.mk" 157.include "../../x11/libXxf86misc/buildlink3.mk"
158.include "../../x11/libXxf86vm/buildlink3.mk" 158.include "../../x11/libXxf86vm/buildlink3.mk"
159.include "../../x11/libXinerama/buildlink3.mk" 159.include "../../x11/libXinerama/buildlink3.mk"
160.include "../../x11/libdrm/buildlink3.mk" 160.include "../../x11/libdrm/buildlink3.mk"
161.include "../../x11/libxkbfile/buildlink3.mk" 161.include "../../x11/libxkbfile/buildlink3.mk"
162.include "../../x11/libxkbui/buildlink3.mk" 162.include "../../x11/libxkbui/buildlink3.mk"
163.include "../../x11/pixman/buildlink3.mk" 163.include "../../x11/pixman/buildlink3.mk"
164.include "../../x11/randrproto/buildlink3.mk" 164.include "../../x11/randrproto/buildlink3.mk"
165.include "../../x11/recordproto/buildlink3.mk" 165.include "../../x11/recordproto/buildlink3.mk"
166.include "../../x11/renderproto/buildlink3.mk" 166.include "../../x11/renderproto/buildlink3.mk"
167.include "../../x11/resourceproto/buildlink3.mk" 167.include "../../x11/resourceproto/buildlink3.mk"
168.include "../../x11/scrnsaverproto/buildlink3.mk" 168.include "../../x11/scrnsaverproto/buildlink3.mk"
169.include "../../x11/trapproto/buildlink3.mk" 169.include "../../x11/trapproto/buildlink3.mk"
170.include "../../x11/videoproto/buildlink3.mk" 170.include "../../x11/videoproto/buildlink3.mk"
171.include "../../x11/xcmiscproto/buildlink3.mk" 171.include "../../x11/xcmiscproto/buildlink3.mk"
172.include "../../x11/xextproto/buildlink3.mk" 172.include "../../x11/xextproto/buildlink3.mk"
173.include "../../x11/kbproto/buildlink3.mk" 173.include "../../x11/kbproto/buildlink3.mk"
174.include "../../x11/xf86bigfontproto/buildlink3.mk" 174.include "../../x11/xf86bigfontproto/buildlink3.mk"
175.include "../../x11/xf86dgaproto/buildlink3.mk" 175.include "../../x11/xf86dgaproto/buildlink3.mk"
176.include "../../x11/xf86driproto/buildlink3.mk" 176.include "../../x11/xf86driproto/buildlink3.mk"
177.include "../../x11/xf86miscproto/buildlink3.mk" 177.include "../../x11/xf86miscproto/buildlink3.mk"
178.include "../../x11/xf86vidmodeproto/buildlink3.mk" 178.include "../../x11/xf86vidmodeproto/buildlink3.mk"
179.include "../../x11/xineramaproto/buildlink3.mk" 179.include "../../x11/xineramaproto/buildlink3.mk"
180.include "../../x11/xproto/buildlink3.mk" 180.include "../../x11/xproto/buildlink3.mk"
181.include "../../x11/xtrans/buildlink3.mk" 181.include "../../x11/xtrans/buildlink3.mk"
182 182
183.include "../../mk/bsd.pkg.mk" 183.include "../../mk/bsd.pkg.mk"
cvs diff -r1.24 -r1.25 pkgsrc/x11/xdm/Makefile (switch to unified diff)

--- pkgsrc/x11/xdm/Makefile 2013/06/13 22:30:41 1.24
+++ pkgsrc/x11/xdm/Makefile 2013/06/16 13:34:30 1.25
@@ -1,83 +1,83 @@ @@ -1,83 +1,83 @@
1# $NetBSD: Makefile,v 1.24 2013/06/13 22:30:41 joerg Exp $ 1# $NetBSD: Makefile,v 1.25 2013/06/16 13:34:30 obache Exp $
2 2
3DISTNAME= xdm-1.1.11 3DISTNAME= xdm-1.1.11
4PKGREVISION= 4 4PKGREVISION= 4
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= ${MASTER_SITE_XORG:=app/} 6MASTER_SITES= ${MASTER_SITE_XORG:=app/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= blair.sadewitz@gmail.com 9MAINTAINER= blair.sadewitz@gmail.com
10HOMEPAGE= http://xorg.freedesktop.org/ 10HOMEPAGE= http://xorg.freedesktop.org/
11COMMENT= X Display Manager from modular X.org 11COMMENT= X Display Manager from modular X.org
12 12
13DEPENDS+= sessreg-[0-9]*:../../x11/sessreg 13DEPENDS+= sessreg-[0-9]*:../../x11/sessreg
14 14
15PKG_SYSCONFSUBDIR= xdm 15PKG_SYSCONFSUBDIR= xdm
16CONFIGURE_ARGS+= --with-xdmconfigdir=${PKG_SYSCONFDIR:Q} 16CONFIGURE_ARGS+= --with-xdmconfigdir=${PKG_SYSCONFDIR:Q}
17 17
18EGDIR= ${PREFIX}/share/examples/xdm 18EGDIR= ${PREFIX}/share/examples/xdm
19INSTALL_MAKE_FLAGS+= xdmconfigdir=${EGDIR:Q} 19INSTALL_MAKE_FLAGS+= xdmconfigdir=${EGDIR:Q}
20 20
21CONF_FILES+= ${EGDIR}/xdm-config ${PKG_SYSCONFDIR}/xdm-config 21CONF_FILES+= ${EGDIR}/xdm-config ${PKG_SYSCONFDIR}/xdm-config
22CONF_FILES+= ${EGDIR}/Xaccess ${PKG_SYSCONFDIR}/Xaccess 22CONF_FILES+= ${EGDIR}/Xaccess ${PKG_SYSCONFDIR}/Xaccess
23CONF_FILES+= ${EGDIR}/Xresources ${PKG_SYSCONFDIR}/Xresources 23CONF_FILES+= ${EGDIR}/Xresources ${PKG_SYSCONFDIR}/Xresources
24CONF_FILES+= ${EGDIR}/Xservers ${PKG_SYSCONFDIR}/Xservers 24CONF_FILES+= ${EGDIR}/Xservers ${PKG_SYSCONFDIR}/Xservers
25 25
26CONFIGURE_ARGS+= --enable-dynamic-greeter 26CONFIGURE_ARGS+= --enable-dynamic-greeter
27CONFIGURE_ARGS+= --enable-tcp-transport 27CONFIGURE_ARGS+= --enable-tcp-transport
28CONFIGURE_ARGS+= --enable-unix-transport 28CONFIGURE_ARGS+= --enable-unix-transport
29CONFIGURE_ARGS+= --enable-xdmshell 29CONFIGURE_ARGS+= --enable-xdmshell
30CONFIGURE_ARGS+= --with-appdefaultdir=${PREFIX}/lib/X11/app-defaults 30CONFIGURE_ARGS+= --with-appdefaultdir=${PREFIX}/lib/X11/app-defaults
31 31
32USE_TOOLS+= pkg-config 32USE_TOOLS+= pkg-config
33GNU_CONFIGURE= yes 33GNU_CONFIGURE= yes
34USE_LIBTOOL= yes 34USE_LIBTOOL= yes
35 35
36RCD_SCRIPTS= xdm 36RCD_SCRIPTS= xdm
37 37
38BUILD_DEFS+= VARBASE 38BUILD_DEFS+= VARBASE
39CONFIGURE_ARGS+= --with-logdir=${VARBASE}/log 39CONFIGURE_ARGS+= --with-logdir=${VARBASE}/log
40CONFIGURE_ARGS+= --with-piddir=${VARBASE}/run 40CONFIGURE_ARGS+= --with-piddir=${VARBASE}/run
41CONFIGURE_ARGS+= --with-authdir=${VARBASE}/lib/xdm 41CONFIGURE_ARGS+= --with-authdir=${VARBASE}/lib/xdm
42OWN_DIRS_PERMS+= ${VARBASE}/lib/xdm \ 42OWN_DIRS_PERMS+= ${VARBASE}/lib/xdm \
43 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755 43 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755
44 44
45.include "../../mk/compiler.mk" 45.include "../../mk/compiler.mk"
46 46
47.if !empty(CC_VERSION:Mgcc-[3-4]*) 47.if !empty(CC_VERSION:Mgcc-[3-4]*)
48CFLAGS+= -fno-strict-aliasing 48CFLAGS+= -fno-strict-aliasing
49.endif 49.endif
50 50
51BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp 51TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
52CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" 52CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
53 53
54.if ${OPSYS} == "NetBSD" 54.if ${OPSYS} == "NetBSD"
55CONFIGURE_ARGS+= --with-random-device=/dev/urandom 55CONFIGURE_ARGS+= --with-random-device=/dev/urandom
56.endif 56.endif
57 57
58# The following forces the X server to start on the 5th virtual terminal. 58# The following forces the X server to start on the 5th virtual terminal.
59# This is suboptimal but matches the defaults for the xdm configuration, 59# This is suboptimal but matches the defaults for the xdm configuration,
60# which should work for most installations. See the definition of 60# which should work for most installations. See the definition of
61# DEFAULTVT in xsrc/xfree/xc/programs/xdm/config/Imakefile. 61# DEFAULTVT in xsrc/xfree/xc/programs/xdm/config/Imakefile.
62# 62#
63# If we do not do this, we hit a very annoying and obscure problem: during 63# If we do not do this, we hit a very annoying and obscure problem: during
64# system startup, xdm starts before init spawns gettys. If the X server 64# system startup, xdm starts before init spawns gettys. If the X server
65# is started before init spawns the gettys (which easily happens on slow 65# is started before init spawns the gettys (which easily happens on slow
66# machines), it grabs the first virtual terminal (instead of the first 66# machines), it grabs the first virtual terminal (instead of the first
67# "free" one). Later on, when the first getty is started, it grabs the 67# "free" one). Later on, when the first getty is started, it grabs the
68# same terminal X used (the first one). As a result, only one of them 68# same terminal X used (the first one). As a result, only one of them
69# will receive key presses. And on slow machines, X will have lost access 69# will receive key presses. And on slow machines, X will have lost access
70# to the keyboard. 70# to the keyboard.
71.if (${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD") && \ 71.if (${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD") && \
72 (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") 72 (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
73CONFIGURE_ARGS+= --with-default-vt=vt05 73CONFIGURE_ARGS+= --with-default-vt=vt05
74.endif 74.endif
75 75
76.include "options.mk" 76.include "options.mk"
77 77
78.include "../../x11/libXaw/buildlink3.mk" 78.include "../../x11/libXaw/buildlink3.mk"
79.include "../../x11/libXft/buildlink3.mk" 79.include "../../x11/libXft/buildlink3.mk"
80.include "../../x11/libXmu/buildlink3.mk" 80.include "../../x11/libXmu/buildlink3.mk"
81.include "../../x11/libXinerama/buildlink3.mk" 81.include "../../x11/libXinerama/buildlink3.mk"
82.include "../../mk/pam.buildlink3.mk" 82.include "../../mk/pam.buildlink3.mk"
83.include "../../mk/bsd.pkg.mk" 83.include "../../mk/bsd.pkg.mk"
cvs diff -r1.16 -r1.17 pkgsrc/x11/xf86-video-sis/Makefile (switch to unified diff)

--- pkgsrc/x11/xf86-video-sis/Makefile 2013/06/13 22:30:41 1.16
+++ pkgsrc/x11/xf86-video-sis/Makefile 2013/06/16 13:34:30 1.17
@@ -1,37 +1,37 @@ @@ -1,37 +1,37 @@
1# $NetBSD: Makefile,v 1.16 2013/06/13 22:30:41 joerg Exp $ 1# $NetBSD: Makefile,v 1.17 2013/06/16 13:34:30 obache Exp $
2# 2#
3 3
4DISTNAME= xf86-video-sis-0.10.7 4DISTNAME= xf86-video-sis-0.10.7
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= ${MASTER_SITE_XORG:=driver/} 6MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= joerg@NetBSD.org 9MAINTAINER= joerg@NetBSD.org
10HOMEPAGE= http://xorg.freedesktop.org/ 10HOMEPAGE= http://xorg.freedesktop.org/
11COMMENT= Modular Xorg SiS and XGI video driver 11COMMENT= Modular Xorg SiS and XGI video driver
12 12
13CONFIGURE_ARGS+= --enable-dri 13CONFIGURE_ARGS+= --enable-dri
14 14
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17USE_TOOLS+= pkg-config 17USE_TOOLS+= pkg-config
18 18
19.include "../../mk/bsd.prefs.mk" 19.include "../../mk/bsd.prefs.mk"
20 20
21BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp 21TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
22CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" 22CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
23 23
24.if ${OPSYS} == "SunOS" 24.if ${OPSYS} == "SunOS"
25CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 25CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4
26.endif 26.endif
27 27
28.include "../../graphics/MesaLib/buildlink3.mk" 28.include "../../graphics/MesaLib/buildlink3.mk"
29.include "../../x11/modular-xorg-server/buildlink3.mk" 29.include "../../x11/modular-xorg-server/buildlink3.mk"
30.include "../../x11/randrproto/buildlink3.mk" 30.include "../../x11/randrproto/buildlink3.mk"
31.include "../../x11/renderproto/buildlink3.mk" 31.include "../../x11/renderproto/buildlink3.mk"
32.include "../../x11/videoproto/buildlink3.mk" 32.include "../../x11/videoproto/buildlink3.mk"
33.include "../../x11/xextproto/buildlink3.mk" 33.include "../../x11/xextproto/buildlink3.mk"
34.include "../../x11/xf86dgaproto/buildlink3.mk" 34.include "../../x11/xf86dgaproto/buildlink3.mk"
35.include "../../x11/xf86miscproto/buildlink3.mk" 35.include "../../x11/xf86miscproto/buildlink3.mk"
36.include "../../x11/xineramaproto/buildlink3.mk" 36.include "../../x11/xineramaproto/buildlink3.mk"
37.include "../../mk/bsd.pkg.mk" 37.include "../../mk/bsd.pkg.mk"
cvs diff -r1.18 -r1.19 pkgsrc/x11/xinit/Makefile (switch to unified diff)

--- pkgsrc/x11/xinit/Makefile 2013/06/13 22:30:41 1.18
+++ pkgsrc/x11/xinit/Makefile 2013/06/16 13:34:30 1.19
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: Makefile,v 1.18 2013/06/13 22:30:41 joerg Exp $ 1# $NetBSD: Makefile,v 1.19 2013/06/16 13:34:30 obache Exp $
2# 2#
3 3
4DISTNAME= xinit-1.3.2 4DISTNAME= xinit-1.3.2
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= ${MASTER_SITE_XORG:=app/} 6MASTER_SITES= ${MASTER_SITE_XORG:=app/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= joerg@NetBSD.org 9MAINTAINER= joerg@NetBSD.org
10HOMEPAGE= http://xorg.freedesktop.org/ 10HOMEPAGE= http://xorg.freedesktop.org/
11COMMENT= X init program 11COMMENT= X init program
12LICENSE= mit 12LICENSE= mit
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15CONFIGURE_ARGS+= --with-xinit=${PREFIX}/bin/xinit 15CONFIGURE_ARGS+= --with-xinit=${PREFIX}/bin/xinit
16USE_TOOLS+= pkg-config xauth:run 16USE_TOOLS+= pkg-config xauth:run
17 17
18BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp 18TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
19CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" 19CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
20 20
21.include "../../x11/libX11/buildlink3.mk" 21.include "../../x11/libX11/buildlink3.mk"
22.include "../../mk/bsd.pkg.mk" 22.include "../../mk/bsd.pkg.mk"