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 (expand / 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,14 +1,14 @@ @@ -1,14 +1,14 @@
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
@@ -25,27 +25,27 @@ CONFIGURE_ENV+= FILE_MAN_SUFFIX=5 @@ -25,27 +25,27 @@ CONFIGURE_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"
cvs diff -r1.18 -r1.19 pkgsrc/x11/libXext/Makefile (expand / 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 (expand / 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,14 +1,14 @@ @@ -1,14 +1,14 @@
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
@@ -23,27 +23,27 @@ PKGCONFIG_OVERRIDE+= xorg-server.pc.in @@ -23,27 +23,27 @@ PKGCONFIG_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
cvs diff -r1.24 -r1.25 pkgsrc/x11/xdm/Makefile (expand / 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,14 +1,14 @@ @@ -1,14 +1,14 @@
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
@@ -38,27 +38,27 @@ RCD_SCRIPTS= xdm @@ -38,27 +38,27 @@ RCD_SCRIPTS= xdm
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
cvs diff -r1.16 -r1.17 pkgsrc/x11/xf86-video-sis/Makefile (expand / 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,34 +1,34 @@ @@ -1,34 +1,34 @@
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"
cvs diff -r1.18 -r1.19 pkgsrc/x11/xinit/Makefile (expand / 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"