From owner-svn-ports-all@FreeBSD.ORG  Sat Nov 24 06:56:16 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id A8231A9F;
 Sat, 24 Nov 2012 06:56:16 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 7290D8FC12;
 Sat, 24 Nov 2012 06:56:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAO6uGWL089083;
 Sat, 24 Nov 2012 06:56:16 GMT (envelope-from danfe@svn.freebsd.org)
Received: (from danfe@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAO6uGAu089082;
 Sat, 24 Nov 2012 06:56:16 GMT (envelope-from danfe@svn.freebsd.org)
Message-Id: <201211240656.qAO6uGAu089082@svn.freebsd.org>
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Sat, 24 Nov 2012 06:56:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r307711 - head/net-p2p/qbittorrent
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Nov 2012 06:56:16 -0000

Author: danfe
Date: Sat Nov 24 06:56:16 2012
New Revision: 307711
URL: http://svnweb.freebsd.org/changeset/ports/307711

Log:
  - Convert to new OPTIONS framework
  - Remove no longer relevant CONFLICTS
  - Delete rather obvious pkg-message
  - Sort the knobs a bit while I'm here
  
  Feature safe:	yes

Deleted:
  head/net-p2p/qbittorrent/pkg-message
Modified:
  head/net-p2p/qbittorrent/Makefile

Modified: head/net-p2p/qbittorrent/Makefile
==============================================================================
--- head/net-p2p/qbittorrent/Makefile	Sat Nov 24 06:22:57 2012	(r307710)
+++ head/net-p2p/qbittorrent/Makefile	Sat Nov 24 06:56:16 2012	(r307711)
@@ -9,37 +9,31 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT?=	Bittorrent client using Qt4 and libtorrent-rasterbar
 
-# lib versions specified on purpose
+# ABI versions specified on purpose
 LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo \
 		torrent-rasterbar.6:${PORTSDIR}/net-p2p/libtorrent-rasterbar-16
 
-MAKE_JOBS_SAFE=	yes
+HAS_CONFIGURE=	yes
+USE_QT4=	corelib network qmake_build moc_build rcc_build
+QT_NONSTANDARD=	yes
 
-CONFLICTS=	qbittorrent-2.* qbittorrent-4.[0-9].*
+MAKE_JOBS_SAFE=	yes
 
-USE_QT4=	corelib network qmake_build moc_build rcc_build
+MAN1?=		qbittorrent.1
 
 .if !defined(QB_NOX_SLAVE)
-.if defined(WITHOUT_X11)
-BROKEN=	Use net-p2p/${PORTNAME}-nox11 for the non-GUI version
-.endif
 LIB_DEPENDS+=	GeoIP.5:${PORTSDIR}/net/GeoIP
-OPTIONS=	DBUS "Enable dbus support" off
 USE_QT4+=	gui xml uic_build
 INSTALLS_ICONS=	yes
+OPTIONS_DEFINE=	DBUS
 .else
 CONFIGURE_ARGS+=	--disable-gui
 .endif
 
-QT_NONSTANDARD=	yes
-HAS_CONFIGURE=	yes
-
-MAN1?=		qbittorrent.1
-
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_DBUS)
-USE_QT4+=		dbus
+.if ${PORT_OPTIONS:MDBUS}
+USE_QT4+=	dbus
 .else
 CONFIGURE_ARGS+=	--disable-qt-dbus
 .endif
@@ -47,7 +41,6 @@ CONFIGURE_ARGS+=	--disable-qt-dbus
 post-install:
 .if !defined(QB_NOX_SLAVE)
 	@${STRIP_CMD} ${PREFIX}/bin/qbittorrent
-	@${CAT} ${PKGMESSAGE}
 .else
 	@${STRIP_CMD} ${PREFIX}/bin/qbittorrent-nox
 	${INSTALL_MAN} ${WRKSRC}/doc/qbittorrent-nox.1 ${MANPREFIX}/man/man1