Upgrade to GNOME 1.0. The following are the details:

 ports/audio/esound			0.2.7    ->  0.2.8	PR ports/10422
 ports/audio/gnomeaudio			0.99.8   ->  1.0.0	PR ports/10426
 ports/audio/libaudiofile		0.1.5    ->  0.1.6	PR ports/10421
 ports/deskutils/gnomepim		0.99.8.1 ->  1.0.1	PR ports/10435
 ports/devel/ORBit			0.3.98   ->  0.4.0	PR ports/10423
 ports/devel/gettext			shared libs now		PR ports/10293
 ports/devel/glib12			1.1.16   ->  1.2.0	PR ports/10419
 ports/devel/libgtop			0.99.8   ->  1.0.1	PR ports/10430
 ports/games/gnomegames			0.99.8   ->  1.0.1	PR ports/10436
 ports/graphics/electriceyes		distfile moved		PR ports/10437
 ports/graphics/imlib			1.9.3    ->  1.9.4	PR ports/10424
 ports/lang/gnomeobjc			0.99.3   ->  1.0.1	PR ports/10441
 ports/math/gnumeric			0.6      ->  0.15	PR ports/10439
 ports/misc/gnomeutils			0.99.5   ->  1.0.1	PR ports/10442
 ports/sysutils/gnomeadmin		0.99.1   ->  1.0.1	PR ports/10445
 ports/sysutils/gnomecontrolcenter	0.99.3.1 ->  1.0.1	PR ports/10446
 ports/sysutils/gtop			0.99.2   ->  1.0.1	PR ports/10477
 ports/textproc/libxml			0.99.8   ->  1.0.0	PR ports/10438
 ports/www/libghttp			distfile moved		PR ports/10429
 ports/x11/gnome			0.99.3   ->  1.0.0	PR ports/10450
 ports/x11/gnomecore			0.99.8.1 ->  1.0.1	PR ports/10432
 ports/x11/gnomelibs			0.99.8.1 ->  1.0.1	PR ports/10425
 ports/x11-fm/gnomemc			4.5.10   ->  4.5.23	PR ports/10448
 ports/x11-toolkits/gtk-engines		0.1      ->  0.5	PR ports/10427
 ports/x11-toolkits/gtk12		1.1.6    ->  1.2.0	PR ports/10420

Note that repository copies were made before this commit, as follows:

 ports/devel/glib11-devel       -> ports/devel/glib12
 ports/x11-toolkits/gtk11-devel -> ports/x11-toolkits/gtk12

Submitted by:	Jeremy Lea <reg@shale.csir.co.za>

8 files changed, 247 insertions, 398 deletions

diff --git a/devel/glib12/Makefile b/devel/glib12/Makefile
index 7343c701a67b..7992787f2356 100644
--- a/devel/glib12/Makefile
+++ b/devel/glib12/Makefile
@@ -1,24 +1,24 @@
-# New ports collection makefile for:   glib11-devel
-# Version required:		1.1.16
+# New ports collection makefile for:   glib12
+# Version required:		1.2.0
 # Date Created:			28 July 1998
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.16 1999/01/30 20:23:09 sada Exp $
+# $Id: Makefile,v 1.17 1999/02/17 18:12:08 vanilla Exp $
 #
 
-DISTNAME=	glib-1.1.16
+DISTNAME=	glib-1.2.0
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.1/ \
-		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \
-		http://www.ameth.org/gimp/gtk/v1.1/
+MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.2/ \
+		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
+		http://www.ameth.org/gimp/gtk/v1.2/
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ARGS=	--includedir=${PREFIX}/include/glib11d
+CONFIGURE_ARGS=	--includedir=${PREFIX}/include/glib12
 
-MAN1=		glib-config.1
+MAN1=		glib12-config.1
 
 post-install:
 	@if [ ! -f ${PREFIX}/info/dir ]; then \
diff --git a/devel/glib12/distinfo b/devel/glib12/distinfo
index 84c47db10e06..3339035c5518 100644
--- a/devel/glib12/distinfo
+++ b/devel/glib12/distinfo
@@ -1 +1 @@
-MD5 (glib-1.1.16.tar.gz) = f1b32a51becffdad18193b84656989b0
+MD5 (glib-1.2.0.tar.gz) = b19f308dbbd393b6199e743cb1c648a1
diff --git a/devel/glib12/files/patch-ab b/devel/glib12/files/patch-ab
index df40e4bbf003..0ae004d00c11 100644
--- a/devel/glib12/files/patch-ab
+++ b/devel/glib12/files/patch-ab
@@ -11,113 +11,91 @@
 +configincludedir = $(includedir)
  
 -bin_SCRIPTS = glib-config
-+bin_SCRIPTS = glib11d-config
++bin_SCRIPTS = glib12-config
  
  BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
  
-@@ -102,9 +102,9 @@
- EXTRA_DIST =  	glib.m4				glib.spec			acglib.m4			sanity_check			README.win32			glib.def			makefile.msc			giowin32.c			glibconfig.h.win32		config.h.win32
+@@ -102,7 +102,7 @@
+ EXTRA_DIST =  	glib.m4				glib.spec.in			acglib.m4			sanity_check			README.win32			glib.def			makefile.msc			giowin32.c			glibconfig.h.win32		config.h.win32
  
  
 -lib_LTLIBRARIES = libglib.la
-+lib_LTLIBRARIES = libglib11d.la
++lib_LTLIBRARIES = libglib12.la
  
--libglib_la_SOURCES =  	garray.c		gcache.c		gcompletion.c		gdataset.c		gdate.c         	gerror.c		ghash.c			ghook.c			giochannel.c    	giounix.c       	glist.c			gmain.c         	gmem.c			gmessages.c		gmutex.c		gnode.c			gprimes.c		grel.c			gscanner.c		gslist.c		gstrfuncs.c		gstring.c		gtimer.c		gtree.c			gutils.c
-+libglib11d_la_SOURCES =  	garray.c		gcache.c		gcompletion.c		gdataset.c		gdate.c         	gerror.c		ghash.c			ghook.c			giochannel.c    	giounix.c       	glist.c			gmain.c         	gmem.c			gmessages.c		gmutex.c		gnode.c			gprimes.c		grel.c			gscanner.c		gslist.c		gstrfuncs.c		gstring.c		gtimer.c		gtree.c			gutils.c
+ libglib_la_SOURCES =  	garray.c		gcache.c		gcompletion.c		gdataset.c		gdate.c         	gerror.c		ghash.c			ghook.c			giochannel.c    	giounix.c       	glist.c			gmain.c         	gmem.c			gmessages.c		gmutex.c		gnode.c			gprimes.c		grel.c			gscanner.c		gslist.c		gstrfuncs.c		gstring.c		gtimer.c		gtree.c			gutils.c
  
- 
- include_HEADERS =  	glib.h
 @@ -113,20 +113,20 @@
  configinclude_DATA =  	glibconfig.h
  
  
 -libglib_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
-+libglib11d_la_LDFLAGS =  	-version-info 2:1:0
++libglib_la_LDFLAGS =  	-version-info 1:0:0
  
  
  noinst_PROGRAMS = testglib testgdate testgdateparser
 -testglib_LDADD = libglib.la
 -testgdate_LDADD = libglib.la
 -testgdateparser_LDADD = libglib.la
-+testglib_LDADD = libglib11d.la
-+testgdate_LDADD = libglib11d.la
-+testgdateparser_LDADD = libglib11d.la
++testglib_LDADD = libglib12.la
++testgdate_LDADD = libglib12.la
++testgdateparser_LDADD = libglib12.la
  
  m4datadir = $(datadir)/aclocal
  m4data_DATA = glib.m4
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = config.h
--CONFIG_CLEAN_FILES =  glib-config
-+CONFIG_CLEAN_FILES =  glib11d-config
+-CONFIG_CLEAN_FILES =  glib.spec glib-config
++CONFIG_CLEAN_FILES =  glib12-config
  LTLIBRARIES =  $(lib_LTLIBRARIES)
  
  
-@@ -134,8 +134,8 @@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--libglib_la_LIBADD = 
--libglib_la_OBJECTS =  garray.lo gcache.lo gcompletion.lo gdataset.lo \
-+libglib11d_la_LIBADD = 
-+libglib11d_la_OBJECTS =  garray.lo gcache.lo gcompletion.lo gdataset.lo \
- gdate.lo gerror.lo ghash.lo ghook.lo giochannel.lo giounix.lo glist.lo \
- gmain.lo gmem.lo gmessages.lo gmutex.lo gnode.lo gprimes.lo grel.lo \
- gscanner.lo gslist.lo gstrfuncs.lo gstring.lo gtimer.lo gtree.lo \
 @@ -144,15 +144,15 @@
  
  testglib_SOURCES = testglib.c
  testglib_OBJECTS =  testglib.o
 -testglib_DEPENDENCIES =  libglib.la
-+testglib_DEPENDENCIES =  libglib11d.la
++testglib_DEPENDENCIES =  libglib12.la
  testglib_LDFLAGS = 
  testgdate_SOURCES = testgdate.c
  testgdate_OBJECTS =  testgdate.o
 -testgdate_DEPENDENCIES =  libglib.la
-+testgdate_DEPENDENCIES =  libglib11d.la
++testgdate_DEPENDENCIES =  libglib12.la
  testgdate_LDFLAGS = 
  testgdateparser_SOURCES = testgdateparser.c
  testgdateparser_OBJECTS =  testgdateparser.o
 -testgdateparser_DEPENDENCIES =  libglib.la
-+testgdateparser_DEPENDENCIES =  libglib11d.la
++testgdateparser_DEPENDENCIES =  libglib12.la
  testgdateparser_LDFLAGS = 
  SCRIPTS =  $(bin_SCRIPTS)
  
-@@ -175,8 +175,8 @@
- 
- TAR = tar
- GZIP_ENV = --best
--SOURCES = $(libglib_la_SOURCES) testglib.c testgdate.c testgdateparser.c
--OBJECTS = $(libglib_la_OBJECTS) testglib.o testgdate.o testgdateparser.o
-+SOURCES = $(libglib11d_la_SOURCES) testglib.c testgdate.c testgdateparser.c
-+OBJECTS = $(libglib11d_la_OBJECTS) testglib.o testgdate.o testgdateparser.o
- 
- all: all-redirect
- .SUFFIXES:
-@@ -223,7 +223,10 @@
- 	-rm -f config.h
- 
+@@ -226,7 +226,7 @@
  maintainer-clean-hdr:
+ glib.spec: $(top_builddir)/config.status glib.spec.in
+ 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 -glib-config: $(top_builddir)/config.status glib-config.in
-+glib11d-config.in: glib-config.in
-+	cp glib-config.in glib11d-config.in
-+
-+glib11d-config: $(top_builddir)/config.status glib11d-config.in
++glib12-config: $(top_builddir)/config.status glib12-config.in
  	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
  
  mostlyclean-libLTLIBRARIES:
-@@ -289,8 +292,8 @@
+@@ -292,7 +292,7 @@
  
  maintainer-clean-libtool:
  
 -libglib.la: $(libglib_la_OBJECTS) $(libglib_la_DEPENDENCIES)
--	$(LINK) -rpath $(libdir) $(libglib_la_LDFLAGS) $(libglib_la_OBJECTS) $(libglib_la_LIBADD) $(LIBS)
-+libglib11d.la: $(libglib11d_la_OBJECTS) $(libglib11d_la_DEPENDENCIES)
-+	$(LINK) -rpath $(libdir) $(libglib11d_la_LDFLAGS) $(libglib11d_la_OBJECTS) $(libglib11d_la_LIBADD) $(LIBS)
++libglib12.la: $(libglib_la_OBJECTS) $(libglib_la_DEPENDENCIES)
+ 	$(LINK) -rpath $(libdir) $(libglib_la_LDFLAGS) $(libglib_la_OBJECTS) $(libglib_la_LIBADD) $(LIBS)
  
  mostlyclean-noinstPROGRAMS:
+@@ -535,7 +535,6 @@
+ 	      || exit 1; \
+ 	  fi; \
+ 	done
+-	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
  
-@@ -558,7 +561,7 @@
+ info-am:
+ info: info-recursive
+@@ -562,7 +561,7 @@
  		uninstall-configincludeDATA uninstall-m4dataDATA \
  		uninstall-includeHEADERS
  uninstall: uninstall-recursive
@@ -126,114 +104,69 @@
  		$(HEADERS) config.h
  all-redirect: all-recursive-am
  install-strip:
+@@ -640,7 +639,8 @@
+ installdirs mostlyclean-generic distclean-generic clean-generic \
+ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+ 
+-glib-config: glib-config.in
++glib12-config.in: glib-config.in
++	cp glib-config.in glib12-config.in
+ 
+ configure: configure.in acglib.m4		
+ glibconfig.h: stamp-gc-h
 --- gmodule/Makefile.in.orig	Thu Jan 28 23:01:00 1999
 +++ gmodule/Makefile.in	Thu Jan 28 23:06:56 1999
-@@ -98,29 +98,29 @@
+@@ -98,12 +98,12 @@
  include_HEADERS =  		gmodule.h
  
  
 -libglib = $(top_builddir)/libglib.la # -lglib
-+libglib = $(top_builddir)/libglib11d.la # -lglib
++libglib = $(top_builddir)/libglib12.la # -lglib
  
 -lib_LTLIBRARIES = libgmodule.la libgplugin_a.la libgplugin_b.la
-+lib_LTLIBRARIES = libgmodule11d.la libgplugin11d_a.la libgplugin11d_b.la
++lib_LTLIBRARIES = libgmodule12.la libgplugin12_a.la libgplugin12_b.la
  
--libgmodule_la_SOURCES = gmodule.c
+ libgmodule_la_SOURCES = gmodule.c
 -libgmodule_la_LDFLAGS =  	@G_MODULE_LDFLAGS@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
-+libgmodule11d_la_SOURCES = gmodule.c
-+libgmodule11d_la_LDFLAGS =  	@G_MODULE_LDFLAGS@ 	-version-info 2:1:0
- 
- 
--libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
-+libgmodule11d_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
- # we should really depend on $(libglib) for libgmodule.la, but libtool has a
- # problem with this ;(
- 
--libgplugin_a_la_SOURCES = libgplugin_a.c
--libgplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@
--libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
--
--libgplugin_b_la_SOURCES = libgplugin_b.c
--libgplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@
--libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
-+libgplugin11d_a_la_SOURCES = libgplugin_a.c
-+libgplugin11d_a_la_LDFLAGS = @G_MODULE_LDFLAGS@
-+libgplugin11d_a_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
-+
-+libgplugin11d_b_la_SOURCES = libgplugin_b.c
-+libgplugin11d_b_la_LDFLAGS = @G_MODULE_LDFLAGS@
-+libgplugin11d_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
++libgmodule_la_LDFLAGS =  	@G_MODULE_LDFLAGS@ 	-version-info 1:0:0
+ 
+ 
+ libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
+@@ -120,7 +120,7 @@
  
  noinst_PROGRAMS = testgmodule
  testgmodule_LDFLAGS =  @G_MODULE_LDFLAGS@
 -testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@
-+testgmodule_LDADD = libgmodule11d.la $(libglib) @G_MODULE_LIBS@
++testgmodule_LDADD = libgmodule12.la $(libglib) @G_MODULE_LIBS@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../config.h
  CONFIG_CLEAN_FILES =  gmoduleconf.h
-@@ -131,22 +131,22 @@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--libgmodule_la_DEPENDENCIES = 
--libgmodule_la_OBJECTS =  gmodule.lo
--libgplugin_a_la_DEPENDENCIES = 
--libgplugin_a_la_OBJECTS =  libgplugin_a.lo
--libgplugin_b_la_DEPENDENCIES = 
--libgplugin_b_la_OBJECTS =  libgplugin_b.lo
-+libgmodule11d_la_DEPENDENCIES = 
-+libgmodule11d_la_OBJECTS =  gmodule.lo
-+libgplugin11d_a_la_DEPENDENCIES = 
-+libgplugin11d_a_la_OBJECTS =  libgplugin_a.lo
-+libgplugin11d_b_la_DEPENDENCIES = 
-+libgplugin11d_b_la_OBJECTS =  libgplugin_b.lo
- PROGRAMS =  $(noinst_PROGRAMS)
+@@ -141,7 +141,7 @@
  
  testgmodule_SOURCES = testgmodule.c
  testgmodule_OBJECTS =  testgmodule.o
 -testgmodule_DEPENDENCIES =  libgmodule.la $(top_builddir)/libglib.la
-+testgmodule_DEPENDENCIES =  libgmodule11d.la $(top_builddir)/libglib11d.la
++testgmodule_DEPENDENCIES =  libgmodule12.la $(top_builddir)/libglib12.la
  CFLAGS = @CFLAGS@
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --mode=link $(CCLD) -export-dynamic $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
- HEADERS =  $(include_HEADERS)
- 
- DIST_COMMON =  AUTHORS COPYING ChangeLog Makefile.am Makefile.in \
-@@ -157,8 +157,8 @@
- 
- TAR = tar
- GZIP_ENV = --best
--SOURCES = $(libgmodule_la_SOURCES) $(libgplugin_a_la_SOURCES) $(libgplugin_b_la_SOURCES) testgmodule.c
--OBJECTS = $(libgmodule_la_OBJECTS) $(libgplugin_a_la_OBJECTS) $(libgplugin_b_la_OBJECTS) testgmodule.o
-+SOURCES = $(libgmodule11d_la_SOURCES) $(libgplugin11d_a_la_SOURCES) $(libgplugin11d_b_la_SOURCES) testgmodule.c
-+OBJECTS = $(libgmodule11d_la_OBJECTS) $(libgplugin11d_a_la_OBJECTS) $(libgplugin11d_b_la_OBJECTS) testgmodule.o
- 
- all: all-redirect
- .SUFFIXES:
-@@ -226,14 +226,14 @@
+@@ -226,13 +226,13 @@
  
  maintainer-clean-libtool:
  
 -libgmodule.la: $(libgmodule_la_OBJECTS) $(libgmodule_la_DEPENDENCIES)
--	$(LINK) -rpath $(libdir) $(libgmodule_la_LDFLAGS) $(libgmodule_la_OBJECTS) $(libgmodule_la_LIBADD) $(LIBS)
-+libgmodule11d.la: $(libgmodule11d_la_OBJECTS) $(libgmodule11d_la_DEPENDENCIES)
-+	$(LINK) -rpath $(libdir) $(libgmodule11d_la_LDFLAGS) $(libgmodule11d_la_OBJECTS) $(libgmodule11d_la_LIBADD) $(LIBS)
++libgmodule12.la: $(libgmodule_la_OBJECTS) $(libgmodule_la_DEPENDENCIES)
+ 	$(LINK) -rpath $(libdir) $(libgmodule_la_LDFLAGS) $(libgmodule_la_OBJECTS) $(libgmodule_la_LIBADD) $(LIBS)
  
 -libgplugin_a.la: $(libgplugin_a_la_OBJECTS) $(libgplugin_a_la_DEPENDENCIES)
--	$(LINK) -rpath $(libdir) $(libgplugin_a_la_LDFLAGS) $(libgplugin_a_la_OBJECTS) $(libgplugin_a_la_LIBADD) $(LIBS)
-+libgplugin11d_a.la: $(libgplugin11d_a_la_OBJECTS) $(libgplugin11d_a_la_DEPENDENCIES)
-+	$(LINK) -rpath $(libdir) $(libgplugin11d_a_la_LDFLAGS) $(libgplugin11d_a_la_OBJECTS) $(libgplugin11d_a_la_LIBADD) $(LIBS)
++libgplugin12_a.la: $(libgplugin_a_la_OBJECTS) $(libgplugin_a_la_DEPENDENCIES)
+ 	$(LINK) -rpath $(libdir) $(libgplugin_a_la_LDFLAGS) $(libgplugin_a_la_OBJECTS) $(libgplugin_a_la_LIBADD) $(LIBS)
  
 -libgplugin_b.la: $(libgplugin_b_la_OBJECTS) $(libgplugin_b_la_DEPENDENCIES)
--	$(LINK) -rpath $(libdir) $(libgplugin_b_la_LDFLAGS) $(libgplugin_b_la_OBJECTS) $(libgplugin_b_la_LIBADD) $(LIBS)
-+libgplugin11d_b.la: $(libgplugin11d_b_la_OBJECTS) $(libgplugin11d_b_la_DEPENDENCIES)
-+	$(LINK) -rpath $(libdir) $(libgplugin11d_b_la_LDFLAGS) $(libgplugin11d_b_la_OBJECTS) $(libgplugin11d_b_la_LIBADD) $(LIBS)
++libgplugin12_b.la: $(libgplugin_b_la_OBJECTS) $(libgplugin_b_la_DEPENDENCIES)
+ 	$(LINK) -rpath $(libdir) $(libgplugin_b_la_LDFLAGS) $(libgplugin_b_la_OBJECTS) $(libgplugin_b_la_LIBADD) $(LIBS)
  
  mostlyclean-noinstPROGRAMS:
- 
 @@ -327,7 +327,7 @@
  install: install-am
  uninstall-am: uninstall-libLTLIBRARIES uninstall-includeHEADERS
@@ -248,11 +181,11 @@
  	done
  
 -install-libLTLIBRARIES: libgmodule.la
-+install-libLTLIBRARIES: libgmodule11d.la
++install-libLTLIBRARIES: libgmodule12.la
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(libdir)
 -	@list='libgmodule.la'; for p in $$list; do \
-+	@list='libgmodule11d.la'; for p in $$list; do \
++	@list='libgmodule12.la'; for p in $$list; do \
  	 if test -f $$p; then \
  	  echo "$(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
  	  $(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
@@ -263,65 +196,42 @@
  
  
 -libglib = $(top_builddir)/libglib.la # -lglib
-+libglib = $(top_builddir)/libglib11d.la # -lglib
++libglib = $(top_builddir)/libglib12.la # -lglib
  
 -lib_LTLIBRARIES = libgthread.la
-+lib_LTLIBRARIES = libgthread11d.la
++lib_LTLIBRARIES = libgthread12.la
  
--libgthread_la_SOURCES = gthread.c
+ libgthread_la_SOURCES = gthread.c
 -libgthread_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
-+libgthread11d_la_SOURCES = gthread.c
-+libgthread11d_la_LDFLAGS =  	-version-info 2:1:0
++libgthread_la_LDFLAGS =  	-version-info 1:0:0
  
  
--libgthread_la_LIBADD = @G_THREAD_LIBS@
-+libgthread11d_la_LIBADD = @G_THREAD_LIBS@
+ libgthread_la_LIBADD = @G_THREAD_LIBS@
  
  noinst_PROGRAMS = testgthread
 -testgthread_LDADD = ../libglib.la libgthread.la 
-+testgthread_LDADD = ../libglib11d.la libgthread11d.la 
++testgthread_LDADD = ../libglib12.la libgthread12.la 
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../config.h
  CONFIG_CLEAN_FILES = 
-@@ -114,13 +114,13 @@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--libgthread_la_DEPENDENCIES = 
--libgthread_la_OBJECTS =  gthread.lo
-+libgthread11d_la_DEPENDENCIES = 
-+libgthread11d_la_OBJECTS =  gthread.lo
- PROGRAMS =  $(noinst_PROGRAMS)
+@@ -120,7 +120,7 @@
  
  testgthread_SOURCES = testgthread.c
  testgthread_OBJECTS =  testgthread.o
 -testgthread_DEPENDENCIES =  ../libglib.la libgthread.la
-+testgthread_DEPENDENCIES =  ../libglib11d.la libgthread11d.la
++testgthread_DEPENDENCIES =  ../libglib12.la libgthread12.la
  testgthread_LDFLAGS = 
  CFLAGS = @CFLAGS@
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -134,8 +134,8 @@
- 
- TAR = tar
- GZIP_ENV = --best
--SOURCES = $(libgthread_la_SOURCES) testgthread.c
--OBJECTS = $(libgthread_la_OBJECTS) testgthread.o
-+SOURCES = $(libgthread11d_la_SOURCES) testgthread.c
-+OBJECTS = $(libgthread11d_la_OBJECTS) testgthread.o
- 
- all: all-redirect
- .SUFFIXES:
-@@ -211,8 +211,8 @@
+@@ -211,7 +211,7 @@
  
  maintainer-clean-libtool:
  
 -libgthread.la: $(libgthread_la_OBJECTS) $(libgthread_la_DEPENDENCIES)
--	$(LINK) -rpath $(libdir) $(libgthread_la_LDFLAGS) $(libgthread_la_OBJECTS) $(libgthread_la_LIBADD) $(LIBS)
-+libgthread11d.la: $(libgthread11d_la_OBJECTS) $(libgthread11d_la_DEPENDENCIES)
-+	$(LINK) -rpath $(libdir) $(libgthread11d_la_LDFLAGS) $(libgthread11d_la_OBJECTS) $(libgthread11d_la_LIBADD) $(LIBS)
++libgthread12.la: $(libgthread_la_OBJECTS) $(libgthread_la_DEPENDENCIES)
+ 	$(LINK) -rpath $(libdir) $(libgthread_la_LDFLAGS) $(libgthread_la_OBJECTS) $(libgthread_la_LIBADD) $(LIBS)
  
  mostlyclean-noinstPROGRAMS:
- 
 @@ -291,7 +291,7 @@
  install: install-am
  uninstall-am: uninstall-libLTLIBRARIES
@@ -331,3 +241,116 @@
  all-redirect: all-am
  install-strip:
  	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+--- docs/Makefile.in.orig	Tue Mar  2 10:39:11 1999
++++ docs/Makefile.in	Tue Mar  2 10:40:18 1999
+@@ -89,9 +89,9 @@
+ 
+ info_TEXINFOS = glib.texi
+ 
+-man_MANS = glib-config.1
++man_MANS = glib12-config.1
+ 
+-EXTRA_DIST = glib-config.1		     glib.html 			     glib_toc.html
++EXTRA_DIST = glib12-config.1		     glib.html 			     glib_toc.html
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+@@ -125,6 +125,8 @@
+ glib.info: glib.texi
+ glib.dvi: glib.texi
+ 
++glib12-config.1: glib-config.1
++	cp glib-config.1 glib12-config.1
+ 
+ DVIPS = dvips
+ 
+--- tests/Makefile.in.orig	Tue Mar  2 10:42:05 1999
++++ tests/Makefile.in	Tue Mar  2 10:42:39 1999
+@@ -94,17 +94,17 @@
+ 
+ noinst_PROGRAMS = $(TESTS)
+ 
+-array_test_LDADD = $(top_builddir)/libglib.la
+-dirname_test_LDADD = $(top_builddir)/libglib.la
+-hash_test_LDADD = $(top_builddir)/libglib.la
+-list_test_LDADD = $(top_builddir)/libglib.la
+-node_test_LDADD = $(top_builddir)/libglib.la
+-relation_test_LDADD = $(top_builddir)/libglib.la
+-slist_test_LDADD = $(top_builddir)/libglib.la
+-string_test_LDADD = $(top_builddir)/libglib.la
+-strfunc_test_LDADD = $(top_builddir)/libglib.la
+-tree_test_LDADD = $(top_builddir)/libglib.la
+-type_test_LDADD = $(top_builddir)/libglib.la
++array_test_LDADD = $(top_builddir)/libglib12.la
++dirname_test_LDADD = $(top_builddir)/libglib12.la
++hash_test_LDADD = $(top_builddir)/libglib12.la
++list_test_LDADD = $(top_builddir)/libglib12.la
++node_test_LDADD = $(top_builddir)/libglib12.la
++relation_test_LDADD = $(top_builddir)/libglib12.la
++slist_test_LDADD = $(top_builddir)/libglib12.la
++string_test_LDADD = $(top_builddir)/libglib12.la
++strfunc_test_LDADD = $(top_builddir)/libglib12.la
++tree_test_LDADD = $(top_builddir)/libglib12.la
++type_test_LDADD = $(top_builddir)/libglib12.la
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES = 
+@@ -117,47 +117,47 @@
+ LIBS = @LIBS@
+ array_test_SOURCES = array-test.c
+ array_test_OBJECTS =  array-test.o
+-array_test_DEPENDENCIES =  $(top_builddir)/libglib.la
++array_test_DEPENDENCIES =  $(top_builddir)/libglib12.la
+ array_test_LDFLAGS = 
+ dirname_test_SOURCES = dirname-test.c
+ dirname_test_OBJECTS =  dirname-test.o
+-dirname_test_DEPENDENCIES =  $(top_builddir)/libglib.la
++dirname_test_DEPENDENCIES =  $(top_builddir)/libglib12.la
+ dirname_test_LDFLAGS = 
+ hash_test_SOURCES = hash-test.c
+ hash_test_OBJECTS =  hash-test.o
+-hash_test_DEPENDENCIES =  $(top_builddir)/libglib.la
++hash_test_DEPENDENCIES =  $(top_builddir)/libglib12.la
+ hash_test_LDFLAGS = 
+ list_test_SOURCES = list-test.c
+ list_test_OBJECTS =  list-test.o
+-list_test_DEPENDENCIES =  $(top_builddir)/libglib.la
++list_test_DEPENDENCIES =  $(top_builddir)/libglib12.la
+ list_test_LDFLAGS = 
+ node_test_SOURCES = node-test.c
+ node_test_OBJECTS =  node-test.o
+-node_test_DEPENDENCIES =  $(top_builddir)/libglib.la
++node_test_DEPENDENCIES =  $(top_builddir)/libglib12.la
+ node_test_LDFLAGS = 
+ relation_test_SOURCES = relation-test.c
+ relation_test_OBJECTS =  relation-test.o
+-relation_test_DEPENDENCIES =  $(top_builddir)/libglib.la
++relation_test_DEPENDENCIES =  $(top_builddir)/libglib12.la
+ relation_test_LDFLAGS = 
+ slist_test_SOURCES = slist-test.c
+ slist_test_OBJECTS =  slist-test.o
+-slist_test_DEPENDENCIES =  $(top_builddir)/libglib.la
++slist_test_DEPENDENCIES =  $(top_builddir)/libglib12.la
+ slist_test_LDFLAGS = 
+ string_test_SOURCES = string-test.c
+ string_test_OBJECTS =  string-test.o
+-string_test_DEPENDENCIES =  $(top_builddir)/libglib.la
++string_test_DEPENDENCIES =  $(top_builddir)/libglib12.la
+ string_test_LDFLAGS = 
+ strfunc_test_SOURCES = strfunc-test.c
+ strfunc_test_OBJECTS =  strfunc-test.o
+-strfunc_test_DEPENDENCIES =  $(top_builddir)/libglib.la
++strfunc_test_DEPENDENCIES =  $(top_builddir)/libglib12.la
+ strfunc_test_LDFLAGS = 
+ tree_test_SOURCES = tree-test.c
+ tree_test_OBJECTS =  tree-test.o
+-tree_test_DEPENDENCIES =  $(top_builddir)/libglib.la
++tree_test_DEPENDENCIES =  $(top_builddir)/libglib12.la
+ tree_test_LDFLAGS = 
+ type_test_SOURCES = type-test.c
+ type_test_OBJECTS =  type-test.o
+-type_test_DEPENDENCIES =  $(top_builddir)/libglib.la
++type_test_DEPENDENCIES =  $(top_builddir)/libglib12.la
+ type_test_LDFLAGS = 
+ CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/devel/glib12/files/patch-ac b/devel/glib12/files/patch-ac
index 3570ed47a9dc..1532d62c6f74 100644
--- a/devel/glib12/files/patch-ac
+++ b/devel/glib12/files/patch-ac
@@ -5,7 +5,7 @@
  {
  	cat <<EOF
 -Usage: glib-config [OPTIONS] [LIBRARIES]
-+Usage: glib11d-config [OPTIONS] [LIBRARIES]
++Usage: glib12-config [OPTIONS] [LIBRARIES]
  Options:
  	[--prefix[=DIR]]
  	[--exec-prefix[=DIR]]
@@ -21,16 +21,16 @@
  	libsa=""
  	if test "$lib_glib" = "yes"; then
 -		libsp="$libsp -lglib"
-+		libsp="$libsp -lglib11d"
++		libsp="$libsp -lglib12"
  	fi
  	if test "$lib_gthread" = "yes"; then
 -		libsp="-lgthread $libsp"
-+		libsp="-rdynamic -lgthread11d $libsp"
++		libsp="-lgthread12 $libsp"
  		libsa="$libsa @G_THREAD_LIBS@"
  	fi
  	if test "$lib_gmodule" = "yes"; then
 -		libsp="@G_MODULE_LDFLAGS@ -lgmodule $libsp"
-+		libsp="@G_MODULE_LDFLAGS@ -lgmodule11d $libsp"
++		libsp="@G_MODULE_LDFLAGS@ -lgmodule12 $libsp"
  		libsa="$libsa @G_MODULE_LIBS@"
  	fi
  	echo -L@libdir@ $libsp $libsa
diff --git a/devel/glib12/files/patch-ad b/devel/glib12/files/patch-ad
index 6ad303c7ab4b..f373a5042242 100644
--- a/devel/glib12/files/patch-ad
+++ b/devel/glib12/files/patch-ad
@@ -1,6 +1,6 @@
 --- configure.in.orig	Thu Jan 28 09:59:01 1999
 +++ configure.in	Thu Jan 28 23:13:01 1999
-@@ -250,7 +250,7 @@
+@@ -268,7 +268,7 @@
  AC_CHECK_HEADERS(values.h, AC_DEFINE(HAVE_VALUES_H))
  
  # Check for some functions
@@ -9,7 +9,17 @@
  
  # Check for sys_errlist
  AC_MSG_CHECKING(for sys_errlist)
-@@ -732,11 +732,13 @@
+@@ -507,6 +507,9 @@
+ 	  linux*)
+ 	    G_MODULE_LDFLAGS='-rdynamic'
+ 	    ;;
++	  freebsd*)
++	    G_MODULE_LDFLAGS='-Wl,-E'
++	    ;;
+ 	esac
+ 	LIBS_orig="$LIBS"
+ 	LDFLAGS_orig="$LDFLAGS"
+@@ -716,11 +719,13 @@
              	        G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
  		fi
  		;;
@@ -18,17 +28,17 @@
 -
 -		# FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
 -		# -mthreads flag.
-+	*-*-freebsd2.2* | *-*-freebsd3* | *-*-freebsd4*)
++	*-*-freebsd*)
 +		if test x"$G_THREAD_LIBS" = x"-lc_r"; then
 +			G_THREAD_CFLAGS="-D_THREAD_SAFE -pthread"
 +			have_poll=no
 +		else
-+			G_THREAD_CFLAGS="-D_THREAD_SAFE"
++			G_THREAD_CFLAGS="-D_THREAD_SAFE -DLINUXTHREADS"
 +		fi
  		;;
      esac
  
-@@ -785,6 +788,9 @@
+@@ -834,6 +839,9 @@
  dnl ****************************************
  dnl *** GLib POLL* compatibility defines ***
  dnl ****************************************
diff --git a/devel/glib12/files/patch-ae b/devel/glib12/files/patch-ae
index fcb74bc9edae..32343d705d05 100644
--- a/devel/glib12/files/patch-ae
+++ b/devel/glib12/files/patch-ae
@@ -9,7 +9,17 @@
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
  echo "configure:3765: checking for $ac_func" >&5
-@@ -5302,11 +5302,13 @@
+@@ -4610,6 +4610,9 @@
+ 	  linux*)
+ 	    G_MODULE_LDFLAGS='-rdynamic'
+ 	    ;;
++	  freebsd*)
++	    G_MODULE_LDFLAGS='-Wl,-E'
++	    ;;
+ 	esac
+ 	LIBS_orig="$LIBS"
+ 	LDFLAGS_orig="$LDFLAGS"
+@@ -5302,11 +5305,13 @@
              	        G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
  		fi
  		;;
@@ -23,180 +33,12 @@
 +			G_THREAD_CFLAGS="-D_THREAD_SAFE -pthread"
 +			have_poll=no
 +		else
-+			G_THREAD_CFLAGS="-D_THREAD_SAFE"
++			G_THREAD_CFLAGS="-D_THREAD_SAFE -DLINUXTHREADS"
 +		fi
  		;;
      esac
  
-@@ -5315,7 +5317,7 @@
-     old_CPPFLAGS=$CPPFLAGS
-     CPPFLAGS="$CPPFLAGS $G_THREAD_CFLAGS"
-     cat > conftest.$ac_ext <<EOF
--#line 5319 "configure"
-+#line 5321 "configure"
- #include "confdefs.h"
- #include <time.h>
- EOF
-@@ -5332,7 +5334,7 @@
-     CPPFLAGS=$old_CPPFLAGS
- 
-     echo $ac_n "checking necessary compiler options""... $ac_c" 1>&6
--echo "configure:5336: checking necessary compiler options" >&5
-+echo "configure:5338: checking necessary compiler options" >&5
- 
-     echo "$ac_t""$G_THREAD_CFLAGS" 1>&6
- else
-@@ -5350,12 +5352,12 @@
- 	for ac_func in localtime_r rand_r
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:5354: checking for $ac_func" >&5
-+echo "configure:5356: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5359 "configure"
-+#line 5361 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -5378,7 +5380,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -5404,7 +5406,7 @@
- 
- 	if test "$ac_cv_header_pwd_h" = "yes"; then
- 		echo $ac_n "checking for getpwuid_r""... $ac_c" 1>&6
--echo "configure:5408: checking for getpwuid_r" >&5
-+echo "configure:5410: checking for getpwuid_r" >&5
- 	 	if eval "test \"`echo '$''{'ac_cv_func_getpwuid_r'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5412,7 +5414,7 @@
-     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5416 "configure"
-+#line 5418 "configure"
- #include "confdefs.h"
- #include <errno.h>
- 				int main () { char buffer[10000], *pointer; 
-@@ -5423,7 +5425,7 @@
- 					sizeof (buffer), &pointer);
- 				return errno == ENOSYS;}
- EOF
--if { (eval echo configure:5427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   ac_cv_func_getpwuid_r=yes
- else
-@@ -5448,20 +5450,20 @@
- 		fi
- 		if test "$ac_cv_func_getpwuid_r" = "yes"; then
- 			echo $ac_n "checking whether getpwuid_r is posix like""... $ac_c" 1>&6
--echo "configure:5452: checking whether getpwuid_r is posix like" >&5
-+echo "configure:5454: checking whether getpwuid_r is posix like" >&5
- 			# getpwuid_r(0, NULL, NULL, 0) is the signature on
- 			# solaris, if that is not found, the prog below won't 
- 			# compile, then the posix signature is assumed as 
- 			# the default.
- 			cat > conftest.$ac_ext <<EOF
--#line 5458 "configure"
-+#line 5460 "configure"
- #include "confdefs.h"
- #include <pwd.h>
- int main() {
- getpwuid_r(0, NULL, NULL, 0);
- ; return 0; }
- EOF
--if { (eval echo configure:5465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   echo "$ac_t""no" 1>&6
- else
-@@ -5479,17 +5481,17 @@
- 	fi
- 	if test x"$have_threads" = xposix; then
- 		echo $ac_n "checking whether pthread_getspecific is posix like""... $ac_c" 1>&6
--echo "configure:5483: checking whether pthread_getspecific is posix like" >&5
-+echo "configure:5485: checking whether pthread_getspecific is posix like" >&5
- 		# PCThreads has pthread_getspecific(pthread_key_t, void **);
- 		cat > conftest.$ac_ext <<EOF
--#line 5486 "configure"
-+#line 5488 "configure"
- #include "confdefs.h"
- #include <pthread.h>
- int main() {
- pthread_getspecific(0,NULL);
- ; return 0; }
- EOF
--if { (eval echo configure:5493: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5495: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   echo "$ac_t""no" 1>&6
- else
-@@ -5530,7 +5532,7 @@
-         case "$mutex_has_default" in
-         "yes")
-                 echo $ac_n "checking size of $mutex_default_type""... $ac_c" 1>&6
--echo "configure:5534: checking size of $mutex_default_type" >&5
-+echo "configure:5536: checking size of $mutex_default_type" >&5
- if eval "test \"`echo '$''{'glib_cv_sizeof_gmutex'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5538,7 +5540,7 @@
-     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5542 "configure"
-+#line 5544 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #include <$mutex_header_file>
-@@ -5550,7 +5552,7 @@
-   exit(0);
- }
- EOF
--if { (eval echo configure:5554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   glib_cv_sizeof_gmutex=`cat conftestval`
- else
-@@ -5570,7 +5572,7 @@
- 
- 
- 	echo $ac_n "checking byte contents of $mutex_default_type""... $ac_c" 1>&6
--echo "configure:5574: checking byte contents of $mutex_default_type" >&5
-+echo "configure:5576: checking byte contents of $mutex_default_type" >&5
- if eval "test \"`echo '$''{'glib_cv_byte_contents_gmutex'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5578,7 +5580,7 @@
-   glib_cv_byte_contents_gmutex=0
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5582 "configure"
-+#line 5584 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #include <$mutex_header_file>
-@@ -5595,7 +5597,7 @@
-   exit(0);
- }
- EOF
--if { (eval echo configure:5599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   glib_cv_byte_contents_gmutex=`cat conftestval`
- else
-@@ -5623,6 +5625,63 @@
+@@ -5623,6 +5628,63 @@
  
  
  
@@ -204,12 +46,12 @@
 +	for ac_func in poll
 +do
 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:5633: checking for $ac_func" >&5
++echo "configure:5636: checking for $ac_func" >&5
 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
 +  echo $ac_n "(cached) $ac_c" 1>&6
 +else
 +  cat > conftest.$ac_ext <<EOF
-+#line 5638 "configure"
++#line 5641 "configure"
 +#include "confdefs.h"
 +/* System header to define __stub macros and hopefully few prototypes,
 +    which can conflict with char $ac_func(); below.  */
@@ -232,7 +74,7 @@
 +
 +; return 0; }
 +EOF
-+if { (eval echo configure:5661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 +  rm -rf conftest*
 +  eval "ac_cv_func_$ac_func=yes"
 +else
@@ -260,26 +102,3 @@
  glib_sysdefso="glibconfig-sysdefs.h"
  glib_sysdef_msg=`echo POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32 | sed 's/:[^ 	]*//g'`
  if test "x`(echo '\n') 2>/dev/null`" != 'x\n'; then
-@@ -5631,7 +5690,7 @@
-   glib_nl='\n'
- fi
- echo $ac_n "checking system definitions for $glib_sysdef_msg""... $ac_c" 1>&6
--echo "configure:5635: checking system definitions for $glib_sysdef_msg" >&5
-+echo "configure:5694: checking system definitions for $glib_sysdef_msg" >&5
- cat >confrun.c <<_______EOF
- #include <stdio.h>
- #include <sys/types.h>
-@@ -5658,11 +5717,11 @@
-     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5662 "configure"
-+#line 5721 "configure"
- #include "confdefs.h"
- `cat confrun.c`
- EOF
--if { (eval echo configure:5666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   echo "$ac_t""done" 1>&6
- else
diff --git a/devel/glib12/pkg-descr b/devel/glib12/pkg-descr
index 469154423427..65e7944cba86 100644
--- a/devel/glib12/pkg-descr
+++ b/devel/glib12/pkg-descr
@@ -1,10 +1,7 @@
-This is GLib version 1.1.   GLib, is a library which includes support
+This is GLib version 1.2.   GLib, is a library which includes support
 routines for C such as lists, trees, hashes, memory allocation, and
 many other things.
 
-Versions of GLib prior to 1.1.0 are distributed with GTK+ versions 1.1.0
-and earlier.
-
 The official ftp site is:
   ftp://ftp.gtk.org/pub/gtk
 
diff --git a/devel/glib12/pkg-plist b/devel/glib12/pkg-plist
index a2c5ff7fd2f2..85ba872ce363 100644
--- a/devel/glib12/pkg-plist
+++ b/devel/glib12/pkg-plist
@@ -1,24 +1,24 @@
-bin/glib11d-config
-include/glib11d/glib.h
-include/glib11d/glibconfig.h
-include/glib11d/gmodule.h
+bin/glib12-config
+include/glib12/glib.h
+include/glib12/glibconfig.h
+include/glib12/gmodule.h
 @unexec install-info --delete %D/info/glib.info %D/info/dir
 info/glib.info
 @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/glib.info %D/info/dir
-lib/libglib11d.a
-lib/libglib11d.la
-lib/libglib11d.so
-lib/libglib11d.so.2.1
-lib/libgmodule11d.a
-lib/libgmodule11d.la
-lib/libgmodule11d.so
-lib/libgmodule11d.so.2.1
-lib/libgthread11d.a
-lib/libgthread11d.la
-lib/libgthread11d.so
-lib/libgthread11d.so.2.1
+lib/libglib12.a
+lib/libglib12.la
+lib/libglib12.so
+lib/libglib12.so.1
+lib/libgmodule12.a
+lib/libgmodule12.la
+lib/libgmodule12.so
+lib/libgmodule12.so.1
+lib/libgthread12.a
+lib/libgthread12.la
+lib/libgthread12.so
+lib/libgthread12.so.1
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/aclocal/glib.m4
-@dirrm include/glib11d
+@dirrm include/glib12