Sat Apr 14 15:43:11 2012 UTC ()
Use updated kqueue patch for glib 2.30.3.


(jmmv)
diff -r1.167 -r1.168 pkgsrc/devel/glib2/distinfo
diff -r1.14 -r1.15 pkgsrc/devel/glib2/options.mk
cvs diff -r1.167 -r1.168 pkgsrc/devel/glib2/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/glib2/distinfo 2012/04/10 19:48:17 1.167
+++ pkgsrc/devel/glib2/distinfo 2012/04/14 15:43:10 1.168
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: distinfo,v 1.167 2012/04/10 19:48:17 bsiegert Exp $ 1$NetBSD: distinfo,v 1.168 2012/04/14 15:43:10 jmmv Exp $
2 2
3SHA1 (glib-2.30.3.tar.xz) = ec97dd659862dca05d18093a6ea6c309dcff0cdd 3SHA1 (glib-2.30.3.tar.xz) = ec97dd659862dca05d18093a6ea6c309dcff0cdd
4RMD160 (glib-2.30.3.tar.xz) = 0887b08e2fff75c325ed1fb1123baaf42dc9779b 4RMD160 (glib-2.30.3.tar.xz) = 0887b08e2fff75c325ed1fb1123baaf42dc9779b
5Size (glib-2.30.3.tar.xz) = 5642448 bytes 5Size (glib-2.30.3.tar.xz) = 5642448 bytes
6SHA1 (glib-gio-kqueue-2.28.8-v3.patch) = d50bee14ce72201c3ec2b82d0e498c8828fbd8c2 6SHA1 (glib-gio-kqueue-2.30.3-v4.1.patch) = d66bc669442a89205a2855623c115f8a1eaf6677
7RMD160 (glib-gio-kqueue-2.28.8-v3.patch) = ba4859d4336db50bacb6bdaace995ee761306a85 7RMD160 (glib-gio-kqueue-2.30.3-v4.1.patch) = 2f51d0d838a915df6da7c3853219cc9c78f1637a
8Size (glib-gio-kqueue-2.28.8-v3.patch) = 89920 bytes 8Size (glib-gio-kqueue-2.30.3-v4.1.patch) = 100410 bytes
9SHA1 (patch-aa) = 44a3cc4b457ea75a3516d5c49155a3720bde515f 9SHA1 (patch-aa) = 44a3cc4b457ea75a3516d5c49155a3720bde515f
10SHA1 (patch-ab) = 757cfd7f686d3e3147d13f530d1c85c7835bf762 10SHA1 (patch-ab) = 757cfd7f686d3e3147d13f530d1c85c7835bf762
11SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337 11SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
12SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3 12SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3
13SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5 13SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
14SHA1 (patch-af) = 4db7dff19ba34d5a204c12c0c410415fcb077f20 14SHA1 (patch-af) = 4db7dff19ba34d5a204c12c0c410415fcb077f20
15SHA1 (patch-ag) = 65e50668eb909353210152ef54dfea923740179b 15SHA1 (patch-ag) = 65e50668eb909353210152ef54dfea923740179b
16SHA1 (patch-ah) = 239dc3d0734424a7cafc5dd8d8381768cba2d23e 16SHA1 (patch-ah) = 239dc3d0734424a7cafc5dd8d8381768cba2d23e
17SHA1 (patch-ai) = a21e04468ea05e29e1d3778f32c2a5da90e23e56 17SHA1 (patch-ai) = a21e04468ea05e29e1d3778f32c2a5da90e23e56
18SHA1 (patch-aj) = 9e5a7ccf081e3ebdf7888a67b027b696f632177c 18SHA1 (patch-aj) = 9e5a7ccf081e3ebdf7888a67b027b696f632177c
19SHA1 (patch-ak) = 5190e6d3b2a333ac83968a044755e1a139bf4460 19SHA1 (patch-ak) = 5190e6d3b2a333ac83968a044755e1a139bf4460
20SHA1 (patch-al) = bde29693322c568f9a4ad090f1d469de5f69920e 20SHA1 (patch-al) = bde29693322c568f9a4ad090f1d469de5f69920e
21SHA1 (patch-am) = 062d3d295f00485ac3c3839dd4697957ebc66772 21SHA1 (patch-am) = 062d3d295f00485ac3c3839dd4697957ebc66772
cvs diff -r1.14 -r1.15 pkgsrc/devel/glib2/options.mk (expand / switch to unified diff)

--- pkgsrc/devel/glib2/options.mk 2012/03/23 07:11:50 1.14
+++ pkgsrc/devel/glib2/options.mk 2012/04/14 15:43:10 1.15
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1# $NetBSD: options.mk,v 1.14 2012/03/23 07:11:50 obache Exp $ 1# $NetBSD: options.mk,v 1.15 2012/04/14 15:43:10 jmmv Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.glib2 3PKG_OPTIONS_VAR= PKG_OPTIONS.glib2
4PKG_SUPPORTED_OPTIONS= kqueue 4PKG_SUPPORTED_OPTIONS= kqueue
5PKG_SUGGESTED_OPTIONS= # empty 5PKG_SUGGESTED_OPTIONS= # empty
6 6
7# We really should be doing this by default. However, the kqueue patch is not 7# We really should be doing this by default. However, the kqueue patch is not
8# official, needs some more testing and, due to the way it is written, forces 8# official, needs some more testing and, due to the way it is written, forces
9# us to run autoconf. If the code gets integrated upstream, there is no reason 9# us to run autoconf. If the code gets integrated upstream, there is no reason
10# for us to provide a 'kqueue' option here and it should just go away. 10# for us to provide a 'kqueue' option here and it should just go away.
11# 11#
12#.if exists(/usr/include/sys/event.h) 12#.if exists(/usr/include/sys/event.h)
13#PKG_SUGGESTED_OPTIONS+= kqueue 13#PKG_SUGGESTED_OPTIONS+= kqueue
14#.endif 14#.endif
15 15
16.include "../../mk/bsd.prefs.mk" 16.include "../../mk/bsd.prefs.mk"
17.include "../../mk/bsd.options.mk" 17.include "../../mk/bsd.options.mk"
18 18
19.if $(PKG_OPTIONS:Mkqueue) 19.if $(PKG_OPTIONS:Mkqueue)
20PATCH_SITES= http://dmitrymatveev.co.uk/files/ 20PATCH_SITES= http://dmitrymatveev.co.uk/files/
21PATCHFILES= glib-gio-kqueue-2.28.8-v3.patch 21PATCHFILES= glib-gio-kqueue-2.30.3-v4.1.patch
22PATCH_DIST_STRIP= -p0 22PATCH_DIST_STRIP= -p0
23 23
24BUILD_DEPENDS+= gtk-doc-[0-9]*:../../textproc/gtk-doc 24BUILD_DEPENDS+= gtk-doc-[0-9]*:../../textproc/gtk-doc
25USE_TOOLS+= autoconf autoheader automake 25USE_TOOLS+= autoconf autoheader automake
26pre-configure: regen-autotools 26pre-configure: regen-autotools
27regen-autotools: 27regen-autotools:
28 cd ${WRKSRC} && aclocal 28 cd ${WRKSRC} && aclocal
29 cd ${WRKSRC} && automake 29 cd ${WRKSRC} && automake
30 cd ${WRKSRC} && autoheader 30 cd ${WRKSRC} && autoheader
31 cd ${WRKSRC} && autoconf 31 cd ${WRKSRC} && autoconf
32.endif 32.endif