svn commit: r323724 - head/audio/osd-lyrics

[Baptiste Daroussin]

Author: bapt
Date: Fri Jul 26 14:31:26 2013
New Revision: 323724
URL: http://svnweb.freebsd.org/changeset/ports/323724

Log:
  Add an explicit dependency on iconv and pkgconfig
  Fix build with newer binutils
  Use options helpers

Modified:
  head/audio/osd-lyrics/Makefile

Modified: head/audio/osd-lyrics/Makefile
==============================================================================
--- head/audio/osd-lyrics/Makefile	Fri Jul 26 14:29:35 2013	(r323723)
+++ head/audio/osd-lyrics/Makefile	Fri Jul 26 14:31:26 2013	(r323724)
@@ -22,35 +22,25 @@ CONFIGURE_ENV=	DATADIRNAME=share
 # Cannot enable -Werror yet: Clang does not like the code `printf(_("..."))',
 # see this bug for details: http://llvm.org/bugs/show_bug.cgi?id=3814
 #CONFIGURE_ARGS=	--with-werror
-USES=		gettext
-USE_GMAKE=	yes
+USES=		gettext gmake iconv pkgconfig
 USE_GNOME=	gtk20
 USE_SQLITE=	yes
 INSTALLS_ICONS=	yes
 PORTDOCS=	AUTHORS ChangeLog NEWS README
+LDFLAGS=	-liconv
 
 OPTIONS_DEFINE=	DOCS MPD XMMS2 AMAROK
 MPD_DESC=	Enable MPD support
 XMMS2_DESC=	Enable XMMS2 support
 AMAROK_DESC=	Enable Amarok 1.4 support
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMPD}
-LIB_DEPENDS+=	mpd:${PORTSDIR}/audio/libmpd
-.else
-CONFIGURE_ARGS+=	--disable-mpd
-.endif
+MPD_LIB_DEPENDS=	mpd:${PORTSDIR}/audio/libmpd
+MPD_CONFIGURE_OFF=	--disable-mpd
+XMMS2_LIB_DEPENDS=	xmmsclient:${PORTSDIR}/audio/xmms2
+XMMS2_CONFIGURE_OFF=	--disable-xmms2
+AMAROK_CONFIGURE_ENABLE=	amarok1
 
-.if ${PORT_OPTIONS:MXMMS2}
-LIB_DEPENDS+=	xmmsclient:${PORTSDIR}/audio/xmms2
-.else
-CONFIGURE_ARGS+=	--disable-xmms2
-.endif
-
-.if ${PORT_OPTIONS:MAMAROK}
-CONFIGURE_ARGS+=	--enable-amarok1
-.endif
+.include <bsd.port.options.mk>
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}