Ticket #38090: Portfile.diff

File Portfile.diff, 2.8 KB (added by cooljeanius (Eric Gallager), 12 years ago)

diff between old portfile and new one

  • Portfile

    old new  
    3232# This was taken from the valgrind portfile; I don't know if it actually applies to valkyrie, too, though...
    3333pre-configure {
    3434    if {"darwin" == ${os.platform} && (${os.major} < 9 || ${os.major} > 12)} {
    35         ui_error "${name} ${version} is only compatible with Mac OS X 10.5, 10.6, 10.7 and 10.8"
    36         return -code error "incompatible Mac OS X version"
     35        ui_error "${name} ${version} is only compatible with OS X 10.5, 10.6, 10.7 and 10.8"
     36        return -code error "incompatible OS X version"
    3737    }
    3838}
    3939
    40 # "use_configure no" is a dirty hack used because I couldn't get it to work otherwise
    41 use_configure         no
    42 # Even though we're not using configure, I left these in, in case someone want to try to remove it
    43 # and use the configure step properly again
    4440configure.cmd         "${qt_qmake_cmd}"
    45 configure.args-delete --prefix=/opt/local \
    46                       --disable-dependency-tracking
    47 configure.args        QMAKESPEC=${qt_mkspecs_dir}/macx-g++
     41configure.args-append  QMAKESPEC=${qt_mkspecs_dir}/macx-g++ PREFIX=${prefix}
    4842configure.pre_args
    4943configure.post_args
    5044configure.ldflags
     45configure.universal_args
     46configure.env-append  PREFIX=${prefix}
    5147
    5248depends_build-append  port:makeicns
    5349depends_lib-append    path:bin/valgrind:valgrind \
    5450                      port:xpm
    5551
    5652post-configure {
    57 # doing the actual configuring in a post-configure step goes with the dirty hack of
    58 # using "use_configure no" above
    59     system -W ${worksrcpath} "${qt_qmake_cmd} QMAKESPEC=${qt_mkspecs_dir}/macx-g++"
    6053# When Qt is installed without +universal, and qmake is called with
    6154# "QMAKE_LDFLAGS += -arch foo", and "foo" is the native arch, then, at
    6255# least sometimes, qmake will erroneously remove the second "foo" but
     
    7568    }
    7669}
    7770
     71# Just in case
     72build.env-append      ${configure.env}
     73
     74# This variant could have been left empty but I felt like I had to put something in it
    7875variant debug description {Set for debugging} {
    7976    use_parallel_build no
    8077}
    8178
    82 # Setting destroot.destdir doesn't actually work, but it should though.
     79# Apparently putting stuff in ${applications_dir} counts as violating the mtree...
     80destroot.violate_mtree      yes
     81
     82# Setting destroot.destdir just in case
    8383destroot.destdir      ${destroot}${prefix}
    84 # "make install" by default puts stuff into ${destroot}/usr/local,
    85 # so we have to move everything into the right places manually
    8684post-destroot {
    8785    xinstall -d ${destroot}${prefix}/share/${name}-${version}
    88     copy [glob ${destroot}/usr/local/share/${name}-${version}/*] ${destroot}${prefix}/share/${name}-${version}
    8986    xinstall -m 755 -d ${destroot}${applications_dir}
    9087    copy [glob ${destroot}/*/local/bin/*.app] ${destroot}${applications_dir}
    9188    foreach png [glob ${worksrcpath}/icons/*.png] {