Update to version 1.2.3.

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

17 files changed, 286 insertions, 906 deletions

diff --git a/devel/glib12/Makefile b/devel/glib12/Makefile
index 15f35c833d96..be88e37f4160 100644
--- a/devel/glib12/Makefile
+++ b/devel/glib12/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   glib12
-# Version required:		1.2.2
+# Version required:		1.2.3
 # Date Created:			28 July 1998
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.20 1999/05/02 05:21:19 kuriyama Exp $
+# $Id: Makefile,v 1.21 1999/05/06 19:59:12 mharo Exp $
 #
 
-DISTNAME=	glib-1.2.2
+DISTNAME=	glib-1.2.3
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.2/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
@@ -14,11 +14,9 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.2/ \
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/glib12
-MAN1=		glib12-config.1
 
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+MAN1=		glib12-config.1
 
 .include <bsd.port.mk>
diff --git a/devel/glib12/distinfo b/devel/glib12/distinfo
index 3d88d967abff..e4b3e0541613 100644
--- a/devel/glib12/distinfo
+++ b/devel/glib12/distinfo
@@ -1 +1 @@
-MD5 (glib-1.2.2.tar.gz) = 1ecec788b21ae0b6b6debbe5ff9d5c65
+MD5 (glib-1.2.3.tar.gz) = 56944969be7a7cefdd25171ef4a01c2a
diff --git a/devel/glib12/files/patch-ab b/devel/glib12/files/patch-ab
index 49afbe61d07b..4072fa65329f 100644
--- a/devel/glib12/files/patch-ab
+++ b/devel/glib12/files/patch-ab
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Thu Jan 28 22:53:35 1999
-+++ Makefile.in	Thu Jan 28 22:59:44 1999
-@@ -89,11 +89,11 @@
+--- Makefile.in.orig	Tue May 11 05:06:36 1999
++++ Makefile.in	Mon May 17 22:28:24 1999
+@@ -95,11 +95,11 @@
  
  AUTOMAKE_OPTIONS = 1.4
  
@@ -11,83 +11,29 @@
 +configincludedir = $(includedir)
  
 -bin_SCRIPTS = glib-config
-+bin_SCRIPTS = glib12-config
++bin_SCRIPTS = glib@LT_RELEASE@-config
  
  BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
  
-@@ -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 = 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
- 
-@@ -113,20 +113,20 @@
- configinclude_DATA =  	glibconfig.h
- 
- 
--libglib_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
-+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 = libglib12.la
-+testgdate_LDADD = libglib12.la
-+testgdateparser_LDADD = libglib12.la
- 
- m4datadir = $(datadir)/aclocal
- m4data_DATA = glib.m4
+@@ -132,7 +132,7 @@
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = config.h
--CONFIG_CLEAN_FILES =  glib.spec glibconfig.h.win32 glib-config
-+CONFIG_CLEAN_FILES =  glib12-config
+-CONFIG_CLEAN_FILES =  glib.spec glib-config
++CONFIG_CLEAN_FILES =  glib.spec glib@LT_RELEASE@-config
  LTLIBRARIES =  $(lib_LTLIBRARIES)
  
  
-@@ -144,15 +144,15 @@
- 
- testglib_SOURCES = testglib.c
- testglib_OBJECTS =  testglib.o
--testglib_DEPENDENCIES =  libglib.la
-+testglib_DEPENDENCIES =  libglib12.la
- testglib_LDFLAGS = 
- testgdate_SOURCES = testgdate.c
- testgdate_OBJECTS =  testgdate.o
--testgdate_DEPENDENCIES =  libglib.la
-+testgdate_DEPENDENCIES =  libglib12.la
- testgdate_LDFLAGS = 
- testgdateparser_SOURCES = testgdateparser.c
- testgdateparser_OBJECTS =  testgdateparser.o
--testgdateparser_DEPENDENCIES =  libglib.la
-+testgdateparser_DEPENDENCIES =  libglib12.la
- testgdateparser_LDFLAGS = 
- SCRIPTS =  $(bin_SCRIPTS)
- 
-@@ -226,7 +226,7 @@
+@@ -232,7 +232,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
-+glib12-config: $(top_builddir)/config.status glib12-config.in
++glib@LT_RELEASE@-config: $(top_builddir)/config.status glib@LT_RELEASE@-config.in
  	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
  
  mostlyclean-libLTLIBRARIES:
-@@ -292,7 +292,7 @@
- 
- maintainer-clean-libtool:
- 
--libglib.la: $(libglib_la_OBJECTS) $(libglib_la_DEPENDENCIES)
-+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 @@
+@@ -541,7 +541,6 @@
  	      || exit 1; \
  	  fi; \
  	done
@@ -95,7 +41,7 @@
  
  info-am:
  info: info-recursive
-@@ -562,7 +561,7 @@
+@@ -568,7 +567,7 @@
  		uninstall-configincludeDATA uninstall-m4dataDATA \
  		uninstall-includeHEADERS
  uninstall: uninstall-recursive
@@ -104,70 +50,19 @@
  		$(HEADERS) config.h
  all-redirect: all-recursive-am
  install-strip:
-@@ -640,7 +639,8 @@
+@@ -646,7 +645,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
++glib@LT_RELEASE@-config.in: glib-config.in
++	cp glib-config.in glib@LT_RELEASE@-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,12 +98,12 @@
- include_HEADERS =  		gmodule.h
- 
- 
--libglib = $(top_builddir)/libglib.la # -lglib
-+libglib = $(top_builddir)/libglib12.la # -lglib
- 
--lib_LTLIBRARIES = libgmodule.la libgplugin_a.la libgplugin_b.la
-+lib_LTLIBRARIES = libgmodule12.la libgplugin12_a.la libgplugin12_b.la
- 
- libgmodule_la_SOURCES = gmodule.c
--libgmodule_la_LDFLAGS =  	@G_MODULE_LDFLAGS@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
-+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 = libgmodule12.la $(libglib) @G_MODULE_LIBS@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES =  gmoduleconf.h
-@@ -141,7 +141,7 @@
- 
- testgmodule_SOURCES = testgmodule.c
- testgmodule_OBJECTS =  testgmodule.o
--testgmodule_DEPENDENCIES =  libgmodule.la $(top_builddir)/libglib.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)
-@@ -226,13 +226,13 @@
- 
- maintainer-clean-libtool:
- 
--libgmodule.la: $(libgmodule_la_OBJECTS) $(libgmodule_la_DEPENDENCIES)
-+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)
-+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)
-+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 @@
+--- gmodule/Makefile.in.orig	Tue May 11 05:06:37 1999
++++ gmodule/Makefile.in	Mon May 17 22:28:24 1999
+@@ -333,7 +333,7 @@
  install: install-am
  uninstall-am: uninstall-libLTLIBRARIES uninstall-includeHEADERS
  uninstall: uninstall-am
@@ -176,63 +71,18 @@
  all-redirect: all-am
  install-strip:
  	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-@@ -398,10 +398,10 @@
- 	  echo $$p; \
- 	done
- 
--install-libLTLIBRARIES: libgmodule.la
-+install-libLTLIBRARIES: libgmodule12.la
- 	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(libdir)
--	@list='libgmodule.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; \
---- gthread/Makefile.in.orig	Thu Jan 28 23:07:14 1999
-+++ gthread/Makefile.in	Thu Jan 28 23:09:35 1999
-@@ -92,18 +92,18 @@
- EXTRA_DIST =  		gthread-posix.c				gthread-solaris.c			gthread-nspr.c				gthread-none.c				gthread.def
- 
- 
--libglib = $(top_builddir)/libglib.la # -lglib
-+libglib = $(top_builddir)/libglib12.la # -lglib
- 
--lib_LTLIBRARIES = libgthread.la
-+lib_LTLIBRARIES = libgthread12.la
- 
- libgthread_la_SOURCES = gthread.c
--libgthread_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
-+libgthread_la_LDFLAGS =  	-version-info 1:0:0
- 
- 
- libgthread_la_LIBADD = @G_THREAD_LIBS@
- 
- noinst_PROGRAMS = testgthread
--testgthread_LDADD = ../libglib.la libgthread.la 
-+testgthread_LDADD = ../libglib12.la libgthread12.la 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES = 
-@@ -120,7 +120,7 @@
- 
- testgthread_SOURCES = testgthread.c
+--- gthread/Makefile.in.orig	Tue May 11 05:06:39 1999
++++ gthread/Makefile.in	Mon May 17 22:28:24 1999
+@@ -128,7 +128,7 @@
  testgthread_OBJECTS =  testgthread.o
--testgthread_DEPENDENCIES =  ../libglib.la libgthread.la
-+testgthread_DEPENDENCIES =  ../libglib12.la libgthread12.la
+ testgthread_DEPENDENCIES =  ../libglib.la libgthread.la
  testgthread_LDFLAGS = 
- CFLAGS = @CFLAGS@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ @G_THREAD_CFLAGS@
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -211,7 +211,7 @@
- 
- maintainer-clean-libtool:
- 
--libgthread.la: $(libgthread_la_OBJECTS) $(libgthread_la_DEPENDENCIES)
-+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 @@
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+@@ -297,7 +297,7 @@
  install: install-am
  uninstall-am: uninstall-libLTLIBRARIES
  uninstall: uninstall-am
@@ -241,116 +91,26 @@
  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 @@
+--- docs/Makefile.in.orig	Tue May 11 05:06:40 1999
++++ docs/Makefile.in	Mon May 17 22:28:24 1999
+@@ -95,9 +95,9 @@
  
  info_TEXINFOS = glib.texi
  
 -man_MANS = glib-config.1
-+man_MANS = glib12-config.1
++man_MANS = glib@LT_RELEASE@-config.1
  
 -EXTRA_DIST = glib-config.1.in		     glib.html 			     glib_toc.html
-+EXTRA_DIST = glib12-config.1.in		     glib.html 			     glib_toc.html
++EXTRA_DIST = glib@LT_RELEASE@-config.1.in		     glib.html 			     glib_toc.html
  
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../config.h
-@@ -125,6 +125,8 @@
+@@ -133,6 +133,8 @@
  glib.info: glib.texi
  glib.dvi: glib.texi
  
-+glib12-config.1: glib-config.1
-+	cp glib-config.1 glib12-config.1
++glib@LT_RELEASE@-config.1: glib-config.1
++	cp glib-config.1 glib@LT_RELEASE@-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 1532d62c6f74..d96c8efcc96c 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: glib12-config [OPTIONS] [LIBRARIES]
++Usage: glib@LT_RELEASE@-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 -lglib12"
++		libsp="$libsp -lglib@LT_RELEASE@"
  	fi
  	if test "$lib_gthread" = "yes"; then
 -		libsp="-lgthread $libsp"
-+		libsp="-lgthread12 $libsp"
++		libsp="-lgthread@LT_RELEASE@ $libsp"
  		libsa="$libsa @G_THREAD_LIBS@"
  	fi
  	if test "$lib_gmodule" = "yes"; then
 -		libsp="@G_MODULE_LDFLAGS@ -lgmodule $libsp"
-+		libsp="@G_MODULE_LDFLAGS@ -lgmodule12 $libsp"
++		libsp="@G_MODULE_LDFLAGS@ -lgmodule@LT_RELEASE@ $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 f373a5042242..21f00017acbf 100644
--- a/devel/glib12/files/patch-ad
+++ b/devel/glib12/files/patch-ad
@@ -1,6 +1,21 @@
---- configure.in.orig	Thu Jan 28 09:59:01 1999
-+++ configure.in	Thu Jan 28 23:13:01 1999
-@@ -268,7 +268,7 @@
+--- configure.in.orig	Tue May 11 04:31:37 1999
++++ configure.in	Mon May 17 22:29:31 1999
+@@ -48,10 +48,10 @@
+ AC_SUBST(GLIB_BINARY_AGE)
+ 
+ # libtool versioning
+-LT_RELEASE=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION
+-LT_CURRENT=`expr $GLIB_MICRO_VERSION - $GLIB_INTERFACE_AGE`
+-LT_REVISION=$GLIB_INTERFACE_AGE
+-LT_AGE=`expr $GLIB_BINARY_AGE - $GLIB_INTERFACE_AGE`
++LT_RELEASE=12
++LT_CURRENT=2
++LT_REVISION=0
++LT_AGE=0
+ AC_SUBST(LT_RELEASE)
+ AC_SUBST(LT_CURRENT)
+ AC_SUBST(LT_REVISION)
+@@ -273,7 +273,7 @@
  AC_CHECK_HEADERS(values.h, AC_DEFINE(HAVE_VALUES_H))
  
  # Check for some functions
@@ -9,17 +24,20 @@
  
  # Check for sys_errlist
  AC_MSG_CHECKING(for sys_errlist)
-@@ -507,6 +507,9 @@
+@@ -528,6 +528,12 @@
  	  linux*)
  	    G_MODULE_LDFLAGS='-rdynamic'
  	    ;;
 +	  freebsd*)
-+	    G_MODULE_LDFLAGS='-Wl,-E'
++	    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++	    if test $objformat = "elf"; then
++		    G_MODULE_LDFLAGS='-Wl,-E'
++	    fi
 +	    ;;
  	esac
  	LIBS_orig="$LIBS"
  	LDFLAGS_orig="$LDFLAGS"
-@@ -716,11 +719,13 @@
+@@ -737,11 +743,14 @@
              	        G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
  		fi
  		;;
@@ -30,7 +48,8 @@
 -		# -mthreads flag.
 +	*-*-freebsd*)
 +		if test x"$G_THREAD_LIBS" = x"-lc_r"; then
-+			G_THREAD_CFLAGS="-D_THREAD_SAFE -pthread"
++			G_THREAD_CFLAGS="-D_THREAD_SAFE"
++			G_THREAD_LIBS="-pthread"
 +			have_poll=no
 +		else
 +			G_THREAD_CFLAGS="-D_THREAD_SAFE -DLINUXTHREADS"
@@ -38,7 +57,16 @@
  		;;
      esac
  
-@@ -834,6 +839,9 @@
+@@ -858,8 +867,6 @@
+ AC_SUBST(G_THREAD_CFLAGS)
+ AC_SUBST(G_THREAD_LIBS)
+ 
+-CFLAGS="$CFLAGS $G_THREAD_CFLAGS"
+-
+ dnl **********************************************
+ dnl *** GDefaultMutex setup and initialization ***
+ dnl **********************************************
+@@ -883,6 +890,9 @@
  dnl ****************************************
  dnl *** GLib POLL* compatibility defines ***
  dnl ****************************************
diff --git a/devel/glib12/files/patch-ae b/devel/glib12/files/patch-ae
index 32343d705d05..8d24ca7e3fb8 100644
--- a/devel/glib12/files/patch-ae
+++ b/devel/glib12/files/patch-ae
@@ -1,6 +1,21 @@
---- configure.orig	Wed Feb 17 04:14:07 1999
-+++ configure	Wed Feb 17 21:11:29 1999
-@@ -3758,7 +3758,7 @@
+--- configure.orig	Tue May 11 04:55:02 1999
++++ configure	Mon May 17 22:30:32 1999
+@@ -587,10 +587,10 @@
+ 
+ 
+ # libtool versioning
+-LT_RELEASE=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION
+-LT_CURRENT=`expr $GLIB_MICRO_VERSION - $GLIB_INTERFACE_AGE`
+-LT_REVISION=$GLIB_INTERFACE_AGE
+-LT_AGE=`expr $GLIB_BINARY_AGE - $GLIB_INTERFACE_AGE`
++LT_RELEASE=12
++LT_CURRENT=2
++LT_REVISION=0
++LT_AGE=0
+ 
+ 
+ 
+@@ -3472,7 +3472,7 @@
  
  
  # Check for some functions
@@ -8,18 +23,21 @@
 +for ac_func in lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
- echo "configure:3765: checking for $ac_func" >&5
-@@ -4610,6 +4610,9 @@
+ echo "configure:3479: checking for $ac_func" >&5
+@@ -4365,6 +4365,12 @@
  	  linux*)
  	    G_MODULE_LDFLAGS='-rdynamic'
  	    ;;
 +	  freebsd*)
-+	    G_MODULE_LDFLAGS='-Wl,-E'
++	    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++	    if test $objformat = "elf"; then
++		    G_MODULE_LDFLAGS='-Wl,-E'
++	    fi
 +	    ;;
  	esac
  	LIBS_orig="$LIBS"
  	LDFLAGS_orig="$LDFLAGS"
-@@ -5302,11 +5305,13 @@
+@@ -5057,11 +5063,14 @@
              	        G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
  		fi
  		;;
@@ -28,9 +46,10 @@
 -
 -		# 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"
++			G_THREAD_CFLAGS="-D_THREAD_SAFE"
++			G_THREAD_LIBS="-pthread"
 +			have_poll=no
 +		else
 +			G_THREAD_CFLAGS="-D_THREAD_SAFE -DLINUXTHREADS"
@@ -38,7 +57,17 @@
  		;;
      esac
  
-@@ -5623,6 +5628,63 @@
+@@ -5349,9 +5358,6 @@
+ 
+ 
+ 
+-CFLAGS="$CFLAGS $G_THREAD_CFLAGS"
+-
+-
+         case "$mutex_has_default" in
+         "yes")
+                 echo $ac_n "checking size of $mutex_default_type""... $ac_c" 1>&6
+@@ -5448,6 +5454,63 @@
  
  
  
diff --git a/devel/glib12/pkg-plist b/devel/glib12/pkg-plist
index c5652f822f19..79c46cbaa2bf 100644
--- a/devel/glib12/pkg-plist
+++ b/devel/glib12/pkg-plist
@@ -6,17 +6,14 @@ include/glib12/gmodule.h
 info/glib.info
 @exec install-info %D/info/glib.info %D/info/dir
 lib/libglib12.a
-lib/libglib12.la
 lib/libglib12.so
-lib/libglib12.so.1
+lib/libglib12.so.2
 lib/libgmodule12.a
-lib/libgmodule12.la
 lib/libgmodule12.so
-lib/libgmodule12.so.1
+lib/libgmodule12.so.2
 lib/libgthread12.a
-lib/libgthread12.la
 lib/libgthread12.so
-lib/libgthread12.so.1
+lib/libgthread12.so.2
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/aclocal/glib.m4
diff --git a/devel/glib13/Makefile b/devel/glib13/Makefile
index 15f35c833d96..be88e37f4160 100644
--- a/devel/glib13/Makefile
+++ b/devel/glib13/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   glib12
-# Version required:		1.2.2
+# Version required:		1.2.3
 # Date Created:			28 July 1998
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.20 1999/05/02 05:21:19 kuriyama Exp $
+# $Id: Makefile,v 1.21 1999/05/06 19:59:12 mharo Exp $
 #
 
-DISTNAME=	glib-1.2.2
+DISTNAME=	glib-1.2.3
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.2/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
@@ -14,11 +14,9 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.2/ \
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/glib12
-MAN1=		glib12-config.1
 
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+MAN1=		glib12-config.1
 
 .include <bsd.port.mk>
diff --git a/devel/glib13/distinfo b/devel/glib13/distinfo
index 3d88d967abff..e4b3e0541613 100644
--- a/devel/glib13/distinfo
+++ b/devel/glib13/distinfo
@@ -1 +1 @@
-MD5 (glib-1.2.2.tar.gz) = 1ecec788b21ae0b6b6debbe5ff9d5c65
+MD5 (glib-1.2.3.tar.gz) = 56944969be7a7cefdd25171ef4a01c2a
diff --git a/devel/glib13/files/patch-ab b/devel/glib13/files/patch-ab
index 49afbe61d07b..4072fa65329f 100644
--- a/devel/glib13/files/patch-ab
+++ b/devel/glib13/files/patch-ab
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Thu Jan 28 22:53:35 1999
-+++ Makefile.in	Thu Jan 28 22:59:44 1999
-@@ -89,11 +89,11 @@
+--- Makefile.in.orig	Tue May 11 05:06:36 1999
++++ Makefile.in	Mon May 17 22:28:24 1999
+@@ -95,11 +95,11 @@
  
  AUTOMAKE_OPTIONS = 1.4
  
@@ -11,83 +11,29 @@
 +configincludedir = $(includedir)
  
 -bin_SCRIPTS = glib-config
-+bin_SCRIPTS = glib12-config
++bin_SCRIPTS = glib@LT_RELEASE@-config
  
  BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
  
-@@ -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 = 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
- 
-@@ -113,20 +113,20 @@
- configinclude_DATA =  	glibconfig.h
- 
- 
--libglib_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
-+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 = libglib12.la
-+testgdate_LDADD = libglib12.la
-+testgdateparser_LDADD = libglib12.la
- 
- m4datadir = $(datadir)/aclocal
- m4data_DATA = glib.m4
+@@ -132,7 +132,7 @@
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = config.h
--CONFIG_CLEAN_FILES =  glib.spec glibconfig.h.win32 glib-config
-+CONFIG_CLEAN_FILES =  glib12-config
+-CONFIG_CLEAN_FILES =  glib.spec glib-config
++CONFIG_CLEAN_FILES =  glib.spec glib@LT_RELEASE@-config
  LTLIBRARIES =  $(lib_LTLIBRARIES)
  
  
-@@ -144,15 +144,15 @@
- 
- testglib_SOURCES = testglib.c
- testglib_OBJECTS =  testglib.o
--testglib_DEPENDENCIES =  libglib.la
-+testglib_DEPENDENCIES =  libglib12.la
- testglib_LDFLAGS = 
- testgdate_SOURCES = testgdate.c
- testgdate_OBJECTS =  testgdate.o
--testgdate_DEPENDENCIES =  libglib.la
-+testgdate_DEPENDENCIES =  libglib12.la
- testgdate_LDFLAGS = 
- testgdateparser_SOURCES = testgdateparser.c
- testgdateparser_OBJECTS =  testgdateparser.o
--testgdateparser_DEPENDENCIES =  libglib.la
-+testgdateparser_DEPENDENCIES =  libglib12.la
- testgdateparser_LDFLAGS = 
- SCRIPTS =  $(bin_SCRIPTS)
- 
-@@ -226,7 +226,7 @@
+@@ -232,7 +232,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
-+glib12-config: $(top_builddir)/config.status glib12-config.in
++glib@LT_RELEASE@-config: $(top_builddir)/config.status glib@LT_RELEASE@-config.in
  	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
  
  mostlyclean-libLTLIBRARIES:
-@@ -292,7 +292,7 @@
- 
- maintainer-clean-libtool:
- 
--libglib.la: $(libglib_la_OBJECTS) $(libglib_la_DEPENDENCIES)
-+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 @@
+@@ -541,7 +541,6 @@
  	      || exit 1; \
  	  fi; \
  	done
@@ -95,7 +41,7 @@
  
  info-am:
  info: info-recursive
-@@ -562,7 +561,7 @@
+@@ -568,7 +567,7 @@
  		uninstall-configincludeDATA uninstall-m4dataDATA \
  		uninstall-includeHEADERS
  uninstall: uninstall-recursive
@@ -104,70 +50,19 @@
  		$(HEADERS) config.h
  all-redirect: all-recursive-am
  install-strip:
-@@ -640,7 +639,8 @@
+@@ -646,7 +645,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
++glib@LT_RELEASE@-config.in: glib-config.in
++	cp glib-config.in glib@LT_RELEASE@-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,12 +98,12 @@
- include_HEADERS =  		gmodule.h
- 
- 
--libglib = $(top_builddir)/libglib.la # -lglib
-+libglib = $(top_builddir)/libglib12.la # -lglib
- 
--lib_LTLIBRARIES = libgmodule.la libgplugin_a.la libgplugin_b.la
-+lib_LTLIBRARIES = libgmodule12.la libgplugin12_a.la libgplugin12_b.la
- 
- libgmodule_la_SOURCES = gmodule.c
--libgmodule_la_LDFLAGS =  	@G_MODULE_LDFLAGS@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
-+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 = libgmodule12.la $(libglib) @G_MODULE_LIBS@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES =  gmoduleconf.h
-@@ -141,7 +141,7 @@
- 
- testgmodule_SOURCES = testgmodule.c
- testgmodule_OBJECTS =  testgmodule.o
--testgmodule_DEPENDENCIES =  libgmodule.la $(top_builddir)/libglib.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)
-@@ -226,13 +226,13 @@
- 
- maintainer-clean-libtool:
- 
--libgmodule.la: $(libgmodule_la_OBJECTS) $(libgmodule_la_DEPENDENCIES)
-+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)
-+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)
-+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 @@
+--- gmodule/Makefile.in.orig	Tue May 11 05:06:37 1999
++++ gmodule/Makefile.in	Mon May 17 22:28:24 1999
+@@ -333,7 +333,7 @@
  install: install-am
  uninstall-am: uninstall-libLTLIBRARIES uninstall-includeHEADERS
  uninstall: uninstall-am
@@ -176,63 +71,18 @@
  all-redirect: all-am
  install-strip:
  	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-@@ -398,10 +398,10 @@
- 	  echo $$p; \
- 	done
- 
--install-libLTLIBRARIES: libgmodule.la
-+install-libLTLIBRARIES: libgmodule12.la
- 	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(libdir)
--	@list='libgmodule.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; \
---- gthread/Makefile.in.orig	Thu Jan 28 23:07:14 1999
-+++ gthread/Makefile.in	Thu Jan 28 23:09:35 1999
-@@ -92,18 +92,18 @@
- EXTRA_DIST =  		gthread-posix.c				gthread-solaris.c			gthread-nspr.c				gthread-none.c				gthread.def
- 
- 
--libglib = $(top_builddir)/libglib.la # -lglib
-+libglib = $(top_builddir)/libglib12.la # -lglib
- 
--lib_LTLIBRARIES = libgthread.la
-+lib_LTLIBRARIES = libgthread12.la
- 
- libgthread_la_SOURCES = gthread.c
--libgthread_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
-+libgthread_la_LDFLAGS =  	-version-info 1:0:0
- 
- 
- libgthread_la_LIBADD = @G_THREAD_LIBS@
- 
- noinst_PROGRAMS = testgthread
--testgthread_LDADD = ../libglib.la libgthread.la 
-+testgthread_LDADD = ../libglib12.la libgthread12.la 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES = 
-@@ -120,7 +120,7 @@
- 
- testgthread_SOURCES = testgthread.c
+--- gthread/Makefile.in.orig	Tue May 11 05:06:39 1999
++++ gthread/Makefile.in	Mon May 17 22:28:24 1999
+@@ -128,7 +128,7 @@
  testgthread_OBJECTS =  testgthread.o
--testgthread_DEPENDENCIES =  ../libglib.la libgthread.la
-+testgthread_DEPENDENCIES =  ../libglib12.la libgthread12.la
+ testgthread_DEPENDENCIES =  ../libglib.la libgthread.la
  testgthread_LDFLAGS = 
- CFLAGS = @CFLAGS@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ @G_THREAD_CFLAGS@
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -211,7 +211,7 @@
- 
- maintainer-clean-libtool:
- 
--libgthread.la: $(libgthread_la_OBJECTS) $(libgthread_la_DEPENDENCIES)
-+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 @@
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+@@ -297,7 +297,7 @@
  install: install-am
  uninstall-am: uninstall-libLTLIBRARIES
  uninstall: uninstall-am
@@ -241,116 +91,26 @@
  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 @@
+--- docs/Makefile.in.orig	Tue May 11 05:06:40 1999
++++ docs/Makefile.in	Mon May 17 22:28:24 1999
+@@ -95,9 +95,9 @@
  
  info_TEXINFOS = glib.texi
  
 -man_MANS = glib-config.1
-+man_MANS = glib12-config.1
++man_MANS = glib@LT_RELEASE@-config.1
  
 -EXTRA_DIST = glib-config.1.in		     glib.html 			     glib_toc.html
-+EXTRA_DIST = glib12-config.1.in		     glib.html 			     glib_toc.html
++EXTRA_DIST = glib@LT_RELEASE@-config.1.in		     glib.html 			     glib_toc.html
  
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../config.h
-@@ -125,6 +125,8 @@
+@@ -133,6 +133,8 @@
  glib.info: glib.texi
  glib.dvi: glib.texi
  
-+glib12-config.1: glib-config.1
-+	cp glib-config.1 glib12-config.1
++glib@LT_RELEASE@-config.1: glib-config.1
++	cp glib-config.1 glib@LT_RELEASE@-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/glib13/files/patch-ae b/devel/glib13/files/patch-ae
index 32343d705d05..8d24ca7e3fb8 100644
--- a/devel/glib13/files/patch-ae
+++ b/devel/glib13/files/patch-ae
@@ -1,6 +1,21 @@
---- configure.orig	Wed Feb 17 04:14:07 1999
-+++ configure	Wed Feb 17 21:11:29 1999
-@@ -3758,7 +3758,7 @@
+--- configure.orig	Tue May 11 04:55:02 1999
++++ configure	Mon May 17 22:30:32 1999
+@@ -587,10 +587,10 @@
+ 
+ 
+ # libtool versioning
+-LT_RELEASE=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION
+-LT_CURRENT=`expr $GLIB_MICRO_VERSION - $GLIB_INTERFACE_AGE`
+-LT_REVISION=$GLIB_INTERFACE_AGE
+-LT_AGE=`expr $GLIB_BINARY_AGE - $GLIB_INTERFACE_AGE`
++LT_RELEASE=12
++LT_CURRENT=2
++LT_REVISION=0
++LT_AGE=0
+ 
+ 
+ 
+@@ -3472,7 +3472,7 @@
  
  
  # Check for some functions
@@ -8,18 +23,21 @@
 +for ac_func in lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
- echo "configure:3765: checking for $ac_func" >&5
-@@ -4610,6 +4610,9 @@
+ echo "configure:3479: checking for $ac_func" >&5
+@@ -4365,6 +4365,12 @@
  	  linux*)
  	    G_MODULE_LDFLAGS='-rdynamic'
  	    ;;
 +	  freebsd*)
-+	    G_MODULE_LDFLAGS='-Wl,-E'
++	    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++	    if test $objformat = "elf"; then
++		    G_MODULE_LDFLAGS='-Wl,-E'
++	    fi
 +	    ;;
  	esac
  	LIBS_orig="$LIBS"
  	LDFLAGS_orig="$LDFLAGS"
-@@ -5302,11 +5305,13 @@
+@@ -5057,11 +5063,14 @@
              	        G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
  		fi
  		;;
@@ -28,9 +46,10 @@
 -
 -		# 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"
++			G_THREAD_CFLAGS="-D_THREAD_SAFE"
++			G_THREAD_LIBS="-pthread"
 +			have_poll=no
 +		else
 +			G_THREAD_CFLAGS="-D_THREAD_SAFE -DLINUXTHREADS"
@@ -38,7 +57,17 @@
  		;;
      esac
  
-@@ -5623,6 +5628,63 @@
+@@ -5349,9 +5358,6 @@
+ 
+ 
+ 
+-CFLAGS="$CFLAGS $G_THREAD_CFLAGS"
+-
+-
+         case "$mutex_has_default" in
+         "yes")
+                 echo $ac_n "checking size of $mutex_default_type""... $ac_c" 1>&6
+@@ -5448,6 +5454,63 @@
  
  
  
diff --git a/devel/glib13/pkg-plist b/devel/glib13/pkg-plist
index c5652f822f19..79c46cbaa2bf 100644
--- a/devel/glib13/pkg-plist
+++ b/devel/glib13/pkg-plist
@@ -6,17 +6,14 @@ include/glib12/gmodule.h
 info/glib.info
 @exec install-info %D/info/glib.info %D/info/dir
 lib/libglib12.a
-lib/libglib12.la
 lib/libglib12.so
-lib/libglib12.so.1
+lib/libglib12.so.2
 lib/libgmodule12.a
-lib/libgmodule12.la
 lib/libgmodule12.so
-lib/libgmodule12.so.1
+lib/libgmodule12.so.2
 lib/libgthread12.a
-lib/libgthread12.la
 lib/libgthread12.so
-lib/libgthread12.so.1
+lib/libgthread12.so.2
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/aclocal/glib.m4
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 15f35c833d96..be88e37f4160 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   glib12
-# Version required:		1.2.2
+# Version required:		1.2.3
 # Date Created:			28 July 1998
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.20 1999/05/02 05:21:19 kuriyama Exp $
+# $Id: Makefile,v 1.21 1999/05/06 19:59:12 mharo Exp $
 #
 
-DISTNAME=	glib-1.2.2
+DISTNAME=	glib-1.2.3
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.2/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
@@ -14,11 +14,9 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.2/ \
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/glib12
-MAN1=		glib12-config.1
 
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+MAN1=		glib12-config.1
 
 .include <bsd.port.mk>
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index 3d88d967abff..e4b3e0541613 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1 +1 @@
-MD5 (glib-1.2.2.tar.gz) = 1ecec788b21ae0b6b6debbe5ff9d5c65
+MD5 (glib-1.2.3.tar.gz) = 56944969be7a7cefdd25171ef4a01c2a
diff --git a/devel/glib20/files/patch-ab b/devel/glib20/files/patch-ab
index 49afbe61d07b..4072fa65329f 100644
--- a/devel/glib20/files/patch-ab
+++ b/devel/glib20/files/patch-ab
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Thu Jan 28 22:53:35 1999
-+++ Makefile.in	Thu Jan 28 22:59:44 1999
-@@ -89,11 +89,11 @@
+--- Makefile.in.orig	Tue May 11 05:06:36 1999
++++ Makefile.in	Mon May 17 22:28:24 1999
+@@ -95,11 +95,11 @@
  
  AUTOMAKE_OPTIONS = 1.4
  
@@ -11,83 +11,29 @@
 +configincludedir = $(includedir)
  
 -bin_SCRIPTS = glib-config
-+bin_SCRIPTS = glib12-config
++bin_SCRIPTS = glib@LT_RELEASE@-config
  
  BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
  
-@@ -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 = 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
- 
-@@ -113,20 +113,20 @@
- configinclude_DATA =  	glibconfig.h
- 
- 
--libglib_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
-+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 = libglib12.la
-+testgdate_LDADD = libglib12.la
-+testgdateparser_LDADD = libglib12.la
- 
- m4datadir = $(datadir)/aclocal
- m4data_DATA = glib.m4
+@@ -132,7 +132,7 @@
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = config.h
--CONFIG_CLEAN_FILES =  glib.spec glibconfig.h.win32 glib-config
-+CONFIG_CLEAN_FILES =  glib12-config
+-CONFIG_CLEAN_FILES =  glib.spec glib-config
++CONFIG_CLEAN_FILES =  glib.spec glib@LT_RELEASE@-config
  LTLIBRARIES =  $(lib_LTLIBRARIES)
  
  
-@@ -144,15 +144,15 @@
- 
- testglib_SOURCES = testglib.c
- testglib_OBJECTS =  testglib.o
--testglib_DEPENDENCIES =  libglib.la
-+testglib_DEPENDENCIES =  libglib12.la
- testglib_LDFLAGS = 
- testgdate_SOURCES = testgdate.c
- testgdate_OBJECTS =  testgdate.o
--testgdate_DEPENDENCIES =  libglib.la
-+testgdate_DEPENDENCIES =  libglib12.la
- testgdate_LDFLAGS = 
- testgdateparser_SOURCES = testgdateparser.c
- testgdateparser_OBJECTS =  testgdateparser.o
--testgdateparser_DEPENDENCIES =  libglib.la
-+testgdateparser_DEPENDENCIES =  libglib12.la
- testgdateparser_LDFLAGS = 
- SCRIPTS =  $(bin_SCRIPTS)
- 
-@@ -226,7 +226,7 @@
+@@ -232,7 +232,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
-+glib12-config: $(top_builddir)/config.status glib12-config.in
++glib@LT_RELEASE@-config: $(top_builddir)/config.status glib@LT_RELEASE@-config.in
  	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
  
  mostlyclean-libLTLIBRARIES:
-@@ -292,7 +292,7 @@
- 
- maintainer-clean-libtool:
- 
--libglib.la: $(libglib_la_OBJECTS) $(libglib_la_DEPENDENCIES)
-+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 @@
+@@ -541,7 +541,6 @@
  	      || exit 1; \
  	  fi; \
  	done
@@ -95,7 +41,7 @@
  
  info-am:
  info: info-recursive
-@@ -562,7 +561,7 @@
+@@ -568,7 +567,7 @@
  		uninstall-configincludeDATA uninstall-m4dataDATA \
  		uninstall-includeHEADERS
  uninstall: uninstall-recursive
@@ -104,70 +50,19 @@
  		$(HEADERS) config.h
  all-redirect: all-recursive-am
  install-strip:
-@@ -640,7 +639,8 @@
+@@ -646,7 +645,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
++glib@LT_RELEASE@-config.in: glib-config.in
++	cp glib-config.in glib@LT_RELEASE@-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,12 +98,12 @@
- include_HEADERS =  		gmodule.h
- 
- 
--libglib = $(top_builddir)/libglib.la # -lglib
-+libglib = $(top_builddir)/libglib12.la # -lglib
- 
--lib_LTLIBRARIES = libgmodule.la libgplugin_a.la libgplugin_b.la
-+lib_LTLIBRARIES = libgmodule12.la libgplugin12_a.la libgplugin12_b.la
- 
- libgmodule_la_SOURCES = gmodule.c
--libgmodule_la_LDFLAGS =  	@G_MODULE_LDFLAGS@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
-+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 = libgmodule12.la $(libglib) @G_MODULE_LIBS@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES =  gmoduleconf.h
-@@ -141,7 +141,7 @@
- 
- testgmodule_SOURCES = testgmodule.c
- testgmodule_OBJECTS =  testgmodule.o
--testgmodule_DEPENDENCIES =  libgmodule.la $(top_builddir)/libglib.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)
-@@ -226,13 +226,13 @@
- 
- maintainer-clean-libtool:
- 
--libgmodule.la: $(libgmodule_la_OBJECTS) $(libgmodule_la_DEPENDENCIES)
-+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)
-+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)
-+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 @@
+--- gmodule/Makefile.in.orig	Tue May 11 05:06:37 1999
++++ gmodule/Makefile.in	Mon May 17 22:28:24 1999
+@@ -333,7 +333,7 @@
  install: install-am
  uninstall-am: uninstall-libLTLIBRARIES uninstall-includeHEADERS
  uninstall: uninstall-am
@@ -176,63 +71,18 @@
  all-redirect: all-am
  install-strip:
  	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-@@ -398,10 +398,10 @@
- 	  echo $$p; \
- 	done
- 
--install-libLTLIBRARIES: libgmodule.la
-+install-libLTLIBRARIES: libgmodule12.la
- 	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(libdir)
--	@list='libgmodule.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; \
---- gthread/Makefile.in.orig	Thu Jan 28 23:07:14 1999
-+++ gthread/Makefile.in	Thu Jan 28 23:09:35 1999
-@@ -92,18 +92,18 @@
- EXTRA_DIST =  		gthread-posix.c				gthread-solaris.c			gthread-nspr.c				gthread-none.c				gthread.def
- 
- 
--libglib = $(top_builddir)/libglib.la # -lglib
-+libglib = $(top_builddir)/libglib12.la # -lglib
- 
--lib_LTLIBRARIES = libgthread.la
-+lib_LTLIBRARIES = libgthread12.la
- 
- libgthread_la_SOURCES = gthread.c
--libgthread_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
-+libgthread_la_LDFLAGS =  	-version-info 1:0:0
- 
- 
- libgthread_la_LIBADD = @G_THREAD_LIBS@
- 
- noinst_PROGRAMS = testgthread
--testgthread_LDADD = ../libglib.la libgthread.la 
-+testgthread_LDADD = ../libglib12.la libgthread12.la 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES = 
-@@ -120,7 +120,7 @@
- 
- testgthread_SOURCES = testgthread.c
+--- gthread/Makefile.in.orig	Tue May 11 05:06:39 1999
++++ gthread/Makefile.in	Mon May 17 22:28:24 1999
+@@ -128,7 +128,7 @@
  testgthread_OBJECTS =  testgthread.o
--testgthread_DEPENDENCIES =  ../libglib.la libgthread.la
-+testgthread_DEPENDENCIES =  ../libglib12.la libgthread12.la
+ testgthread_DEPENDENCIES =  ../libglib.la libgthread.la
  testgthread_LDFLAGS = 
- CFLAGS = @CFLAGS@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ @G_THREAD_CFLAGS@
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -211,7 +211,7 @@
- 
- maintainer-clean-libtool:
- 
--libgthread.la: $(libgthread_la_OBJECTS) $(libgthread_la_DEPENDENCIES)
-+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 @@
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+@@ -297,7 +297,7 @@
  install: install-am
  uninstall-am: uninstall-libLTLIBRARIES
  uninstall: uninstall-am
@@ -241,116 +91,26 @@
  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 @@
+--- docs/Makefile.in.orig	Tue May 11 05:06:40 1999
++++ docs/Makefile.in	Mon May 17 22:28:24 1999
+@@ -95,9 +95,9 @@
  
  info_TEXINFOS = glib.texi
  
 -man_MANS = glib-config.1
-+man_MANS = glib12-config.1
++man_MANS = glib@LT_RELEASE@-config.1
  
 -EXTRA_DIST = glib-config.1.in		     glib.html 			     glib_toc.html
-+EXTRA_DIST = glib12-config.1.in		     glib.html 			     glib_toc.html
++EXTRA_DIST = glib@LT_RELEASE@-config.1.in		     glib.html 			     glib_toc.html
  
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../config.h
-@@ -125,6 +125,8 @@
+@@ -133,6 +133,8 @@
  glib.info: glib.texi
  glib.dvi: glib.texi
  
-+glib12-config.1: glib-config.1
-+	cp glib-config.1 glib12-config.1
++glib@LT_RELEASE@-config.1: glib-config.1
++	cp glib-config.1 glib@LT_RELEASE@-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/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index 32343d705d05..8d24ca7e3fb8 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -1,6 +1,21 @@
---- configure.orig	Wed Feb 17 04:14:07 1999
-+++ configure	Wed Feb 17 21:11:29 1999
-@@ -3758,7 +3758,7 @@
+--- configure.orig	Tue May 11 04:55:02 1999
++++ configure	Mon May 17 22:30:32 1999
+@@ -587,10 +587,10 @@
+ 
+ 
+ # libtool versioning
+-LT_RELEASE=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION
+-LT_CURRENT=`expr $GLIB_MICRO_VERSION - $GLIB_INTERFACE_AGE`
+-LT_REVISION=$GLIB_INTERFACE_AGE
+-LT_AGE=`expr $GLIB_BINARY_AGE - $GLIB_INTERFACE_AGE`
++LT_RELEASE=12
++LT_CURRENT=2
++LT_REVISION=0
++LT_AGE=0
+ 
+ 
+ 
+@@ -3472,7 +3472,7 @@
  
  
  # Check for some functions
@@ -8,18 +23,21 @@
 +for ac_func in lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
- echo "configure:3765: checking for $ac_func" >&5
-@@ -4610,6 +4610,9 @@
+ echo "configure:3479: checking for $ac_func" >&5
+@@ -4365,6 +4365,12 @@
  	  linux*)
  	    G_MODULE_LDFLAGS='-rdynamic'
  	    ;;
 +	  freebsd*)
-+	    G_MODULE_LDFLAGS='-Wl,-E'
++	    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++	    if test $objformat = "elf"; then
++		    G_MODULE_LDFLAGS='-Wl,-E'
++	    fi
 +	    ;;
  	esac
  	LIBS_orig="$LIBS"
  	LDFLAGS_orig="$LDFLAGS"
-@@ -5302,11 +5305,13 @@
+@@ -5057,11 +5063,14 @@
              	        G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
  		fi
  		;;
@@ -28,9 +46,10 @@
 -
 -		# 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"
++			G_THREAD_CFLAGS="-D_THREAD_SAFE"
++			G_THREAD_LIBS="-pthread"
 +			have_poll=no
 +		else
 +			G_THREAD_CFLAGS="-D_THREAD_SAFE -DLINUXTHREADS"
@@ -38,7 +57,17 @@
  		;;
      esac
  
-@@ -5623,6 +5628,63 @@
+@@ -5349,9 +5358,6 @@
+ 
+ 
+ 
+-CFLAGS="$CFLAGS $G_THREAD_CFLAGS"
+-
+-
+         case "$mutex_has_default" in
+         "yes")
+                 echo $ac_n "checking size of $mutex_default_type""... $ac_c" 1>&6
+@@ -5448,6 +5454,63 @@
  
  
  
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index c5652f822f19..79c46cbaa2bf 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -6,17 +6,14 @@ include/glib12/gmodule.h
 info/glib.info
 @exec install-info %D/info/glib.info %D/info/dir
 lib/libglib12.a
-lib/libglib12.la
 lib/libglib12.so
-lib/libglib12.so.1
+lib/libglib12.so.2
 lib/libgmodule12.a
-lib/libgmodule12.la
 lib/libgmodule12.so
-lib/libgmodule12.so.1
+lib/libgmodule12.so.2
 lib/libgthread12.a
-lib/libgthread12.la
 lib/libgthread12.so
-lib/libgthread12.so.1
+lib/libgthread12.so.2
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/aclocal/glib.m4