From owner-svn-ports-head@freebsd.org Tue Oct 27 16:59:16 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 086F2A1F811; Tue, 27 Oct 2015 16:59:16 +0000 (UTC) (envelope-from novel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AD8CD161C; Tue, 27 Oct 2015 16:59:15 +0000 (UTC) (envelope-from novel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9RGxEb1083614; Tue, 27 Oct 2015 16:59:14 GMT (envelope-from novel@FreeBSD.org) Received: (from novel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9RGxE2k083613; Tue, 27 Oct 2015 16:59:14 GMT (envelope-from novel@FreeBSD.org) Message-Id: <201510271659.t9RGxE2k083613@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: novel set sender to novel@FreeBSD.org using -f From: Roman Bogorodskiy Date: Tue, 27 Oct 2015 16:59:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r400331 - head/audio/deadbeef X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Oct 2015 16:59:16 -0000 Author: novel Date: Tue Oct 27 16:59:14 2015 New Revision: 400331 URL: https://svnweb.freebsd.org/changeset/ports/400331 Log: audio/deadbeef: fix GUI option handling The audio/deadbeef port has a GUI radio option that allows to choose between GTK2 and GTK3 sub-options. Apparently, choosing sub-options does not directly affect the parent option, for example, choosing GTK2 doesn't turn the GUI option. As it's used in PLIST_SUB, it could result in a broken package, e.g. without gui even if GTK2 is enabled. Fix that by adding appropriate _IMPLIES for sub-options and manually turn off the parent option if none of sub-options was enabled. Bump PORTREVISION so users could get a new package with GTK2 UI as it supposed to be. PR: 203974 Approved by: vg (maintainer) Modified: head/audio/deadbeef/Makefile Modified: head/audio/deadbeef/Makefile ============================================================================== --- head/audio/deadbeef/Makefile Tue Oct 27 16:49:27 2015 (r400330) +++ head/audio/deadbeef/Makefile Tue Oct 27 16:59:14 2015 (r400331) @@ -3,7 +3,7 @@ PORTNAME= deadbeef PORTVERSION= 0.6.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= audio MASTER_SITES= SF/${PORTNAME}/ @@ -78,11 +78,13 @@ GTK2_USE= gnome=gtk20,glib20 GTK2_CONFIGURE_OFF= --disable-gtk2 GTK2_CONFIGURE_ON= --enable-gtk2 GTK2_VARS= GTK_VER=2 +GTK2_IMPLIES= GUI GTK3_USE= gnome=gtk30 GTK3_CONFIGURE_OFF= --disable-gtk3 GTK3_CONFIGURE_ON= --enable-gtk3 GTK3_VARS= GTK_VER=3 +GTK3_IMPLIES= GUI PLIST_SUB+= GTK_VER=${GTK_VER} @@ -183,6 +185,12 @@ PLTBROWSER_CONFIGURE_OFF= --disable-pltb WMA_CONFIGURE_OFF= --disable-wma +.include + +.if !${PORT_OPTIONS:MGTK2} && !${PORT_OPTIONS:MGTK3} +PORT_OPTIONS:= ${PORT_OPTIONS:NGUI} +.endif + post-patch: # Do not link to libsupc++ which may be PIC-unsafe (breaks 64-bit arches) @${REINPLACE_CMD} -e 's, -lsupc++,,' \