Fri Nov 11 03:12:10 2011 UTC ()
Update the kqueue patch to v1 and bump PKGREVISION to 2.  This fixes some
interaction problems with the Gtk file chooser and also corrects other
problems.


(jmmv)
diff -r1.187 -r1.188 pkgsrc/devel/glib2/Makefile
diff -r1.154 -r1.155 pkgsrc/devel/glib2/distinfo
diff -r1.9 -r1.10 pkgsrc/devel/glib2/options.mk
cvs diff -r1.187 -r1.188 pkgsrc/devel/glib2/Makefile (switch to unified diff)

--- pkgsrc/devel/glib2/Makefile 2011/10/09 19:40:02 1.187
+++ pkgsrc/devel/glib2/Makefile 2011/11/11 03:12:10 1.188
@@ -1,53 +1,53 @@ @@ -1,53 +1,53 @@
1# $NetBSD: Makefile,v 1.187 2011/10/09 19:40:02 jmmv Exp $ 1# $NetBSD: Makefile,v 1.188 2011/11/11 03:12:10 jmmv Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4.include "options.mk" 4.include "options.mk"
5 5
6PKGREVISION= 1 6PKGREVISION= 2
7 7
8CATEGORIES= devel 8CATEGORIES= devel
9 9
10COMMENT= Some useful routines for C programming (glib2) 10COMMENT= Some useful routines for C programming (glib2)
11 11
12USE_TOOLS+= msgfmt perl:run 12USE_TOOLS+= msgfmt perl:run
13 13
14PKGCONFIG_OVERRIDE= glib-2.0-uninstalled.pc.in 14PKGCONFIG_OVERRIDE= glib-2.0-uninstalled.pc.in
15PKGCONFIG_OVERRIDE+= glib-2.0.pc.in 15PKGCONFIG_OVERRIDE+= glib-2.0.pc.in
16PKGCONFIG_OVERRIDE+= gmodule-2.0-uninstalled.pc.in 16PKGCONFIG_OVERRIDE+= gmodule-2.0-uninstalled.pc.in
17PKGCONFIG_OVERRIDE+= gmodule-2.0.pc.in 17PKGCONFIG_OVERRIDE+= gmodule-2.0.pc.in
18PKGCONFIG_OVERRIDE+= gmodule-export-2.0.pc.in 18PKGCONFIG_OVERRIDE+= gmodule-export-2.0.pc.in
19PKGCONFIG_OVERRIDE+= gmodule-no-export-2.0-uninstalled.pc.in 19PKGCONFIG_OVERRIDE+= gmodule-no-export-2.0-uninstalled.pc.in
20PKGCONFIG_OVERRIDE+= gmodule-no-export-2.0.pc.in 20PKGCONFIG_OVERRIDE+= gmodule-no-export-2.0.pc.in
21PKGCONFIG_OVERRIDE+= gobject-2.0-uninstalled.pc.in 21PKGCONFIG_OVERRIDE+= gobject-2.0-uninstalled.pc.in
22PKGCONFIG_OVERRIDE+= gobject-2.0.pc.in 22PKGCONFIG_OVERRIDE+= gobject-2.0.pc.in
23PKGCONFIG_OVERRIDE+= gthread-2.0-uninstalled.pc.in 23PKGCONFIG_OVERRIDE+= gthread-2.0-uninstalled.pc.in
24PKGCONFIG_OVERRIDE+= gthread-2.0.pc.in 24PKGCONFIG_OVERRIDE+= gthread-2.0.pc.in
25PKGCONFIG_OVERRIDE+= gio-2.0.pc.in 25PKGCONFIG_OVERRIDE+= gio-2.0.pc.in
26PKGCONFIG_OVERRIDE+= gio-unix-2.0.pc.in 26PKGCONFIG_OVERRIDE+= gio-unix-2.0.pc.in
27 27
28FILES_SUBST+= GIO_MODULES_DIR=${PREFIX}/lib/gio/modules 28FILES_SUBST+= GIO_MODULES_DIR=${PREFIX}/lib/gio/modules
29FILES_SUBST+= GIO_QUERYMODULES=${PREFIX}/bin/gio-querymodules 29FILES_SUBST+= GIO_QUERYMODULES=${PREFIX}/bin/gio-querymodules
30FILES_SUBST+= GLIB_COMPILE_SCHEMAS=${PREFIX}/bin/glib-compile-schemas 30FILES_SUBST+= GLIB_COMPILE_SCHEMAS=${PREFIX}/bin/glib-compile-schemas
31FILES_SUBST+= GLIB_SCHEMAS_DIR=${PREFIX}/share/glib-2.0/schemas 31FILES_SUBST+= GLIB_SCHEMAS_DIR=${PREFIX}/share/glib-2.0/schemas
32 32
33# gtester is the glib unit testing and reporting framework 33# gtester is the glib unit testing and reporting framework
34# agc doesn't want glib2 to depend on python so we install it 34# agc doesn't want glib2 to depend on python so we install it
35# in a broken and useless state. 35# in a broken and useless state.
36CHECK_INTERPRETER_SKIP+= bin/gtester-report 36CHECK_INTERPRETER_SKIP+= bin/gtester-report
37 37
38# need pcre utf8 + unicode-properties 38# need pcre utf8 + unicode-properties
39BUILDLINK_API_DEPENDS.pcre+= pcre>=8.11 39BUILDLINK_API_DEPENDS.pcre+= pcre>=8.11
40# to avoid pkg-config dependency, explicitly specify pcre location 40# to avoid pkg-config dependency, explicitly specify pcre location
41CONFIGURE_ARGS+= PCRE_CFLAGS=-I${BUILDLINK_PREFIX.pcre}/include 41CONFIGURE_ARGS+= PCRE_CFLAGS=-I${BUILDLINK_PREFIX.pcre}/include
42CONFIGURE_ARGS+= PCRE_LIBS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib -L${BUILDLINK_PREFIX.pcre}/lib -lpcre" 42CONFIGURE_ARGS+= PCRE_LIBS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib -L${BUILDLINK_PREFIX.pcre}/lib -lpcre"
43 43
44# needs gz_header structure 44# needs gz_header structure
45BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.2.1 45BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.2.1
46 46
47LIBS.SunOS+= -lnsl -lsocket 47LIBS.SunOS+= -lnsl -lsocket
48 48
49.include "../../converters/libiconv/buildlink3.mk" 49.include "../../converters/libiconv/buildlink3.mk"
50.include "../../devel/gettext-lib/buildlink3.mk" 50.include "../../devel/gettext-lib/buildlink3.mk"
51.include "../../devel/pcre/buildlink3.mk" 51.include "../../devel/pcre/buildlink3.mk"
52.include "../../devel/zlib/buildlink3.mk" 52.include "../../devel/zlib/buildlink3.mk"
53.include "../../mk/bsd.pkg.mk" 53.include "../../mk/bsd.pkg.mk"
cvs diff -r1.154 -r1.155 pkgsrc/devel/glib2/distinfo (switch to unified diff)

--- pkgsrc/devel/glib2/distinfo 2011/10/09 19:40:02 1.154
+++ pkgsrc/devel/glib2/distinfo 2011/11/11 03:12:10 1.155
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1$NetBSD: distinfo,v 1.154 2011/10/09 19:40:02 jmmv Exp $ 1$NetBSD: distinfo,v 1.155 2011/11/11 03:12:10 jmmv Exp $
2 2
3SHA1 (glib-2.28.8.tar.bz2) = 20cd63705a8805260da0320c65b979233f2e3c18 3SHA1 (glib-2.28.8.tar.bz2) = 20cd63705a8805260da0320c65b979233f2e3c18
4RMD160 (glib-2.28.8.tar.bz2) = f087a71445eb40fae5eab45a14cb74d4e239d5e6 4RMD160 (glib-2.28.8.tar.bz2) = f087a71445eb40fae5eab45a14cb74d4e239d5e6
5Size (glib-2.28.8.tar.bz2) = 7017806 bytes 5Size (glib-2.28.8.tar.bz2) = 7017806 bytes
6SHA1 (glib-gio-kqueue-2.28.8-v0.patch) = 2705a9da3aa87cf3ef15e4288adb1367462ff012 6SHA1 (glib-gio-kqueue-2.28.8-v1.patch) = 26ad455030a91403cbd0ce0e848719d10e1c42ca
7RMD160 (glib-gio-kqueue-2.28.8-v0.patch) = ebd7c05b2b6adde972c15476a728eb4a98b19969 7RMD160 (glib-gio-kqueue-2.28.8-v1.patch) = 87e10eec2cdb473e35c144cb2e590a088a9b867a
8Size (glib-gio-kqueue-2.28.8-v0.patch) = 58453 bytes 8Size (glib-gio-kqueue-2.28.8-v1.patch) = 88069 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) = ff1963c05cf82059de692cd5bf08872544297b7f 17SHA1 (patch-ai) = ff1963c05cf82059de692cd5bf08872544297b7f
18SHA1 (patch-aj) = 9e5a7ccf081e3ebdf7888a67b027b696f632177c 18SHA1 (patch-aj) = 9e5a7ccf081e3ebdf7888a67b027b696f632177c
19SHA1 (patch-ak) = 29a2adc7d7cd41a28ecad039cb5f46be5e9df974 19SHA1 (patch-ak) = 29a2adc7d7cd41a28ecad039cb5f46be5e9df974
20SHA1 (patch-al) = bde29693322c568f9a4ad090f1d469de5f69920e 20SHA1 (patch-al) = bde29693322c568f9a4ad090f1d469de5f69920e
21SHA1 (patch-am) = 062d3d295f00485ac3c3839dd4697957ebc66772 21SHA1 (patch-am) = 062d3d295f00485ac3c3839dd4697957ebc66772
22SHA1 (patch-an) = dd136645f7555f3600562b055cdcb4f60b41ae78 22SHA1 (patch-an) = dd136645f7555f3600562b055cdcb4f60b41ae78
23SHA1 (patch-ap) = 3df3c29373efb491d1b0e96d57a192b1b30f2cfa 23SHA1 (patch-ap) = 3df3c29373efb491d1b0e96d57a192b1b30f2cfa
24SHA1 (patch-aq) = aa7087b91c7d0eca9f9895feb6924df95eccb372 24SHA1 (patch-aq) = aa7087b91c7d0eca9f9895feb6924df95eccb372
25SHA1 (patch-ba) = b235c2037bce84e0cdd9c87abaac274550ec0c95 25SHA1 (patch-ba) = b235c2037bce84e0cdd9c87abaac274550ec0c95
26SHA1 (patch-cb) = 0f084c33fb67fbb8e12448034450699da26289ff 26SHA1 (patch-cb) = 0f084c33fb67fbb8e12448034450699da26289ff
27SHA1 (patch-cc) = dd73079b727bca9013465204dc3b53b76a280e54 27SHA1 (patch-cc) = dd73079b727bca9013465204dc3b53b76a280e54
28SHA1 (patch-cd) = d1c6fa921be58469adb6b860f4e91f0a7eff067e 28SHA1 (patch-cd) = d1c6fa921be58469adb6b860f4e91f0a7eff067e
29SHA1 (patch-ce) = 7192ae3bbf27ff92287a66ee090baa80a12cdc79 29SHA1 (patch-ce) = 7192ae3bbf27ff92287a66ee090baa80a12cdc79
30SHA1 (patch-cf) = 41ed2146e19cf088456795d4f0e8dc4af4368e44 30SHA1 (patch-cf) = 41ed2146e19cf088456795d4f0e8dc4af4368e44
31SHA1 (patch-cg) = f65c5a23102d3dee12bee68bd126385b3c3fe632 31SHA1 (patch-cg) = f65c5a23102d3dee12bee68bd126385b3c3fe632
32SHA1 (patch-ch) = df8444835b9954f902936c8b6fab5b44ac350db0 32SHA1 (patch-ch) = df8444835b9954f902936c8b6fab5b44ac350db0
33SHA1 (patch-ci) = f0191fd416222617a2e95e95a05c3dcf6b6ce2d2 33SHA1 (patch-ci) = f0191fd416222617a2e95e95a05c3dcf6b6ce2d2
34SHA1 (patch-cj) = ef6b6ec1986990df096b342cfd8e9513e42671df 34SHA1 (patch-cj) = ef6b6ec1986990df096b342cfd8e9513e42671df
35SHA1 (patch-ck) = 324116cc6fb8dbce8ce8d20f5b237fc469a55cd2 35SHA1 (patch-ck) = 324116cc6fb8dbce8ce8d20f5b237fc469a55cd2
36SHA1 (patch-cl) = a78266f135dc08e1f4710370c19cc820a6da7eb8 36SHA1 (patch-cl) = a78266f135dc08e1f4710370c19cc820a6da7eb8
37SHA1 (patch-cm) = 8ddac97b3476c992abea3e5d9383cd3a5c9008f3 37SHA1 (patch-cm) = 8ddac97b3476c992abea3e5d9383cd3a5c9008f3
38SHA1 (patch-cn) = b930dc95d44eacc9448f2a3a799a95db2880bfd4 38SHA1 (patch-cn) = b930dc95d44eacc9448f2a3a799a95db2880bfd4
cvs diff -r1.9 -r1.10 pkgsrc/devel/glib2/options.mk (switch to unified diff)

--- pkgsrc/devel/glib2/options.mk 2011/10/09 20:31:22 1.9
+++ pkgsrc/devel/glib2/options.mk 2011/11/11 03:12:10 1.10
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1# $NetBSD: options.mk,v 1.9 2011/10/09 20:31:22 jmmv Exp $ 1# $NetBSD: options.mk,v 1.10 2011/11/11 03:12: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-v0.patch 21PATCHFILES= glib-gio-kqueue-2.28.8-v1.patch
22PATCH_DIST_STRIP= -p0 22PATCH_DIST_STRIP= -p0
23 23
24USE_TOOLS+= autoconf autoheader automake 24USE_TOOLS+= autoconf autoheader automake
25pre-configure: regen-autotools 25pre-configure: regen-autotools
26regen-autotools: 26regen-autotools:
27 cd ${WRKSRC} && automake 27 cd ${WRKSRC} && automake
28 cd ${WRKSRC} && autoheader 28 cd ${WRKSRC} && autoheader
29 cd ${WRKSRC} && autoconf 29 cd ${WRKSRC} && autoconf
30.endif 30.endif