From de4e6f960821e1238ede5a03059cf9eaac5388d3 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 3 Jun 2012 01:59:10 +0000 Subject: Finish that patch by reorder the -I just like in the offical FreeBSD ports. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16859 df743ca5-7f9a-e211-a948-0013205c9059 --- .../files/patch-champlain-gtk_Makefile.in | 24 +++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/graphics/libchamplain/files/patch-champlain-gtk_Makefile.in b/graphics/libchamplain/files/patch-champlain-gtk_Makefile.in index 4e124bd82..df1632d37 100644 --- a/graphics/libchamplain/files/patch-champlain-gtk_Makefile.in +++ b/graphics/libchamplain/files/patch-champlain-gtk_Makefile.in @@ -1,5 +1,5 @@ ---- champlain-gtk/Makefile.in.orig 2012-06-02 16:02:24.000000000 -0500 -+++ champlain-gtk/Makefile.in 2012-06-02 16:04:15.000000000 -0500 +--- champlain-gtk/Makefile.in.orig 2012-06-02 20:46:55.000000000 -0500 ++++ champlain-gtk/Makefile.in 2012-06-02 20:56:23.000000000 -0500 @@ -124,8 +124,8 @@ LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = @@ -11,7 +11,7 @@ am__objects_1 = am__objects_2 = gtk-champlain-embed.lo am_libchamplain_gtk_@CHAMPLAIN_API_VERSION@_la_OBJECTS = \ -@@ -388,8 +388,8 @@ +@@ -388,15 +388,15 @@ $(libchamplain_gtk_sources_built) libchamplain_gtk_@CHAMPLAIN_API_VERSION@_la_LIBADD = \ @@ -22,3 +22,21 @@ libchamplain_gtk_@CHAMPLAIN_API_VERSION@_la_LDFLAGS = \ -version-info $(LIBRARY_VERSION) \ + -no-undefined \ + -export-symbols-regex ^gtk_champlain_.* + +-AM_CPPFLAGS = $(DEPS_CFLAGS) $(GTK_CFLAGS) $(WARN_CFLAGS) -I$(top_srcdir) -DCHAMPLAIN_GTK_COMPILATION ++AM_CPPFLAGS = -I$(top_srcdir) $(DEPS_CFLAGS) $(GTK_CFLAGS) $(WARN_CFLAGS) -DCHAMPLAIN_GTK_COMPILATION + lib_LTLIBRARIES = libchamplain-gtk-@CHAMPLAIN_API_VERSION@.la + libchamplain_gtkdir = $(includedir)/libchamplain-gtk-@CHAMPLAIN_API_VERSION@/champlain-gtk + libchamplain_gtk_HEADERS = $(libchamplain_gtk_headers_public) +@@ -420,8 +420,8 @@ + @HAVE_INTROSPECTION_TRUE@ --include-uninstalled=$(top_builddir)/champlain/Champlain-@CHAMPLAIN_API_VERSION@.gir + + @HAVE_INTROSPECTION_TRUE@GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_CFLAGS = \ +-@HAVE_INTROSPECTION_TRUE@ $(SOUP_CFLAGS) $(GTK_CFLAGS) $(DEPS_CFLAGS) \ + @HAVE_INTROSPECTION_TRUE@ -I$(top_srcdir) -I$(top_builddir)\ ++@HAVE_INTROSPECTION_TRUE@ $(SOUP_CFLAGS) $(GTK_CFLAGS) $(DEPS_CFLAGS) \ + @HAVE_INTROSPECTION_TRUE@ -DCHAMPLAIN_COMPILATION -DCHAMPLAIN_GTK_COMPILATION + + @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0 -- cgit v1.2.3