From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Aug 24 13:40:03 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0759A10656A6 for ; Tue, 24 Aug 2010 13:40:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id BB65A8FC19 for ; Tue, 24 Aug 2010 13:40:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o7ODe1QW092205 for ; Tue, 24 Aug 2010 13:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o7ODe1bb092204; Tue, 24 Aug 2010 13:40:01 GMT (envelope-from gnats) Resent-Date: Tue, 24 Aug 2010 13:40:01 GMT Resent-Message-Id: <201008241340.o7ODe1bb092204@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, Sunpoet Po-Chuan Hsieh Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6A5D51065693; Tue, 24 Aug 2010 13:30:47 +0000 (UTC) (envelope-from sunpoet@sunpoet.net) Received: from mail-pv0-f182.google.com (mail-pv0-f182.google.com [74.125.83.182]) by mx1.freebsd.org (Postfix) with ESMTP id 4494C8FC1E; Tue, 24 Aug 2010 13:30:46 +0000 (UTC) Received: by pvg4 with SMTP id 4so2952821pvg.13 for ; Tue, 24 Aug 2010 06:30:46 -0700 (PDT) Received: by 10.142.172.1 with SMTP id u1mr5697848wfe.137.1282656646623; Tue, 24 Aug 2010 06:30:46 -0700 (PDT) Received: from sunpoet.net (sunpoet.net [220.133.12.240]) by mx.google.com with ESMTPS id n2sm129354wfl.1.2010.08.24.06.30.44 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 24 Aug 2010 06:30:45 -0700 (PDT) Received: by sunpoet.net (Postfix, from userid 1000) id AACC02AEC4EC; Tue, 24 Aug 2010 21:30:18 +0800 (CST) Message-Id: <20100824133018.AACC02AEC4EC@sunpoet.net> Date: Tue, 24 Aug 2010 21:30:18 +0800 (CST) From: Sunpoet Po-Chuan Hsieh To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: lwhsu@FreeBSD.org Subject: ports/149935: [PATCH] net/googlecl: fix 'make package' when py-setuptools is installed X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Aug 2010 13:40:03 -0000 >Number: 149935 >Category: ports >Synopsis: [PATCH] net/googlecl: fix 'make package' when py-setuptools is installed >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: Tue Aug 24 13:40:01 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Sunpoet Po-Chuan Hsieh >Release: FreeBSD 8.1-STABLE amd64 >Organization: SUNPOET.net >Environment: System: FreeBSD bonjour.sunpoet.net 8.1-STABLE FreeBSD 8.1-STABLE #0: Sun Jul 25 00:09:24 CST 2010 >Description: According googlecl's setup.py, it will first try to generate an egg. An egg will be generated if py-setuptools is installed. Therefore, the files in PLIST will not be installed since they are all in the egg. This patch is to keep googlecl from egg generation. Added file(s): - files/patch-setup.py Port maintainer (lwhsu@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: % cd /usr/ports/devel/py-setuptools; make install % cd /usr/ports/net/googlecl; make install package >Fix: --- googlecl-0.9.9.patch begins here --- diff -ruN --exclude=CVS /usr/ports/net/googlecl/files/patch-setup.py /usr/ports/sunpoet/googlecl/files/patch-setup.py --- /usr/ports/net/googlecl/files/patch-setup.py 1970-01-01 08:00:00.000000000 +0800 +++ /usr/ports/sunpoet/googlecl/files/patch-setup.py 2010-08-24 21:11:45.000000000 +0800 @@ -0,0 +1,14 @@ +--- setup.py.orig 2010-07-24 10:30:33.000000000 +0800 ++++ setup.py 2010-08-24 21:11:15.000000000 +0800 +@@ -12,10 +12,7 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-try: +- from setuptools import setup +-except ImportError: +- from distutils.core import setup ++from distutils.core import setup + packages =['googlecl', + 'googlecl.blogger', + 'googlecl.calendar', --- googlecl-0.9.9.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: