Remove our "hack" for glibconfig.h and do what upstream intended.

I know this is a hier(7) violation but I was confronted with a project
that tripped over the fact that we did it differently.
This also reduces FreeBSD only patches, which is a plus IMO.


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

4 files changed, 4 insertions, 20 deletions

diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index f5228a2c2..4c3dbf956 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	glib
 PORTVERSION=	2.40.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/devel/glib20/files/patch-glib-2.0.pc.in b/devel/glib20/files/patch-glib-2.0.pc.in
deleted file mode 100644
index 9bd74ad43..000000000
--- a/devel/glib20/files/patch-glib-2.0.pc.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- glib-2.0.pc.in.orig	2012-01-16 04:12:06.000000000 +0100
-+++ glib-2.0.pc.in	2012-03-06 12:30:11.000000000 +0100
-@@ -13,4 +13,4 @@
- Requires.private: @PCRE_REQUIRES@
- Libs: -L${libdir} -lglib-2.0 @INTLLIBS@
- Libs.private: @G_THREAD_LIBS@ @G_LIBS_EXTRA@ @PCRE_LIBS@ @INTLLIBS@ @ICONV_LIBS@
--Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@
-+Cflags: -I${includedir}/glib-2.0 @GLIB_EXTRA_CFLAGS@
diff --git a/devel/glib20/files/patch-glib_Makefile.in b/devel/glib20/files/patch-glib_Makefile.in
deleted file mode 100644
index fc0b7438c..000000000
--- a/devel/glib20/files/patch-glib_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- glib/Makefile.in.orig	2013-09-26 18:18:49.000000000 +0200
-+++ glib/Makefile.in	2013-09-26 18:19:38.000000000 +0200
-@@ -961,7 +961,7 @@
- @ENABLE_INSTALLED_TESTS_TRUE@                      $(dist_test_scripts) $(dist_installed_test_scripts)
- 
- @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test)
--configexecincludedir = $(libdir)/glib-2.0/include
-+configexecincludedir = $(prefix)/include/glib-2.0
- nodist_configexecinclude_HEADERS = glibconfig.h
- @HAVE_GOOD_PRINTF_FALSE@PRINTF_SUBDIR = gnulib
- @HAVE_GOOD_PRINTF_FALSE@printf_la = gnulib/libgnulib.la
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 7d8fe2f37..2fc142eae 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -246,7 +246,6 @@ include/glib-2.0/glib/gvarianttype.h
 include/glib-2.0/glib/gversion.h
 include/glib-2.0/glib/gversionmacros.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/gbinding.h
 include/glib-2.0/gobject/gboxed.h
@@ -267,6 +266,7 @@ 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/glib-2.0/include/glibconfig.h
 lib/libgio-2.0.la
 lib/libgio-2.0.so
 lib/libgio-2.0.so.0
@@ -496,6 +496,8 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
 @exec mkdir -p %D/share/GConf/gsettings
 @dirrm share/GConf/gsettings
 @dirrm share/GConf
+@dirrm lib/glib-2.0/include
+@dirrm lib/glib-2.0
 @exec mkdir -p %D/lib/gio/modules
 @exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
 @dirrmtry lib/gio/modules