ports/devel/glib20/files/patch-glib_Makefile.in
Koop Mast 7887c684ad * Update the glib to 2.34.3 and gtk20 to 2.24.17 and gtk30 to 3.6.4 which
are the latest stable releases.
* Update vala to the newest stable release 0.18.1, also update a few ports
  in the gtk/gnome stack.
* The c++ bindings ports for glib, atk, gconf, etc, have now USE_GNOME toggles.
* Remove pkg-config run depends from glib20 and freetype2. This doesn't
  eliminate pkg-config run dependency completely, a second phase is needed
  and is planned.
* Support for .:run. and .:build. for USE_GNOME components was added.
  Currently only libxml2 and libxslt support this mechanism.
* Updates of the telepathy stack and empathy.
* Trim makefile headers, convert ports to new options, trim off library
  versions for some ports.
* Fix other ports so they build with the new glib version.

Thanks to miwi and crees for helping out with some exp-runs.
Approved by:	portmgr (miwi & bapt)
Obtained from:	gnome team repo
2013-03-08 10:51:34 +00:00

31 lines
1.6 KiB
Text

--- glib/Makefile.in.orig 2012-09-24 01:59:13.000000000 +0000
+++ glib/Makefile.in 2012-09-24 02:02:07.000000000 +0000
@@ -585,7 +585,7 @@
#
DISTCLEANFILES = glibconfig-stamp glibconfig.h
CLEANFILES = libglib-gdb.py glib-public-headers.txt $(am__append_6)
-configexecincludedir = $(libdir)/glib-2.0/include
+configexecincludedir = $(includedir)/glib-2.0
nodist_configexecinclude_HEADERS = glibconfig.h
@HAVE_GOOD_PRINTF_FALSE@PRINTF_SUBDIR = gnulib
@HAVE_GOOD_PRINTF_FALSE@printf_la = gnulib/libgnulib.la
@@ -1617,7 +1617,7 @@
info-am:
install-data-am: install-data-local install-deprecatedincludeHEADERS \
- install-dist_gdbSCRIPTS install-glibincludeHEADERS \
+ install-glibincludeHEADERS \
install-glibsubincludeHEADERS install-tapsetDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -1906,9 +1906,7 @@
libglib-gdb.py: libglib-gdb.py.in
$(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > $(builddir)/libglib-gdb.py
-install-data-hook: libglib-gdb.py
- mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)
- $(INSTALL) $(builddir)/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)