Changeset 112865 for trunk/dports/aqua


Ignore:
Timestamp:
Nov 3, 2013, 2:28:23 AM (6 years ago)
Author:
ryandesign@…
Message:

namebench: actually use MacPorts python (#40859); add required PyObjC and PyObjC-Cocoa dependencies; remove python24 variant because python24 does not provide a Python library

Location:
trunk/dports/aqua/namebench
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/aqua/namebench/Portfile

    r112561 r112865  
    77name                namebench
    88version             1.3.1
     9revision            1
    910categories          aqua sysutils
    1011maintainers         nomaintainer
     
    2728extract.suffix      .tgz
    2829worksrcdir          ${name}-${version}/cocoa
    29 patchfiles          project.diff
    3030checksums           rmd160  93d1186caf2a214ecf1966ee798f01d329ecfd64 \
    3131                    sha256  30ccf9e870c1174c6bf02fca488f62bba280203a0b1e8e4d26f3756e1a5b9425
    3232
    33 variant python24 conflicts python25 python26 python27 {
    34     depends_lib         port:py24-libnamebench
     33patchfiles          project.diff patch-main.m.diff
     34
     35post-patch {
     36    set py_bin      ${prefix}/bin/python${py}
     37    reinplace "s|/usr/bin/python|${py_bin}|g" ${worksrcpath}/main.m
     38    reinplace "s|@FRAMEWORKS_DIR@|${frameworks_dir}|g" ${worksrcpath}/namebench.xcodeproj/project.pbxproj
     39    reinplace "s|@PYTHON_VERSION@|${py}|g" ${worksrcpath}/namebench.xcodeproj/project.pbxproj
    3540}
    36 variant python25 conflicts python24 python26 python27 {
    37     depends_lib         port:py25-libnamebench
     41
     42set py ""
     43variant python25 conflicts python26 python27 {
     44    set py              2.5
     45    depends_lib-append  port:py25-libnamebench port:py25-pyobjc port:py25-pyobjc-cocoa
    3846}
    39 variant python26 conflicts python24 python25 python27 {
    40     depends_lib         port:py26-libnamebench
     47variant python26 conflicts python25 python27 {
     48    set py              2.6
     49    depends_lib-append  port:py26-libnamebench port:py26-pyobjc port:py26-pyobjc-cocoa
    4150}
    42 variant python27 conflicts python24 python25 python26 {
    43     depends_lib         port:py27-libnamebench
     51variant python27 conflicts python25 python26 {
     52    set py              2.7
     53    depends_lib-append  port:py27-libnamebench port:py27-pyobjc port:py27-pyobjc-cocoa
    4454}
    45 if {![variant_isset python24] && ![variant_isset python25] && ![variant_isset python26] && ![variant_isset python27]} {
     55if {![variant_isset python25] && ![variant_isset python26] && ![variant_isset python27]} {
    4656    default_variants    +python27
    4757}
  • trunk/dports/aqua/namebench/files/project.diff

    r67797 r112865  
    11--- namebench.xcodeproj/project.pbxproj.orig    2010-05-18 11:03:01.000000000 -0400
    2 +++ namebench.xcodeproj/project.pbxproj 2010-05-18 11:01:31.000000000 -0400
     2+++ namebench.xcodeproj/project.pbxproj 2013-11-02 19:25:47.000000000 -0500
     3@@ -7,17 +7,17 @@
     4        objects = {
     5 
     6 /* Begin PBXBuildFile section */
     7+               5016A55B1825CF38009A6057 /* Python in Frameworks */ = {isa = PBXBuildFile; fileRef = 5016A55A1825CF38009A6057 /* Python */; };
     8                697CE1ED10DA048D00D5C46F /* tools in Resources */ = {isa = PBXBuildFile; fileRef = 697CE1E910DA048D00D5C46F /* tools */; };
     9                697CE1EE10DA048D00D5C46F /* nb_third_party in Resources */ = {isa = PBXBuildFile; fileRef = 697CE1EA10DA048D00D5C46F /* nb_third_party */; };
     10                697CE1EF10DA048D00D5C46F /* templates in Resources */ = {isa = PBXBuildFile; fileRef = 697CE1EB10DA048D00D5C46F /* templates */; };
     11                697CE1F010DA048D00D5C46F /* libnamebench in Resources */ = {isa = PBXBuildFile; fileRef = 697CE1EC10DA048D00D5C46F /* libnamebench */; };
     12                697CE2B110DA04D600D5C46F /* config in Resources */ = {isa = PBXBuildFile; fileRef = 697CE2AB10DA04D600D5C46F /* config */; };
     13-               77631A270C06C501005415CB /* Python.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 77631A260C06C501005415CB /* Python.framework */; };
     14                77631A3F0C0748CF005415CB /* main.py in Resources */ = {isa = PBXBuildFile; fileRef = 77631A3E0C0748CF005415CB /* main.py */; };
     15                7790198F0C07548A00326F66 /* namebenchAppDelegate.py in Resources */ = {isa = PBXBuildFile; fileRef = 7790198E0C07548A00326F66 /* namebenchAppDelegate.py */; };
     16                77C8C1F90C07829500965286 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 77C8C1F70C07829500965286 /* MainMenu.xib */; };
     17                8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
     18-               8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
     19+               8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); COMPILER_FLAGS = "-isystem@FRAMEWORKS_DIR@/Python.framework/Versions/@PYTHON_VERSION@/Headers"; }; };
     20                8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
     21                DCABD7DC11365CF10067F26A /* data in Resources */ = {isa = PBXBuildFile; fileRef = DCABD7D711365CF10067F26A /* data */; };
     22                DCC47243107F4BB1009BBD14 /* controller.py in Resources */ = {isa = PBXBuildFile; fileRef = DCC47242107F4BB1009BBD14 /* controller.py */; };
     23@@ -32,6 +32,7 @@
     24                29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
     25                29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
     26                32CA4F630368D1EE00C91783 /* namebench_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = namebench_Prefix.pch; sourceTree = "<group>"; };
     27+               5016A55A1825CF38009A6057 /* Python */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = Python; path = @FRAMEWORKS_DIR@/Python.framework/Versions/@PYTHON_VERSION@/Python; sourceTree = "<group>"; };
     28                697CE1E910DA048D00D5C46F /* tools */ = {isa = PBXFileReference; lastKnownFileType = folder; name = tools; path = ../tools; sourceTree = SOURCE_ROOT; };
     29                697CE1EA10DA048D00D5C46F /* nb_third_party */ = {isa = PBXFileReference; lastKnownFileType = folder; name = nb_third_party; path = ../nb_third_party; sourceTree = SOURCE_ROOT; };
     30                697CE1EB10DA048D00D5C46F /* templates */ = {isa = PBXFileReference; lastKnownFileType = folder; name = templates; path = ../templates; sourceTree = SOURCE_ROOT; };
     31@@ -54,7 +55,7 @@
     32                        buildActionMask = 2147483647;
     33                        files = (
     34                                8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
     35-                               77631A270C06C501005415CB /* Python.framework in Frameworks */,
     36+                               5016A55B1825CF38009A6057 /* Python in Frameworks */,
     37                        );
     38                        runOnlyForDeploymentPostprocessing = 0;
     39                };
     40@@ -139,6 +140,7 @@
     41                29B97323FDCFA39411CA2CEA /* Frameworks */ = {
     42                        isa = PBXGroup;
     43                        children = (
     44+                               5016A55A1825CF38009A6057 /* Python */,
     45                                1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
     46                                1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
     47                        );
     48@@ -248,6 +256,10 @@
     49                                GCC_PREFIX_HEADER = namebench_Prefix.pch;
     50                                INFOPLIST_FILE = Info.plist;
     51                                INSTALL_PATH = "$(HOME)/Applications";
     52+                               LIBRARY_SEARCH_PATHS = (
     53+                                       "$(inherited)",
     54+                                       @FRAMEWORKS_DIR@/Python.framework/Versions/@PYTHON_VERSION@,
     55+                               );
     56                                ONLY_ACTIVE_ARCH = YES;
     57                                PRODUCT_NAME = namebench;
     58                                WRAPPER_EXTENSION = app;
     59@@ -264,6 +276,10 @@
     60                                GCC_PREFIX_HEADER = namebench_Prefix.pch;
     61                                INFOPLIST_FILE = Info.plist;
     62                                INSTALL_PATH = "$(HOME)/Applications";
     63+                               LIBRARY_SEARCH_PATHS = (
     64+                                       "$(inherited)",
     65+                                       @FRAMEWORKS_DIR@/Python.framework/Versions/@PYTHON_VERSION@,
     66+                               );
     67                                PRODUCT_NAME = namebench;
     68                                WRAPPER_EXTENSION = app;
     69                        };
    370@@ -286,14 +286,14 @@
    471                C01FCF5008A954540054247B /* Release */ = {
Note: See TracChangeset for help on using the changeset viewer.