summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2006-02-25 17:34:18 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2006-02-25 17:34:18 +0800
commit105ee6f8563f53928704bc0481849cc170e8de6b (patch)
treecf855160427b28f2a0e7c1386e25823cfe42ef35
parent098e12fbdd2eec0557b8fa7a6bc26a02a862ccdf (diff)
downloadmarcuscom-ports-105ee6f8563f53928704bc0481849cc170e8de6b.tar
marcuscom-ports-105ee6f8563f53928704bc0481849cc170e8de6b.tar.gz
marcuscom-ports-105ee6f8563f53928704bc0481849cc170e8de6b.tar.bz2
marcuscom-ports-105ee6f8563f53928704bc0481849cc170e8de6b.tar.lz
marcuscom-ports-105ee6f8563f53928704bc0481849cc170e8de6b.tar.xz
marcuscom-ports-105ee6f8563f53928704bc0481849cc170e8de6b.tar.zst
marcuscom-ports-105ee6f8563f53928704bc0481849cc170e8de6b.zip
Update to 2.10.0.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5761 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--devel/glib20/Makefile9
-rw-r--r--devel/glib20/distinfo6
-rw-r--r--devel/glib20/files/patch-ae8
-rw-r--r--devel/glib20/files/patch-glib_gslice.c24
4 files changed, 7 insertions, 40 deletions
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 527b15fe7..84fb384ad 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -3,15 +3,14 @@
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/glib20/Makefile,v 1.68 2006/02/24 18:15:19 marcus Exp $
+# $MCom: ports/devel/glib20/Makefile,v 1.69 2006/02/24 20:43:28 marcus Exp $
#
PORTNAME= glib
-PORTVERSION= 2.9.6
-PORTREVISION= 2
+PORTVERSION= 2.10.0
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.9,} \
- ftp://ftp.gtk.org/pub/gtk/v2.9/ \
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.10,} \
+ ftp://ftp.gtk.org/pub/gtk/v2.10/ \
ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
http://www.ameth.org/gimp/%SUBDIR%/ \
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index 993e404e7..653b9233b 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glib-2.9.6.tar.bz2) = 2ba1146e767454e14ac0788187c35892
-SHA256 (gnome2/glib-2.9.6.tar.bz2) = 20a4abbf8bf5c1e10c6f7e5189cc6f7bdee8d2d54d561dda290ae049a8e03eb6
-SIZE (gnome2/glib-2.9.6.tar.bz2) = 2755876
+MD5 (gnome2/glib-2.10.0.tar.bz2) = 60c9f62979415bcb82f0b87d6785dc3b
+SHA256 (gnome2/glib-2.10.0.tar.bz2) = 7629d438a19f4536a3aef20f4303cd4f0f88f9b359e1b03827d04fa3537a3bd5
+SIZE (gnome2/glib-2.10.0.tar.bz2) = 2758837
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index 457a8ef52..46738f939 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -1,13 +1,5 @@
--- configure.orig Sun Jan 29 13:06:22 2006
+++ configure Sun Jan 29 13:06:48 2006
-@@ -32826,7 +32826,6 @@
-
- #define _XOPEN_SOURCE 600
- #include <stdlib.h>
-- #include <malloc.h>
- static void test_memalign (size_t boundary, size_t size) {
- void *mem = 0;
- if (posix_memalign (&mem, boundary, size) != 0 || !mem)
@@ -34462,6 +34461,8 @@
;;
esac
diff --git a/devel/glib20/files/patch-glib_gslice.c b/devel/glib20/files/patch-glib_gslice.c
deleted file mode 100644
index a59be1a0b..000000000
--- a/devel/glib20/files/patch-glib_gslice.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- glib/gslice.c.orig Tue Feb 14 11:45:19 2006
-+++ glib/gslice.c Tue Feb 14 11:46:37 2006
-@@ -20,7 +20,8 @@
-
- #include "config.h"
-
--#ifdef HAVE_POSIX_MEMALIGN
-+#if defined(HAVE_POSIX_MEMALIGN) && defined(POSIX_MEMALIGN_WITH_COMPLIANT_ALLOCS)
-+#define HAVE_COMPLIANT_POSIX_MEMALIGN 1
- #define _XOPEN_SOURCE 600 /* posix_memalign() */
- #endif
- #include <stdlib.h> /* posix_memalign() */
-@@ -37,11 +38,6 @@
- #include <windows.h>
- #include <process.h>
- #endif
--
--#if defined HAVE_POSIX_MEMALIGN && defined POSIX_MEMALIGN_WITH_COMPLIANT_ALLOCS
--# define HAVE_COMPLIANT_POSIX_MEMALIGN 1
--#endif
--
-
- /* the GSlice allocator is split up into 4 layers, roughly modelled after the slab
- * allocator and magazine extensions as outlined in: