6 files changed, 58 insertions, 49 deletions

diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 398371d2fb96..0806087eb929 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	glib
-PORTVERSION=	2.2.3
-PORTREVISION=	1
+PORTVERSION=	2.4.0
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.2,} \
-		ftp://ftp.gtk.org/pub/gtk/v2.2/ \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.4,} \
+		ftp://ftp.gtk.org/pub/gtk/v2.3/ \
 		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
 		http://www.ameth.org/gimp/%SUBDIR%/ \
@@ -25,17 +24,31 @@ NO_LATEST_LINK=	yes
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=13
+USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_GMAKE=	yes
 USE_PERL5=	yes
-CONFIGURE_ARGS=	--enable-static --with-libiconv=gnu
+CONFIGURE_ARGS=	--enable-static --with-libiconv=gnu \
+		--disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \
+		--disable-man --without-xml-catalog
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lintl" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
-MAN1=		glib-genmarshal.1 glib-mkenums.1
+pre-everything::
+	@${ECHO_CMD} '******************************************'
+	@${ECHO_CMD}
+	@${ECHO_CMD} If you have not updated your GNOME ports in the manner outlined in
+	@${ECHO_CMD} 	http://www.FreeBSD.org/gnome/docs/develfaq.html
+	@${ECHO_CMD} then you should abort this build immediately and follow the directions
+	@${ECHO_CMD} outlined in that document.
+	@${ECHO_CMD}
+	@${ECHO_CMD} Failure to follow the above directions will result in everything
+	@${ECHO_CMD} GNOME-related breaking.
+	@${ECHO_CMD}
+	@${ECHO_CMD} '******************************************'
 
 .include <bsd.port.mk>
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index dc973c4e09b1..9ee62b116c18 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/glib-2.2.3.tar.bz2) = aa214a10d873b68ddd67cd9de2ccae55
-SIZE (gnome2/glib-2.2.3.tar.bz2) = 1636987
+MD5 (gnome2/glib-2.4.0.tar.bz2) = 0f5f4896782ec7ab6ea8c7c1d9958114
+SIZE (gnome2/glib-2.4.0.tar.bz2) = 2034272
diff --git a/devel/glib20/files/patch-ah b/devel/glib20/files/patch-ah
index afb4544d268b..c339b76e2477 100644
--- a/devel/glib20/files/patch-ah
+++ b/devel/glib20/files/patch-ah
@@ -1,11 +1,11 @@
---- docs/reference/Makefile.in	2000/11/20 09:49:25	1.1
-+++ docs/reference/Makefile.in	2000/11/20 09:50:55
-@@ -106,7 +106,7 @@
- STRIP_END = @STRIP_END@
- VERSION = @VERSION@
- 
+--- docs/reference/Makefile.in.orig	Fri Oct 24 18:05:32 2003
++++ docs/reference/Makefile.in	Fri Oct 24 18:06:00 2003
+@@ -226,7 +226,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
 -SUBDIRS = glib gobject
 +SUBDIRS = #glib gobject
+ subdir = docs/reference
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
- CONFIG_CLEAN_FILES = 
+ CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/devel/glib20/files/patch-glib::libcharset::Makefile.in b/devel/glib20/files/patch-glib::libcharset::Makefile.in
index 0ef01e926f44..2d0f82ab2263 100644
--- a/devel/glib20/files/patch-glib::libcharset::Makefile.in
+++ b/devel/glib20/files/patch-glib::libcharset::Makefile.in
@@ -1,18 +1,15 @@
-
-$FreeBSD$
-
---- glib/libcharset/Makefile.in.orig	Tue Jun  4 01:47:05 2002
-+++ glib/libcharset/Makefile.in	Tue Jun  4 03:41:15 2002
-@@ -148,7 +148,7 @@
- ms_librarian = @ms_librarian@
+--- glib/libcharset/Makefile.in.orig	Fri Oct 24 18:07:07 2003
++++ glib/libcharset/Makefile.in	Fri Oct 24 18:09:20 2003
+@@ -228,7 +228,7 @@
+ target_alias = @target_alias@
  
  INCLUDES = \
 -	-DLIBDIR=\"$(libdir)\"
-+	-DLIBDIR=\"$(prefix)/libdata\"
++	   -DLIBDIR=\"$(prefix)/libdata\"
  
  
  noinst_LTLIBRARIES = libcharset.la
-@@ -171,8 +171,8 @@
+@@ -249,8 +249,8 @@
  	make-patch.sh
  
  
@@ -23,12 +20,12 @@ $FreeBSD$
  
  SUFFIXES = .sed .sin
  
-@@ -326,7 +326,7 @@
- check: check-am
- installcheck-am:
- installcheck: installcheck-am
+@@ -492,7 +492,7 @@
+ 
+ install-data-am:
+ 
 -install-exec-am: install-exec-local
 +install-exec-am: # install-exec-local
- install-exec: install-exec-am
  
- install-data-am:
+ install-info: install-info-am
+ 
diff --git a/devel/glib20/pkg-descr b/devel/glib20/pkg-descr
index d762ed2f440d..3b305903069d 100644
--- a/devel/glib20/pkg-descr
+++ b/devel/glib20/pkg-descr
@@ -1,13 +1,5 @@
-This is GLib version 2.0.  GLib, is a library which includes support
-routines for C such as lists, trees, hashes, memory allocation, and
-many other things.
+GLib provides a simple, abstract, and highly portable set of C support
+routines such as lists, trees, hashes, memory allocation, and much, much
+more.  It is a foundation for writing portable applications.
 
 WWW: http://www.gtk.org/
-ftp://ftp.gtk.org/pub/gtk
-
-A mailing list is located at gtk-list@redhat.com for discussion.
-
-GLib-2.0 is a stable release that forms the basis of GTK+-2.0.
-
-- Vanilla
-vanilla@FreeBSD.ORG
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 958f40c5aac4..fcaad2e8d4e3 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -7,6 +7,7 @@ include/glib-2.0/glib.h
 include/glib-2.0/glib/galloca.h
 include/glib-2.0/glib/garray.h
 include/glib-2.0/glib/gasyncqueue.h
+include/glib-2.0/glib/gatomic.h
 include/glib-2.0/glib/gbacktrace.h
 include/glib-2.0/glib/gcache.h
 include/glib-2.0/glib/gcompletion.h
@@ -18,6 +19,8 @@ include/glib-2.0/glib/gerror.h
 include/glib-2.0/glib/gfileutils.h
 include/glib-2.0/glib/ghash.h
 include/glib-2.0/glib/ghook.h
+include/glib-2.0/glib/gi18n-lib.h
+include/glib-2.0/glib/gi18n.h
 include/glib-2.0/glib/giochannel.h
 include/glib-2.0/glib/glist.h
 include/glib-2.0/glib/gmacros.h
@@ -69,16 +72,16 @@ include/glib-2.0/gobject/gvaluecollector.h
 include/glib-2.0/gobject/gvaluetypes.h
 lib/libglib-2.0.a
 lib/libglib-2.0.so
-lib/libglib-2.0.so.200
+lib/libglib-2.0.so.400
 lib/libgmodule-2.0.a
 lib/libgmodule-2.0.so
-lib/libgmodule-2.0.so.200
+lib/libgmodule-2.0.so.400
 lib/libgobject-2.0.a
 lib/libgobject-2.0.so
-lib/libgobject-2.0.so.200
+lib/libgobject-2.0.so.400
 lib/libgthread-2.0.a
 lib/libgthread-2.0.so
-lib/libgthread-2.0.so.200
+lib/libgthread-2.0.so.400
 libdata/pkgconfig/glib-2.0.pc
 libdata/pkgconfig/gmodule-2.0.pc
 libdata/pkgconfig/gobject-2.0.pc
@@ -87,6 +90,7 @@ share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
 share/glib-2.0/gettext/po/Makefile.in.in
 share/locale/am/LC_MESSAGES/glib20.mo
+share/locale/ar/LC_MESSAGES/glib20.mo
 share/locale/az/LC_MESSAGES/glib20.mo
 share/locale/be/LC_MESSAGES/glib20.mo
 share/locale/bg/LC_MESSAGES/glib20.mo
@@ -104,23 +108,25 @@ share/locale/eu/LC_MESSAGES/glib20.mo
 share/locale/fa/LC_MESSAGES/glib20.mo
 share/locale/fi/LC_MESSAGES/glib20.mo
 share/locale/fr/LC_MESSAGES/glib20.mo
+share/locale/ga/LC_MESSAGES/glib20.mo
 share/locale/gl/LC_MESSAGES/glib20.mo
 share/locale/he/LC_MESSAGES/glib20.mo
 share/locale/hi/LC_MESSAGES/glib20.mo
+share/locale/hr/LC_MESSAGES/glib20.mo
 share/locale/id/LC_MESSAGES/glib20.mo
 share/locale/is/LC_MESSAGES/glib20.mo
 share/locale/it/LC_MESSAGES/glib20.mo
 share/locale/ja/LC_MESSAGES/glib20.mo
 share/locale/ko/LC_MESSAGES/glib20.mo
-share/locale/li/LC_MESSAGES/glib20.mo
+share/locale/lt/LC_MESSAGES/glib20.mo
 share/locale/lv/LC_MESSAGES/glib20.mo
 share/locale/mk/LC_MESSAGES/glib20.mo
-share/locale/ml/LC_MESSAGES/glib20.mo
 share/locale/mn/LC_MESSAGES/glib20.mo
 share/locale/ms/LC_MESSAGES/glib20.mo
 share/locale/nl/LC_MESSAGES/glib20.mo
 share/locale/nn/LC_MESSAGES/glib20.mo
 share/locale/no/LC_MESSAGES/glib20.mo
+share/locale/pa/LC_MESSAGES/glib20.mo
 share/locale/pl/LC_MESSAGES/glib20.mo
 share/locale/pt/LC_MESSAGES/glib20.mo
 share/locale/pt_BR/LC_MESSAGES/glib20.mo
@@ -131,6 +137,7 @@ share/locale/sl/LC_MESSAGES/glib20.mo
 share/locale/sq/LC_MESSAGES/glib20.mo
 share/locale/sr/LC_MESSAGES/glib20.mo
 share/locale/sr@Latn/LC_MESSAGES/glib20.mo
+share/locale/sr@ije/LC_MESSAGES/glib20.mo
 share/locale/sv/LC_MESSAGES/glib20.mo
 share/locale/ta/LC_MESSAGES/glib20.mo
 share/locale/tr/LC_MESSAGES/glib20.mo