March 2014 - macports-changes - lists.macosforge.org

[117528] trunk/dports/php
by ryandesign＠macports.org 03 Mar '14

03 Mar '14

Revision: 117528 https://trac.macports.org/changeset/117528 Author: ryandesign(a)macports.org Date: 2014-03-02 18:18:27 -0800 (Sun, 02 Mar 2014) Log Message: ----------- php-xdebug: update to 2.2.4 Modified Paths: -------------- trunk/dports/php/php-xdebug/Portfile trunk/dports/php/php5-xdebug/Portfile Modified: trunk/dports/php/php-xdebug/Portfile =================================================================== --- trunk/dports/php/php-xdebug/Portfile 2014-03-03 02:16:12 UTC (rev 117527) +++ trunk/dports/php/php-xdebug/Portfile 2014-03-03 02:18:27 UTC (rev 117528) @@ -5,7 +5,7 @@ PortGroup php 1.1 name php-xdebug -version 2.2.3 +version 2.2.4 categories-append net devel platforms darwin freebsd openbsd maintainers ryandesign openmaintainer @@ -27,12 +27,12 @@ execution analysis and optimization. It also supports \ debugging interactively using the dbg debug client. -checksums rmd160 582c39c56c6911506f6066b841feb17dc11fa692 \ - sha256 b351872da46ed8378dff90a87673f5ec1e0bdd94324558ebc898e1d115e9d71c +checksums rmd160 deefcc1034e052defc9635ff08e6a809da8161d1 \ + sha256 3e7a2382558fec16145c4cc44bd9fdb7bdeb608b0f2720c2e946806925472e70 extract.suffix .tgz -if {${name} != ${subport}} { +if {${name} ne ${subport}} { configure.args --enable-xdebug set xdebug_docs ${homepage}docs/ Modified: trunk/dports/php/php5-xdebug/Portfile =================================================================== --- trunk/dports/php/php5-xdebug/Portfile 2014-03-03 02:16:12 UTC (rev 117527) +++ trunk/dports/php/php5-xdebug/Portfile 2014-03-03 02:18:27 UTC (rev 117528) @@ -4,7 +4,7 @@ PortSystem 1.0 PortGroup php5extension 1.0 -php5extension.setup xdebug 2.2.3 +php5extension.setup xdebug 2.2.4 php5extension.type zend categories-append net devel platforms darwin freebsd openbsd @@ -24,8 +24,8 @@ execution analysis and optimization. It also supports \ debugging interactively using the dbg debug client. -checksums rmd160 582c39c56c6911506f6066b841feb17dc11fa692 \ - sha256 b351872da46ed8378dff90a87673f5ec1e0bdd94324558ebc898e1d115e9d71c +checksums rmd160 deefcc1034e052defc9635ff08e6a809da8161d1 \ + sha256 3e7a2382558fec16145c4cc44bd9fdb7bdeb608b0f2720c2e946806925472e70 extract.suffix .tgz

1 0

[117527] trunk/dports/net/youtube-dl/Portfile
by ryandesign＠macports.org 03 Mar '14

03 Mar '14

Revision: 117527 https://trac.macports.org/changeset/117527 Author: ryandesign(a)macports.org Date: 2014-03-02 18:16:12 -0800 (Sun, 02 Mar 2014) Log Message: ----------- youtube-dl: update to 2014.02.28 Modified Paths: -------------- trunk/dports/net/youtube-dl/Portfile Modified: trunk/dports/net/youtube-dl/Portfile =================================================================== --- trunk/dports/net/youtube-dl/Portfile 2014-03-03 02:15:12 UTC (rev 117526) +++ trunk/dports/net/youtube-dl/Portfile 2014-03-03 02:16:12 UTC (rev 117527) @@ -4,7 +4,7 @@ PortSystem 1.0 name youtube-dl -version 2014.02.27.1 +version 2014.02.28 categories net platforms darwin maintainers ryandesign openmaintainer @@ -18,8 +18,8 @@ homepage http://rg3.github.com/youtube-dl/ master_sites http://youtube-dl.org/downloads/${version} -checksums rmd160 2787b9b9f444b43a086fa77f1d03795914e43376 \ - sha256 40693c2632ff5b14d64d7a78e810b367e98e79fec87618016b0f6d9c887d6f2a +checksums rmd160 60c8436fee2b973dd229cac1bf9f3223500bec73 \ + sha256 23a0f2d19a1416518c3e9fc0df7a97776cd2ac8a07695cc30b8d0f77c8c43ff6 depends_build bin:zip:zip

1 0

[117526] trunk/dports/graphics/jpeg
by ryandesign＠macports.org 03 Mar '14

03 Mar '14

Revision: 117526 https://trac.macports.org/changeset/117526 Author: ryandesign(a)macports.org Date: 2014-03-02 18:15:12 -0800 (Sun, 02 Mar 2014) Log Message: ----------- jpeg: update to 9a Modified Paths: -------------- trunk/dports/graphics/jpeg/Portfile Removed Paths: ------------- trunk/dports/graphics/jpeg/files/ Modified: trunk/dports/graphics/jpeg/Portfile =================================================================== --- trunk/dports/graphics/jpeg/Portfile 2014-03-02 20:54:57 UTC (rev 117525) +++ trunk/dports/graphics/jpeg/Portfile 2014-03-03 02:15:12 UTC (rev 117526) @@ -5,8 +5,7 @@ name jpeg conflicts libjpeg-turbo -version 9 -revision 1 +version 9a categories graphics platforms darwin freebsd sunos maintainers ryandesign openmaintainer @@ -25,11 +24,9 @@ distname ${name}src.v${version} worksrcdir ${name}-${version} -checksums rmd160 048e52334f6341424bd684458799d9c72254e8ec \ - sha256 c4e29e9375aaf60b4b79db87a58b063fb5b84f923bee97a88280b3d159e7e535 +checksums rmd160 885898b3db086ad3b65169d0149bf1f270dff1b5 \ + sha256 3a753ea48d917945dd54a2d97de388aa06ca2eb1066cbfdc6652036349fe05a7 -patchfiles boolean.patch - configure.ldflags-delete -L${prefix}/lib configure.cppflags-delete -I${prefix}/include configure.args --disable-silent-rules @@ -37,12 +34,13 @@ test.run yes post-destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - xinstall -m 444 -W ${worksrcpath} \ + set docdir ${prefix}/share/doc/${subport} + xinstall -d ${destroot}${docdir} + xinstall -m 644 -W ${worksrcpath} \ README change.log libjpeg.txt structure.txt usage.txt wizard.txt \ - ${destroot}${prefix}/share/doc/${name} + ${destroot}${docdir} } livecheck.type regex -livecheck.url [lindex $master_sites 0]/?M=D +livecheck.url [lindex ${master_sites} 0] livecheck.regex ${name}src.v(.*?)${extract.suffix}

1 0

[117525] trunk/dports/multimedia/VLC-devel/Portfile
by jeremyhu＠macports.org 02 Mar '14

02 Mar '14

Revision: 117525 https://trac.macports.org/changeset/117525 Author: jeremyhu(a)macports.org Date: 2014-03-02 12:54:57 -0800 (Sun, 02 Mar 2014) Log Message: ----------- VLC-devel: Enable live555 support Modified Paths: -------------- trunk/dports/multimedia/VLC-devel/Portfile Modified: trunk/dports/multimedia/VLC-devel/Portfile =================================================================== --- trunk/dports/multimedia/VLC-devel/Portfile 2014-03-02 20:30:53 UTC (rev 117524) +++ trunk/dports/multimedia/VLC-devel/Portfile 2014-03-02 20:54:57 UTC (rev 117525) @@ -6,7 +6,7 @@ name VLC-devel version 2.1.99 -revision 8 +revision 9 categories multimedia @@ -50,7 +50,7 @@ port:libdvdnav port:libdvdread port:libproxy \ port:fluidsynth port:libsamplerate port:libupnp \ port:avahi path:lib/libavcodec.dylib:ffmpeg \ - port:openjpeg15 port:libbluray port:FreeRDP \ + port:openjpeg15 port:libbluray port:FreeRDP port:live555 \ port:libdc1394 port:libmpeg2 port:libass port:libsdl \ port:libsdl_image port:schroedinger port:speex port:libmodplug \ port:libmpcdec port:fontconfig port:freetype port:fribidi port:libdvbpsi \ @@ -60,7 +60,7 @@ port:readline port:xorg-libX11 port:xorg-libXau port:xorg-libXdmcp \ port:xorg-libXext port:xorg-libXrandr port:xorg-libxcb port:xrender -# TODO: live555 opencv +# TODO: opencv # VLC-2.1 and later are x86_64-only: https://trac.videolan.org/vlc/ticket/8161 universal_variant no @@ -120,6 +120,9 @@ # gl.c:121:3: error: Platform not recognized. configure.cppflags-append -D__unix__=1 +# live555 is installed to a weird location +configure.cppflags-append -I${prefix}/lib/live/liveMedia/include + build.target all destroot.target install @@ -147,7 +150,7 @@ # Codec Plugins configure.args-append \ - --enable-a52 --enable-faad --enable-flac --disable-live555 \ + --enable-a52 --enable-faad --enable-flac --enable-live555 \ --enable-opus --enable-vorbis --enable-ogg --enable-mad --enable-libass \ --enable-dca --enable-png --disable-quicktime --enable-twolame \ --enable-speex --enable-theora --enable-x264 --enable-postproc \

1 0

[117524] trunk/dports/multimedia/VLC-devel
by jeremyhu＠macports.org 02 Mar '14

02 Mar '14

Revision: 117524 https://trac.macports.org/changeset/117524 Author: jeremyhu(a)macports.org Date: 2014-03-02 12:30:53 -0800 (Sun, 02 Mar 2014) Log Message: ----------- VLC-devel: Bump to current git and enable FreeRDP support (#42664) Modified Paths: -------------- trunk/dports/multimedia/VLC-devel/Portfile Added Paths: ----------- trunk/dports/multimedia/VLC-devel/files/rdp.patch Modified: trunk/dports/multimedia/VLC-devel/Portfile =================================================================== --- trunk/dports/multimedia/VLC-devel/Portfile 2014-03-02 20:29:59 UTC (rev 117523) +++ trunk/dports/multimedia/VLC-devel/Portfile 2014-03-02 20:30:53 UTC (rev 117524) @@ -6,7 +6,7 @@ name VLC-devel version 2.1.99 -revision 7 +revision 8 categories multimedia @@ -29,7 +29,7 @@ fetch.type git #git.url git://git.videolan.org/vlc/vlc-2.1.git git.url git://git.videolan.org/vlc.git -git.branch ee6b5cefbc89b56b9688698e1e03eb178b653762 +git.branch 508d92f2f8168ac9def51eea59f133af50352d07 #master_sites http://download.videolan.org/pub/videolan/vlc/${version}/ #distname vlc-${version} @@ -50,8 +50,8 @@ port:libdvdnav port:libdvdread port:libproxy \ port:fluidsynth port:libsamplerate port:libupnp \ port:avahi path:lib/libavcodec.dylib:ffmpeg \ - port:openjpeg15 port:libbluray \ - port:libdc1394 port:libmpeg2 port:dirac port:libass port:libsdl \ + port:openjpeg15 port:libbluray port:FreeRDP \ + port:libdc1394 port:libmpeg2 port:libass port:libsdl \ port:libsdl_image port:schroedinger port:speex port:libmodplug \ port:libmpcdec port:fontconfig port:freetype port:fribidi port:libdvbpsi \ port:XviD port:bzip2 port:gettext path:lib/pkgconfig/glib-2.0.pc:glib2 port:gmp \ @@ -60,7 +60,7 @@ port:readline port:xorg-libX11 port:xorg-libXau port:xorg-libXdmcp \ port:xorg-libXext port:xorg-libXrandr port:xorg-libxcb port:xrender -# TODO: live555 opencv FreeRDP +# TODO: live555 opencv # VLC-2.1 and later are x86_64-only: https://trac.videolan.org/vlc/ticket/8161 universal_variant no @@ -81,7 +81,8 @@ PR-34741-no__clang_version__.patch \ class_struct.patch \ static_assert.patch \ - no-sparkle.patch + no-sparkle.patch \ + rdp.patch post-patch { reinplace "s:librsvg-2/librsvg:librsvg:" \ @@ -132,12 +133,11 @@ --disable-gnomevfs --disable-growl --disable-macosx-vlc-app \ # Input Plugins -# build fails when FreeRDP is installed # build fails when opencv is installed configure.args-append \ --enable-dvdnav --enable-dvdread --disable-smbclient --disable-vcdx \ --disable-macosx-qtkit --disable-macosx-eyetv --disable-realrtsp \ - --disable-freerdp --disable-opencv \ + --enable-freerdp --disable-opencv \ --enable-sftp # Mux/Demux Plugins @@ -152,7 +152,7 @@ --enable-dca --enable-png --disable-quicktime --enable-twolame \ --enable-speex --enable-theora --enable-x264 --enable-postproc \ --enable-avcodec --enable-avformat --enable-swscale \ - --disable-fluidsynth --enable-dirac --enable-schroedinger + --disable-fluidsynth --enable-schroedinger # Video Plugins configure.args-append \ Added: trunk/dports/multimedia/VLC-devel/files/rdp.patch =================================================================== --- trunk/dports/multimedia/VLC-devel/files/rdp.patch (rev 0) +++ trunk/dports/multimedia/VLC-devel/files/rdp.patch 2014-03-02 20:30:53 UTC (rev 117524) @@ -0,0 +1,50 @@ +--- modules/access/rdp.c.orig ++++ modules/access/rdp.c +@@ -198,17 +198,17 @@ + demux_sys_t *p_sys = p_vlccontext->p_demux->p_sys; + + /* Configure connexion */ +- p_instance->settings->sw_gdi = true; /* render in buffer */ +- p_instance->settings->fullscreen = true; +- p_instance->settings->hostname = strdup( p_sys->psz_hostname ); +- p_instance->settings->username = ++ p_instance->settings->SoftwareGdi = true; /* render in buffer */ ++ p_instance->settings->Fullscreen = true; ++ p_instance->settings->ServerHostname = strdup( p_sys->psz_hostname ); ++ p_instance->settings->Username = + var_InheritString( p_vlccontext->p_demux, CFG_PREFIX "user" ); +- p_instance->settings->password = ++ p_instance->settings->Password = + var_InheritString( p_vlccontext->p_demux, CFG_PREFIX "password" ); +- p_instance->settings->port = p_sys->i_port; +- p_instance->settings->encryption = ++ p_instance->settings->ServerPort = p_sys->i_port; ++ p_instance->settings->EncryptionMethods = + var_InheritBool( p_vlccontext->p_demux, CFG_PREFIX "encrypt" ); +- ++ + return true; + } + +@@ -217,9 +217,9 @@ + vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_instance->context; + + msg_Dbg( p_vlccontext->p_demux, "connected to desktop %dx%d (%d bpp)", +- p_instance->settings->width, +- p_instance->settings->height, +- p_instance->settings->color_depth ); ++ p_instance->settings->DesktopWidth, ++ p_instance->settings->DesktopHeight, ++ p_instance->settings->ColorDepth ); + + p_instance->update->DesktopResize = desktopResizeHandler; + p_instance->update->BeginPaint = beginPaintHandler; +@@ -415,7 +415,7 @@ + p_sys->p_instance->Authenticate = authenticateHandler; + + /* Set up context handlers and let it be allocated */ +- p_sys->p_instance->context_size = sizeof( vlcrdp_context_t ); ++ p_sys->p_instance->ContextSize = sizeof( vlcrdp_context_t ); + freerdp_context_new( p_sys->p_instance ); + + vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_sys->p_instance->context;

1 0

[117523] trunk/dports/net/FreeRDP
by jeremyhu＠macports.org 02 Mar '14

02 Mar '14

Revision: 117523 https://trac.macports.org/changeset/117523 Author: jeremyhu(a)macports.org Date: 2014-03-02 12:29:59 -0800 (Sun, 02 Mar 2014) Log Message: ----------- FreeRDP: Fix the pkg-config file as well (#42664) Modified Paths: -------------- trunk/dports/net/FreeRDP/Portfile Added Paths: ----------- trunk/dports/net/FreeRDP/files/patch-freerdp.pc.in.diff Modified: trunk/dports/net/FreeRDP/Portfile =================================================================== --- trunk/dports/net/FreeRDP/Portfile 2014-03-02 19:09:37 UTC (rev 117522) +++ trunk/dports/net/FreeRDP/Portfile 2014-03-02 20:29:59 UTC (rev 117523) @@ -9,7 +9,7 @@ github.setup FreeRDP FreeRDP ${version_name}+${version_date} epoch 1 version ${version_name}-${version_date} -revision 5 +revision 6 categories net platforms darwin license Apache @@ -41,5 +41,6 @@ "-DWITH_FFMPEG=ON" patchfiles patch-client_mac_mrdview.diff \ - patch-ffmpeg-2.0.diff \ - patch-winpr-include-winpr-platform.h.diff + patch-ffmpeg-2.0.diff \ + patch-winpr-include-winpr-platform.h.diff \ + patch-freerdp.pc.in.diff Added: trunk/dports/net/FreeRDP/files/patch-freerdp.pc.in.diff =================================================================== --- trunk/dports/net/FreeRDP/files/patch-freerdp.pc.in.diff (rev 0) +++ trunk/dports/net/FreeRDP/files/patch-freerdp.pc.in.diff 2014-03-02 20:29:59 UTC (rev 117523) @@ -0,0 +1,11 @@ +--- freerdp.pc.in.orig 2013-07-10 01:00:21.000000000 -0700 ++++ freerdp.pc.in 2014-03-02 11:52:57.000000000 -0800 +@@ -8,6 +8,6 @@ Description: A free remote desktop proto + URL: http://www.freerdp.com/ + Version: @FREERDP_VERSION_FULL@ +-Requires: +-Libs: -L${libdir} -lfreerdp-cache -lfreerdp-codec -lfreerdp-core -lfreerdp-crypto -lfreerdp-gdi -lfreerdp-locale -lfreerdp-rail -lfreerdp-utils -lwinpr-sspi -lwinpr-rpc -lwinpr-utils ++Requires: openssl ++Libs: -L${libdir} -lfreerdp-cache -lfreerdp-client -lfreerdp-codec -lfreerdp-common -lfreerdp-core -lfreerdp-crypto -lfreerdp-gdi -lfreerdp-locale -lfreerdp-primitives -lfreerdp-rail -lfreerdp-utils -lwinpr-asn1 -lwinpr-bcrypt -lwinpr-credentials -lwinpr-credui -lwinpr-crt -lwinpr-crypto -lwinpr-dsparse -lwinpr-environment -lwinpr-error -lwinpr-file -lwinpr-handle -lwinpr-heap -lwinpr-input -lwinpr-interlocked -lwinpr-io -lwinpr-library -lwinpr-makecert-tool -lwinpr-path -lwinpr-pipe -lwinpr-pool -lwinpr-registry -lwinpr-rpc -lwinpr-sspi -lwinpr-sspicli -lwinpr-synch -lwinpr-sysinfo -lwinpr-thread -lwinpr-timezone -lwinpr-utils -lwinpr-winhttp -lwinpr-winsock + Cflags: -I${includedir} +

1 0

[117522] trunk/dports/net/FreeRDP
by jeremyhu＠macports.org 02 Mar '14

02 Mar '14

Revision: 117522 https://trac.macports.org/changeset/117522 Author: jeremyhu(a)macports.org Date: 2014-03-02 11:09:37 -0800 (Sun, 02 Mar 2014) Log Message: ----------- FreeRDP: Fix missing include of TargetConditionals.h (#42664) Modified Paths: -------------- trunk/dports/net/FreeRDP/Portfile Added Paths: ----------- trunk/dports/net/FreeRDP/files/patch-winpr-include-winpr-platform.h.diff Modified: trunk/dports/net/FreeRDP/Portfile =================================================================== --- trunk/dports/net/FreeRDP/Portfile 2014-03-02 17:50:48 UTC (rev 117521) +++ trunk/dports/net/FreeRDP/Portfile 2014-03-02 19:09:37 UTC (rev 117522) @@ -9,7 +9,7 @@ github.setup FreeRDP FreeRDP ${version_name}+${version_date} epoch 1 version ${version_name}-${version_date} -revision 4 +revision 5 categories net platforms darwin license Apache @@ -41,4 +41,5 @@ "-DWITH_FFMPEG=ON" patchfiles patch-client_mac_mrdview.diff \ - patch-ffmpeg-2.0.diff + patch-ffmpeg-2.0.diff \ + patch-winpr-include-winpr-platform.h.diff Added: trunk/dports/net/FreeRDP/files/patch-winpr-include-winpr-platform.h.diff =================================================================== --- trunk/dports/net/FreeRDP/files/patch-winpr-include-winpr-platform.h.diff (rev 0) +++ trunk/dports/net/FreeRDP/files/patch-winpr-include-winpr-platform.h.diff 2014-03-02 19:09:37 UTC (rev 117522) @@ -0,0 +1,13 @@ +--- winpr/include/winpr/platform.h.orig 2014-03-02 09:52:04.000000000 -0800 ++++ winpr/include/winpr/platform.h 2014-03-02 09:53:35.000000000 -0800 +@@ -156,6 +156,10 @@ + + /* Mac OS X (__MACOSX__) */ + ++#if (__APPLE__) ++#include <TargetConditionals.h> ++#endif ++ + #if (__APPLE__ && __MACH__) + #ifndef __MACOSX__ + #define __MACOSX__ 1

1 0

[117521] trunk/dports/multimedia/VLC-devel/Portfile
by jeremyhu＠macports.org 02 Mar '14

02 Mar '14

Revision: 117521 https://trac.macports.org/changeset/117521 Author: jeremyhu(a)macports.org Date: 2014-03-02 09:50:48 -0800 (Sun, 02 Mar 2014) Log Message: ----------- VLC-devel: Fix configure option for freerdp (#42664) Modified Paths: -------------- trunk/dports/multimedia/VLC-devel/Portfile Modified: trunk/dports/multimedia/VLC-devel/Portfile =================================================================== --- trunk/dports/multimedia/VLC-devel/Portfile 2014-03-02 17:32:20 UTC (rev 117520) +++ trunk/dports/multimedia/VLC-devel/Portfile 2014-03-02 17:50:48 UTC (rev 117521) @@ -137,7 +137,7 @@ configure.args-append \ --enable-dvdnav --enable-dvdread --disable-smbclient --disable-vcdx \ --disable-macosx-qtkit --disable-macosx-eyetv --disable-realrtsp \ - --disable-libfreerdp --disable-opencv \ + --disable-freerdp --disable-opencv \ --enable-sftp # Mux/Demux Plugins

1 0

[117520] trunk/base
by jmr＠macports.org 02 Mar '14

02 Mar '14

Revision: 117520 https://trac.macports.org/changeset/117520 Author: jmr(a)macports.org Date: 2014-03-02 09:32:20 -0800 (Sun, 02 Mar 2014) Log Message: ----------- revert most of r117518, ability to set a custom PATH is important for custom builds, especially on other platforms provide a shell script that demonstrates how to run configure for a standard build Revision Links: -------------- https://trac.macports.org/changeset/117518 Modified Paths: -------------- trunk/base/aclocal.m4 trunk/base/configure trunk/base/configure.ac Added Paths: ----------- trunk/base/standard_configure.sh Modified: trunk/base/aclocal.m4 =================================================================== --- trunk/base/aclocal.m4 2014-03-02 16:01:03 UTC (rev 117519) +++ trunk/base/aclocal.m4 2014-03-02 17:32:20 UTC (rev 117520) @@ -895,14 +895,32 @@ dnl This macro ensures MP installation prefix paths are NOT in PATH dnl for configure to prevent potential problems when base/ code is updated dnl and ports are installed that would match needed items. -dnl This macro also resets the PATH to a standard value for this system; some -dnl checks might fail if e.g. /sbin was missing. -AC_DEFUN([MP_PATH_RESET],[ - AC_MSG_CHECKING([for a clean \$PATH]) - PATH="/usr/bin:/bin:/usr/sbin:/sbin" - export PATH - AC_SUBST(PATH_CLEANED,$PATH) - AC_MSG_RESULT([$PATH]) +AC_DEFUN([MP_PATH_SCAN],[ + oldprefix=$prefix + if test "x$prefix" = "xNONE" ; then + prefix=$ac_default_prefix + fi + oldPATH=$PATH + newPATH= + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $oldPATH + do + IFS=$as_save_IFS + case "$as_dir" in + $prefix/*) + ;; + *) + if test -z "$newPATH"; then + newPATH=$as_dir + else + newPATH=$newPATH$PATH_SEPARATOR$as_dir + fi + ;; + esac + done + PATH=$newPATH; export PATH + AC_SUBST(PATH_CLEANED,$newPATH) + prefix=$oldprefix ]) dnl This macro tests for sed support of -E (BSD) or -r (GNU) Modified: trunk/base/configure =================================================================== --- trunk/base/configure 2014-03-02 16:01:03 UTC (rev 117519) +++ trunk/base/configure 2014-03-02 17:32:20 UTC (rev 117520) @@ -2795,17 +2795,34 @@ $as_echo "$MACPORTS_VERSION" >&6; } -# Reset user PATH to /usr/bin:/bin:/usr/sbin:/sbin to avoid problems (e.g. -# when /sbin isn't on the PATH) +# Check user PATH for MP paths, and remove as necessary. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a clean \$PATH" >&5 -$as_echo_n "checking for a clean \$PATH... " >&6; } - PATH="/usr/bin:/bin:/usr/sbin:/sbin" - export PATH - PATH_CLEANED=$PATH + oldprefix=$prefix + if test "x$prefix" = "xNONE" ; then + prefix=$ac_default_prefix + fi + oldPATH=$PATH + newPATH= + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $oldPATH + do + IFS=$as_save_IFS + case "$as_dir" in + $prefix/*) + ;; + *) + if test -z "$newPATH"; then + newPATH=$as_dir + else + newPATH=$newPATH$PATH_SEPARATOR$as_dir + fi + ;; + esac + done + PATH=$newPATH; export PATH + PATH_CLEANED=$newPATH - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH" >&5 -$as_echo "$PATH" >&6; } + prefix=$oldprefix # Extract the first word of "sw_vers", so it can be a program name with args. Modified: trunk/base/configure.ac =================================================================== --- trunk/base/configure.ac 2014-03-02 16:01:03 UTC (rev 117519) +++ trunk/base/configure.ac 2014-03-02 17:32:20 UTC (rev 117520) @@ -14,9 +14,8 @@ AC_MSG_RESULT([$MACPORTS_VERSION]) AC_SUBST(MACPORTS_VERSION) -# Reset user PATH to /usr/bin:/bin:/usr/sbin:/sbin to avoid problems (e.g. -# when /sbin isn't on the PATH) -MP_PATH_RESET +# Check user PATH for MP paths, and remove as necessary. +MP_PATH_SCAN AC_PATH_PROG(SW_VERS, sw_vers) AC_PATH_PROG(DEFAULTS, defaults) @@ -138,7 +137,7 @@ AC_PATH_PROG(SANDBOX_EXEC, [sandbox-exec], [], [/usr/bin]) AC_PATH_PROG(SED, [sed]) AC_PATH_PROG(SVN, [svn], []) -AC_PATH_PROG(SWIG, [swig], [], []) +AC_PATH_PROG(SWIG, [swig], []) AC_PATH_PROG(TAR, [tar]) AC_PATH_PROG(UNZIP, [unzip]) AC_PATH_PROG(XAR, [xar], []) Added: trunk/base/standard_configure.sh =================================================================== --- trunk/base/standard_configure.sh (rev 0) +++ trunk/base/standard_configure.sh 2014-03-02 17:32:20 UTC (rev 117520) @@ -0,0 +1,9 @@ +#!/bin/sh + +# This is how we run configure when building binary packages (more or less, +# minus architecture selection). If you don't want a custom build, this +# is probably how you should run it too. +env PATH=/usr/bin:/bin:/usr/sbin:/sbin CFLAGS="-pipe -Os" ./configure --enable-readline + +# If you want to use a different prefix, add this to the above: +# --prefix=/some/path --with-applications-dir=/some/path/Applications Property changes on: trunk/base/standard_configure.sh ___________________________________________________________________ Added: svn:executable + *

1 0

[117519] trunk/base/configure
by cal＠macports.org 02 Mar '14

02 Mar '14

Revision: 117519 https://trac.macports.org/changeset/117519 Author: cal(a)macports.org Date: 2014-03-02 08:01:03 -0800 (Sun, 02 Mar 2014) Log Message: ----------- configure: regenerate following r117518. Revision Links: -------------- https://trac.macports.org/changeset/117518 Modified Paths: -------------- trunk/base/configure Modified: trunk/base/configure =================================================================== --- trunk/base/configure 2014-03-02 16:00:30 UTC (rev 117518) +++ trunk/base/configure 2014-03-02 16:01:03 UTC (rev 117519) @@ -2795,34 +2795,17 @@ $as_echo "$MACPORTS_VERSION" >&6; } -# Check user PATH for MP paths, and remove as necessary. +# Reset user PATH to /usr/bin:/bin:/usr/sbin:/sbin to avoid problems (e.g. +# when /sbin isn't on the PATH) - oldprefix=$prefix - if test "x$prefix" = "xNONE" ; then - prefix=$ac_default_prefix - fi - oldPATH=$PATH - newPATH= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $oldPATH - do - IFS=$as_save_IFS - case "$as_dir" in - $prefix/*) - ;; - *) - if test -z "$newPATH"; then - newPATH=$as_dir - else - newPATH=$newPATH$PATH_SEPARATOR$as_dir - fi - ;; - esac - done - PATH=$newPATH; export PATH - PATH_CLEANED=$newPATH + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a clean \$PATH" >&5 +$as_echo_n "checking for a clean \$PATH... " >&6; } + PATH="/usr/bin:/bin:/usr/sbin:/sbin" + export PATH + PATH_CLEANED=$PATH - prefix=$oldprefix + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH" >&5 +$as_echo "$PATH" >&6; } # Extract the first word of "sw_vers", so it can be a program name with args. @@ -4392,7 +4375,8 @@ ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH +as_dummy="$PATH:/usr/sbin" +for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4554,8 +4538,7 @@ ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_dummy="$PATH:/usr/local/bin" -for as_dir in $as_dummy +for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4600,8 +4583,7 @@ ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_dummy="$PATH:/usr/local/bin" -for as_dir in $as_dummy +for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4646,8 +4628,7 @@ ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_dummy="$PATH:/usr/local/bin" -for as_dir in $as_dummy +for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5531,8 +5512,7 @@ ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_dummy="$PATH:/usr/local/bin" -for as_dir in $as_dummy +for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5851,7 +5831,7 @@ ac_cv_prog_HAVE_LAUNCHD="$HAVE_LAUNCHD" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH +for as_dir in /sbin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=.

1 0