ports/159018: Fixed LIB_DEPENDS and avahi support in audio/ario

[Grzegorz Blach]

>Number:         159018
>Category:       ports
>Synopsis:       Fixed LIB_DEPENDS and avahi support in audio/ario
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 18 20:40:07 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Grzegorz Blach
>Release:        FreeBSD 8.2-STABLE amd64
>Organization:
>Environment:


System: FreeBSD 8.2-STABLE #11 r224094: Sat Jul 16 15:34:14 CEST 2011
    magik at silver.nine:/usr/obj/usr/src/sys/SILVER



>Description:


In port audio/ario:
- added LICENSE= GPLv2
- added security/libgcrypt to LIB_DEPENDES
- added KNOB for avahi support (or not)
- attached patch witch fix build with --enable-avahi



>How-To-Repeat:





>Fix:


--- ario.diff.txt begins here ---
diff -x .svn -ruN /var/cache/portsmerge/ports/audio/ario/Makefile audio/ario/Makefile
--- /var/cache/portsmerge/ports/audio/ario/Makefile	2011-06-20 14:56:14.000000000 +0200
+++ audio/ario/Makefile	2011-07-18 22:23:47.300183402 +0200
@@ -7,13 +7,17 @@
 
 PORTNAME=	ario
 PORTVERSION=	1.5.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	SF/ario-player/ario-player/${PORTVERSION}
 
 MAINTAINER=	magik at roorback.net
 COMMENT=	Ario is a GTK2 client for MPD
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls \
+		gcrypt:${PORTSDIR}/security/libgcrypt \
 		curl:${PORTSDIR}/ftp/curl \
 		notify:${PORTSDIR}/devel/libnotify \
 		soup:${PORTSDIR}/devel/libsoup22 \
@@ -22,21 +26,28 @@
 		mpdclient:${PORTSDIR}/audio/libmpdclient
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-avahi		# without this ario don't build
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20 gnomehack gnometarget
 INSTALLS_ICONS=	yes
 
-OPTIONS=	NLS "Use NLS" On
+OPTIONS=	AVAHI "Zeroconf support (Avahi)" Off \
+		NLS "NLS support" On
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-nls
+.if defined(WITH_AVAHI)
+LIB_DEPENDS+=	avahi-client:${PORTSDIR}/net/avahi-app
+CONFIGURE_ARGS+=	--enable-avahi
 .else
-CONFIGURE_ARGS+=	--enable-nls
+CONFIGURE_ARGS+=	--disable-avahi
+.endif
+
+.if ! defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=	--enable-nls
+.else
+CONFIGURE_ARGS+=	--disable-nls
 .endif
 
 .include <bsd.port.mk>
diff -x .svn -ruN /var/cache/portsmerge/ports/audio/ario/files/patch-src_ario-avahi.c audio/ario/files/patch-src_ario-avahi.c
--- /var/cache/portsmerge/ports/audio/ario/files/patch-src_ario-avahi.c	1970-01-01 01:00:00.000000000 +0100
+++ audio/ario/files/patch-src_ario-avahi.c	2011-07-18 20:29:42.581497647 +0200
@@ -0,0 +1,14 @@
+--- src/ario-avahi.c.orig	2011-07-18 20:05:50.915461042 +0200
++++ src/ario-avahi.c	2011-07-18 20:08:56.334574365 +0200
+@@ -34,6 +34,11 @@
+ #include <avahi-common/simple-watch.h>
+ #include "ario-debug.h"
+ 
++#ifdef __FreeBSD__
++#include <sys/socket.h>
++#include <netinet/in.h>
++#endif
++
+ #define SERVICE_TYPE "_mpd._tcp"
+ #define DOMAIN "local"
+ 
--- ario.diff.txt ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: