Update libchamplain to 0.12.8. Kill keepla. Bump users of

libchamplain (eog-plugins and empathy) and remove keepla
from those too. Do some INSTALL_TARGET=install-strip here
and there.


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

7 files changed, 17 insertions, 34 deletions

diff --git a/graphics/eog-plugins/Makefile b/graphics/eog-plugins/Makefile
index e7e270f5f..3ffe9f78d 100644
--- a/graphics/eog-plugins/Makefile
+++ b/graphics/eog-plugins/Makefile
@@ -1,9 +1,10 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports-experimental/trunk/graphics/eog-plugins/Makefile 19511 2014-04-14 21:44:49Z gusi $
+#   $MCom$
 
 PORTNAME=	eog-plugins
 PORTVERSION=	3.12.1
+PORTREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -18,10 +19,11 @@ LIB_DEPENDS=	libgdata.so.13:${PORTSDIR}/devel/libgdata \
 RUN_DEPENDS=	eog:${PORTSDIR}/graphics/eog
 
 USE_GNOME=	gnomeprefix intlhack gtk30
-USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
+USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.gnome.eog.plugins.exif-display.gschema.xml
 
@@ -60,7 +62,4 @@ post-patch:
 		${WRKSRC}/configure
 .endif
 
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/eog/plugins/lib*.so
-
 .include <bsd.port.mk>
diff --git a/graphics/libchamplain/Makefile b/graphics/libchamplain/Makefile
index 6b90d09d8..cadcf46cb 100644
--- a/graphics/libchamplain/Makefile
+++ b/graphics/libchamplain/Makefile
@@ -3,7 +3,7 @@
 #   $MCom$
 
 PORTNAME=	libchamplain
-PORTVERSION=	0.12.7
+PORTVERSION=	0.12.8
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 
@@ -13,7 +13,7 @@ COMMENT=	C library aimed to provide a Gtk+ widget to display rasterized maps and
 LIB_DEPENDS=	libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3 \
 		libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome
 
-USES=		gmake libtool:keepla pathfix pkgconfig tar:xz
+USES=		gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	gtk30 gnomehier introspection:build
 USE_GL=		gl
 USE_SQLITE=	3
@@ -22,6 +22,7 @@ USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-gtk-doc-html=no
+INSTALL_TARGET=	install-strip
 
 PLIST_SUB=	VERSION=0.12
 
@@ -30,7 +31,4 @@ post-patch:
 		${WRKSRC}/docs/reference/Makefile.in \
 		${WRKSRC}/docs/reference-gtk/Makefile.in
 
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libchamplain*.so*
-
 .include <bsd.port.mk>
diff --git a/graphics/libchamplain/distinfo b/graphics/libchamplain/distinfo
index f2380207c..effc38026 100644
--- a/graphics/libchamplain/distinfo
+++ b/graphics/libchamplain/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libchamplain-0.12.7.tar.xz) = b607fa7e32dd67e5d9541d620abb212a85d076d1def0252c0112a362bddeac5e
-SIZE (libchamplain-0.12.7.tar.xz) = 589608
+SHA256 (libchamplain-0.12.8.tar.xz) = cc826fb92f7e362ba781a7301f3e269e4cb837bb9c6684670c5cd2e170435912
+SIZE (libchamplain-0.12.8.tar.xz) = 589704
diff --git a/graphics/libchamplain/files/patch-champlain-gtk_Makefile.in b/graphics/libchamplain/files/patch-champlain-gtk_Makefile.in
index df1632d37..4f7ef42e5 100644
--- a/graphics/libchamplain/files/patch-champlain-gtk_Makefile.in
+++ b/graphics/libchamplain/files/patch-champlain-gtk_Makefile.in
@@ -1,6 +1,6 @@
---- 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 @@
+--- champlain-gtk/Makefile.in.orig	2014-07-02 09:20:14.564390009 +0000
++++ champlain-gtk/Makefile.in	2014-07-02 09:22:14.312426331 +0000
+@@ -141,8 +141,8 @@
  LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
  libchamplain_gtk_@CHAMPLAIN_API_VERSION@_la_DEPENDENCIES =  \
@@ -11,7 +11,7 @@
  am__objects_1 =
  am__objects_2 = gtk-champlain-embed.lo
  am_libchamplain_gtk_@CHAMPLAIN_API_VERSION@_la_OBJECTS =  \
-@@ -388,15 +388,15 @@
+@@ -405,15 +405,15 @@
  	$(libchamplain_gtk_sources_built)
  
  libchamplain_gtk_@CHAMPLAIN_API_VERSION@_la_LIBADD = \
@@ -30,13 +30,3 @@
  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
diff --git a/graphics/libchamplain/pkg-plist b/graphics/libchamplain/pkg-plist
index 01ff06a93..54b9e358a 100644
--- a/graphics/libchamplain/pkg-plist
+++ b/graphics/libchamplain/pkg-plist
@@ -43,15 +43,13 @@ include/libchamplain-gtk-%%VERSION%%/champlain-gtk/gtk-champlain-embed.h
 lib/girepository-1.0/Champlain-%%VERSION%%.typelib
 lib/girepository-1.0/GtkChamplain-%%VERSION%%.typelib
 lib/libchamplain-%%VERSION%%.a
-lib/libchamplain-%%VERSION%%.la
 lib/libchamplain-%%VERSION%%.so
 lib/libchamplain-%%VERSION%%.so.0
-lib/libchamplain-%%VERSION%%.so.0.4.2
+lib/libchamplain-%%VERSION%%.so.0.4.3
 lib/libchamplain-gtk-%%VERSION%%.a
-lib/libchamplain-gtk-%%VERSION%%.la
 lib/libchamplain-gtk-%%VERSION%%.so
 lib/libchamplain-gtk-%%VERSION%%.so.0
-lib/libchamplain-gtk-%%VERSION%%.so.0.4.2
+lib/libchamplain-gtk-%%VERSION%%.so.0.4.3
 libdata/pkgconfig/champlain-%%VERSION%%.pc
 libdata/pkgconfig/champlain-gtk-%%VERSION%%.pc
 share/gir-1.0/Champlain-%%VERSION%%.gir
diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile
index cee697bc1..be533bd20 100644
--- a/net-im/empathy/Makefile
+++ b/net-im/empathy/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	empathy
 PORTVERSION=	3.12.4
+PORTREVISION=	1
 CATEGORIES=	net-im gnome
 MASTER_SITES=	GNOME
 
@@ -37,7 +38,7 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co
 		geoclue>=0:${PORTSDIR}/net/geoclue \
     		${LOCALBASE}/libexec/mission-control-5:${PORTSDIR}/net-im/telepathy-mission-control
 
-USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
+USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	evolutiondataserver3 gnomeprefix
 USE_PYTHON=	yes
 USE_GSTREAMER1=	yes
diff --git a/net-im/empathy/pkg-plist b/net-im/empathy/pkg-plist
index 37083ac3d..82ada94e6 100644
--- a/net-im/empathy/pkg-plist
+++ b/net-im/empathy/pkg-plist
@@ -4,13 +4,10 @@ bin/empathy-debugger
 lib/empathy/libempathy-3.12.4.so
 lib/empathy/libempathy-gtk-3.12.4.so
 lib/empathy/libempathy-gtk.a
-lib/empathy/libempathy-gtk.la
 lib/empathy/libempathy-gtk.so
 lib/empathy/libempathy.a
-lib/empathy/libempathy.la
 lib/empathy/libempathy.so
 lib/mission-control-plugins.0/mcp-account-manager-goa.a
-lib/mission-control-plugins.0/mcp-account-manager-goa.la
 lib/mission-control-plugins.0/mcp-account-manager-goa.so
 libexec/empathy-auth-client
 libexec/empathy-call