[70554] trunk/dports/devel/bzr

[raimue at macports.org]

Revision: 70554
          http://trac.macports.org/changeset/70554
Author:   raimue at macports.org
Date:     2010-08-13 05:22:42 -0700 (Fri, 13 Aug 2010)
Log Message:
-----------
devel/bzr: Disable apport, #26033

Modified Paths:
--------------
    trunk/dports/devel/bzr/Portfile

Added Paths:
-----------
    trunk/dports/devel/bzr/files/patch-no-apport.diff

Modified: trunk/dports/devel/bzr/Portfile
===================================================================
--- trunk/dports/devel/bzr/Portfile	2010-08-13 12:19:36 UTC (rev 70553)
+++ trunk/dports/devel/bzr/Portfile	2010-08-13 12:22:42 UTC (rev 70554)
@@ -5,6 +5,7 @@
 
 name          bzr
 version       2.2.0
+revision      1
 set branch    [join [lrange [split ${version} .] 0 1] .]
 categories    devel python
 platforms     darwin
@@ -26,7 +27,8 @@
               sha1    1cf1252df3ba31b2133a91d781db03ff832e14a6 \
               rmd160  65940081bcb7619b3e173c89c32cb9454b23371e
 
-patchfiles    patch-setup.py.diff
+patchfiles    patch-setup.py.diff \
+              patch-no-apport.diff
 
 depends_lib-append  port:py26-paramiko \
                     port:py26-crypto \

Added: trunk/dports/devel/bzr/files/patch-no-apport.diff
===================================================================
--- trunk/dports/devel/bzr/files/patch-no-apport.diff	                        (rev 0)
+++ trunk/dports/devel/bzr/files/patch-no-apport.diff	2010-08-13 12:22:42 UTC (rev 70554)
@@ -0,0 +1,22 @@
+--- setup.py.orig	2010-08-13 14:03:11.000000000 +0200
++++ setup.py	2010-08-13 14:03:26.000000000 +0200
+@@ -727,19 +727,6 @@
+         # easy_install one
+         DATA_FILES = [('share/man/man1', ['bzr.1'])]
+ 
+-    if sys.platform != 'win32':
+-        # see https://wiki.kubuntu.org/Apport/DeveloperHowTo
+-        #
+-        # checking the paths and hardcoding the check for root is a bit gross,
+-        # but I don't see a cleaner way to find out the locations in a way
+-        # that's going to align with the hardcoded paths in apport.
+-        if os.geteuid() == 0:
+-            DATA_FILES += [
+-                ('/usr/share/apport/package-hooks',
+-                    ['apport/source_bzr.py']),
+-                ('/etc/apport/crashdb.conf.d/',
+-                    ['apport/bzr-crashdb.conf']),]
+-
+     # std setup
+     ARGS = {'scripts': ['bzr'],
+             'data_files': DATA_FILES,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100813/dfbdd5b0/attachment.html>