Update to 2.5.6 from the ports-experimental module.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3054 df743ca5-7f9a-e211-a948-0013205c9059

11 files changed, 362 insertions, 0 deletions

diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
new file mode 100644
index 000000000..25b15f99d
--- /dev/null
+++ b/devel/glib20/Makefile
@@ -0,0 +1,46 @@
+# New ports collection makefile for:   glib13
+# Date Created:			28 July 1998
+# Whom:				Vanilla I. Shu <vanilla@FreeBSD.org>
+#
+# $FreeBSD: ports/devel/glib20/Makefile,v 1.103 2004/07/30 22:04:13 mezz Exp $
+#
+
+PORTNAME=	glib
+PORTVERSION=	2.5.6
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.5,} \
+		ftp://ftp.gtk.org/pub/gtk/v2.5/ \
+		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
+		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
+		http://www.ameth.org/gimp/%SUBDIR%/ \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
+MASTER_SITE_SUBDIR=	gtk/v${PORTVERSION:R}
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Some useful routines of C programming (current stable version)
+
+LATEST_LINK=	glib20
+
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
+USE_LIBTOOL_VER=15
+USE_REINPLACE=	yes
+INSTALLS_SHLIB=	yes
+USE_GNOME=	gnomehack gnometarget pkgconfig
+USE_GMAKE=	yes
+USE_PERL5=	yes
+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}"
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
+		s|%%X11BASE%%|${X11BASE}|g' \
+		${WRKSRC}/glib/gutils.c
+
+.include <bsd.port.mk>
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
new file mode 100644
index 000000000..da5718a40
--- /dev/null
+++ b/devel/glib20/distinfo
@@ -0,0 +1,2 @@
+MD5 (gnome2/glib-2.5.6.tar.bz2) = 4c4aaa25e4714fbda6071f10106e6d91
+SIZE (gnome2/glib-2.5.6.tar.bz2) = 2294351
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
new file mode 100644
index 000000000..89850e102
--- /dev/null
+++ b/devel/glib20/files/patch-ae
@@ -0,0 +1,11 @@
+--- configure.orig	Fri Apr 30 09:05:01 2004
++++ configure	Tue May  4 12:52:56 2004
+@@ -31818,6 +31819,8 @@
+          ;;
+     esac
+   fi
++  G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
++  G_THREAD_LIBS="${PTHREAD_LIBS}"
+ 
+   if test x"$G_THREAD_CFLAGS" = x; then
+ 
diff --git a/devel/glib20/files/patch-ag b/devel/glib20/files/patch-ag
new file mode 100644
index 000000000..3e8fbfbf4
--- /dev/null
+++ b/devel/glib20/files/patch-ag
@@ -0,0 +1,14 @@
+--- Makefile.in.orig	Sun Dec 23 16:53:53 2001
++++ Makefile.in	Fri Feb  8 12:44:30 2002
+@@ -151,3 +151,3 @@
+ 
+-SUBDIRS = . m4macros glib gobject gmodule gthread tests build po docs
++SUBDIRS = . m4macros glib gobject gmodule gthread build po docs
+ 
+@@ -192,4 +192,4 @@
+ 
+-
+-configexecincludedir = $(libdir)/glib-2.0/include
++glibincludedir = $(includedir)/glib-2.0
++configexecincludedir = $(glibincludedir)
+ 
diff --git a/devel/glib20/files/patch-ah b/devel/glib20/files/patch-ah
new file mode 100644
index 000000000..c339b76e2
--- /dev/null
+++ b/devel/glib20/files/patch-ah
@@ -0,0 +1,11 @@
+--- 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 = $(top_builddir)/config.h
diff --git a/devel/glib20/files/patch-glib::libcharset::Makefile.in b/devel/glib20/files/patch-glib::libcharset::Makefile.in
new file mode 100644
index 000000000..9afd57416
--- /dev/null
+++ b/devel/glib20/files/patch-glib::libcharset::Makefile.in
@@ -0,0 +1,31 @@
+--- glib/libcharset/Makefile.in.orig	Fri Apr 30 12:10:27 2004
++++ glib/libcharset/Makefile.in	Fri Apr 30 12:12:01 2004
+@@ -225,7 +225,7 @@
+ target_alias = @target_alias@
+ 
+ INCLUDES = \
+-	-DLIBDIR=\"$(libdir)\" -I$(top_srcdir)
++	-DLIBDIR=\"$(prefix)/libdata\" -I$(top_srcdir)
+ 
+ 
+ noinst_LTLIBRARIES = libcharset.la
+@@ -246,8 +246,8 @@
+ 	make-patch.sh
+ 
+ 
+-charset_alias = $(DESTDIR)$(libdir)/charset.alias
+-charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
++charset_alias = $(DESTDIR)$(prefix)/libdata/charset.alias
++charset_tmp = $(DESTDIR)$(prefix)/libdata/charset.tmp
+ 
+ SUFFIXES = .sed .sin
+ 
+@@ -487,7 +487,7 @@
+ 
+ install-data-am:
+ 
+-install-exec-am: install-exec-local
++install-exec-am: # install-exec-local
+ 
+ install-info: install-info-am
+ 
diff --git a/devel/glib20/files/patch-glib_gutils.c b/devel/glib20/files/patch-glib_gutils.c
new file mode 100644
index 000000000..d32b910ad
--- /dev/null
+++ b/devel/glib20/files/patch-glib_gutils.c
@@ -0,0 +1,20 @@
+--- glib/gutils.c.orig	Sat Sep  4 15:49:27 2004
++++ glib/gutils.c	Sat Sep  4 15:55:24 2004
+@@ -1466,7 +1466,7 @@
+       data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
+ 
+       if (!data_dirs || !data_dirs[0])
+-          data_dirs = "/usr/local/share/:/usr/share/";
++          data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/";
+ #endif
+       data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
+ 
+@@ -1509,7 +1509,7 @@
+       conf_dirs = (gchar *) g_getenv ("XDG_CONFIG_DIRS");
+ 
+       if (!conf_dirs || !conf_dirs[0])
+-          conf_dirs = "/etc/xdg";
++          conf_dirs = "%%X11BASE%%/etc/xdg:/usr/local/etc/xdg:/etc/xdg";
+ #endif
+       conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
+     }
diff --git a/devel/glib20/files/patch-gmodule::gmodule-dl.c b/devel/glib20/files/patch-gmodule::gmodule-dl.c
new file mode 100644
index 000000000..a8a4aa434
--- /dev/null
+++ b/devel/glib20/files/patch-gmodule::gmodule-dl.c
@@ -0,0 +1,23 @@
+
+$FreeBSD: ports/devel/glib20/files/patch-gmodule::gmodule-dl.c,v 1.3 2004/04/05 03:11:21 marcus Exp $
+
+--- gmodule/gmodule-dl.c.orig	Sat Feb 17 08:28:07 2001
++++ gmodule/gmodule-dl.c	Fri Jan 18 09:48:45 2002
+@@ -104,6 +104,7 @@
+ static gpointer
+ _g_module_self (void)
+ {
++#ifndef __FreeBSD__
+   gpointer handle;
+   
+   /* to query symbols from the program itself, special link options
+@@ -115,6 +116,9 @@
+     g_module_set_error (fetch_dlerror (TRUE));
+   
+   return handle;
++#else
++  return RTLD_DEFAULT;
++#endif
+ }
+ 
+ static void
diff --git a/devel/glib20/files/patch-gthread_gthread-posix.c b/devel/glib20/files/patch-gthread_gthread-posix.c
new file mode 100644
index 000000000..e240b9772
--- /dev/null
+++ b/devel/glib20/files/patch-gthread_gthread-posix.c
@@ -0,0 +1,34 @@
+--- gthread/gthread-posix.c.orig	Mon Nov  4 15:09:47 2002
++++ gthread/gthread-posix.c	Tue Jul 27 09:44:54 2004
+@@ -116,6 +116,7 @@
+ #endif /* POSIX_MIN_PRIORITY && POSIX_MAX_PRIORITY */
+ 
+ static gulong g_thread_min_stack_size = 0;
++static gulong g_thread_default_stack_size = 0x100000;
+ 
+ #define G_MUTEX_SIZE (sizeof (pthread_mutex_t))
+ 
+@@ -125,7 +126,8 @@
+ g_thread_impl_init()
+ {
+ #ifdef _SC_THREAD_STACK_MIN
+-  g_thread_min_stack_size = MAX (sysconf (_SC_THREAD_STACK_MIN), 0);
++  g_thread_min_stack_size = MAX (sysconf (_SC_THREAD_STACK_MIN),
++    g_thread_min_stack_size);
+ #endif /* _SC_THREAD_STACK_MIN */
+ #ifdef HAVE_PRIORITIES
+ # ifdef G_THREADS_IMPL_POSIX
+@@ -307,8 +309,12 @@
+   if (stack_size)
+     {
+       stack_size = MAX (g_thread_min_stack_size, stack_size);
+-      posix_check_cmd (pthread_attr_setstacksize (&attr, stack_size));
+     }
++  else
++    {
++      stack_size = MAX (g_thread_min_stack_size, g_thread_default_stack_size);
++    }
++  posix_check_cmd (pthread_attr_setstacksize (&attr, stack_size));
+ #endif /* HAVE_PTHREAD_ATTR_SETSTACKSIZE */
+ 
+ #ifdef PTHREAD_SCOPE_SYSTEM
diff --git a/devel/glib20/pkg-descr b/devel/glib20/pkg-descr
new file mode 100644
index 000000000..3b3059030
--- /dev/null
+++ b/devel/glib20/pkg-descr
@@ -0,0 +1,5 @@
+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/
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
new file mode 100644
index 000000000..c09e26466
--- /dev/null
+++ b/devel/glib20/pkg-plist
@@ -0,0 +1,165 @@
+bin/glib-genmarshal
+bin/glib-gettextize
+bin/glib-mkenums
+bin/gobject-query
+include/glib-2.0/glib-object.h
+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
+include/glib-2.0/glib/gconvert.h
+include/glib-2.0/glib/gdataset.h
+include/glib-2.0/glib/gdate.h
+include/glib-2.0/glib/gdir.h
+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/gkeyfile.h
+include/glib-2.0/glib/glist.h
+include/glib-2.0/glib/gmacros.h
+include/glib-2.0/glib/gmain.h
+include/glib-2.0/glib/gmarkup.h
+include/glib-2.0/glib/gmem.h
+include/glib-2.0/glib/gmessages.h
+include/glib-2.0/glib/gnode.h
+include/glib-2.0/glib/goption.h
+include/glib-2.0/glib/gpattern.h
+include/glib-2.0/glib/gprimes.h
+include/glib-2.0/glib/gprintf.h
+include/glib-2.0/glib/gqsort.h
+include/glib-2.0/glib/gquark.h
+include/glib-2.0/glib/gqueue.h
+include/glib-2.0/glib/grand.h
+include/glib-2.0/glib/grel.h
+include/glib-2.0/glib/gscanner.h
+include/glib-2.0/glib/gshell.h
+include/glib-2.0/glib/gslist.h
+include/glib-2.0/glib/gspawn.h
+include/glib-2.0/glib/gstdio.h
+include/glib-2.0/glib/gstrfuncs.h
+include/glib-2.0/glib/gstring.h
+include/glib-2.0/glib/gthread.h
+include/glib-2.0/glib/gthreadpool.h
+include/glib-2.0/glib/gtimer.h
+include/glib-2.0/glib/gtree.h
+include/glib-2.0/glib/gtypes.h
+include/glib-2.0/glib/gunicode.h
+include/glib-2.0/glib/gutils.h
+include/glib-2.0/glib/gwin32.h
+include/glib-2.0/glibconfig.h
+include/glib-2.0/gmodule.h
+include/glib-2.0/gobject/gboxed.h
+include/glib-2.0/gobject/gclosure.h
+include/glib-2.0/gobject/genums.h
+include/glib-2.0/gobject/gmarshal.h
+include/glib-2.0/gobject/gobject.h
+include/glib-2.0/gobject/gobjectnotifyqueue.c
+include/glib-2.0/gobject/gparam.h
+include/glib-2.0/gobject/gparamspecs.h
+include/glib-2.0/gobject/gsignal.h
+include/glib-2.0/gobject/gsourceclosure.h
+include/glib-2.0/gobject/gtype.h
+include/glib-2.0/gobject/gtypemodule.h
+include/glib-2.0/gobject/gtypeplugin.h
+include/glib-2.0/gobject/gvalue.h
+include/glib-2.0/gobject/gvaluearray.h
+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.505
+lib/libgmodule-2.0.a
+lib/libgmodule-2.0.so
+lib/libgmodule-2.0.so.505
+lib/libgobject-2.0.a
+lib/libgobject-2.0.so
+lib/libgobject-2.0.so.505
+lib/libgthread-2.0.a
+lib/libgthread-2.0.so
+lib/libgthread-2.0.so.505
+libdata/pkgconfig/glib-2.0.pc
+libdata/pkgconfig/gmodule-2.0.pc
+libdata/pkgconfig/gobject-2.0.pc
+libdata/pkgconfig/gthread-2.0.pc
+share/aclocal/glib-2.0.m4
+share/aclocal/glib-gettext.m4
+share/glib-2.0/gettext/mkinstalldirs
+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
+share/locale/bn/LC_MESSAGES/glib20.mo
+share/locale/bs/LC_MESSAGES/glib20.mo
+share/locale/ca/LC_MESSAGES/glib20.mo
+share/locale/cs/LC_MESSAGES/glib20.mo
+share/locale/cy/LC_MESSAGES/glib20.mo
+share/locale/da/LC_MESSAGES/glib20.mo
+share/locale/de/LC_MESSAGES/glib20.mo
+share/locale/el/LC_MESSAGES/glib20.mo
+share/locale/en_CA/LC_MESSAGES/glib20.mo
+share/locale/en_GB/LC_MESSAGES/glib20.mo
+share/locale/eo/LC_MESSAGES/glib20.mo
+share/locale/es/LC_MESSAGES/glib20.mo
+share/locale/et/LC_MESSAGES/glib20.mo
+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/gu/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/lt/LC_MESSAGES/glib20.mo
+share/locale/lv/LC_MESSAGES/glib20.mo
+share/locale/mk/LC_MESSAGES/glib20.mo
+share/locale/mn/LC_MESSAGES/glib20.mo
+share/locale/ms/LC_MESSAGES/glib20.mo
+share/locale/ne/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/or/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
+share/locale/ro/LC_MESSAGES/glib20.mo
+share/locale/ru/LC_MESSAGES/glib20.mo
+share/locale/sk/LC_MESSAGES/glib20.mo
+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
+share/locale/uk/LC_MESSAGES/glib20.mo
+share/locale/vi/LC_MESSAGES/glib20.mo
+share/locale/wa/LC_MESSAGES/glib20.mo
+share/locale/yi/LC_MESSAGES/glib20.mo
+share/locale/zh_CN/LC_MESSAGES/glib20.mo
+share/locale/zh_TW/LC_MESSAGES/glib20.mo
+@dirrm share/glib-2.0/gettext/po
+@dirrm share/glib-2.0/gettext
+@dirrm share/glib-2.0
+@dirrm include/glib-2.0/gobject
+@dirrm include/glib-2.0/glib
+@dirrm include/glib-2.0