import glib2-2.0.0

GLib is a library which includes routines for C, providing lists,
trees, hashes, memory allocation functionality and many other things.

glib2 will coexist with glib-1.2.*

12 files changed, 421 insertions, 0 deletions

diff --git a/devel/glib2/DESCR b/devel/glib2/DESCR
new file mode 100644
index 00000000000..31a4fb90c6b
--- /dev/null
+++ b/devel/glib2/DESCR
@@ -0,0 +1,2 @@
+GLib is a library which includes routines for C, providing lists,
+trees, hashes, memory allocation functionality and many other things.
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
new file mode 100644
index 00000000000..b31c7f907a6
--- /dev/null
+++ b/devel/glib2/Makefile
@@ -0,0 +1,38 @@
+# $NetBSD: Makefile,v 1.1.1.1 2002/03/24 20:27:13 dmcmahill Exp $
+#
+
+DISTNAME=		glib-2.0.0
+PKGNAME=		${DISTNAME:S/glib/glib2/}
+CATEGORIES=		devel
+MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
+			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.0/ \
+			http://www.ameth.org/gimp/pub/gtk/v2.0/ \
+			${MASTER_SITE_GNOME:=stable/sources/glib/}
+
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.gtk.org/docs/glib_toc.html
+COMMENT=		Some useful routines for C programming
+
+BUILD_USES_MSGFMT=	yes
+GNU_CONFIGURE=		yes
+USE_BUILDLINK_ONLY=	yes
+USE_GMAKE=		yes
+USE_LIBTOOL=		yes
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+USE_PERL5=		yes
+CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/glib
+CPPFLAGS+=		-I${BUILDLINK_DIR}/PTL/include
+MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
+
+# GLib needs a working pre-emptive pthreads implementation
+USE_PTHREAD=	native ptl2
+
+test: build
+	cd ${WRKSRC} &&  ${MAKE_ENV} ${MAKE_PROGRAM} check 2>&1 | \
+		tee ${WRKDIR}/check.log
+
+.include "../../converters/libiconv/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../devel/pkgconfig/buildlink.mk"
+.include "../../mk/pthread.buildlink.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST
new file mode 100644
index 00000000000..b78c4feb5f2
--- /dev/null
+++ b/devel/glib2/PLIST
@@ -0,0 +1,218 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2002/03/24 20:27:13 dmcmahill Exp $
+bin/glib-genmarshal
+bin/glib-gettextize
+bin/glib-mkenums
+bin/gobject-query
+include/glib/glib-2.0/glib-object.h
+include/glib/glib-2.0/glib.h
+include/glib/glib-2.0/glib/galloca.h
+include/glib/glib-2.0/glib/garray.h
+include/glib/glib-2.0/glib/gasyncqueue.h
+include/glib/glib-2.0/glib/gbacktrace.h
+include/glib/glib-2.0/glib/gcache.h
+include/glib/glib-2.0/glib/gcompletion.h
+include/glib/glib-2.0/glib/gconvert.h
+include/glib/glib-2.0/glib/gdataset.h
+include/glib/glib-2.0/glib/gdate.h
+include/glib/glib-2.0/glib/gdir.h
+include/glib/glib-2.0/glib/gerror.h
+include/glib/glib-2.0/glib/gfileutils.h
+include/glib/glib-2.0/glib/ghash.h
+include/glib/glib-2.0/glib/ghook.h
+include/glib/glib-2.0/glib/giochannel.h
+include/glib/glib-2.0/glib/glist.h
+include/glib/glib-2.0/glib/gmacros.h
+include/glib/glib-2.0/glib/gmain.h
+include/glib/glib-2.0/glib/gmarkup.h
+include/glib/glib-2.0/glib/gmem.h
+include/glib/glib-2.0/glib/gmessages.h
+include/glib/glib-2.0/glib/gnode.h
+include/glib/glib-2.0/glib/gpattern.h
+include/glib/glib-2.0/glib/gprimes.h
+include/glib/glib-2.0/glib/gqsort.h
+include/glib/glib-2.0/glib/gquark.h
+include/glib/glib-2.0/glib/gqueue.h
+include/glib/glib-2.0/glib/grand.h
+include/glib/glib-2.0/glib/grel.h
+include/glib/glib-2.0/glib/gscanner.h
+include/glib/glib-2.0/glib/gshell.h
+include/glib/glib-2.0/glib/gslist.h
+include/glib/glib-2.0/glib/gspawn.h
+include/glib/glib-2.0/glib/gstrfuncs.h
+include/glib/glib-2.0/glib/gstring.h
+include/glib/glib-2.0/glib/gthread.h
+include/glib/glib-2.0/glib/gthreadpool.h
+include/glib/glib-2.0/glib/gtimer.h
+include/glib/glib-2.0/glib/gtree.h
+include/glib/glib-2.0/glib/gtypes.h
+include/glib/glib-2.0/glib/gunicode.h
+include/glib/glib-2.0/glib/gutils.h
+include/glib/glib-2.0/glib/gwin32.h
+include/glib/glib-2.0/gmodule.h
+include/glib/glib-2.0/gobject/gboxed.h
+include/glib/glib-2.0/gobject/gclosure.h
+include/glib/glib-2.0/gobject/genums.h
+include/glib/glib-2.0/gobject/gmarshal.h
+include/glib/glib-2.0/gobject/gobject.h
+include/glib/glib-2.0/gobject/gobjectnotifyqueue.c
+include/glib/glib-2.0/gobject/gparam.h
+include/glib/glib-2.0/gobject/gparamspecs.h
+include/glib/glib-2.0/gobject/gsignal.h
+include/glib/glib-2.0/gobject/gsourceclosure.h
+include/glib/glib-2.0/gobject/gtype.h
+include/glib/glib-2.0/gobject/gtypemodule.h
+include/glib/glib-2.0/gobject/gtypeplugin.h
+include/glib/glib-2.0/gobject/gvalue.h
+include/glib/glib-2.0/gobject/gvaluearray.h
+include/glib/glib-2.0/gobject/gvaluecollector.h
+include/glib/glib-2.0/gobject/gvaluetypes.h
+lib/glib-2.0/include/glibconfig.h
+lib/libglib-2.0.a
+lib/libglib-2.0.la
+lib/libglib-2.0.so
+lib/libglib-2.0.so.0
+lib/libglib-2.0.so.0.0
+lib/libgmodule-2.0.a
+lib/libgmodule-2.0.la
+lib/libgmodule-2.0.so
+lib/libgmodule-2.0.so.0
+lib/libgmodule-2.0.so.0.0
+lib/libgobject-2.0.a
+lib/libgobject-2.0.la
+lib/libgobject-2.0.so
+lib/libgobject-2.0.so.0
+lib/libgobject-2.0.so.0.0
+lib/libgthread-2.0.a
+lib/libgthread-2.0.la
+lib/libgthread-2.0.so
+lib/libgthread-2.0.so.0
+lib/libgthread-2.0.so.0.0
+lib/pkgconfig/glib-2.0.pc
+lib/pkgconfig/gmodule-2.0.pc
+lib/pkgconfig/gobject-2.0.pc
+lib/pkgconfig/gthread-2.0.pc
+man/man1/glib-genmarshal.1
+man/man1/glib-mkenums.1
+share/aclocal/glib-2.0.m4
+share/aclocal/glib-gettext.m4
+share/glib-2.0/gettext/po/Makefile.in.in
+share/gtk-doc/html/glib/glib-arrays.html
+share/gtk-doc/html/glib/glib-asynchronous-queues.html
+share/gtk-doc/html/glib/glib-automatic-string-completion.html
+share/gtk-doc/html/glib/glib-balanced-binary-trees.html
+share/gtk-doc/html/glib/glib-basic-types.html
+share/gtk-doc/html/glib/glib-building.html
+share/gtk-doc/html/glib/glib-byte-arrays.html
+share/gtk-doc/html/glib/glib-byte-order-macros.html
+share/gtk-doc/html/glib/glib-caches.html
+share/gtk-doc/html/glib/glib-changes-2-0.html
+share/gtk-doc/html/glib/glib-character-set-conversion.html
+share/gtk-doc/html/glib/glib-compiling.html
+share/gtk-doc/html/glib/glib-core.html
+share/gtk-doc/html/glib/glib-data-types.html
+share/gtk-doc/html/glib/glib-datasets.html
+share/gtk-doc/html/glib/glib-date-and-time-functions.html
+share/gtk-doc/html/glib/glib-double-ended-queues.html
+share/gtk-doc/html/glib/glib-doubly-linked-lists.html
+share/gtk-doc/html/glib/glib-dynamic-loading-of-modules.html
+share/gtk-doc/html/glib/glib-error-reporting.html
+share/gtk-doc/html/glib/glib-file-utilities.html
+share/gtk-doc/html/glib/glib-fundamentals.html
+share/gtk-doc/html/glib/glib-glob-style-pattern-matching.html
+share/gtk-doc/html/glib/glib-hash-tables.html
+share/gtk-doc/html/glib/glib-hook-functions.html
+share/gtk-doc/html/glib/glib-io-channels.html
+share/gtk-doc/html/glib/glib-keyed-data-lists.html
+share/gtk-doc/html/glib/glib-lexical-scanner.html
+share/gtk-doc/html/glib/glib-limits-of-basic-types.html
+share/gtk-doc/html/glib/glib-memory-allocation.html
+share/gtk-doc/html/glib/glib-memory-allocators.html
+share/gtk-doc/html/glib/glib-memory-chunks.html
+share/gtk-doc/html/glib/glib-message-logging.html
+share/gtk-doc/html/glib/glib-miscellaneous-macros.html
+share/gtk-doc/html/glib/glib-miscellaneous-utility-functions.html
+share/gtk-doc/html/glib/glib-n-ary-trees.html
+share/gtk-doc/html/glib/glib-numerical-definitions.html
+share/gtk-doc/html/glib/glib-pointer-arrays.html
+share/gtk-doc/html/glib/glib-quarks.html
+share/gtk-doc/html/glib/glib-random-numbers.html
+share/gtk-doc/html/glib/glib-relations-and-tuples.html
+share/gtk-doc/html/glib/glib-resources.html
+share/gtk-doc/html/glib/glib-running.html
+share/gtk-doc/html/glib/glib-shell-related-utilities.html
+share/gtk-doc/html/glib/glib-simple-xml-subset-parser.html
+share/gtk-doc/html/glib/glib-singly-linked-lists.html
+share/gtk-doc/html/glib/glib-spawning-processes.html
+share/gtk-doc/html/glib/glib-standard-macros.html
+share/gtk-doc/html/glib/glib-string-chunks.html
+share/gtk-doc/html/glib/glib-string-utility-functions.html
+share/gtk-doc/html/glib/glib-strings.html
+share/gtk-doc/html/glib/glib-the-main-event-loop.html
+share/gtk-doc/html/glib/glib-thread-pools.html
+share/gtk-doc/html/glib/glib-threads.html
+share/gtk-doc/html/glib/glib-timers.html
+share/gtk-doc/html/glib/glib-trash-stacks.html
+share/gtk-doc/html/glib/glib-type-conversion-macros.html
+share/gtk-doc/html/glib/glib-unicode-manipulation.html
+share/gtk-doc/html/glib/glib-utilities.html
+share/gtk-doc/html/glib/glib-warnings-and-assertions.html
+share/gtk-doc/html/glib/glib-windows-compatability-functions.html
+share/gtk-doc/html/glib/glib.html
+share/gtk-doc/html/glib/index.html
+share/gtk-doc/html/glib/index.sgml
+share/gtk-doc/html/glib/mainloop-states.gif
+share/gtk-doc/html/gobject/f4.html
+share/gtk-doc/html/gobject/gobject-boxed-types.html
+share/gtk-doc/html/gobject/gobject-closures.html
+share/gtk-doc/html/gobject/gobject-enumeration-and-flag-types.html
+share/gtk-doc/html/gobject/gobject-generic-values.html
+share/gtk-doc/html/gobject/gobject-gparamspec.html
+share/gtk-doc/html/gobject/gobject-gtype.html
+share/gtk-doc/html/gobject/gobject-gtypemodule.html
+share/gtk-doc/html/gobject/gobject-gtypeplugin.html
+share/gtk-doc/html/gobject/gobject-signals.html
+share/gtk-doc/html/gobject/gobject-standard-parameter-and-value-types.html
+share/gtk-doc/html/gobject/gobject-the-base-object-type.html
+share/gtk-doc/html/gobject/gobject-value-arrays.html
+share/gtk-doc/html/gobject/gobject-varargs-value-collection.html
+share/gtk-doc/html/gobject/index.html
+share/gtk-doc/html/gobject/index.sgml
+share/gtk-doc/html/gobject/r28.html
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/glib20.mo
+@dirrm share/gtk-doc/html/gobject
+@dirrm share/gtk-doc/html/glib
+@unexec ${RMDIR} %D/share/gtk-doc/html 2>/dev/null || true
+@unexec ${RMDIR} %D/share/gtk-doc 2>/dev/null || true
+@dirrm share/glib-2.0/gettext/po
+@dirrm share/glib-2.0/gettext
+@dirrm share/glib-2.0
+@dirrm lib/glib-2.0/include
+@dirrm lib/glib-2.0
+@dirrm include/glib/glib-2.0/gobject
+@dirrm include/glib/glib-2.0/glib
+@dirrm include/glib/glib-2.0
+@unexec ${RMDIR} %D/include/glib 2>/dev/null || true
diff --git a/devel/glib2/buildlink.mk b/devel/glib2/buildlink.mk
new file mode 100644
index 00000000000..469d59f6c18
--- /dev/null
+++ b/devel/glib2/buildlink.mk
@@ -0,0 +1,49 @@
+# $NetBSD: buildlink.mk,v 1.1.1.1 2002/03/24 20:27:12 dmcmahill Exp $
+#
+# This Makefile fragment is included by packages that use glib2.
+#
+# To use this Makefile fragment, simply:
+#
+# (1) Optionally define BUILDLINK_DEPENDS.glib2 to the dependency pattern
+#     for the version of glib2 desired.
+# (2) Include this Makefile fragment in the package Makefile,
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
+#     search path, and
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
+#     path.
+
+.if !defined(GLIB2_BUILDLINK_MK)
+GLIB2_BUILDLINK_MK=	# defined
+
+.include "../../mk/bsd.buildlink.mk"
+
+BUILDLINK_DEPENDS.glib2?=	glib2>=2.0.0
+DEPENDS+=	${BUILDLINK_DEPENDS.glib2}:../../devel/glib2
+
+EVAL_PREFIX+=		BUILDLINK_PREFIX.glib2=glib2
+BUILDLINK_PREFIX.glib2_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.glib2=	include/glib/glib-2.0/*/*
+BUILDLINK_FILES.glib2+=	include/glib/glib-2.0/*
+BUILDLINK_FILES.glib2+=	lib/glib-2.0/*/*
+BUILDLINK_FILES.glib2+=	lib/libglib-2.0.*
+BUILDLINK_FILES.glib2+=	lib/libgmodule-2.0.*
+BUILDLINK_FILES.glib2+=	lib/libgobject-2.0.*
+BUILDLINK_FILES.glib2+=	lib/libgthread-2.0.*
+
+.include "../../devel/pkgconfig/buildlink.mk"
+
+USE_PTHREAD=	native pth
+
+.include "../../mk/bsd.prefs.mk"
+.include "../../mk/pthread.buildlink.mk"
+
+BUILDLINK_TARGETS.glib2=	glib2-buildlink
+BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.glib2}
+BUILDLINK_TARGETS+=		${BUILDLINK_PKG_CONFIG}
+
+pre-configure: ${BUILDLINK_TARGETS}
+glib2-buildlink: _BUILDLINK_USE
+
+.include "../../converters/libiconv/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink.mk"
+.endif	# GLIB2_BUILDLINK_MK
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
new file mode 100644
index 00000000000..02b016d4896
--- /dev/null
+++ b/devel/glib2/distinfo
@@ -0,0 +1,11 @@
+$NetBSD: distinfo,v 1.1.1.1 2002/03/24 20:27:13 dmcmahill Exp $
+
+SHA1 (glib-2.0.0.tar.gz) = 0e3a4e3e5976b80b3012d2d43ab4302234cd6d2a
+Size (glib-2.0.0.tar.gz) = 1912609 bytes
+SHA1 (patch-aa) = d59bac2708e57bb4ed71c8c53cf5a44e49678200
+SHA1 (patch-ab) = 25af7a9182d6f418a31fe4dcd55f9aa122efd014
+SHA1 (patch-ac) = 7e142da5602e4a85053f63579d1ac355fa3c3624
+SHA1 (patch-ad) = 67336714c87cad9b2400b24b6f3d2d4dca977214
+SHA1 (patch-ae) = 595a79aea5bbe65a10e34084629900b1da7b4b7b
+SHA1 (patch-af) = 28dff19acbe3df8c1bcf2055b35eb5b20201f395
+SHA1 (patch-ag) = fb9865c0210ede92c7af3792d30b13d582e5d38d
diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa
new file mode 100644
index 00000000000..7aa3db10358
--- /dev/null
+++ b/devel/glib2/patches/patch-aa
@@ -0,0 +1,11 @@
+$NetBSD: patch-aa,v 1.1.1.1 2002/03/24 20:27:13 dmcmahill Exp $
+
+--- glib-2.0.pc.in.orig	Tue Mar  5 00:17:38 2002
++++ glib-2.0.pc.in
+@@ -10,5 +10,5 @@
+ Name: GLib
+ Description: C Utility Library
+ Version: @VERSION@
+-Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ @ICONV_LIBS@
++Libs: -L${libdir} -R${libdir} -lglib-2.0 @INTLLIBS@ @ICONV_LIBS@
+ Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include 
diff --git a/devel/glib2/patches/patch-ab b/devel/glib2/patches/patch-ab
new file mode 100644
index 00000000000..c9f3555ed1c
--- /dev/null
+++ b/devel/glib2/patches/patch-ab
@@ -0,0 +1,11 @@
+$NetBSD: patch-ab,v 1.1.1.1 2002/03/24 20:27:13 dmcmahill Exp $
+
+--- gmodule-2.0.pc.in.orig	Tue Mar  5 00:17:38 2002
++++ gmodule-2.0.pc.in
+@@ -9,5 +9,5 @@
+ Description: Dynamic module loader for GLib
+ Requires: glib-2.0
+ Version: @VERSION@
+-Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-2.0 @G_MODULE_LIBS@
++Libs: -L${libdir} -R${libdir} @G_MODULE_LDFLAGS@ -lgmodule-2.0 @G_MODULE_LIBS@
+ Cflags:
diff --git a/devel/glib2/patches/patch-ac b/devel/glib2/patches/patch-ac
new file mode 100644
index 00000000000..7d4a2914e16
--- /dev/null
+++ b/devel/glib2/patches/patch-ac
@@ -0,0 +1,11 @@
+$NetBSD: patch-ac,v 1.1.1.1 2002/03/24 20:27:13 dmcmahill Exp $
+
+--- gobject-2.0.pc.in.orig	Tue Mar  5 00:17:38 2002
++++ gobject-2.0.pc.in
+@@ -7,5 +7,5 @@
+ Description: GLib Type, Object, Parameter and Signal Library
+ Requires: glib-2.0
+ Version: @VERSION@
+-Libs: -L${libdir} -lgobject-2.0
++Libs: -L${libdir} -R${libdir} -lgobject-2.0
+ Cflags:
diff --git a/devel/glib2/patches/patch-ad b/devel/glib2/patches/patch-ad
new file mode 100644
index 00000000000..77413266bd4
--- /dev/null
+++ b/devel/glib2/patches/patch-ad
@@ -0,0 +1,11 @@
+$NetBSD: patch-ad,v 1.1.1.1 2002/03/24 20:27:13 dmcmahill Exp $
+
+--- gthread-2.0.pc.in.orig	Tue Mar  5 00:17:38 2002
++++ gthread-2.0.pc.in
+@@ -7,5 +7,5 @@
+ Description: Thread support for GLib
+ Requires: glib-2.0
+ Version: @VERSION@
+-Libs: -L${libdir} -lgthread-2.0 @G_THREAD_LIBS@
++Libs: -L${libdir} -R${libdir} -lgthread-2.0 @G_THREAD_LIBS@
+ Cflags: @G_THREAD_CFLAGS@
diff --git a/devel/glib2/patches/patch-ae b/devel/glib2/patches/patch-ae
new file mode 100644
index 00000000000..8f335cb7ab5
--- /dev/null
+++ b/devel/glib2/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1.1.1 2002/03/24 20:27:13 dmcmahill Exp $
+
+--- configure.orig	Fri Mar  8 10:54:21 2002
++++ configure
+@@ -6123,7 +6123,7 @@
+ 
+ # AM_GLIB_GNU_GETTEXT above substs $DATADIRNAME
+ # this is the directory where the *.{mo,gmo} files are installed
+-GLIB_LOCALE_DIR="${prefix}/${DATADIRNAME}/locale"
++GLIB_LOCALE_DIR="${prefix}/${PKGLOCALEDIR}/locale"
+ cat >>confdefs.h <<_ACEOF
+ #define GLIB_LOCALE_DIR "$GLIB_LOCALE_DIR"
+ _ACEOF
+@@ -16852,7 +16852,7 @@
+ 		G_THREAD_LIBS="-pthread"
+ 		;;
+              *)
+-		for thread_lib in "" pthread pthread32 pthreads thread dce; do
++		for thread_lib in "" PTL pthread pthread32 pthreads thread dce; do
+ 			if test x"$thread_lib" = x; then
+ 				add_thread_lib=""
+ 				IN=""
diff --git a/devel/glib2/patches/patch-af b/devel/glib2/patches/patch-af
new file mode 100644
index 00000000000..ce2a2760b29
--- /dev/null
+++ b/devel/glib2/patches/patch-af
@@ -0,0 +1,15 @@
+$NetBSD: patch-af,v 1.1.1.1 2002/03/24 20:27:13 dmcmahill Exp $
+
+--- po/Makefile.in.in.orig	Thu Jan 31 19:02:12 2002
++++ po/Makefile.in.in
+@@ -26,8 +26,8 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = $(prefix)/@DATADIRNAME@
+-localedir = $(datadir)/locale
+-gnulocaledir = $(prefix)/share/locale
++localedir = $(prefix)/${PKGLOCALEDIR}/locale
++gnulocaledir = $(prefix)/${PKGLOCALEDIR}/locale
+ gettextsrcdir = $(prefix)/share/glib-2.0/gettext/po
+ subdir = po
+ 
diff --git a/devel/glib2/patches/patch-ag b/devel/glib2/patches/patch-ag
new file mode 100644
index 00000000000..39691dcd504
--- /dev/null
+++ b/devel/glib2/patches/patch-ag
@@ -0,0 +1,22 @@
+$NetBSD: patch-ag,v 1.1.1.1 2002/03/24 20:27:13 dmcmahill Exp $
+
+--- glib/giochannel.c.orig	Fri Mar  8 10:50:54 2002
++++ glib/giochannel.c
+@@ -1730,7 +1730,7 @@
+ 
+   if (!channel->use_buffer)
+     {
+-      gint tmp_bytes;
++      glong tmp_bytes;
+       
+       g_assert (!channel->read_buf || channel->read_buf->len == 0);
+ 
+@@ -1922,7 +1922,7 @@
+ 
+   if (!channel->use_buffer)
+     {
+-      gint tmp_bytes;
++      glong tmp_bytes;
+       
+       g_assert (!channel->write_buf || channel->write_buf->len == 0);
+       g_assert (channel->partial_write_buf[0] == '\0');