Wed Feb 5 09:42:33 2014 UTC ()
require randrproto>=1.4 to build, and packags not using builtin libXrandr
also require the version.

fixes a part of PR pkg/48532.


(obache)
diff -r1.15 -r1.16 pkgsrc/x11/libXrandr/Makefile
diff -r1.2 -r1.3 pkgsrc/x11/libXrandr/builtin.mk
cvs diff -r1.15 -r1.16 pkgsrc/x11/libXrandr/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/libXrandr/Makefile 2013/09/08 08:19:48 1.15
+++ pkgsrc/x11/libXrandr/Makefile 2014/02/05 09:42:33 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.15 2013/09/08 08:19:48 wiz Exp $ 1# $NetBSD: Makefile,v 1.16 2014/02/05 09:42:33 obache Exp $
2 2
3DISTNAME= libXrandr-1.4.2 3DISTNAME= libXrandr-1.4.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 RandR Library from X.org 10COMMENT= X RandR Library from X.org
11 11
12CONFLICTS+= Xrandr-[0-9]* 12CONFLICTS+= Xrandr-[0-9]*
13 13
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
@@ -17,17 +17,18 @@ USE_TOOLS+= pkg-config @@ -17,17 +17,18 @@ USE_TOOLS+= pkg-config
17 17
18CONFIGURE_ENV+= LIB_MAN_SUFFIX=3 18CONFIGURE_ENV+= LIB_MAN_SUFFIX=3
19PKGCONFIG_OVERRIDE+= xrandr.pc.in 19PKGCONFIG_OVERRIDE+= xrandr.pc.in
20 20
21.include "../../mk/bsd.prefs.mk" 21.include "../../mk/bsd.prefs.mk"
22 22
23.if ${OPSYS} == "NetBSD" 23.if ${OPSYS} == "NetBSD"
24CONFIGURE_ARGS+= --disable-malloc0returnsnull 24CONFIGURE_ARGS+= --disable-malloc0returnsnull
25.endif 25.endif
26 26
27.include "../../x11/libX11/buildlink3.mk" 27.include "../../x11/libX11/buildlink3.mk"
28.include "../../x11/libXext/buildlink3.mk" 28.include "../../x11/libXext/buildlink3.mk"
29.include "../../x11/libXrender/buildlink3.mk" 29.include "../../x11/libXrender/buildlink3.mk"
 30BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.4
30.include "../../x11/randrproto/buildlink3.mk" 31.include "../../x11/randrproto/buildlink3.mk"
31.include "../../x11/renderproto/buildlink3.mk" 32.include "../../x11/renderproto/buildlink3.mk"
32 33
33.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/x11/libXrandr/builtin.mk (expand / switch to unified diff)

--- pkgsrc/x11/libXrandr/builtin.mk 2008/10/05 21:36:33 1.2
+++ pkgsrc/x11/libXrandr/builtin.mk 2014/02/05 09:42:33 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $ 1# $NetBSD: builtin.mk,v 1.3 2014/02/05 09:42:33 obache Exp $
2 2
3BUILTIN_PKG:= libXrandr 3BUILTIN_PKG:= libXrandr
4 4
5BUILTIN_FIND_FILES_VAR:= H_XRANDR 5BUILTIN_FIND_FILES_VAR:= H_XRANDR
6BUILTIN_FIND_FILES.H_XRANDR= ${X11BASE}/include/X11/extensions/Xrandr.h 6BUILTIN_FIND_FILES.H_XRANDR= ${X11BASE}/include/X11/extensions/Xrandr.h
7 7
8.include "../../mk/buildlink3/bsd.builtin.mk" 8.include "../../mk/buildlink3/bsd.builtin.mk"
9 9
10### 10###
11### Determine if there is a built-in implementation of the package and 11### Determine if there is a built-in implementation of the package and
12### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). 12### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
13### 13###
14.if ${X11BASE} == ${LOCALBASE} 14.if ${X11BASE} == ${LOCALBASE}
@@ -39,13 +39,22 @@ USE_BUILTIN.libXrandr!= \ @@ -39,13 +39,22 @@ USE_BUILTIN.libXrandr!= \
39 if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libXrandr:Q}; then \ 39 if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libXrandr:Q}; then \
40 ${ECHO} yes; \ 40 ${ECHO} yes; \
41 else \ 41 else \
42 ${ECHO} no; \ 42 ${ECHO} no; \
43 fi 43 fi
44. endif 44. endif
45. endfor 45. endfor
46. endif 46. endif
47. endif # PREFER.libXrandr 47. endif # PREFER.libXrandr
48.endif 48.endif
49MAKEVARS+= USE_BUILTIN.libXrandr 49MAKEVARS+= USE_BUILTIN.libXrandr
50 50
51.include "../../mk/x11.builtin.mk" 51.include "../../mk/x11.builtin.mk"
 52
 53CHECK_BUILTIN.libXrandr?= no
 54.if !empty(CHECK_BUILTIN.libXrandr:M[nN][oO])
 55
 56. if !empty(USE_BUILTIN.libXrandr:M[nN][oO])
 57BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.4
 58. endif
 59
 60.endif # CHECK_BUILTIN.libXrandr