ports/182523: Additional options for irc/hexchat

[Ade Lovett]

>Number:         182523
>Category:       ports
>Synopsis:       Additional options for irc/hexchat
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 30 20:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Ade Lovett
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 10.0-CURRENT FreeBSD 10.0-CURRENT #2 r255453: Mon Sep 16 12:43:32 UTC 2013 root at freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL amd64


>Description:
	Currently, irc/hexchat has explicit dependencies on both libproxy
	and libcanberra, whereas the configure script indicates that these
	are in fact optional dependencies, and the resulting binary can
	run quite well without them.

	This update provides for OPTIONS for both these items, defaulting
	to ON (so no functionality) is removed, whilst allowing for those
	that don't have audio on their systems to build what is ostensibly
	a textual client without bringing in a multitude of additional
	dependencies (20+ or so on my test system, mainly from everything
	associated with libcanberra).


>How-To-Repeat:
>Fix:

PORTREVISION bump included for completeness sake -- not strictly necessary.


Index: Makefile
===================================================================
--- Makefile	(revision 328861)
+++ Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	hexchat
 PORTVERSION=	2.9.6.1
-PORTREVISION=	1 
+PORTREVISION=	2
 CATEGORIES=	irc gnome ipv6
 MASTER_SITES=	http://dl.hexchat.org/${PORTNAME}/
 
@@ -12,9 +12,6 @@
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libproxy.so:${PORTSDIR}/net/libproxy \
-		libcanberra.so:${PORTSDIR}/audio/libcanberra
-
 USE_XZ=		yes
 USES=		gmake desktop-file-utils pkgconfig
 USE_GNOME=	gtk20 libxml2
@@ -32,12 +29,12 @@
 
 PORTDOCS=	*
 
-OPTIONS_DEFINE=		DOCS NLS SOCKS XFT TEXTFE PYTHON PERL DOAT FISHLIM DBUS NOTIFY
+OPTIONS_DEFINE=		DOCS NLS SOCKS XFT TEXTFE PYTHON PERL DOAT FISHLIM DBUS NOTIFY PROXY CANBERRA
 
 OPTIONS_RADIO=		SPELL
 OPTIONS_RADIO_SPELL=	LIBSEXY GTKSPELL STATIC
 
-OPTIONS_DEFAULT=	SOCKS XFT PERL DOAT DBUS NOTIFY LIBSEXY
+OPTIONS_DEFAULT=	SOCKS XFT PERL DOAT DBUS NOTIFY LIBSEXY PROXY CANBERRA
 
 OPTIONS_SUB=	yes
 
@@ -47,6 +44,8 @@
 STATIC_DESC=		Spell checking embedded in the binary
 LIBSEXY_DESC=		Spell checking support via Libsexy
 GTKSPELL_DESC=		Spell checking support via GTKSpell
+PROXY_DESC=		Proxy support via Libproxy
+CANBERRA_DESC=		Audio support via Libcanberra
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
@@ -64,6 +63,10 @@
 DBUS_CONFIGURE_ENABLE=	dbus
 NOTIFY_RUN_DEPENDS=	notify-send:${PORTSDIR}/devel/libnotify
 NOTIFY_CONFIGURE_ENABLE=	libnotify
+PROXY_LIB_DEPENDS=	libproxy.so:${PORTSDIR}/net/libproxy
+PROXY_CONFIGURE_ENABLE=	libproxy
+CANBERRA_LIB_DEPENDS=	libcanberra.so:${PORTSDIR}/audio/libcanberra
+CANBERRA_CONFIGURE_ENABLE=	libcanberra
 
 NO_STAGE=	yes
 .include <bsd.port.options.mk>
>Release-Note:
>Audit-Trail:
>Unformatted: