Add support for kqueue by using the patches written by Dmitry Matveev during
the Google Summer of Code 2011 program.  Congratulations, Dmitry!  :-)

This comes in the form of a new 'kqueue' build-time option.  This should NOT
be an option, but it is for two reasons:
- I consider this still experimental for it to be enabled on everyone's
  machines, and the code is not "official".
- The patch requires us to run automake/autoconf during the pre-configure
  stage, and I don't want to add these dependencies on the default package
  build.
When these patches get integrated upstream, we can get rid of the option
altogether.

Also note that I had to backport some of our custom changes to Makefile.in
files and some to configure to the original Makefile.am files and
configure.ac.  This is to prevent our custom patches from being lost during
the automake/autoconf invocations we now do when 'kqueue' is enabled.

Bump PKGREVISION to 1.


(jmmv)

# $NetBSD: options.mk,v 1.8 2011/10/09 19:40:02 jmmv Exp $

PKG_OPTIONS_VAR=	PKG_OPTIONS.glib2
PKG_SUPPORTED_OPTIONS=	kqueue
PKG_SUGGESTED_OPTIONS=	# empty

# We really should be doing this by default.  However, the kqueue patch is not
# official, needs some more testing and, due to the way it is written, forces
# us to run autoconf.  If the code gets integrated upstream, there is no reason
# for us to provide a 'kqueue' option here and it should just go away.
#
#.if exists(/usr/include/sys/event.h)
#PKG_SUGGESTED_OPTIONS+=	kqueue
#.endif

.include "../../mk/bsd.prefs.mk"
.include "../../mk/bsd.options.mk"

.if $(PKG_OPTIONS:Mkqueue)
PATCH_SITES=		http://dmitrymatveev.co.uk/files/
PATCHFILES=		glib-gio-kqueue-2.28.8-v0.patch
PATCH_DIST_STRIP=	-p0

USE_TOOLS+=	automake autoconf
pre-configure: regen-autotools
regen-autotools:
	cd ${WRKSRC} && automake
	cd ${WRKSRC} && autoconf
.endif

$NetBSD: patch-ck,v 1.1 2011/10/09 19:40:02 jmmv Exp $

--- glib/libcharset/Makefile.am.orig	2011-06-05 23:18:49.000000000 +0000
+++ glib/libcharset/Makefile.am
@@ -25,18 +25,6 @@ EXTRA_DIST += 			\
 charset_alias = $(DESTDIR)$(libdir)/charset.alias
 charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
 install-exec-local: all-local
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
-	if test -f $(charset_alias); then \
-	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
-	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
-	  rm -f $(charset_tmp) ; \
-	else \
-	  if test @GLIBC21@ = no; then \
-	    sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
-	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
-	    rm -f $(charset_tmp) ; \
-	  fi ; \
-	fi
 
 uninstall-local: all-local
 	if test -f $(charset_alias); then \

$NetBSD: patch-cl,v 1.1 2011/10/09 19:40:02 jmmv Exp $

--- gio/Makefile.am.orig	2011-10-09 17:21:29.000000000 +0000
+++ gio/Makefile.am
@@ -632,12 +632,6 @@ gdbus_LDADD = libgio-2.0.la \
 	$(top_builddir)/glib/libglib-2.0.la 		\
 	$(top_builddir)/gobject/libgobject-2.0.la
 
-completiondir = $(sysconfdir)/bash_completion.d
-completion_SCRIPTS = \
-	gdbus-bash-completion.sh		\
-	gsettings-bash-completion.sh
-EXTRA_DIST += $(completion_SCRIPTS)
-
 # ------------------------------------------------------------------------
 
 dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj ../build/win32/vs10/gio.vcxproj ../build/win32/vs10/gio.vcxproj.filters

$NetBSD: patch-cm,v 1.1 2011/10/09 19:40:02 jmmv Exp $

sysutils/gio-fam builds the gio/fam backend as a separate module.  Force it
to link against the installed version of glib2, as it is not rebuilt by the
package.

--- gio/fam/Makefile.am.orig	2010-09-27 18:48:33.000000000 +0000
+++ gio/fam/Makefile.am
@@ -25,11 +25,9 @@ libgiofam_la_CFLAGS = \
 	-DGIO_COMPILATION		\
 	-DG_DISABLE_DEPRECATED
 
-libgiofam_la_LDFLAGS = $(module_flags)
+libgiofam_la_LDFLAGS = $(module_flags) \
+		$$(pkg-config --libs gio-2.0 gobject-2.0 glib-2.0)
 libgiofam_la_LIBADD = \
-		$(top_builddir)/gio/libgio-2.0.la \
-		$(top_builddir)/gobject/libgobject-2.0.la \
-		$(top_builddir)/glib/libglib-2.0.la \
 		$(GLIB_LIBS) \
 		$(FAM_LIBS) \
 		$(NULL)
@@ -41,9 +39,6 @@ RUN_QUERY_MODULES=true
 endif
 
 install-data-hook:
-	if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then					\
-		$(top_builddir)/gio/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ;	\
-	fi
 
 uninstall-local:
 	$(RM) $(DESTDIR)$(GIO_MODULE_DIR)/giomodules.cache

$NetBSD: patch-cn,v 1.1 2011/10/09 19:40:03 jmmv Exp $

The mem-overflow test contains a declaration of an empty struct, which breaks
on at least SunPro cc, and presumably some other non-gcc compilers.  Skip this
test for now, pending a better fix.
https://bugzilla.gnome.org/show_bug.cgi?id=641350

--- glib/tests/Makefile.am.orig	2011-06-05 23:18:49.000000000 +0000
+++ glib/tests/Makefile.am
@@ -66,9 +66,6 @@ hostutils_LDADD     = $(progs_ldadd)
 TEST_PROGS         += gvariant
 gvariant_LDADD      = $(progs_ldadd)
 
-TEST_PROGS         += mem-overflow
-mem_overflow_LDADD  = $(progs_ldadd)
-
 TEST_PROGS              += utf8-performance
 utf8_performance_SOURCES = utf8-performance.c
 utf8_performance_LDADD   = $(progs_ldadd)