[131699] trunk/dports

jeremyhu at macports.org jeremyhu at macports.org
Thu Jan 15 18:47:18 PST 2015


Revision: 131699
          https://trac.macports.org/changeset/131699
Author:   jeremyhu at macports.org
Date:     2015-01-15 18:47:18 -0800 (Thu, 15 Jan 2015)
Log Message:
-----------
misc: Obsolete xnu-headers, libc-headers, libm-headers, and CarbonHeaders (#46521)

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/obsolete-1.0.tcl
    trunk/dports/devel/CarbonHeaders/Portfile
    trunk/dports/devel/libc-headers/Portfile
    trunk/dports/devel/libm-headers/Portfile
    trunk/dports/devel/ossp-uuid/Portfile
    trunk/dports/devel/poll-emulator/Portfile
    trunk/dports/devel/virtuoso-6/Portfile
    trunk/dports/devel/virtuoso-7/Portfile
    trunk/dports/devel/xnu-headers/Portfile
    trunk/dports/editors/textmate2/Portfile
    trunk/dports/net/libpftputil/Portfile

Modified: trunk/dports/_resources/port1.0/group/obsolete-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/obsolete-1.0.tcl	2015-01-15 23:26:11 UTC (rev 131698)
+++ trunk/dports/_resources/port1.0/group/obsolete-1.0.tcl	2015-01-16 02:47:18 UTC (rev 131699)
@@ -44,7 +44,11 @@
 maintainers     nomaintainer
 supported_archs noarch
 
-description     this port is only a stub and has been made obsolete by ${replaced_by}
+if {[info exists replaced_by]} {
+    description     this port is only a stub and has been made obsolete by ${replaced_by}
+} else {
+    description     this port is only a stub and has been made obsolete without replacement.
+}
 default long_description ${description}
 
 homepage        http://www.macports.org/
@@ -53,7 +57,11 @@
 distfiles
 
 pre-configure {
-    ui_error "${subport} has been made obsolete by the port ${replaced_by}. Please install ${replaced_by} instead."
+    if {[info exists replaced_by]} {
+        ui_error "${subport} has been made obsolete by the port ${replaced_by}. Please install ${replaced_by} instead."
+    } else {
+        ui_error "${subport} is an obsolete port.  Please uninstall it."
+    }
     return -code error "obsolete port"
 }
 

Modified: trunk/dports/devel/CarbonHeaders/Portfile
===================================================================
--- trunk/dports/devel/CarbonHeaders/Portfile	2015-01-15 23:26:11 UTC (rev 131698)
+++ trunk/dports/devel/CarbonHeaders/Portfile	2015-01-16 02:47:18 UTC (rev 131699)
@@ -1,55 +1,11 @@
 # $Id$
 
 PortSystem              1.0
+PortGroup               obsolete 1.0
+
 name                    CarbonHeaders
 version                 18.1
-set xnu_headers_version 2422.1.72
-revision                2
+revision                3
 categories              devel
 platforms               darwin
-maintainers             mfeiri openmaintainer
 license                 APSL-2
-description             Essential preprocessor definitions for OS X and Darwin
-long_description        A set of headers with essential preprocessor \
-                        definitions for Mac OS X and Darwin.
-
-homepage                http://opensource.apple.com/source/${name}/
-master_sites            http://opensource.apple.com/tarballs/CarbonHeaders/:CarbonHeaders \
-                        http://opensource.apple.com/tarballs/xnu/:xnu
-
-distfiles               ${distname}.tar.gz:CarbonHeaders \
-                        xnu-${xnu_headers_version}.tar.gz:xnu
-
-checksums               ${distname}.tar.gz \
-                        rmd160  b9bb7659da27a90cc469a89cd82d88b3b7e6774d \
-                        sha256  5961f9b951c9905b78aab87e0dba1d85a9352bfee6509b9337b9b343501255fd \
-                        xnu-${xnu_headers_version}.tar.gz \
-                        rmd160  6471a5a0ec5bf48ebba2630dbcb034f9f628210c \
-                        sha256  fbefe23943d0c4c12b3d7abd3f304224176f269b19ef6ad801314bc69cf773db
-
-supported_archs         noarch
-universal_variant       no
-use_configure           no
-
-build {
-    foreach s "@CONFIG_EMBEDDED@ @CONFIG_IPHONE@ @CONFIG_IPHONE_SIMULATOR@" {
-        reinplace "s|${s}|0|g" ${worksrcpath}/TargetConditionals.h
-    }
-}
-
-destroot {
-    file mkdir ${destroot}${prefix}/Developer/SDKs/Darwin${os.major}.sdk/usr/include
-
-    foreach x "TargetConditionals" {
-        xinstall -m 644 ${worksrcpath}/${x}.h ${destroot}${prefix}/Developer/SDKs/Darwin${os.major}.sdk/usr/include/
-    }
-
-    foreach y "AssertMacros Availability AvailabilityInternal AvailabilityMacros" {
-        xinstall -m 644 \
-            ${workpath}/xnu-${xnu_headers_version}/EXTERNAL_HEADERS/${y}.h \
-            ${destroot}${prefix}/Developer/SDKs/Darwin${os.major}.sdk/usr/include/
-    }
-}
-
-livecheck.type          regex
-livecheck.regex         "${name}-(\[\\d.\]+)"

Modified: trunk/dports/devel/libc-headers/Portfile
===================================================================
--- trunk/dports/devel/libc-headers/Portfile	2015-01-15 23:26:11 UTC (rev 131698)
+++ trunk/dports/devel/libc-headers/Portfile	2015-01-16 02:47:18 UTC (rev 131699)
@@ -1,101 +1,11 @@
 # $Id$
 
 PortSystem              1.0
+PortGroup               obsolete 1.0
+
 name                    libc-headers
-revision                2
 version                 997.90.3
+revision                3
 categories              devel
 platforms               macosx
-maintainers             mfeiri openmaintainer
 license                 APSL-1.1 APSL-2 BSD MIT
-
-description             Darwin Libc Headers
-long_description        Headers files for the C standard library
-
-homepage                http://opensource.apple.com/source/Libc/
-master_sites            http://opensource.apple.com/tarballs/Libc/
-
-distname                Libc-${version}
-
-checksums               rmd160  384d6b7dded68aa52e69e1b68b689d3146d263d8 \
-                        sha256  e5fb80eb6f966e9ef93772e1d86f1e4aea8bc44ad63024ec26886042535fe5cb
-
-depends_build           path:bin/unifdef:developer_cmds
-depends_run             port:CarbonHeaders
-
-use_configure           no
-
-build                   {}
-
-destroot.target         installhdrs
-destroot.destdir        DESTDIR=${destroot}${prefix}/Developer/SDKs/Darwin${os.major}.sdk
-
-
-platform darwin 9 {
-    version             498.1.7
-    distname            Libc-${version}
-    checksums           rmd160  4f2c531805165b82e3f3587fca3cd88dd56db592 \
-                        sha256  77122a555050d6b4ba866699507195d05d270700a9b411ab5ee8740857078609
-
-    build.type          bsd
-}
-
-platform darwin 10 {
-    version             594.9.5
-    distname            Libc-${version}
-    checksums           rmd160  160ea30d68d79d5aa10608a67f0246cb65bb33f2 \
-                        sha256  a7a7b65fc4d185db076d30ac8e453f16be555d36c9b8a3b6162d317713686840
-
-    depends_build-append    port:coreosmakefiles
-    build.type              bsd
-}
-
-platform darwin 11 {
-    version             763.13
-    distname            Libc-${version}
-    checksums           rmd160  d2484c13b9ff5b401e732946e1929dd5ca8e9ad4 \
-                        sha256  a1d88010d04f7bc3af3b52d61aacdf0c6826aa0cfa2814e65bdef365cae28bc9
-
-    depends_build-append    port:coreosmakefiles
-    build.type              bsd
-}
-
-platform darwin 12 {
-    version             825.40.1
-    distname            Libc-${version}
-    checksums           rmd160  9ab5a7dba00ba5e45c89d5532ccc2f5d62bbf271 \
-                        sha256  8ef12ebf437227bbe2f6661ef14c6465fa962c84d052b233ab943f516a0c5d77
-
-    pre-destroot {
-        file attributes ${worksrcpath}/xcodescripts/headers.sh -permissions +x
-        file attributes ${worksrcpath}/xcodescripts/manpages.sh -permissions +x
-    }
-
-    destroot.env        ARCHS=${build_arch} PLATFORM_NAME=${platforms} \
-                        DSTROOT=${destroot}${prefix}/Developer/SDKs/Darwin${os.major}.sdk \
-                        DERIVED_FILES_DIR=${workpath} SRCROOT=${worksrcpath} \
-                        PUBLIC_HEADERS_FOLDER_PATH=/usr/include \
-                        PRIVATE_HEADERS_FOLDER_PATH=/usr/local/include
-
-    destroot.cmd        "./xcodescripts/headers.sh && ./xcodescripts/manpages.sh"
-}
-
-
-platform darwin 13 {
-    pre-destroot {
-        file attributes ${worksrcpath}/xcodescripts/headers.sh -permissions +x
-        file attributes ${worksrcpath}/xcodescripts/manpages.sh -permissions +x
-    }
-
-    destroot.env        ARCHS=${build_arch} PLATFORM_NAME=${platforms} \
-                        DSTROOT=${destroot}${prefix}/Developer/SDKs/Darwin${os.major}.sdk \
-                        DERIVED_FILES_DIR=${workpath} SRCROOT=${worksrcpath} \
-                        PUBLIC_HEADERS_FOLDER_PATH=/usr/include \
-                        PRIVATE_HEADERS_FOLDER_PATH=/usr/local/include
-
-    destroot.cmd        "./xcodescripts/headers.sh && ./xcodescripts/manpages.sh"
-}
-
-
-livecheck.type          regex
-livecheck.regex         "Libc-(\[\\d.\]+)"

Modified: trunk/dports/devel/libm-headers/Portfile
===================================================================
--- trunk/dports/devel/libm-headers/Portfile	2015-01-15 23:26:11 UTC (rev 131698)
+++ trunk/dports/devel/libm-headers/Portfile	2015-01-16 02:47:18 UTC (rev 131699)
@@ -1,45 +1,11 @@
 # $Id$
 
 PortSystem              1.0
-PortGroup               xcode 1.0
+PortGroup               obsolete 1.0
 
-name                    libm-headers
+name                    xnu-headers
 version                 2026
-revision                2
+revision                3
 categories              devel
-maintainers             mfeiri openmaintainer
-supported_archs         noarch
-
-homepage                http://opensource.apple.com/source/Libm/
-master_sites            http://opensource.apple.com/tarballs/Libm/
+platforms               darwin
 license                 APSL-1.1 APSL-2
-description             Typedefs, function prototypes, and macros for working \
-                        with C99 floating point and complex math.
-long_description        ${description} Headers only, because the library is \
-                        included in the base operating system.
-
-distname                Libm-${version}
-checksums               rmd160  6591bc8f7100c9dc1c9cbc93110e80c25409b759 \
-                        sha256  876a4fbce9818c2d508a066a14f38f565ff3ef23ab42a69df77b4bf1a2404d0b
-
-depends_run             port:CarbonHeaders
-
-xcode.target            InstallHeaders
-xcode.destroot.settings PUBLIC_HEADERS_FOLDER_PATH=${prefix}/Developer/SDKs/Darwin${os.major}.sdk/usr/include
-
-platform darwin 9 {
-    version             292.4
-    distname            Libm-${version}
-    checksums           rmd160  59e0a551f7dd98cde75b3cac805a38dbfa73107f \
-                        sha256  1e0bbd14fb0ec0eb38f59ea1c32e98fb964101d397d9efc9f2310ce2be1f2d4c
-}
-
-platform darwin 10 {
-    version             315
-    distname            Libm-${version}
-    checksums           rmd160  25af4f3b4d17abe8f96f99404b35e521e36a4eff \
-                        sha256  ca17eb421518aef01ba0b7144c01cee12297ca98a481bf029f5ea81c9dfaa1e2
-}
-
-livecheck.type          regex
-livecheck.regex         "Libm-(\[\\d.\]+)"

Modified: trunk/dports/devel/ossp-uuid/Portfile
===================================================================
--- trunk/dports/devel/ossp-uuid/Portfile	2015-01-15 23:26:11 UTC (rev 131698)
+++ trunk/dports/devel/ossp-uuid/Portfile	2015-01-16 02:47:18 UTC (rev 131699)
@@ -64,7 +64,6 @@
 }
 
 post-destroot {
-    # avoid conflict with libc-headers
     file rename -force ${destroot}${prefix}/share/man/man3/uuid.3 ${destroot}${prefix}/share/man/man3/ossp-uuid.3
     file rename -force ${destroot}${prefix}/share/man/man1/uuid.1 ${destroot}${prefix}/share/man/man1/ossp-uuid.1
     file rename -force ${destroot}${prefix}/share/man/man1/uuid-config.1 ${destroot}${prefix}/share/man/man1/ossp-uuid-config.1

Modified: trunk/dports/devel/poll-emulator/Portfile
===================================================================
--- trunk/dports/devel/poll-emulator/Portfile	2015-01-15 23:26:11 UTC (rev 131698)
+++ trunk/dports/devel/poll-emulator/Portfile	2015-01-16 02:47:18 UTC (rev 131699)
@@ -10,7 +10,6 @@
 license                 BSD
 maintainers             nomaintainer
 platforms               darwin freebsd
-conflicts               xnu-headers
 homepage                http://software.clapper.org/poll/
 
 description             Library to provide poll(2) functionality

Modified: trunk/dports/devel/virtuoso-6/Portfile
===================================================================
--- trunk/dports/devel/virtuoso-6/Portfile	2015-01-15 23:26:11 UTC (rev 131698)
+++ trunk/dports/devel/virtuoso-6/Portfile	2015-01-16 02:47:18 UTC (rev 131699)
@@ -30,9 +30,6 @@
                     port:openssl
 
 conflicts_build     unixODBC
-if {${os.platform} eq "darwin" && ${os.major} < 11} {
-    conflicts_build-append  xnu-headers
-}
 
 configure.args-append   --disable-all-vads
 post-configure {

Modified: trunk/dports/devel/virtuoso-7/Portfile
===================================================================
--- trunk/dports/devel/virtuoso-7/Portfile	2015-01-15 23:26:11 UTC (rev 131698)
+++ trunk/dports/devel/virtuoso-7/Portfile	2015-01-16 02:47:18 UTC (rev 131699)
@@ -30,9 +30,6 @@
                     port:openssl
 
 conflicts_build     unixODBC
-if {${os.platform} eq "darwin" && ${os.major} < 11} {
-    conflicts_build-append  xnu-headers
-}
 
 configure.args-append   --disable-all-vads
 post-configure {

Modified: trunk/dports/devel/xnu-headers/Portfile
===================================================================
--- trunk/dports/devel/xnu-headers/Portfile	2015-01-15 23:26:11 UTC (rev 131698)
+++ trunk/dports/devel/xnu-headers/Portfile	2015-01-16 02:47:18 UTC (rev 131699)
@@ -1,110 +1,11 @@
-# -*- 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
 # $Id$
 
 PortSystem              1.0
+PortGroup               obsolete 1.0
+
 name                    xnu-headers
 version                 2422.115.4
-revision                1
+revision                2
 categories              devel
 platforms               darwin
-maintainers             mfeiri openmaintainer
 license                 APSL BSD
-
-description             X is Not Unix (XNU) kernel headers
-long_description        Header files for the XNU kernel used in \
-                        Mac OS X and Darwin
-
-homepage                http://opensource.apple.com/source/xnu/
-master_sites            http://opensource.apple.com/tarballs/xnu/
-distname                xnu-${version}
-checksums               rmd160  925fea8681aed6e089f36ede90fc8578e72993da \
-                        sha256  1a505922bbf232a616a7398e17eff4477fb0621a6c046ff802a2c7b7bf2b5ceb
-
-
-depends_build           port:bootstrap_cmds port:developer_cmds port:dtrace
-depends_run             port:CarbonHeaders
-use_configure           no
-
-build                   {}
-
-destroot.target         installhdrs
-destroot.args           DSTROOT=${destroot}${prefix}/Developer/SDKs/Darwin${os.major}.sdk
-
-variant universal {
-    destroot.env-append RC_ARCHS='${configure.universal_archs}'
-}
-
-
-platform darwin 9 {
-    version             1228.15.4
-    distname            xnu-${version}
-    checksums           rmd160  c5b7ede52d829769db40aa31461f9c3c7485252a \
-                        sha256  74a90c98f22eb17b0d971b62e3f515930646deb1914a63931e864bc1aa8a0927
-    destroot.env-append RELPATH=${prefix}/bin/relpath
-    depends_skip_archcheck-append bootstrap_cmds
-
-    post-extract {
-        reinplace "s|/usr/local|${prefix}|g" ${worksrcpath}/makedefs/MakeInc.cmd
-        reinplace "s|\$(shell tconf --product)|MacOSX|g" ${worksrcpath}/bsd/sys/Makefile
-    }
-}
-
-platform darwin 10 {
-    version             1504.15.3
-    distname            xnu-${version}
-    checksums           rmd160  5e1e06b46047bf79babe75a05da2e1d4899418b6 \
-                        sha256  1e1fa65e9acf2e0c22cdc1a882d22a3b3eb2d89c273a907aa589da52d202341f
-    destroot.env-append RELPATH=${prefix}/bin/relpath          
-    depends_skip_archcheck-append bootstrap_cmds
-
-    post-extract {
-        reinplace "s|/usr/local|${prefix}|g" ${worksrcpath}/makedefs/MakeInc.cmd
-        reinplace "s|\$(shell tconf --product)|MacOSX|g" ${worksrcpath}/bsd/sys/Makefile
-    }
-}
-
-platform darwin 11 {
-    version             1699.26.8
-    distname            xnu-${version}
-    checksums           rmd160  4e20cb7173cc3df369e631498c582177eb834896 \
-                        sha256  76f0e6e703218b3b1620b29b7fabb5eb177c990af20711a90085a5a6afc54022
-    destroot.env-append RELPATH=${prefix}/bin/relpath          
-    depends_skip_archcheck-append bootstrap_cmds
-
-    post-extract {
-        reinplace "s|\$(\$\{SDKROOT\}/usr/local/libexec/availability.pl --macosx)|10.0 10.1 10.2 10.3 10.4 10.5 10.6 10.7 10.8|g" ${worksrcpath}/bsd/sys/make_symbol_aliasing.sh
-        reinplace "s|\$(\$\{SDKROOT\}/usr/local/libexec/availability.pl --ios)|2.0 2.1 2.2 3.0 3.1 3.2 4.0 4.1 4.2 4.3 5.0 5.1|g" ${worksrcpath}/bsd/sys/make_symbol_aliasing.sh
-        reinplace "s|exit 1||g" ${worksrcpath}/bsd/sys/make_symbol_aliasing.sh
-    }
-}
-
-platform darwin 12 {
-    version             2050.48.11
-    distname            xnu-${version}
-    checksums           rmd160  45e7adf0310d3089a9e5dad4caface8e3befb1a6 \
-                        sha256  454203188d19a368f850f335a6b4c8fbfc383e929116b2b06e63d8365ccd207e
-
-    post-extract {
-        reinplace "s|\$(\$\{SDKROOT\}/usr/local/libexec/availability.pl --macosx)|10.0 10.1 10.2 10.3 10.4 10.5 10.6 10.7 10.8|g" ${worksrcpath}/bsd/sys/make_symbol_aliasing.sh
-        reinplace "s|\$(\$\{SDKROOT\}/usr/local/libexec/availability.pl --ios)|2.0 2.1 2.2 3.0 3.1 3.2 4.0 4.1 4.2 4.3 5.0 5.1|g" ${worksrcpath}/bsd/sys/make_symbol_aliasing.sh
-        reinplace "s|exit 1||g" ${worksrcpath}/bsd/sys/make_symbol_aliasing.sh
-    }
-}
-
-
-platform darwin 13 {
-
-    # disable codesigning to avoid CSSMERR_CSP_INVALID_CONTEXT_HANDLE errors
-    destroot.env-append HOST_CODESIGN=true
-
-    post-extract {
-        # based on http://www.opensource.apple.com/source/AvailabilityVersions/AvailabilityVersions-6/availability.pl
-        reinplace "s|\$(\$\{SDKROOT\}/usr/local/libexec/availability.pl --macosx)|10.0 10.1 10.2 10.3 10.4 10.5 10.6 10.7 10.8 10.9|g" ${worksrcpath}/bsd/sys/make_symbol_aliasing.sh
-        reinplace "s|\$(\$\{SDKROOT\}/usr/local/libexec/availability.pl --ios)|2.0 2.1 2.2 3.0 3.1 3.2 4.0 4.1 4.2 4.3 5.0 5.1 6.0 6.1 7.0|g" ${worksrcpath}/bsd/sys/make_symbol_aliasing.sh
-        reinplace "s|exit 1||g" ${worksrcpath}/bsd/sys/make_symbol_aliasing.sh
-    }
-}
-
-
-livecheck.type          regex
-livecheck.regex         "xnu-(\[\\d.\]+)"

Modified: trunk/dports/editors/textmate2/Portfile
===================================================================
--- trunk/dports/editors/textmate2/Portfile	2015-01-15 23:26:11 UTC (rev 131698)
+++ trunk/dports/editors/textmate2/Portfile	2015-01-16 02:47:18 UTC (rev 131699)
@@ -4,7 +4,6 @@
 PortSystem              1.0
 PortGroup               github 1.0
 PortGroup               xcodeversion 1.0
-PortGroup               conflicts_build 1.0
 
 set app_revision        6
 github.setup            textmate textmate 2.0-beta.${app_revision} v
@@ -22,7 +21,6 @@
     TextMate is well-known for its large number of bundles adding support, snippets, completions \
     and commands for a huge number of file types.
 
-conflicts_build         libc-headers
 platforms               darwin
 supported_archs         x86_64
 license                 GPL-3+

Modified: trunk/dports/net/libpftputil/Portfile
===================================================================
--- trunk/dports/net/libpftputil/Portfile	2015-01-15 23:26:11 UTC (rev 131698)
+++ trunk/dports/net/libpftputil/Portfile	2015-01-16 02:47:18 UTC (rev 131699)
@@ -15,5 +15,4 @@
 checksums		md5 777a8fce0a53f4044b8a1261d243f6d1
 patchfiles		patch-parse_utils.c
 
-conflicts		libc-headers
 depends_lib		lib:libpftp:libpftp
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150115/a9283054/attachment-0001.html>


More information about the macports-changes mailing list