From 366d3f690829f17abf12b4f3bd9ef6194955100e Mon Sep 17 00:00:00 2001
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Tue, 1 Jul 2014 22:16:23 +0000
Subject: [PATCH] - New LIB_DEPENDS syntax - Add USES=libtool

---
 x11/avant-window-navigator-gnome/Makefile |  2 +-
 x11/avant-window-navigator/Makefile       | 14 +++++++++-----
 x11/avant-window-navigator/pkg-plist      |  3 +--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/x11/avant-window-navigator-gnome/Makefile b/x11/avant-window-navigator-gnome/Makefile
index dda4bb6ead25..d2f2e538b938 100644
--- a/x11/avant-window-navigator-gnome/Makefile
+++ b/x11/avant-window-navigator-gnome/Makefile
@@ -1,7 +1,7 @@
 # Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	7
+PORTREVISION=	8
 AWN_DESKTOP=	gnome
 MASTERDIR=	${.CURDIR}/../avant-window-navigator
 
diff --git a/x11/avant-window-navigator/Makefile b/x11/avant-window-navigator/Makefile
index a0e447ff66d8..fe51b3256d0c 100644
--- a/x11/avant-window-navigator/Makefile
+++ b/x11/avant-window-navigator/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	avant-window-navigator
 PORTVERSION=	0.3.2.1
-PORTREVISION?=	9
+PORTREVISION?=	10
 CATEGORIES=	x11
 MASTER_SITES=	http://launchpadlibrarian.net/26374006/ \
 		http://mirror.amdmi3.ru/distfiles/
@@ -13,18 +13,18 @@ COMMENT=	Dock-like navigation bar
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg
-LIB_DEPENDS=	wnck-1:${PORTSDIR}/x11-toolkits/libwnck \
-		dbus-glib-1:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	libwnck-1.so:${PORTSDIR}/x11-toolkits/libwnck \
+		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 
 GNU_CONFIGURE=	yes
-USES=		pathfix pkgconfig gettext gmake
+USES=		gettext gmake libtool pathfix pkgconfig
 USE_GNOME=	glib20 gtk20 pygtk2
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 USE_XORG=	x11 xproto xcomposite xrender
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 AWN_DESKTOP?=	agnostic
 
@@ -58,6 +58,8 @@ CONFIGURE_ARGS+=	--without-gconf
 .endif
 
 post-patch:
+	@${REINPLACE_CMD} '/^awn_applet_activation_LDADD =/s/=/= -lgmodule-2.0/' \
+		${WRKSRC}/awn-applet-activation/Makefile.in
 	@${REINPLACE_CMD} -e 's|#!/usr/bin/python|#!/usr/bin/env python|' \
 		${WRKSRC}/awn-manager/awnManager.py.in \
 		${WRKSRC}/awn-manager/awnManager.py
@@ -69,5 +71,7 @@ post-patch:
 		${WRKSRC}/libawn/awn-config-client-gconf.c
 	@${REINPLACE_CMD} -e 's|glib/gutils.h>|glib.h>|g' \
 		${WRKSRC}/libawn/awn-config-client-gkeyfile.c
+	@${REINPLACE_CMD} '/^avant_window_navigator_LDADD =/s/=/= -ldbus-glib-1/' \
+		${WRKSRC}/src/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/x11/avant-window-navigator/pkg-plist b/x11/avant-window-navigator/pkg-plist
index 12f21623c22f..ea374f98a48d 100644
--- a/x11/avant-window-navigator/pkg-plist
+++ b/x11/avant-window-navigator/pkg-plist
@@ -20,14 +20,13 @@ include/libawn/awn-settings.h
 include/libawn/awn-title.h
 include/libawn/awn-vfs.h
 lib/libawn.a
-lib/libawn.la
 lib/libawn.so
 lib/libawn.so.0
+lib/libawn.so.0.0.1
 %%PYTHON_SITELIBDIR%%/awn/__init__.py
 %%PYTHON_SITELIBDIR%%/awn/__init__.pyc
 %%PYTHON_SITELIBDIR%%/awn/__init__.pyo
 %%PYTHON_SITELIBDIR%%/awn/awn.a
-%%PYTHON_SITELIBDIR%%/awn/awn.la
 %%PYTHON_SITELIBDIR%%/awn/awn.so
 libdata/pkgconfig/awn.pc
 share/applications/avant-window-navigator.desktop