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

Bugfix update to glib2-2.24.1.

Browse Source 
Don't install the gdb python macros.
This commit is contained in:
ajacoutot 2010-05-03 11:41:56 +00:00
parent dc6b82cb33
commit cd5055c213
6 changed files with 60 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
devel/glib2/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.81 2010/04/29 16:38:41 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.82 2010/05/03 11:41:56 ajacoutot Exp $
COMMENT-main= general-purpose utility library
COMMENT-docs= glib2 documentation
VERSION= 2.24.0
VERSION= 2.24.1
DISTNAME= glib-${VERSION}
PKGNAME-main= glib2-${VERSION}p0
PKGNAME-main= glib2-${VERSION}
PKGNAME-docs= glib2-docs-${VERSION}
CATEGORIES= devel
@ -16,11 +16,11 @@ MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
# glib-2.0 and gobject-2.0 need to be in sync as glib-2.0 version is
# used to install *-gdb.py files
SHARED_LIBS+= glib-2.0 1803.0 # .2400.0
SHARED_LIBS+= gobject-2.0 1803.0 # .2400.0
SHARED_LIBS+= gmodule-2.0 1803.0 # .2400.0
SHARED_LIBS+= gthread-2.0 1803.0 # .2400.0
SHARED_LIBS+= gio-2.0 1803.0 # .2400.0
SHARED_LIBS+= glib-2.0 1803.0 # .2400.1
SHARED_LIBS+= gobject-2.0 1803.0 # .2400.1
SHARED_LIBS+= gmodule-2.0 1803.0 # .2400.1
SHARED_LIBS+= gthread-2.0 1803.0 # .2400.1
SHARED_LIBS+= gio-2.0 1803.0 # .2400.1
# LGPLv2
PERMIT_PACKAGE_CDROM= Yes
@ -72,8 +72,5 @@ pre-configure:
-e "s,/usr/share,${LOCALBASE}/share,g;" \
-e "s,/etc/xdg,${SYSCONFDIR}/xdg,g" \
${WRKSRC}/glib/gutils.c ${WRKSRC}/gio/xdgmime/xdgmime.c
perl -pi -e 's,!!LIBglib-2.0_VERSION_R!!,${LIBglib-2.0_VERSION:R},g;' \
-e 's,!!LIBglib-2.0_VERSION_E!!,${LIBglib-2.0_VERSION:E},g' \
${WRKSRC}/configure
.include <bsd.port.mk>

10
devel/glib2/distinfo
View File

@ -1,5 +1,5 @@
MD5 (glib-2.24.0.tar.bz2) = Rai8aX0H+FlWbAtkxAOCqA==
RMD160 (glib-2.24.0.tar.bz2) = qXe6yYhi9GaDrAoTUvIecwZAzBI=
SHA1 (glib-2.24.0.tar.bz2) = MnFOZP/1LRjbXwd3MpECFXkODFs=
SHA256 (glib-2.24.0.tar.bz2) = e2qizyHnNKYJKnEb8Za40t3Fiblx+TM3YQwQ+k8jQA0=
SIZE (glib-2.24.0.tar.bz2) = 5306479
MD5 (glib-2.24.1.tar.bz2) = an24HJos/+ajTa21fXui0g==
RMD160 (glib-2.24.1.tar.bz2) = xs4JZUwb0ouIRENdFQ/LUeb06HI=
SHA1 (glib-2.24.1.tar.bz2) = 1INbsWGPweHf6I74RDwS/K5p+Q4=
SHA256 (glib-2.24.1.tar.bz2) = AUw9qWC/FxFzcQdcFklfBfNlAduZCFHO6mWPFdLqbQQ=
SIZE (glib-2.24.1.tar.bz2) = 5332511

16
devel/glib2/patches/patch-configure
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-configure,v 1.21 2010/04/22 19:34:06 ajacoutot Exp $
--- configure.orig Fri Mar 26 16:01:30 2010
+++ configure Sun Mar 28 07:52:14 2010
@@ -3503,9 +3503,9 @@ $as_echo "#define GLIB_BINARY_AGE 2400" >>confdefs.h
# libtool versioning
LT_RELEASE=2.24
-LT_CURRENT=2400
-LT_REVISION=0
-LT_AGE=2400
+LT_CURRENT=!!LIBglib-2.0_VERSION_R!!
+LT_REVISION=!!LIBglib-2.0_VERSION_E!!
+LT_AGE=!!LIBglib-2.0_VERSION_R!!
LT_CURRENT_MINUS_AGE=0

26
devel/glib2/patches/patch-glib_Makefile_in
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-glib_Makefile_in,v 1.17 2010/04/22 19:34:06 ajacoutot Exp $
$OpenBSD: patch-glib_Makefile_in,v 1.18 2010/05/03 11:41:56 ajacoutot Exp $
Don't install gtester-report, it'll only pull in python.
--- glib/Makefile.in.orig Fri Mar 26 16:01:27 2010
+++ glib/Makefile.in Sun Mar 28 07:51:43 2010
--- glib/Makefile.in.orig Mon May 3 02:59:23 2010
+++ glib/Makefile.in Mon May 3 12:46:28 2010
@@ -726,7 +726,7 @@ INSTALL_PROGS = $(am__append_1) $(am__append_2) $(am__
@OS_WIN32_TRUE@@OS_WIN32_X64_FALSE@gspawn_win32_helper_console_LDADD = libglib-2.0.la
@OS_UNIX_TRUE@gtester_SOURCES = gtester.c
@ -13,3 +13,23 @@ Don't install gtester-report, it'll only pull in python.
@OS_UNIX_TRUE@bin_SCRIPTS = ${auto_config_binscripts}
@OS_UNIX_TRUE@CONFIGVARS = \
@OS_UNIX_TRUE@ "bindir" : "${bindir}", \
@@ -1440,7 +1440,7 @@ info: info-recursive
info-am:
-install-data-am: install-data-local install-dist_gdbSCRIPTS \
+install-data-am: install-data-local \
install-glibincludeHEADERS install-glibsubincludeHEADERS
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -1658,9 +1658,7 @@ distclean-local:
libglib-gdb.py: libglib-gdb.py.in
sed -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > libglib-gdb.py
-install-data-hook: libglib-gdb.py
- mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)
- $(INSTALL) libglib-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py
+install-data-hook:
@HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
@HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libglib-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
@HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)

23
devel/glib2/patches/patch-gobject_Makefile_in Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-gobject_Makefile_in,v 1.8 2010/05/03 11:41:56 ajacoutot Exp $
--- gobject/Makefile.in.orig Mon May 3 12:46:43 2010
+++ gobject/Makefile.in Mon May 3 12:47:04 2010
@@ -1198,7 +1198,7 @@ info: info-recursive
info-am:
-install-data-am: install-data-local install-dist_gdbSCRIPTS \
+install-data-am: install-data-local \
install-libgobjectincludeHEADERS
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -1414,9 +1414,7 @@ libgobject-gdb.py: libgobject-gdb.py.in
uninstall-gdb:
-rm -r $(DESTDIR)$(datadir)/gdb
-install-data-hook: libgobject-gdb.py
- mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load/$(ABS_GLIB_RUNTIME_LIBDIR)
- $(INSTALL) libgobject-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load/$(ABS_GLIB_RUNTIME_LIBDIR)/libgobject-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py
+install-data-hook:
@HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
@HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libgobject-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
@HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libgobject-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.13 2010/04/22 19:34:06 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.14 2010/05/03 11:41:56 ajacoutot Exp $
@conflict glib2-fam-*
@pkgpath devel/glib2
@pkgpath devel/glib2,-fam
@ -213,14 +213,7 @@ lib/pkgconfig/gthread-2.0.pc
@man man/man1/gtester.1
share/aclocal/glib-2.0.m4
share/aclocal/glib-gettext.m4
share/gdb/
share/gdb/auto-load/
share/gdb/auto-load/libglib-2.0.so.0.1803.0-gdb.py
share/gdb/auto-load/libgobject-2.0.so.0.1803.0-gdb.py
share/glib-2.0/
share/glib-2.0/gdb/
share/glib-2.0/gdb/glib.py
share/glib-2.0/gdb/gobject.py
share/glib-2.0/gettext/
share/glib-2.0/gettext/mkinstalldirs
share/glib-2.0/gettext/po/