Index: head/net-p2p/qbittorrent/pkg-message
===================================================================
--- head/net-p2p/qbittorrent/pkg-message	(revision 307710)
+++ head/net-p2p/qbittorrent/pkg-message	(nonexistent)
@@ -1,5 +0,0 @@
-
-****************************************************************************
-*      To change the appearance of the interface use misc/qt4-qtconfig     *
-****************************************************************************
-

Property changes on: head/net-p2p/qbittorrent/pkg-message
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/net-p2p/qbittorrent/Makefile
===================================================================
--- head/net-p2p/qbittorrent/Makefile	(revision 307710)
+++ head/net-p2p/qbittorrent/Makefile	(revision 307711)
@@ -1,56 +1,49 @@
 # $FreeBSD$
 
 PORTNAME=	qbittorrent
 PORTVERSION=	3.0.6
 PORTREVISION?=	0
 CATEGORIES=	net-p2p ipv6
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
 
 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
 
+HAS_CONFIGURE=	yes
+USE_QT4=	corelib network qmake_build moc_build rcc_build
+QT_NONSTANDARD=	yes
+
 MAKE_JOBS_SAFE=	yes
 
-CONFLICTS=	qbittorrent-2.* qbittorrent-4.[0-9].*
+MAN1?=		qbittorrent.1
 
-USE_QT4=	corelib network qmake_build moc_build rcc_build
-
 .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
 
 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
 .endif
 
 .include <bsd.port.post.mk>