ports/152550: [PATCH] net-p2p/qbittorrent-23: support installation without GUI

Wed Nov 24 17:40:07 UTC 2010

>Number:         152550
>Category:       ports
>Synopsis:       [PATCH] net-p2p/qbittorrent-23: support installation without GUI
>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:   Wed Nov 24 17:40:06 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 8.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Fri Jul 30 02:50:28 MSD 2010
>Description:
It's possible to build qbittorrent without GUI support, but the
port lacks support for that. The patch fixes that. Other qbittorrent
ports need similar change as well, I can prepare patches for these
as well, however they should be pretty similar.

Note: this change revealed bug in new/GeoIP which qbittorrent
depends on via rasterbar-libtorrent, and this change should be
committed after ports/152548 (otherwise qbittorrent won't build
with GUI disabled).

Port maintainer (dougb at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- qbittorrent-devel-2.3.0.rc10_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/net-p2p/qbittorrent-23/Makefile,v
retrieving revision 1.1
diff -u -u -r1.1 Makefile
--- Makefile	24 Jul 2010 21:37:21 -0000	1.1
+++ Makefile	23 Nov 2010 23:26:38 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	qbittorrent
 PORTVERSION=	2.3.0.rc10
+PORTREVISION=	1
 CATEGORIES=	net-p2p ipv6
 MASTER_SITES=	http://cdnetworks-us-2.dl.sourceforge.net/project/qbittorrent/qbittorrent-unstable/
 
@@ -25,20 +26,18 @@
 
 CONFLICTS=	qbittorrent-2.2.*
 
-OPTIONS=	NOTIFY "Enable libnotify support" on
+OPTIONS=	NOTIFY "Enable libnotify support" on \
+		GUI    "Enable GUI " on
 
 USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui network xml \
-		moc_build qmake_build rcc_build uic_build
+QT_COMPONENTS=	corelib network qmake_build moc_build rcc_build
 QT_NONSTANDARD=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libboost-inc="${LOCALBASE}/include" \
 		--with-libboost-lib="${LOCALBASE}/lib"
 INSTALLS_ICONS=	yes
 
-MAN1=		qbittorrent.1
-
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if !defined(WITHOUT_NOTIFY)
 LIB_DEPENDS+=	notify.1:${PORTSDIR}/devel/libnotify
@@ -46,6 +45,18 @@
 CONFIGURE_ARGS+=	--disable-libnotify
 .endif
 
+.if !defined(WITHOUT_GUI)
+QT_COMPONENTS+=	gui xml uic_build
+PLIST_SUB+=	X11="" NOX11="@comment "
+MAN1=		qbittorrent.1
+.else
+CONFIGURE_ARGS+=	--disable-gui
+MAN1=		qbittorrent-nox.1
+PLIST_SUB+=	X11="@comment " NOX11=""
+.endif
+
+.include <bsd.port.pre.mk>
+
 BOOSTLIB_PATTERN=	-e 's|\*\-mt\*||'
 
 post-patch:
Index: pkg-plist
===================================================================
RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/net-p2p/qbittorrent-23/pkg-plist,v
retrieving revision 1.1
diff -u -u -r1.1 pkg-plist
--- pkg-plist	24 Jul 2010 21:37:21 -0000	1.1
+++ pkg-plist	23 Nov 2010 21:11:54 -0000
@@ -1,38 +1,39 @@
-bin/qbittorrent
-share/applications/qBittorrent.desktop
-share/icons/hicolor/128x128/apps/qbittorrent.png
-share/icons/hicolor/16x16/apps/qbittorrent.png
-share/icons/hicolor/192x192/apps/qbittorrent.png
-share/icons/hicolor/22x22/apps/qbittorrent.png
-share/icons/hicolor/24x24/apps/qbittorrent.png
-share/icons/hicolor/32x32/apps/qbittorrent.png
-share/icons/hicolor/36x36/apps/qbittorrent.png
-share/icons/hicolor/48x48/apps/qbittorrent.png
-share/icons/hicolor/64x64/apps/qbittorrent.png
-share/icons/hicolor/72x72/apps/qbittorrent.png
-share/icons/hicolor/96x96/apps/qbittorrent.png
- at dirrmtry share/icons/hicolor/96x96/apps
- at dirrmtry share/icons/hicolor/96x96
- at dirrmtry share/icons/hicolor/72x72/apps
- at dirrmtry share/icons/hicolor/72x72
- at dirrmtry share/icons/hicolor/64x64/apps
- at dirrmtry share/icons/hicolor/64x64
- at dirrmtry share/icons/hicolor/48x48/apps
- at dirrmtry share/icons/hicolor/48x48
- at dirrmtry share/icons/hicolor/36x36/apps
- at dirrmtry share/icons/hicolor/36x36
- at dirrmtry share/icons/hicolor/32x32/apps
- at dirrmtry share/icons/hicolor/32x32
- at dirrmtry share/icons/hicolor/24x24/apps
- at dirrmtry share/icons/hicolor/24x24
- at dirrmtry share/icons/hicolor/22x22/apps
- at dirrmtry share/icons/hicolor/22x22
- at dirrmtry share/icons/hicolor/192x192/apps
- at dirrmtry share/icons/hicolor/192x192
- at dirrmtry share/icons/hicolor/16x16/apps
- at dirrmtry share/icons/hicolor/16x16
- at dirrmtry share/icons/hicolor/128x128/apps
- at dirrmtry share/icons/hicolor/128x128
- at dirrmtry share/icons/hicolor
- at dirrmtry share/icons
- at dirrmtry share/applications
+%%X11%%bin/qbittorrent
+%%NOX11%%bin/qbittorrent-nox
+%%X11%%share/applications/qBittorrent.desktop
+%%X11%%share/icons/hicolor/128x128/apps/qbittorrent.png
+%%X11%%share/icons/hicolor/16x16/apps/qbittorrent.png
+%%X11%%share/icons/hicolor/192x192/apps/qbittorrent.png
+%%X11%%share/icons/hicolor/22x22/apps/qbittorrent.png
+%%X11%%share/icons/hicolor/24x24/apps/qbittorrent.png
+%%X11%%share/icons/hicolor/32x32/apps/qbittorrent.png
+%%X11%%share/icons/hicolor/36x36/apps/qbittorrent.png
+%%X11%%share/icons/hicolor/48x48/apps/qbittorrent.png
+%%X11%%share/icons/hicolor/64x64/apps/qbittorrent.png
+%%X11%%share/icons/hicolor/72x72/apps/qbittorrent.png
+%%X11%%share/icons/hicolor/96x96/apps/qbittorrent.png
+%%X11%%@dirrmtry share/icons/hicolor/96x96/apps
+%%X11%%@dirrmtry share/icons/hicolor/96x96
+%%X11%%@dirrmtry share/icons/hicolor/72x72/apps
+%%X11%%@dirrmtry share/icons/hicolor/72x72
+%%X11%%@dirrmtry share/icons/hicolor/64x64/apps
+%%X11%%@dirrmtry share/icons/hicolor/64x64
+%%X11%%@dirrmtry share/icons/hicolor/48x48/apps
+%%X11%%@dirrmtry share/icons/hicolor/48x48
+%%X11%%@dirrmtry share/icons/hicolor/36x36/apps
+%%X11%%@dirrmtry share/icons/hicolor/36x36
+%%X11%%@dirrmtry share/icons/hicolor/32x32/apps
+%%X11%%@dirrmtry share/icons/hicolor/32x32
+%%X11%%@dirrmtry share/icons/hicolor/24x24/apps
+%%X11%%@dirrmtry share/icons/hicolor/24x24
+%%X11%%@dirrmtry share/icons/hicolor/22x22/apps
+%%X11%%@dirrmtry share/icons/hicolor/22x22
+%%X11%%@dirrmtry share/icons/hicolor/192x192/apps
+%%X11%%@dirrmtry share/icons/hicolor/192x192
+%%X11%%@dirrmtry share/icons/hicolor/16x16/apps
+%%X11%%@dirrmtry share/icons/hicolor/16x16
+%%X11%%@dirrmtry share/icons/hicolor/128x128/apps
+%%X11%%@dirrmtry share/icons/hicolor/128x128
+%%X11%%@dirrmtry share/icons/hicolor
+%%X11%%@dirrmtry share/icons
+%%X11%%@dirrmtry share/applications
--- qbittorrent-devel-2.3.0.rc10_1.patch ends here ---

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

