Ticket #37222: 1.patch

File 1.patch, 25.3 KB (added by seanfarley (Sean Farley), 12 years ago)

py-pyobjc: consolidate into one portfile

  • dports/python/py-pyobjc/Portfile 

    # HG changeset patch
# User Sean Farley <sean.michael.farley@gmail.com>
# Date 1354584025 21600
# Node ID 6f873143deb12fb4ad797fa8bf93bc996a311e07
# Parent  a68e3aaab9f31695f8e61cb0096e0876d77fe1da
py-pyobjc: consolidate into one portfile

diff --git a/dports/python/py-pyobjc/Portfile b/dports/python/py-pyobjc/Portfile
    a b  
     1# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
    12# $Id$
    23
    34PortSystem 1.0
    4 PortGroup python24 1.0
     5PortGroup python27 1.0
    56
    6 name                    py-pyobjc
    7 version                 1.4
    8 categories              python devel
     7name            py27-pyobjc
     8version         2.3
     9categories      python devel
    910license         MIT
    10 maintainers             nomaintainer
    11 platforms               darwin
    12 description             bidirectional bridge between python and Objective C
    13 long_description        The PyObjC project aims to provide a bridge between \
    14                                 the Python and Objective-C programming languages. The \
    15                                 bridge is intended to be fully bidirectional, allowing \
    16                                 the Python programmer to take full advantage of the \
    17                                 power provided by various Objective-C based toolkits \
    18                                 and the Objective-C programmer transparent access to \
    19                                 Python based functionality.
     11maintainers     nomaintainer
     12platforms       darwin
     13description     bidirectional bridge between python and Objective C
     14long_description    The PyObjC project aims to provide a bridge between \
     15                the Python and Objective-C programming languages. The \
     16                bridge is intended to be fully bidirectional, allowing \
     17                the Python programmer to take full advantage of the \
     18                power provided by various Objective-C based toolkits \
     19                and the Objective-C programmer transparent access to \
     20                Python based functionality.
    2021
    21 homepage                http://pyobjc.sourceforge.net/
    22 master_sites    http://pyobjc.sourceforge.net/software/
    23 distname                pyobjc-${version}
    24 checksums               sha1 6f83b13b78e19f390709eaedf3004c81d983dc5d
     22homepage        http://pyobjc.sourceforge.net/
     23master_sites    http://pypi.python.org/packages/source/p/pyobjc-core/
     24distname        pyobjc-core-${version}
    2525
    26 if {${os.major} > 8} {
     26checksums       sha1    ef7c5489e86e5ff219e7ae15de84fe28bc1572f6 \
     27                rmd160  8c7b5ec7478035490bcb78193b7659ee6293c785
     28
     29depends_lib     port:py27-distribute \
     30                path:${python.pkgd}/py2app/__init__.py:py27-py2app \
     31                port:libxml2
     32
     33patchfiles      setup.py.diff
     34
     35platform darwin 12 {
     36        patchfiles-append               patch-Modules.diff
     37}
     38
     39post-destroot {
     40    xinstall -m 644 -W ${worksrcpath} HISTORIC.txt Install.txt \
     41        License.txt NEWS.txt README.txt \
     42        ${destroot}${prefix}/share/doc/${name}
     43    copy ${worksrcpath}/Doc ${destroot}${prefix}/share/doc/${name}/html
     44    delete ${destroot}${prefix}/share/doc/${name}/examples
     45    copy ${worksrcpath}/Examples \
     46        ${destroot}${prefix}/share/doc/${name}/examples
     47}
     48
     49if {${os.platform} == "darwin" && ${os.major} <= 8} {
     50    depends_lib
    2751    pre-fetch {
    28         return -code error "PyObjC 1.4 is for Mac OS X 10.4 and lower. On 10.5, use py-pyobjc2 instead."
     52        ui_error "${name} ${version} requires OS X 10.5 or greater."
     53        return -code error "incompatible OS X version"
    2954    }
    3055}
    3156
    32 post-destroot {
    33         xinstall -m 644 -W ${worksrcpath} HISTORIC.txt Install.html Install.txt \
    34                 License.txt NEWS.html NEWS.txt README.txt ReadMe.html \
    35                 ${destroot}${prefix}/share/doc/${name}
    36         file copy ${worksrcpath}/Doc ${destroot}${prefix}/share/doc/${name}/html
    37         file delete ${destroot}${prefix}/share/doc/${name}/examples
    38         file copy ${worksrcpath}/Examples \
    39                 ${destroot}${prefix}/share/doc/${name}/examples
    40 }
     57livecheck.type  regex
     58livecheck.url   http://pypi.python.org/pypi/pyobjc-core/
     59livecheck.regex {pyobjc-core ([0-9.]+)}

  • new file dports/python/py-pyobjc/files/patch-Modules.diff 

    diff --git a/dports/python/py-pyobjc/files/patch-Modules.diff b/dports/python/py-pyobjc/files/patch-Modules.diff
new file mode 100644
    - +  
     1diff -rupN Modules-original/objc/objc-runtime-compat.m Modules/objc/objc-runtime-compat.m
     2--- Modules-original/objc/objc-runtime-compat.m 2009-05-25 03:56:04.000000000 +0900
     3+++ Modules/objc/objc-runtime-compat.m  2012-05-12 01:43:46.000000000 +0900
     4@@ -981,27 +981,4 @@ size_t PyObjC_methodlist_magic(Class cls
     5 
     6 #endif
     7 
     8-#if defined(__x86_64__)
     9 
     10-@implementation Protocol (NSOBjectCompat)
     11-- self
     12-{
     13-       return self;
     14-}
     15-@end
     16-
     17-@implementation Object (NSOBjectCompat)
     18-- self
     19-{
     20-       return self;
     21-}
     22-
     23--doesNotRecognizeSelector:(SEL)sel
     24-{
     25-       printf("--> %s\n", sel_getName(sel));
     26-       abort();
     27-}
     28-@end
     29-       
     30-
     31-#endif
     32diff -rupN Modules-original/objc/objc_support.m Modules/objc/objc_support.m
     33--- Modules-original/objc/objc_support.m        2010-06-30 05:28:09.000000000 +0900
     34+++ Modules/objc/objc_support.m 2012-05-12 01:46:11.000000000 +0900
     35@@ -150,68 +150,7 @@
     36 -(PyObject*)__pyobjc_PythonTransient__:(int*)cookie;
     37 @end /* PyObjCSupport */
     38 
     39-@implementation Protocol (PyObjCSupport)
     40 
     41--(PyObject*)__pyobjc_PythonObject__
     42-{
     43-       PyObject *rval;
     44-
     45-       rval = PyObjC_FindPythonProxy(self);
     46-       if (rval == NULL) {
     47-               rval = PyObjCFormalProtocol_ForProtocol(self);
     48-       }
     49-       return rval;
     50-}
     51-
     52--(PyObject*)__pyobjc_PythonTransient__:(int*)cookie
     53-{
     54-       PyObject *rval;
     55-
     56-       *cookie = 0;
     57-       rval = PyObjC_FindPythonProxy(self);
     58-       if (rval == NULL) {
     59-               rval = PyObjCFormalProtocol_ForProtocol(self);
     60-       }
     61-       return rval;
     62-}
     63-
     64-@end /* PyObjCSupport */
     65-
     66-@interface Object (PyObjCSupport)
     67--(PyObject*)__pyobjc_PythonObject__;
     68--(PyObject*)__pyobjc_PythonTransient__:(int*)cookie;
     69-@end /* PyObjCSupport */
     70-
     71-@implementation Object (PyObjCSupport)
     72-
     73--(PyObject*)__pyobjc_PythonObject__
     74-{
     75-       PyObject *rval;
     76-
     77-       rval = PyObjC_FindPythonProxy(self);
     78-       if (rval == NULL) {
     79-               rval = (PyObject *)PyObjCObject_New(self,
     80-                               PyObjCObject_kCLASSIC, NO);
     81-               PyObjC_RegisterPythonProxy(self, rval);
     82-       }
     83-       return rval;
     84-}
     85-
     86--(PyObject*)__pyobjc_PythonTransient__:(int*)cookie
     87-{
     88-       PyObject *rval;
     89-
     90-       *cookie = 0;
     91-       rval = PyObjC_FindPythonProxy(self);
     92-       if (rval == NULL) {
     93-               rval = (PyObject *)PyObjCObject_New(self,
     94-                               PyObjCObject_kCLASSIC, NO);
     95-               PyObjC_RegisterPythonProxy(self, rval);
     96-       }
     97-       return rval;
     98-}
     99-
     100-@end /* PyObjCSupport */
     101 
     102 @interface NSString (PyObjCSupport)
     103 -(PyObject*)__pyobjc_PythonObject__;
     104diff -rupN Modules-original/objc/selector.m Modules/objc/selector.m
     105--- Modules-original/objc/selector.m    2010-06-24 17:53:29.000000000 +0900
     106+++ Modules/objc/selector.m     2012-05-12 01:49:44.000000000 +0900
     107@@ -798,9 +798,6 @@ PyObjCSelector_FindNative(PyObject* self
     108                }
     109        }
     110 
     111-       if (Object_class == nil) {
     112-               Object_class = [Object class];
     113-       }
     114 
     115        if (name[0] == '_' && name[1] == '_') {
     116                /* No known Objective-C class has methods whose name

  • new file dports/python/py-pyobjc/files/setup.py.diff 

    diff --git a/dports/python/py-pyobjc/files/setup.py.diff b/dports/python/py-pyobjc/files/setup.py.diff
new file mode 100644
    - +  
     1--- setup.py.orig       2010-07-25 00:38:17.000000000 +1000
     2+++ setup.py    2011-05-25 22:47:49.000000000 +1000
     3@@ -22,7 +22,7 @@
     4 # Set USE_SYSTEM_LIBXML to True to link to the system version
     5 # of libxml2 (defaults to False to avoid problems when building
     6 # on 10.6 and running on an earlier release)
     7-USE_SYSTEM_LIBXML = False
     8+USE_SYSTEM_LIBXML = True
     9 
     10 if sys.version_info < MIN_PYTHON:
     11     vstr = '.'.join(map(str, MIN_PYTHON))

  • deleted file dports/python/py25-pyobjc/Portfile 

    diff --git a/dports/python/py25-pyobjc/Portfile b/dports/python/py25-pyobjc/Portfile
deleted file mode 100644
    + -  
    1 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
    2 # $Id$
    3 
    4 PortSystem 1.0
    5 PortGroup python25 1.0
    6 
    7 name            py25-pyobjc
    8 version         2.2
    9 categories      python devel
    10 license         MIT
    11 maintainers     nomaintainer
    12 platforms       darwin
    13 description     bidirectional bridge between python and Objective C
    14 long_description    The PyObjC project aims to provide a bridge between \
    15                 the Python and Objective-C programming languages. The \
    16                 bridge is intended to be fully bidirectional, allowing \
    17                 the Python programmer to take full advantage of the \
    18                 power provided by various Objective-C based toolkits \
    19                 and the Objective-C programmer transparent access to \
    20                 Python based functionality.
    21 
    22 homepage        http://pyobjc.sourceforge.net/
    23 master_sites    http://pypi.python.org/packages/source/p/pyobjc-core/
    24 distname        pyobjc-core-${version}
    25 checksums       md5 91155ec6b319c9b4b066a616dccbdaa2 \
    26                 sha1 6e1fbfa5708eefaf7a36147daf21f0aab62ec1e4 \
    27                 rmd160 a7063fe74ecc95b3105e78196e5b5adc3bba3d4a
    28 
    29 depends_lib     port:py25-distribute \
    30                 path:${python.pkgd}/py2app/__init__.py:py25-py2app
    31 
    32 patchfiles      objc-class.m.diff
    33 
    34 platform darwin 12 {
    35         patchfiles-append               patch-Modules.diff
    36 }
    37 
    38 post-destroot {
    39     xinstall -m 644 -W ${worksrcpath} HISTORIC.txt Install.txt \
    40         License.txt NEWS.txt README.txt \
    41         ${destroot}${prefix}/share/doc/${name}
    42     copy ${worksrcpath}/Doc ${destroot}${prefix}/share/doc/${name}/html
    43     delete ${destroot}${prefix}/share/doc/${name}/examples
    44     copy ${worksrcpath}/Examples \
    45         ${destroot}${prefix}/share/doc/${name}/examples
    46 }
    47 
    48 # 2.3 only supports python >= 2.6
    49 livecheck.type  none

  • deleted file dports/python/py25-pyobjc/files/objc-class.m.diff 

    diff --git a/dports/python/py25-pyobjc/files/objc-class.m.diff b/dports/python/py25-pyobjc/files/objc-class.m.diff
deleted file mode 100644
    + -  
    1 --- Modules/objc/objc-class.m.orig      2009-06-23 15:35:44.000000000 -0700
    2 +++ Modules/objc/objc-class.m   2009-06-29 12:41:41.000000000 -0700
    3 @@ -1413,7 +1413,9 @@
    4                 ((PyTypeObject *)result)->tp_as_buffer = &nsmutabledata_as_buffer;
    5         } else if (strcmp(className, "NSBlock") == 0) {
    6                 ((PyTypeObject *)result)->tp_basicsize = sizeof(PyObjCBlockObject);
    7 +#if PY_MAJOR_VERSION > 2 || PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION > 5
    8                 PyType_Modified((PyTypeObject*)result);
    9 +#endif /* > 2.5 */
    10                 PyType_Ready((PyTypeObject *)result);
    11         }
    12  

  • deleted file dports/python/py25-pyobjc/files/patch-Modules.diff 

    diff --git a/dports/python/py25-pyobjc/files/patch-Modules.diff b/dports/python/py25-pyobjc/files/patch-Modules.diff
deleted file mode 100644
    + -  
    1 diff -rupN Modules-original/objc/objc-runtime-compat.m Modules/objc/objc-runtime-compat.m
    2 --- Modules-original/objc/objc-runtime-compat.m 2009-05-25 03:56:04.000000000 +0900
    3 +++ Modules/objc/objc-runtime-compat.m  2012-05-12 01:43:46.000000000 +0900
    4 @@ -981,27 +981,4 @@ size_t PyObjC_methodlist_magic(Class cls
    5  
    6  #endif
    7  
    8 -#if defined(__x86_64__)
    9  
    10 -@implementation Protocol (NSOBjectCompat)
    11 -- self
    12 -{
    13 -       return self;
    14 -}
    15 -@end
    16 -
    17 -@implementation Object (NSOBjectCompat)
    18 -- self
    19 -{
    20 -       return self;
    21 -}
    22 -
    23 --doesNotRecognizeSelector:(SEL)sel
    24 -{
    25 -       printf("--> %s\n", sel_getName(sel));
    26 -       abort();
    27 -}
    28 -@end
    29 -       
    30 -
    31 -#endif
    32 diff -rupN Modules-original/objc/objc_support.m Modules/objc/objc_support.m
    33 --- Modules-original/objc/objc_support.m        2010-06-30 05:28:09.000000000 +0900
    34 +++ Modules/objc/objc_support.m 2012-05-12 01:46:11.000000000 +0900
    35 @@ -150,68 +150,7 @@
    36  -(PyObject*)__pyobjc_PythonTransient__:(int*)cookie;
    37  @end /* PyObjCSupport */
    38  
    39 -@implementation Protocol (PyObjCSupport)
    40  
    41 --(PyObject*)__pyobjc_PythonObject__
    42 -{
    43 -       PyObject *rval;
    44 -
    45 -       rval = PyObjC_FindPythonProxy(self);
    46 -       if (rval == NULL) {
    47 -               rval = PyObjCFormalProtocol_ForProtocol(self);
    48 -       }
    49 -       return rval;
    50 -}
    51 -
    52 --(PyObject*)__pyobjc_PythonTransient__:(int*)cookie
    53 -{
    54 -       PyObject *rval;
    55 -
    56 -       *cookie = 0;
    57 -       rval = PyObjC_FindPythonProxy(self);
    58 -       if (rval == NULL) {
    59 -               rval = PyObjCFormalProtocol_ForProtocol(self);
    60 -       }
    61 -       return rval;
    62 -}
    63 -
    64 -@end /* PyObjCSupport */
    65 -
    66 -@interface Object (PyObjCSupport)
    67 --(PyObject*)__pyobjc_PythonObject__;
    68 --(PyObject*)__pyobjc_PythonTransient__:(int*)cookie;
    69 -@end /* PyObjCSupport */
    70 -
    71 -@implementation Object (PyObjCSupport)
    72 -
    73 --(PyObject*)__pyobjc_PythonObject__
    74 -{
    75 -       PyObject *rval;
    76 -
    77 -       rval = PyObjC_FindPythonProxy(self);
    78 -       if (rval == NULL) {
    79 -               rval = (PyObject *)PyObjCObject_New(self,
    80 -                               PyObjCObject_kCLASSIC, NO);
    81 -               PyObjC_RegisterPythonProxy(self, rval);
    82 -       }
    83 -       return rval;
    84 -}
    85 -
    86 --(PyObject*)__pyobjc_PythonTransient__:(int*)cookie
    87 -{
    88 -       PyObject *rval;
    89 -
    90 -       *cookie = 0;
    91 -       rval = PyObjC_FindPythonProxy(self);
    92 -       if (rval == NULL) {
    93 -               rval = (PyObject *)PyObjCObject_New(self,
    94 -                               PyObjCObject_kCLASSIC, NO);
    95 -               PyObjC_RegisterPythonProxy(self, rval);
    96 -       }
    97 -       return rval;
    98 -}
    99 -
    100 -@end /* PyObjCSupport */
    101  
    102  @interface NSString (PyObjCSupport)
    103  -(PyObject*)__pyobjc_PythonObject__;
    104 diff -rupN Modules-original/objc/selector.m Modules/objc/selector.m
    105 --- Modules-original/objc/selector.m    2010-06-24 17:53:29.000000000 +0900
    106 +++ Modules/objc/selector.m     2012-05-12 01:49:44.000000000 +0900
    107 @@ -798,9 +798,6 @@ PyObjCSelector_FindNative(PyObject* self
    108                 }
    109         }
    110  
    111 -       if (Object_class == nil) {
    112 -               Object_class = [Object class];
    113 -       }
    114  
    115         if (name[0] == '_' && name[1] == '_') {
    116                 /* No known Objective-C class has methods whose name

  • deleted file dports/python/py26-pyobjc/Portfile 

    diff --git a/dports/python/py26-pyobjc/Portfile b/dports/python/py26-pyobjc/Portfile
deleted file mode 100644
    + -  
    1 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
    2 # $Id$
    3 
    4 PortSystem 1.0
    5 PortGroup python26 1.0
    6 
    7 name            py26-pyobjc
    8 version         2.3
    9 categories      python devel
    10 license         MIT
    11 maintainers     nomaintainer
    12 platforms       darwin
    13 description     bidirectional bridge between python and Objective C
    14 long_description    The PyObjC project aims to provide a bridge between \
    15                 the Python and Objective-C programming languages. The \
    16                 bridge is intended to be fully bidirectional, allowing \
    17                 the Python programmer to take full advantage of the \
    18                 power provided by various Objective-C based toolkits \
    19                 and the Objective-C programmer transparent access to \
    20                 Python based functionality.
    21 
    22 homepage        http://pyobjc.sourceforge.net/
    23 master_sites    http://pypi.python.org/packages/source/p/pyobjc-core/
    24 distname        pyobjc-core-${version}
    25 checksums       md5 8206a8576d557e4670c543c30e044d2a \
    26                 sha1 ef7c5489e86e5ff219e7ae15de84fe28bc1572f6 \
    27                 rmd160 8c7b5ec7478035490bcb78193b7659ee6293c785
    28 
    29 depends_lib     port:py26-distribute \
    30                 path:${python.pkgd}/py2app/__init__.py:py26-py2app \
    31                 port:libxml2
    32 
    33 patchfiles      setup.py.diff
    34 
    35 platform darwin 12 {
    36         patchfiles-append               patch-Modules.diff
    37 }
    38 
    39 post-destroot {
    40     xinstall -m 644 -W ${worksrcpath} HISTORIC.txt Install.txt \
    41         License.txt NEWS.txt README.txt \
    42         ${destroot}${prefix}/share/doc/${name}
    43     copy ${worksrcpath}/Doc ${destroot}${prefix}/share/doc/${name}/html
    44     delete ${destroot}${prefix}/share/doc/${name}/examples
    45     copy ${worksrcpath}/Examples \
    46         ${destroot}${prefix}/share/doc/${name}/examples
    47 }
    48 
    49 if {${os.platform} == "darwin" && ${os.major} <= 8} {
    50     depends_lib
    51     pre-fetch {
    52         ui_error "${name} ${version} requires OS X 10.5 or greater."
    53         return -code error "incompatible OS X version"
    54     }
    55 }
    56 
    57 livecheck.type  regex
    58 livecheck.url   http://pypi.python.org/pypi/pyobjc-core/
    59 livecheck.regex {pyobjc-core ([0-9.]+)}

  • deleted file dports/python/py26-pyobjc/files/patch-Modules.diff 

    diff --git a/dports/python/py26-pyobjc/files/patch-Modules.diff b/dports/python/py26-pyobjc/files/patch-Modules.diff
deleted file mode 100644
    + -  
    1 diff -rupN Modules-original/objc/objc-runtime-compat.m Modules/objc/objc-runtime-compat.m
    2 --- Modules-original/objc/objc-runtime-compat.m 2009-05-25 03:56:04.000000000 +0900
    3 +++ Modules/objc/objc-runtime-compat.m  2012-05-12 01:43:46.000000000 +0900
    4 @@ -981,27 +981,4 @@ size_t PyObjC_methodlist_magic(Class cls
    5  
    6  #endif
    7  
    8 -#if defined(__x86_64__)
    9  
    10 -@implementation Protocol (NSOBjectCompat)
    11 -- self
    12 -{
    13 -       return self;
    14 -}
    15 -@end
    16 -
    17 -@implementation Object (NSOBjectCompat)
    18 -- self
    19 -{
    20 -       return self;
    21 -}
    22 -
    23 --doesNotRecognizeSelector:(SEL)sel
    24 -{
    25 -       printf("--> %s\n", sel_getName(sel));
    26 -       abort();
    27 -}
    28 -@end
    29 -       
    30 -
    31 -#endif
    32 diff -rupN Modules-original/objc/objc_support.m Modules/objc/objc_support.m
    33 --- Modules-original/objc/objc_support.m        2010-06-30 05:28:09.000000000 +0900
    34 +++ Modules/objc/objc_support.m 2012-05-12 01:46:11.000000000 +0900
    35 @@ -150,68 +150,7 @@
    36  -(PyObject*)__pyobjc_PythonTransient__:(int*)cookie;
    37  @end /* PyObjCSupport */
    38  
    39 -@implementation Protocol (PyObjCSupport)
    40  
    41 --(PyObject*)__pyobjc_PythonObject__
    42 -{
    43 -       PyObject *rval;
    44 -
    45 -       rval = PyObjC_FindPythonProxy(self);
    46 -       if (rval == NULL) {
    47 -               rval = PyObjCFormalProtocol_ForProtocol(self);
    48 -       }
    49 -       return rval;
    50 -}
    51 -
    52 --(PyObject*)__pyobjc_PythonTransient__:(int*)cookie
    53 -{
    54 -       PyObject *rval;
    55 -
    56 -       *cookie = 0;
    57 -       rval = PyObjC_FindPythonProxy(self);
    58 -       if (rval == NULL) {
    59 -               rval = PyObjCFormalProtocol_ForProtocol(self);
    60 -       }
    61 -       return rval;
    62 -}
    63 -
    64 -@end /* PyObjCSupport */
    65 -
    66 -@interface Object (PyObjCSupport)
    67 --(PyObject*)__pyobjc_PythonObject__;
    68 --(PyObject*)__pyobjc_PythonTransient__:(int*)cookie;
    69 -@end /* PyObjCSupport */
    70 -
    71 -@implementation Object (PyObjCSupport)
    72 -
    73 --(PyObject*)__pyobjc_PythonObject__
    74 -{
    75 -       PyObject *rval;
    76 -
    77 -       rval = PyObjC_FindPythonProxy(self);
    78 -       if (rval == NULL) {
    79 -               rval = (PyObject *)PyObjCObject_New(self,
    80 -                               PyObjCObject_kCLASSIC, NO);
    81 -               PyObjC_RegisterPythonProxy(self, rval);
    82 -       }
    83 -       return rval;
    84 -}
    85 -
    86 --(PyObject*)__pyobjc_PythonTransient__:(int*)cookie
    87 -{
    88 -       PyObject *rval;
    89 -
    90 -       *cookie = 0;
    91 -       rval = PyObjC_FindPythonProxy(self);
    92 -       if (rval == NULL) {
    93 -               rval = (PyObject *)PyObjCObject_New(self,
    94 -                               PyObjCObject_kCLASSIC, NO);
    95 -               PyObjC_RegisterPythonProxy(self, rval);
    96 -       }
    97 -       return rval;
    98 -}
    99 -
    100 -@end /* PyObjCSupport */
    101  
    102  @interface NSString (PyObjCSupport)
    103  -(PyObject*)__pyobjc_PythonObject__;
    104 diff -rupN Modules-original/objc/selector.m Modules/objc/selector.m
    105 --- Modules-original/objc/selector.m    2010-06-24 17:53:29.000000000 +0900
    106 +++ Modules/objc/selector.m     2012-05-12 01:49:44.000000000 +0900
    107 @@ -798,9 +798,6 @@ PyObjCSelector_FindNative(PyObject* self
    108                 }
    109         }
    110  
    111 -       if (Object_class == nil) {
    112 -               Object_class = [Object class];
    113 -       }
    114  
    115         if (name[0] == '_' && name[1] == '_') {
    116                 /* No known Objective-C class has methods whose name

  • deleted file dports/python/py26-pyobjc/files/setup.py.diff 

    diff --git a/dports/python/py26-pyobjc/files/setup.py.diff b/dports/python/py26-pyobjc/files/setup.py.diff
deleted file mode 100644
    + -  
    1 --- setup.py.orig       2010-07-25 00:38:17.000000000 +1000
    2 +++ setup.py    2011-05-25 22:47:49.000000000 +1000
    3 @@ -22,7 +22,7 @@
    4  # Set USE_SYSTEM_LIBXML to True to link to the system version
    5  # of libxml2 (defaults to False to avoid problems when building
    6  # on 10.6 and running on an earlier release)
    7 -USE_SYSTEM_LIBXML = False
    8 +USE_SYSTEM_LIBXML = True
    9  
    10  if sys.version_info < MIN_PYTHON:
    11      vstr = '.'.join(map(str, MIN_PYTHON))

  • deleted file dports/python/py27-pyobjc/Portfile 

    diff --git a/dports/python/py27-pyobjc/Portfile b/dports/python/py27-pyobjc/Portfile
deleted file mode 100644
    + -  
    1 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
    2 # $Id$
    3 
    4 PortSystem 1.0
    5 PortGroup python27 1.0
    6 
    7 name            py27-pyobjc
    8 version         2.3
    9 categories      python devel
    10 license         MIT
    11 maintainers     nomaintainer
    12 platforms       darwin
    13 description     bidirectional bridge between python and Objective C
    14 long_description    The PyObjC project aims to provide a bridge between \
    15                 the Python and Objective-C programming languages. The \
    16                 bridge is intended to be fully bidirectional, allowing \
    17                 the Python programmer to take full advantage of the \
    18                 power provided by various Objective-C based toolkits \
    19                 and the Objective-C programmer transparent access to \
    20                 Python based functionality.
    21 
    22 homepage        http://pyobjc.sourceforge.net/
    23 master_sites    http://pypi.python.org/packages/source/p/pyobjc-core/
    24 distname        pyobjc-core-${version}
    25 
    26 checksums       sha1    ef7c5489e86e5ff219e7ae15de84fe28bc1572f6 \
    27                 rmd160  8c7b5ec7478035490bcb78193b7659ee6293c785
    28 
    29 depends_lib     port:py27-distribute \
    30                 path:${python.pkgd}/py2app/__init__.py:py27-py2app \
    31                 port:libxml2
    32 
    33 patchfiles      setup.py.diff
    34 
    35 platform darwin 12 {
    36         patchfiles-append               patch-Modules.diff
    37 }
    38 
    39 post-destroot {
    40     xinstall -m 644 -W ${worksrcpath} HISTORIC.txt Install.txt \
    41         License.txt NEWS.txt README.txt \
    42         ${destroot}${prefix}/share/doc/${name}
    43     copy ${worksrcpath}/Doc ${destroot}${prefix}/share/doc/${name}/html
    44     delete ${destroot}${prefix}/share/doc/${name}/examples
    45     copy ${worksrcpath}/Examples \
    46         ${destroot}${prefix}/share/doc/${name}/examples
    47 }
    48 
    49 if {${os.platform} == "darwin" && ${os.major} <= 8} {
    50     depends_lib
    51     pre-fetch {
    52         ui_error "${name} ${version} requires OS X 10.5 or greater."
    53         return -code error "incompatible OS X version"
    54     }
    55 }
    56 
    57 livecheck.type  regex
    58 livecheck.url   http://pypi.python.org/pypi/pyobjc-core/
    59 livecheck.regex {pyobjc-core ([0-9.]+)}

  • deleted file dports/python/py27-pyobjc/files/patch-Modules.diff 

    diff --git a/dports/python/py27-pyobjc/files/patch-Modules.diff b/dports/python/py27-pyobjc/files/patch-Modules.diff
deleted file mode 100644
    + -  
    1 diff -rupN Modules-original/objc/objc-runtime-compat.m Modules/objc/objc-runtime-compat.m
    2 --- Modules-original/objc/objc-runtime-compat.m 2009-05-25 03:56:04.000000000 +0900
    3 +++ Modules/objc/objc-runtime-compat.m  2012-05-12 01:43:46.000000000 +0900
    4 @@ -981,27 +981,4 @@ size_t PyObjC_methodlist_magic(Class cls
    5  
    6  #endif
    7  
    8 -#if defined(__x86_64__)
    9  
    10 -@implementation Protocol (NSOBjectCompat)
    11 -- self
    12 -{
    13 -       return self;
    14 -}
    15 -@end
    16 -
    17 -@implementation Object (NSOBjectCompat)
    18 -- self
    19 -{
    20 -       return self;
    21 -}
    22 -
    23 --doesNotRecognizeSelector:(SEL)sel
    24 -{
    25 -       printf("--> %s\n", sel_getName(sel));
    26 -       abort();
    27 -}
    28 -@end
    29 -       
    30 -
    31 -#endif
    32 diff -rupN Modules-original/objc/objc_support.m Modules/objc/objc_support.m
    33 --- Modules-original/objc/objc_support.m        2010-06-30 05:28:09.000000000 +0900
    34 +++ Modules/objc/objc_support.m 2012-05-12 01:46:11.000000000 +0900
    35 @@ -150,68 +150,7 @@
    36  -(PyObject*)__pyobjc_PythonTransient__:(int*)cookie;
    37  @end /* PyObjCSupport */
    38  
    39 -@implementation Protocol (PyObjCSupport)
    40  
    41 --(PyObject*)__pyobjc_PythonObject__
    42 -{
    43 -       PyObject *rval;
    44 -
    45 -       rval = PyObjC_FindPythonProxy(self);
    46 -       if (rval == NULL) {
    47 -               rval = PyObjCFormalProtocol_ForProtocol(self);
    48 -       }
    49 -       return rval;
    50 -}
    51 -
    52 --(PyObject*)__pyobjc_PythonTransient__:(int*)cookie
    53 -{
    54 -       PyObject *rval;
    55 -
    56 -       *cookie = 0;
    57 -       rval = PyObjC_FindPythonProxy(self);
    58 -       if (rval == NULL) {
    59 -               rval = PyObjCFormalProtocol_ForProtocol(self);
    60 -       }
    61 -       return rval;
    62 -}
    63 -
    64 -@end /* PyObjCSupport */
    65 -
    66 -@interface Object (PyObjCSupport)
    67 --(PyObject*)__pyobjc_PythonObject__;
    68 --(PyObject*)__pyobjc_PythonTransient__:(int*)cookie;
    69 -@end /* PyObjCSupport */
    70 -
    71 -@implementation Object (PyObjCSupport)
    72 -
    73 --(PyObject*)__pyobjc_PythonObject__
    74 -{
    75 -       PyObject *rval;
    76 -
    77 -       rval = PyObjC_FindPythonProxy(self);
    78 -       if (rval == NULL) {
    79 -               rval = (PyObject *)PyObjCObject_New(self,
    80 -                               PyObjCObject_kCLASSIC, NO);
    81 -               PyObjC_RegisterPythonProxy(self, rval);
    82 -       }
    83 -       return rval;
    84 -}
    85 -
    86 --(PyObject*)__pyobjc_PythonTransient__:(int*)cookie
    87 -{
    88 -       PyObject *rval;
    89 -
    90 -       *cookie = 0;
    91 -       rval = PyObjC_FindPythonProxy(self);
    92 -       if (rval == NULL) {
    93 -               rval = (PyObject *)PyObjCObject_New(self,
    94 -                               PyObjCObject_kCLASSIC, NO);
    95 -               PyObjC_RegisterPythonProxy(self, rval);
    96 -       }
    97 -       return rval;
    98 -}
    99 -
    100 -@end /* PyObjCSupport */
    101  
    102  @interface NSString (PyObjCSupport)
    103  -(PyObject*)__pyobjc_PythonObject__;
    104 diff -rupN Modules-original/objc/selector.m Modules/objc/selector.m
    105 --- Modules-original/objc/selector.m    2010-06-24 17:53:29.000000000 +0900
    106 +++ Modules/objc/selector.m     2012-05-12 01:49:44.000000000 +0900
    107 @@ -798,9 +798,6 @@ PyObjCSelector_FindNative(PyObject* self
    108                 }
    109         }
    110  
    111 -       if (Object_class == nil) {
    112 -               Object_class = [Object class];
    113 -       }
    114  
    115         if (name[0] == '_' && name[1] == '_') {
    116                 /* No known Objective-C class has methods whose name

  • deleted file dports/python/py27-pyobjc/files/setup.py.diff 

    diff --git a/dports/python/py27-pyobjc/files/setup.py.diff b/dports/python/py27-pyobjc/files/setup.py.diff
deleted file mode 100644
    + -  
    1 --- setup.py.orig       2010-07-25 00:38:17.000000000 +1000
    2 +++ setup.py    2011-05-25 22:47:49.000000000 +1000
    3 @@ -22,7 +22,7 @@
    4  # Set USE_SYSTEM_LIBXML to True to link to the system version
    5  # of libxml2 (defaults to False to avoid problems when building
    6  # on 10.6 and running on an earlier release)
    7 -USE_SYSTEM_LIBXML = False
    8 +USE_SYSTEM_LIBXML = True
    9  
    10  if sys.version_info < MIN_PYTHON:
    11      vstr = '.'.join(map(str, MIN_PYTHON))