cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update glib2 to 2.14.2

Browse Source 
- don't use the local pcre, but use pcre from ports

with tweaks from wilfried@ (pcre and static libs)
ok steven@
This commit is contained in:
jasper 2007-10-24 22:29:02 +00:00
parent cb603401fc
commit 561f316f27
12 changed files with 78 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
devel/glib2/Makefile
View File

@ -1,20 +1,20 @@
# $OpenBSD: Makefile,v 1.38 2007/09/13 10:51:13 djm Exp $
# $OpenBSD: Makefile,v 1.39 2007/10/24 22:29:02 jasper Exp $
COMMENT-main= general-purpose utility library
COMMENT-docs= glib2 documentation
VERSION= 2.12.13
VERSION= 2.14.2
DISTNAME= glib-${VERSION}
PKGNAME-main= glib2-${VERSION}p0
PKGNAME-main= glib2-${VERSION}
PKGNAME-docs= glib2-docs-${VERSION}
CATEGORIES= devel
HOMEPAGE= http://www.gtk.org
HOMEPAGE= http://www.gtk.org/
SHARED_LIBS += glib-2.0 1200.13 # .1200.13
SHARED_LIBS += gobject-2.0 1200.13 # .1200.13
SHARED_LIBS += gmodule-2.0 1200.13 # .1200.13
SHARED_LIBS += gthread-2.0 1200.13 # .1200.13
SHARED_LIBS += glib-2.0 1400.0 # .1400.1
SHARED_LIBS += gobject-2.0 1400.0 # .1400.1
SHARED_LIBS += gmodule-2.0 1400.0 # .1400.1
SHARED_LIBS += gthread-2.0 1400.0 # .1400.1
# LGPL
PERMIT_PACKAGE_CDROM= Yes
@ -22,7 +22,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glib/2.12/}
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glib/2.14/}
EXTRACT_SUFX= .tar.bz2
MULTI_PACKAGES= -main -docs
@ -30,6 +30,9 @@ MULTI_PACKAGES= -main -docs
MODULES= devel/gettext
WANTLIB-main= c
LIB_DEPENDS-main= pcre:pcre->=7.2:devel/pcre
PKG_ARCH-docs= *
LIB_DEPENDS-docs=
RUN_DEPENDS-docs=
@ -48,7 +51,9 @@ PATCH_LIST= patch-* PPC-patch-glib_Makefile_in
USE_GMAKE= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--enable-static \
--with-pcre=system
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

10
devel/glib2/distinfo
View File

@ -1,5 +1,5 @@
MD5 (glib-2.12.13.tar.bz2) = 12EkI25OIW6MCGE0HpZ6dg==
RMD160 (glib-2.12.13.tar.bz2) = DRPnPLIXPn1jzhiP23d0bMo7BNY=
SHA1 (glib-2.12.13.tar.bz2) = gc4OU/VYO+lwYj0SUjx4WjkmR78=
SHA256 (glib-2.12.13.tar.bz2) = ElPVY8ouUCktkkhJ/jojw7e8cHq4t5vaGTGfnRkrDo4=
SIZE (glib-2.12.13.tar.bz2) = 2938164
MD5 (glib-2.14.2.tar.bz2) = /KXSbI7+pOblR8gcgBv2fA==
RMD160 (glib-2.14.2.tar.bz2) = I6H4Or3X3phjvQLkp1OW6nWRiBA=
SHA1 (glib-2.14.2.tar.bz2) = BxHx6Kv2oFKqKYvLE1C88hldpuQ=
SHA256 (glib-2.14.2.tar.bz2) = vWdnzHyNlVHfD7Pm1AcGdGcj9tqg7NSnj6z/xA+dipc=
SIZE (glib-2.14.2.tar.bz2) = 3340273

8
devel/glib2/patches/patch-glib_gbacktrace_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-glib_gbacktrace_c,v 1.4 2007/04/23 16:22:07 jasper Exp $
--- glib/gbacktrace.c.orig Fri Mar 9 05:01:39 2007
+++ glib/gbacktrace.c Fri Apr 20 19:02:41 2007
@@ -169,7 +169,7 @@ g_on_error_stack_trace (const gchar *prg_name)
$OpenBSD: patch-glib_gbacktrace_c,v 1.5 2007/10/24 22:29:03 jasper Exp $
--- glib/gbacktrace.c.orig Sun Sep 16 18:28:33 2007
+++ glib/gbacktrace.c Tue Oct 2 20:47:04 2007
@@ -167,7 +167,7 @@ g_on_error_stack_trace (const gchar *prg_name)
if (!prg_name)
return;

8
devel/glib2/patches/patch-glib_gmacros_h
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-glib_gmacros_h,v 1.6 2006/05/22 01:39:36 brad Exp $
--- glib/gmacros.h.orig Sun Dec 4 01:41:57 2005
+++ glib/gmacros.h Fri Apr 28 23:41:43 2006
$OpenBSD: patch-glib_gmacros_h,v 1.7 2007/10/24 22:29:03 jasper Exp $
--- glib/gmacros.h.orig Sun Sep 16 18:28:33 2007
+++ glib/gmacros.h Tue Oct 2 20:47:04 2007
@@ -34,6 +34,7 @@
/* We include stddef.h to get the system's definition of NULL
*/
@ -9,7 +9,7 @@ $OpenBSD: patch-glib_gmacros_h,v 1.6 2006/05/22 01:39:36 brad Exp $
/* Here we provide G_GNUC_EXTENSION as an alias for __extension__,
* where this is valid. This allows for warningless compilation of
@@ -163,11 +164,13 @@
@@ -169,11 +170,13 @@
#define TRUE (!FALSE)
#endif

10
devel/glib2/patches/patch-glib_gprintf_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-glib_gprintf_c,v 1.3 2007/04/23 16:22:07 jasper Exp $
--- glib/gprintf.c.orig Fri Mar 9 05:01:39 2007
+++ glib/gprintf.c Fri Apr 20 19:02:41 2007
$OpenBSD: patch-glib_gprintf_c,v 1.4 2007/10/24 22:29:03 jasper Exp $
--- glib/gprintf.c.orig Sun Sep 16 18:28:33 2007
+++ glib/gprintf.c Tue Oct 2 20:47:04 2007
@@ -87,6 +87,8 @@ g_fprintf (FILE *file,
return retval;
}
@ -9,8 +9,8 @@ $OpenBSD: patch-glib_gprintf_c,v 1.3 2007/04/23 16:22:07 jasper Exp $
+ "warning: g_sprintf() is often misused, please use g_snprintf()");
/**
* g_sprintf:
* @string: the buffer to hold the output.
@@ -208,6 +210,8 @@ g_vfprintf (FILE *file,
* @string: A pointer to a memory buffer to contain the resulting string. It
@@ -210,6 +212,8 @@ g_vfprintf (FILE *file,
return _g_vfprintf (file, format, args);
}

10
devel/glib2/patches/patch-glib_gstrfuncs_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-glib_gstrfuncs_c,v 1.4 2007/04/23 16:22:07 jasper Exp $
--- glib/gstrfuncs.c.orig Fri Mar 9 05:01:39 2007
+++ glib/gstrfuncs.c Fri Apr 20 19:02:41 2007
@@ -1280,7 +1280,7 @@ g_strerror (gint errnum)
$OpenBSD: patch-glib_gstrfuncs_c,v 1.5 2007/10/24 22:29:03 jasper Exp $
--- glib/gstrfuncs.c.orig Sun Sep 16 18:28:33 2007
+++ glib/gstrfuncs.c Tue Oct 2 20:47:04 2007
@@ -1308,7 +1308,7 @@ g_strerror (gint errnum)
g_static_private_set (&msg_private, msg, g_free);
}
@ -10,7 +10,7 @@ $OpenBSD: patch-glib_gstrfuncs_c,v 1.4 2007/04/23 16:22:07 jasper Exp $
errno = saved_errno;
return msg;
@@ -1430,7 +1430,7 @@ extern const char *strsignal(int);
@@ -1458,7 +1458,7 @@ extern const char *strsignal(int);
g_static_private_set (&msg_private, msg, g_free);
}

8
devel/glib2/patches/patch-glib_gutils_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-glib_gutils_c,v 1.1 2007/04/24 18:21:14 jasper Exp $
--- glib/gutils.c.orig Thu Jul 6 14:30:16 2006
+++ glib/gutils.c Thu Dec 21 14:07:45 2006
@@ -2489,7 +2489,7 @@ g_get_system_data_dirs (void)
$OpenBSD: patch-glib_gutils_c,v 1.2 2007/10/24 22:29:03 jasper Exp $
--- glib/gutils.c.orig Sun Sep 16 18:28:32 2007
+++ glib/gutils.c Tue Oct 2 20:47:04 2007
@@ -2619,7 +2619,7 @@ g_get_system_data_dirs (void)
gchar *data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
if (!data_dirs || !data_dirs[0])

10
devel/glib2/patches/patch-tests_Makefile_in
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-tests_Makefile_in,v 1.3 2007/04/23 16:22:07 jasper Exp $
--- tests/Makefile.in.orig Fri Mar 9 05:04:20 2007
+++ tests/Makefile.in Fri Apr 20 19:02:41 2007
@@ -335,7 +335,6 @@ test_programs = \
$OpenBSD: patch-tests_Makefile_in,v 1.4 2007/10/24 22:29:03 jasper Exp $
--- tests/Makefile.in.orig Sun Sep 16 18:29:42 2007
+++ tests/Makefile.in Tue Oct 2 20:47:04 2007
@@ -355,7 +355,6 @@ test_programs = \
tree-test \
type-test \
unicode-caseconv \
- unicode-encoding \
utf8-validate \
utf8-pointer \
uri-test
uri-test \

8
devel/glib2/patches/patch-tests_child-test_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-tests_child-test_c,v 1.1 2005/11/13 06:22:03 marcm Exp $
--- tests/child-test.c.orig Mon Oct 31 21:12:02 2005
+++ tests/child-test.c Mon Oct 31 21:12:36 2005
@@ -174,7 +174,7 @@ main (int argc, char *argv[])
$OpenBSD: patch-tests_child-test_c,v 1.2 2007/10/24 22:29:03 jasper Exp $
--- tests/child-test.c.orig Sun Sep 16 18:28:30 2007
+++ tests/child-test.c Tue Oct 2 20:47:04 2007
@@ -175,7 +175,7 @@ main (int argc, char *argv[])
#ifdef G_OS_WIN32
system ("ipconfig /all");
#else

8
devel/glib2/patches/patch-tests_refcount_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-tests_refcount_Makefile_in,v 1.3 2007/04/23 16:22:07 jasper Exp $
--- tests/refcount/Makefile.in.orig Fri Mar 9 05:04:20 2007
+++ tests/refcount/Makefile.in Fri Apr 20 19:02:41 2007
@@ -251,7 +251,6 @@ libgobject = $(top_builddir)/gobject/libgobject-2.0.la
$OpenBSD: patch-tests_refcount_Makefile_in,v 1.4 2007/10/24 22:29:03 jasper Exp $
--- tests/refcount/Makefile.in.orig Sun Sep 16 18:29:42 2007
+++ tests/refcount/Makefile.in Tue Oct 2 20:47:04 2007
@@ -264,7 +264,6 @@ libgobject = $(top_builddir)/gobject/libgobject-2.0.la
LDADD = $(libglib) $(libgobject) $(libgthread) $(G_THREAD_LIBS)
test_programs = \

11
devel/glib2/pkg/PLIST-docs
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-docs,v 1.12 2007/04/23 16:22:07 jasper Exp $
@comment $OpenBSD: PLIST-docs,v 1.13 2007/10/24 22:29:03 jasper Exp $
@conflict glib2-<2.4.6
share/aclocal/
share/gtk-doc/
@ -43,10 +43,12 @@ share/gtk-doc/html/glib/glib-Miscellaneous-Macros.html
share/gtk-doc/html/glib/glib-Miscellaneous-Utility-Functions.html
share/gtk-doc/html/glib/glib-N-ary-Trees.html
share/gtk-doc/html/glib/glib-Numerical-Definitions.html
share/gtk-doc/html/glib/glib-Perl-compatible-regular-expressions.html
share/gtk-doc/html/glib/glib-Pointer-Arrays.html
share/gtk-doc/html/glib/glib-Quarks.html
share/gtk-doc/html/glib/glib-Random-Numbers.html
share/gtk-doc/html/glib/glib-Relations-and-Tuples.html
share/gtk-doc/html/glib/glib-Sequences.html
share/gtk-doc/html/glib/glib-Shell-related-Utilities.html
share/gtk-doc/html/glib/glib-Simple-XML-Subset-Parser.html
share/gtk-doc/html/glib/glib-Singly-Linked-Lists.html
@ -73,6 +75,7 @@ share/gtk-doc/html/glib/glib-cross-compiling.html
share/gtk-doc/html/glib/glib-data-types.html
share/gtk-doc/html/glib/glib-fundamentals.html
share/gtk-doc/html/glib/glib-gettextize.html
share/gtk-doc/html/glib/glib-regex-syntax.html
share/gtk-doc/html/glib/glib-resources.html
share/gtk-doc/html/glib/glib-running.html
share/gtk-doc/html/glib/glib-utilities.html
@ -90,6 +93,7 @@ share/gtk-doc/html/glib/ix05.html
share/gtk-doc/html/glib/ix06.html
share/gtk-doc/html/glib/ix07.html
share/gtk-doc/html/glib/ix08.html
share/gtk-doc/html/glib/ix09.html
share/gtk-doc/html/glib/left.png
share/gtk-doc/html/glib/mainloop-states.gif
share/gtk-doc/html/glib/right.png
@ -99,13 +103,13 @@ share/gtk-doc/html/glib/up.png
share/gtk-doc/html/gobject/
share/gtk-doc/html/gobject/GTypeModule.html
share/gtk-doc/html/gobject/GTypePlugin.html
share/gtk-doc/html/gobject/ch01.html
share/gtk-doc/html/gobject/ch01s02.html
share/gtk-doc/html/gobject/ch02.html
share/gtk-doc/html/gobject/ch06s03.html
share/gtk-doc/html/gobject/ch07s02.html
share/gtk-doc/html/gobject/ch07s03.html
share/gtk-doc/html/gobject/chapter-gobject.html
share/gtk-doc/html/gobject/chapter-gtype.html
share/gtk-doc/html/gobject/chapter-intro.html
share/gtk-doc/html/gobject/chapter-signal.html
share/gtk-doc/html/gobject/glib-genmarshal.html
share/gtk-doc/html/gobject/glib-mkenums.html
@ -151,6 +155,7 @@ share/gtk-doc/html/gobject/ix05.html
share/gtk-doc/html/gobject/ix06.html
share/gtk-doc/html/gobject/ix07.html
share/gtk-doc/html/gobject/ix08.html
share/gtk-doc/html/gobject/ix09.html
share/gtk-doc/html/gobject/left.png
share/gtk-doc/html/gobject/pr01.html
share/gtk-doc/html/gobject/pt01.html

18
devel/glib2/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.2 2007/04/23 16:22:07 jasper Exp $
@comment $OpenBSD: PLIST-main,v 1.3 2007/10/24 22:29:03 jasper Exp $
@pkgpath devel/glib2
bin/glib-genmarshal
bin/glib-gettextize
@ -45,8 +45,10 @@ 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/gregex.h
include/glib-2.0/glib/grel.h
include/glib-2.0/glib/gscanner.h
include/glib-2.0/glib/gsequence.h
include/glib-2.0/glib/gshell.h
include/glib-2.0/glib/gslice.h
include/glib-2.0/glib/gslist.h
@ -117,6 +119,9 @@ share/locale/am/LC_MESSAGES/glib20.mo
share/locale/ar/
share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/glib20.mo
share/locale/as/
share/locale/as/LC_MESSAGES/
share/locale/as/LC_MESSAGES/glib20.mo
share/locale/az/
share/locale/az/LC_MESSAGES/
share/locale/az/LC_MESSAGES/glib20.mo
@ -185,6 +190,9 @@ share/locale/ja/LC_MESSAGES/glib20.mo
share/locale/ka/
share/locale/ka/LC_MESSAGES/
share/locale/ka/LC_MESSAGES/glib20.mo
share/locale/kn/
share/locale/kn/LC_MESSAGES/
share/locale/kn/LC_MESSAGES/glib20.mo
share/locale/ko/LC_MESSAGES/glib20.mo
share/locale/ku/
share/locale/ku/LC_MESSAGES/
@ -193,6 +201,9 @@ share/locale/lt/
share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/glib20.mo
share/locale/lv/LC_MESSAGES/glib20.mo
share/locale/mg/
share/locale/mg/LC_MESSAGES/
share/locale/mg/LC_MESSAGES/glib20.mo
share/locale/mk/
share/locale/mk/LC_MESSAGES/
share/locale/mk/LC_MESSAGES/glib20.mo
@ -211,6 +222,9 @@ share/locale/ne/LC_MESSAGES/
share/locale/ne/LC_MESSAGES/glib20.mo
share/locale/nl/LC_MESSAGES/glib20.mo
share/locale/nn/LC_MESSAGES/glib20.mo
share/locale/oc/
share/locale/oc/LC_MESSAGES/
share/locale/oc/LC_MESSAGES/glib20.mo
share/locale/or/
share/locale/or/LC_MESSAGES/
share/locale/or/LC_MESSAGES/glib20.mo
@ -266,8 +280,6 @@ share/locale/yi/
share/locale/yi/LC_MESSAGES/
share/locale/yi/LC_MESSAGES/glib20.mo
share/locale/zh_CN/LC_MESSAGES/glib20.mo
share/locale/zh_HK/
share/locale/zh_HK/LC_MESSAGES/
share/locale/zh_HK/LC_MESSAGES/glib20.mo
share/locale/zh_TW/LC_MESSAGES/glib20.mo
%%SHARED%%