From owner-freebsd-ports-bugs@FreeBSD.ORG Thu May 15 13:00:29 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DF96437B401 for ; Thu, 15 May 2003 13:00:28 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D8D1143FB1 for ; Thu, 15 May 2003 13:00:27 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h4FK0RUp012025 for ; Thu, 15 May 2003 13:00:27 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h4FK0RMx012024; Thu, 15 May 2003 13:00:27 -0700 (PDT) Resent-Date: Thu, 15 May 2003 13:00:27 -0700 (PDT) Resent-Message-Id: <200305152000.h4FK0RMx012024@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, jabrown@caida.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 110D837B401 for ; Thu, 15 May 2003 12:52:45 -0700 (PDT) Received: from login.caida.org (login.caida.org [192.172.226.78]) by mx1.FreeBSD.org (Postfix) with ESMTP id 903F843F85 for ; Thu, 15 May 2003 12:52:44 -0700 (PDT) (envelope-from jabrown@login.caida.org) Received: from login.caida.org (localhost [127.0.0.1]) by login.caida.org (8.12.9/8.12.9) with ESMTP id h4FJqi2e083897 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO) for ; Thu, 15 May 2003 12:52:44 -0700 (PDT) Received: (from jabrown@localhost) by login.caida.org (8.12.9/8.12.9/Submit) id h4FJqike083896; Thu, 15 May 2003 12:52:44 -0700 (PDT) Message-Id: <200305151952.h4FJqike083896@login.caida.org> Date: Thu, 15 May 2003 12:52:44 -0700 (PDT) From: jabrown@caida.org To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.2 Subject: ports/52296: [patch] ports/net/bittorrent: add UI-selection option X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: jabrown@caida.org List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 May 2003 20:00:29 -0000 >Number: 52296 >Category: ports >Synopsis: Improve bittorrent port to not require X >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: Thu May 15 13:00:27 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Jeff Brown >Release: FreeBSD 4.6.2-RELEASE i386 >Organization: Me, myself, and I >Environment: Nothing remarkable, just a 4.6.2-R system >Description: The bittorrent port as-is requires many libraries and X to install; however, BitTorrent itself ships with both curses and dumb-terminal front ends. This patch allows one of those other front-ends to be selected. (Note: e-mail to MAINTAINER -- winter@freebsd.org -- bounced with "unknown user".) >How-To-Repeat: Patch, build with "make WITH_GUI=curses", run without wxWindows and be happy. >Fix: Apply this patch: diff -urN bittorrent.orig/Makefile bittorrent/Makefile --- bittorrent.orig/Makefile Thu May 15 12:17:34 2003 +++ bittorrent/Makefile Thu May 15 12:06:34 2003 @@ -13,13 +13,27 @@ MAINTAINER= winter@freebsd.org COMMENT= "Peer to Peer file sharing/mirroring." -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/wxPython/wxc.so:${PORTSDIR}/x11-toolkits/py-wxPython - USE_PYTHON= yes MAN1= BitTorrent.1 MLINKS= BitTorrent.1 bittorrent.1 +WITH_UI?= gui +.if $(WITH_UI)=="gui" +RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/wxPython/wxc.so:${PORTSDIR}/x11-toolkits/py-wxPython +.elif $(WITH_UI)!="curses" && $(WITH_UI)!="headless" +BROKEN= "WITH_UI must be one of: gui curses headless" +.endif + +pre-everything:: + @${ECHO_MSG} "-- N O T E --" + @${ECHO_MSG} "" + @${ECHO_MSG} "You can change WITH_UI to select a user interface;" + @${ECHO_MSG} "supported values are: gui curses headless" + @${ECHO_MSG} "" + @${ECHO_MSG} "For example, to use the curses UI instead of the default:" + @${ECHO_MSG} " make WITH_UI=curses" + do-build: @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC} @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC} @@ -30,7 +44,7 @@ --exclude "*.orig" --exclude osx -c -f - .) \ | (cd ${PREFIX}/share/BitTorrent && ${TAR} --unlink -x -f -) @printf "#!/bin/sh\n${PYTHON_CMD} \ - ${PREFIX}/share/BitTorrent/btdownloadgui.py \044*\n" \ + ${PREFIX}/share/BitTorrent/btdownload${WITH_UI}.py \044*\n" \ > ${WRKDIR}/BitTorrent.sh @${INSTALL_SCRIPT} ${WRKDIR}/BitTorrent.sh ${PREFIX}/bin/BitTorrent @${INSTALL_MAN} ${FILESDIR}/BitTorrent.1 ${PREFIX}/man/man1/BitTorrent.1 >Release-Note: >Audit-Trail: >Unformatted: