November 2011 - macports-changes - lists.macosforge.org

[86935] trunk/dports/emulators/scummvm/Portfile
by mww＠macports.org 07 Nov '11

07 Nov '11

Revision: 86935 http://trac.macports.org/changeset/86935 Author: mww(a)macports.org Date: 2011-11-07 00:59:39 -0800 (Mon, 07 Nov 2011) Log Message: ----------- scummvm: version 1.4.0 Modified Paths: -------------- trunk/dports/emulators/scummvm/Portfile Modified: trunk/dports/emulators/scummvm/Portfile =================================================================== --- trunk/dports/emulators/scummvm/Portfile 2011-11-07 08:44:53 UTC (rev 86934) +++ trunk/dports/emulators/scummvm/Portfile 2011-11-07 08:59:39 UTC (rev 86935) @@ -3,7 +3,7 @@ PortSystem 1.0 name scummvm -version 1.3.1 +version 1.4.0 platforms darwin categories emulators games maintainers mww openmaintainer @@ -18,24 +18,23 @@ homepage http://scummvm.org/ master_sites sourceforge:project/${name}/${name}/${version} use_bzip2 yes -checksums md5 87e5076e93bfa762f1c5d7f45b41d4e2 \ - sha1 5f92d22f934448b1ca731fd694422c263134bf62 \ - rmd160 181838d1a89028a5b66ed4d2ed8c65a4444623c4 +checksums md5 361000b78ebf0d0f449e98238d677be1 \ + sha1 92196b062771407d13617caef5efd4895c4e4b5d \ + rmd160 ad4e43f46ec10dc7c3becb52b172ac501fd38941 depends_lib path:lib/pkgconfig/sdl.pc:libsdl \ port:libmad \ port:libogg \ port:libvorbis \ - port:libmpeg2 \ + port:libpng \ port:flac configure.args --with-sdl-prefix=${prefix} \ --with-mad-prefix=${prefix} \ --with-ogg-prefix=${prefix} \ --with-vorbis-prefix=${prefix} \ - --enable-mpeg2 \ - --with-mpeg2-prefix=${prefix} \ --with-flac-prefix=${prefix} \ --with-zlib-prefix=${prefix} \ + --with-png-prefix=${prefix} \ --enable-release \ --enable-verbose-build

1 0

[86934] trunk/dports/python/py-smisk/Portfile
by jmr＠macports.org 07 Nov '11

07 Nov '11

Revision: 86934 http://trac.macports.org/changeset/86934 Author: jmr(a)macports.org Date: 2011-11-07 00:44:53 -0800 (Mon, 07 Nov 2011) Log Message: ----------- change py-readline dep to py24-readline Modified Paths: -------------- trunk/dports/python/py-smisk/Portfile Modified: trunk/dports/python/py-smisk/Portfile =================================================================== --- trunk/dports/python/py-smisk/Portfile 2011-11-07 08:36:13 UTC (rev 86933) +++ trunk/dports/python/py-smisk/Portfile 2011-11-07 08:44:53 UTC (rev 86934) @@ -21,7 +21,7 @@ depends_lib-append port:fcgi \ port:py24-distribute \ - port:py-readline \ + port:py24-readline \ port:py-elixir \ port:py-mako \ port:py-yaml @@ -30,7 +30,7 @@ # Smisk will tell the user when she is trying to use a part of Smisk which # requires a certain module which is not available, thus no extra # configuration is required. - depends_lib-delete port:py-readline \ + depends_lib-delete port:py24-readline \ port:py-elixir \ port:py-mako \ port:py-yaml

1 0

[86933] trunk/dports/multimedia/transcode
by devans＠macports.org 07 Nov '11

07 Nov '11

Revision: 86933 http://trac.macports.org/changeset/86933 Author: devans(a)macports.org Date: 2011-11-07 00:36:13 -0800 (Mon, 07 Nov 2011) Log Message: ----------- transcode: update to final version 1.1.6, update homepage, master_sites, livecheck due to move from berlios.de. Modified Paths: -------------- trunk/dports/multimedia/transcode/Portfile Added Paths: ----------- trunk/dports/multimedia/transcode/files/patch-avilib-avidump.c.diff trunk/dports/multimedia/transcode/files/patch-configure.diff Removed Paths: ------------- trunk/dports/multimedia/transcode/files/patch-configure.in.diff trunk/dports/multimedia/transcode/files/patch-transcode-ffmpeg.diff Modified: trunk/dports/multimedia/transcode/Portfile =================================================================== --- trunk/dports/multimedia/transcode/Portfile 2011-11-07 07:58:01 UTC (rev 86932) +++ trunk/dports/multimedia/transcode/Portfile 2011-11-07 08:36:13 UTC (rev 86933) @@ -4,8 +4,7 @@ PortSystem 1.0 name transcode -version 1.1.5 -revision 3 +version 1.1.6 epoch 1 license GPL-2 categories multimedia @@ -27,16 +26,14 @@ resizing algorithms, smoothing, sharpening, denoisifying, \ and cutting. -homepage http://www.transcoding.org +homepage https://bitbucket.org/france/transcode-tcforge/overview -master_sites http://download.berlios.de/tcforge/ \ - http://download2.berlios.de/tcforge/ +master_sites https://bitbucket.org/france/transcode-tcforge/downloads/ use_bzip2 yes -checksums md5 41ac6b1c0fe30f3aab286e771fc31b9e \ - sha1 48c36e06ca0cd1cdc1a9c6a241e231f896eefd26 \ - rmd160 fdc441190110a4ae4a54a4e2abd307db7f0111aa +checksums md5 d5e062a6f0bdde60285ff1cc5cfeb0f5 \ + sha1 e176622b2c2834b006cda3c368ab521407d375c4 depends_build port:pkgconfig @@ -51,36 +48,29 @@ platforms darwin -patchfiles patch-configure.in.diff \ - patch-transcode-ffmpeg.diff +patchfiles patch-configure.diff \ + patch-avilib-avidump.c.diff -use_autoreconf yes -autoreconf.args --force - - configure.args --disable-mmx \ - --with-libavcodec-prefix=${prefix} \ - --with-libavformat-prefix=${prefix} \ --enable-libmpeg2 \ - --with-libmpeg2-prefix=${prefix} \ --enable-libmpeg2convert \ - --with-libmpeg2convert-prefix=${prefix} \ - --with-libdvdread-prefix=${prefix} \ - --with-libjpeg-prefix=${prefix} \ - --with-lame-prefix=${prefix} + --x-includes=${prefix}/include \ + --x-libraries=${prefix}/lib -use_parallel_build yes +# Optional components -# port:libmpeg2 is not universal +# +# libquicktime is not universal +# mjpegtools is not universal +# + universal_variant no -# Optional components - variant mmx description {enable mmx optimizations} { configure.args-delete --disable-mmx } -variant full requires a52dec faac freetype imagemagick libdv libogg libpostproc libquicktime libtheora libvorbis libxml2 lzo mjpegtools x264 xvid description {enable all optional components} { +variant full requires a52dec faac freetype imagemagick libdv libogg libpostproc libquicktime libsdl libtheora libvorbis libxml2 lzo mjpegtools x264 xvid description {enable all optional components except deprecated and experimental} { } variant a52dec description {enable support for decoding ATSC A/52 streams} { @@ -95,7 +85,7 @@ variant freetype description {enable support for the FreeType font engine} { depends_lib-append port:freetype - configure.args-append --enable-freetype2 --with-freetype2-prefix=${prefix} + configure.args-append --enable-freetype2 } variant imagemagick description {enable support for the manipulation of still images} { @@ -105,36 +95,36 @@ variant libdv description {enable support for the Digital Video format via libdv} { depends_lib-append port:libdv - configure.args-append --enable-libdv --with-libdv-prefix=${prefix} + configure.args-append --enable-libdv } variant libogg description {enable support for encoding and decoding ogg audio} { depends_lib-append port:libogg - configure.args-append --enable-ogg --with-ogg-prefix=${prefix} + configure.args-append --enable-ogg } variant libpostproc description {enable libpostproc support from ffmpeg} { - configure.args-append --enable-libpostproc --with-libpostproc-prefix=${prefix} + configure.args-append --enable-libpostproc } variant libquicktime description {enable support for QuickTime video} { depends_lib-append port:libquicktime - configure.args-append --enable-libquicktime --with-libquicktime-prefix=${prefix} + configure.args-append --enable-libquicktime } variant libtheora description {enable support for the open video codec theora} { depends_lib-append port:libtheora - configure.args-append --enable-theora --with-theora-prefix=${prefix} + configure.args-append --enable-theora } variant libvorbis description {enable support for a fully open compressed audio format} { depends_lib-append port:libvorbis - configure.args-append --enable-vorbis --with-vorbis-prefix=${prefix} + configure.args-append --enable-vorbis } variant libxml2 description {enable support for the XML metalanguage} { depends_lib-append port:libxml2 - configure.args-append --enable-libxml2 --with-libxml2-prefix=${prefix} + configure.args-append --enable-libxml2 } variant lzo description {enable lossless data compression via lzo2} { @@ -144,12 +134,12 @@ variant mjpegtools description {enable mjpegtools support} { depends_lib-append port:mjpegtools - configure.args-append --enable-mjpegtools --with-mjpegtools-prefix=${prefix} + configure.args-append --enable-mjpegtools } variant x264 description {enable support for encoding H264/AVC video} { depends_lib-append port:x264 - configure.args-append --enable-x264 --with-x264-prefix=${prefix} + configure.args-append --enable-x264 } variant xvid description {enable support for the open Xvid video codec} { @@ -171,13 +161,15 @@ variant libsdl description {enable Simple DirectMedia Layer display support} { depends_lib-append path:lib/pkgconfig/sdl.pc:libsdl - configure.args-append --enable-sdl --with-sdl-prefix=${prefix} + configure.args-append --enable-sdl } variant no_x11 description {disable X11 options} { depends_lib-delete port:xorg-libXv depends_lib-delete port:xorg-libXaw depends_lib-delete port:xpm + configure.args-delete --x-includes=${prefix}/include + configure.args-delete --x-libraries=${prefix}/lib configure.args-append --without-x } @@ -186,5 +178,5 @@ } livecheck.type regex -livecheck.url http://download.berlios.de/tcforge/ +livecheck.url ${master_sites} livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}" Added: trunk/dports/multimedia/transcode/files/patch-avilib-avidump.c.diff =================================================================== --- trunk/dports/multimedia/transcode/files/patch-avilib-avidump.c.diff (rev 0) +++ trunk/dports/multimedia/transcode/files/patch-avilib-avidump.c.diff 2011-11-07 08:36:13 UTC (rev 86933) @@ -0,0 +1,10 @@ +--- avilib/avidump.c.orig 2011-11-06 21:57:56.000000000 -0800 ++++ avilib/avidump.c 2011-11-06 22:01:16.000000000 -0800 +@@ -64,6 +64,7 @@ + typedef uint16_t WORD; + typedef DWORD FOURCC; /* Type of FOUR Character Codes */ + typedef uint8_t boolean; ++typedef unsigned long long loff_t; + #define TRUE 1 + #define FALSE 0 + #define BUFSIZE 4096 Added: trunk/dports/multimedia/transcode/files/patch-configure.diff =================================================================== --- trunk/dports/multimedia/transcode/files/patch-configure.diff (rev 0) +++ trunk/dports/multimedia/transcode/files/patch-configure.diff 2011-11-07 08:36:13 UTC (rev 86933) @@ -0,0 +1,13 @@ +--- configure.orig 2011-11-06 01:35:12.000000000 -0700 ++++ configure 2011-11-06 23:04:37.000000000 -0800 +@@ -27483,7 +27483,10 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#undef __MACOSX__ ++#undef __MACOS__ + #include "SDL.h" ++#define main main + int main (int argc, char *argv[]) + { + if ( (SDL_MAJOR_VERSION > $sdl_major_version) || Deleted: trunk/dports/multimedia/transcode/files/patch-configure.in.diff =================================================================== --- trunk/dports/multimedia/transcode/files/patch-configure.in.diff 2011-11-07 07:58:01 UTC (rev 86932) +++ trunk/dports/multimedia/transcode/files/patch-configure.in.diff 2011-11-07 08:36:13 UTC (rev 86933) @@ -1,20 +0,0 @@ ---- configure.in.orig 2009-10-31 09:39:02.000000000 -0700 -+++ configure.in 2010-09-17 18:44:45.000000000 -0700 -@@ -1139,7 +1139,9 @@ - sdl_minor_version=2 - sdl_micro_version=5 - save_CPPFLAGS="$CPPFLAGS" -+ save_LIBS="$LIBS" - CPPFLAGS="$CPPFLAGS $SDL_CFLAGS" -+ LIBS="$LIBS $SDL_LIBS" - AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include <stdio.h> - #include <stdlib.h> -@@ -1169,6 +1171,7 @@ - [AC_MSG_RESULT([cross compiling; assumed OK...]) - have_sdl="yes"]) - CPPFLAGS="$save_CPPFLAGS" -+ LIBS="$save_LIBS" - fi - TC_PKG_HAVE(sdl, SDL) - Deleted: trunk/dports/multimedia/transcode/files/patch-transcode-ffmpeg.diff =================================================================== --- trunk/dports/multimedia/transcode/files/patch-transcode-ffmpeg.diff 2011-11-07 07:58:01 UTC (rev 86932) +++ trunk/dports/multimedia/transcode/files/patch-transcode-ffmpeg.diff 2011-11-07 08:36:13 UTC (rev 86933) @@ -1,102 +0,0 @@ -diff -up export/export_ffmpeg.c.ffmpeg export/export_ffmpeg.c ---- export/export_ffmpeg.c.ffmpeg 2009-02-21 22:01:57.000000000 +0100 -+++ export/export_ffmpeg.c 2011-09-03 12:39:13.000000000 +0200 -@@ -643,8 +643,10 @@ MOD_init - - lavc_venc_context->bit_rate = vob->divxbitrate * 1000; - lavc_venc_context->bit_rate_tolerance = lavc_param_vrate_tolerance * 1000; -+#if FF_API_MB_Q - lavc_venc_context->mb_qmin = lavc_param_mb_qmin; - lavc_venc_context->mb_qmax = lavc_param_mb_qmax; -+#endif - lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5); - lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5); - lavc_venc_context->max_qdiff = lavc_param_vqdiff; -diff -up filter/filter_resample.c.ffmpeg filter/filter_resample.c ---- filter/filter_resample.c.ffmpeg 2009-02-21 22:01:57.000000000 +0100 -+++ filter/filter_resample.c 2011-09-03 13:28:13.000000000 +0200 -@@ -110,8 +110,15 @@ static int resample_configure(TCModuleIn - goto abort; - } - -+#if FF_API_AUDIO_OLD - pd->resample_ctx = audio_resample_init(vob->a_chan, vob->a_chan, - vob->mp3frequency, vob->a_rate); -+#else -+ pd->resample_ctx = av_audio_resample_init(vob->a_chan, vob->a_chan, -+ vob->mp3frequency, vob->a_rate, -+ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16, -+ 16, 10, 0, 0.8); -+#endif - if (pd->resample_ctx == NULL) { - tc_log_error(MOD_NAME, "can't get a resample context"); - goto abort; -diff -up import/decode_lavc.c.ffmpeg import/decode_lavc.c ---- import/decode_lavc.c.ffmpeg 2009-03-28 09:39:08.000000000 +0100 -+++ import/decode_lavc.c 2011-09-03 12:39:13.000000000 +0200 -@@ -261,8 +261,17 @@ void decode_lavc(decode_t *decode) - - //tc_log_msg(__FILE__, "SIZE: (%d) MP4(%d) blen(%d) BUF(%d) read(%ld)", len, mp4_size, buf_len, READ_BUFFER_SIZE, bytes_read); - do { -+#if FF_API_VIDEO_OLD - len = avcodec_decode_video(lavc_dec_context, &picture, - &got_picture, buffer+buf_len, mp4_size-buf_len); -+#else -+ AVPacket avpkt; -+ av_init_packet(&avpkt); -+ avpkt.data = buffer+buf_len; -+ avpkt.size = mp4_size-buf_len; -+ len = avcodec_decode_video2(lavc_dec_context, &picture, -+ &got_picture, &avpkt); -+#endif - - if (len < 0) { - tc_log_error(__FILE__, "frame decoding failed"); -diff -up import/import_ffmpeg.c.ffmpeg import/import_ffmpeg.c ---- import/import_ffmpeg.c.ffmpeg 2009-02-21 22:01:57.000000000 +0100 -+++ import/import_ffmpeg.c 2011-09-03 14:09:41.000000000 +0200 -@@ -543,8 +543,17 @@ MOD_decode { - retry: - do { - TC_LOCK_LIBAVCODEC; -+#if FF_API_VIDEO_OLD - len = avcodec_decode_video(lavc_dec_context, &picture, - &got_picture, buffer, bytes_read); -+#else -+ AVPacket avpkt; -+ av_init_packet(&avpkt); -+ avpkt.data = buffer; -+ avpkt.size = bytes_read; -+ len = avcodec_decode_video2(lavc_dec_context, &picture, -+ &got_picture, &avpkt); -+#endif - TC_UNLOCK_LIBAVCODEC; - - if (len < 0) { -diff -up import/probe_ffmpeg.c.ffmpeg import/probe_ffmpeg.c ---- import/probe_ffmpeg.c.ffmpeg 2009-03-28 09:39:08.000000000 +0100 -+++ import/probe_ffmpeg.c 2011-09-03 12:39:13.000000000 +0200 -@@ -47,7 +47,11 @@ static void translate_info(const AVForma - for (i = 0; i < ctx->nb_streams; i++) { - st = ctx->streams[i]; - -+#if LIBAVCODEC_VERSION_MAJOR < 53 - if (st->codec->codec_type == CODEC_TYPE_VIDEO) { -+#else -+ if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { -+#endif - info->bitrate = st->codec->bit_rate / 1000; - info->width = st->codec->width; - info->height = st->codec->height; -@@ -65,7 +69,11 @@ static void translate_info(const AVForma - for (i = 0; i < ctx->nb_streams; i++) { - st = ctx->streams[i]; - -+#if LIBAVCODEC_VERSION_MAJOR < 53 - if (st->codec->codec_type == CODEC_TYPE_AUDIO -+#else -+ if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO -+#endif - && j < TC_MAX_AUD_TRACKS) { - info->track[j].format = 0x1; /* known wrong */ - info->track[j].chan = st->codec->channels;

1 0

[86932] trunk/dports/sysutils/Pallet/Portfile
by jmr＠macports.org 07 Nov '11

07 Nov '11

Revision: 86932 http://trac.macports.org/changeset/86932 Author: jmr(a)macports.org Date: 2011-11-06 23:58:01 -0800 (Sun, 06 Nov 2011) Log Message: ----------- Pallet: update to latest svn revision (fixes #27911) Modified Paths: -------------- trunk/dports/sysutils/Pallet/Portfile Modified: trunk/dports/sysutils/Pallet/Portfile =================================================================== --- trunk/dports/sysutils/Pallet/Portfile 2011-11-07 07:56:49 UTC (rev 86931) +++ trunk/dports/sysutils/Pallet/Portfile 2011-11-07 07:58:01 UTC (rev 86932) @@ -5,6 +5,7 @@ name Pallet version 1.1 +revision 1 categories sysutils aqua macports maintainers juanger description Aqua application to control a MacPorts installation. @@ -15,11 +16,10 @@ #master_sites #distname ${name} #checksums md5 c586fd603d9978b306aee428ea39e329 -platforms macosx fetch.type svn -svn.url http://svn.macosforge.org/repository/macports/contrib/Pallet -svn.revision 73027 +svn.url https://svn.macosforge.org/repository/macports/contrib/Pallet +svn.revision 86930 worksrcdir Pallet

1 0

[86931] trunk/dports/python/py-scipy/Portfile
by ram＠macports.org 07 Nov '11

07 Nov '11

Revision: 86931 http://trac.macports.org/changeset/86931 Author: ram(a)macports.org Date: 2011-11-06 23:56:49 -0800 (Sun, 06 Nov 2011) Log Message: ----------- python/py-scipy: fix livecheck Modified Paths: -------------- trunk/dports/python/py-scipy/Portfile Modified: trunk/dports/python/py-scipy/Portfile =================================================================== --- trunk/dports/python/py-scipy/Portfile 2011-11-07 07:53:28 UTC (rev 86930) +++ trunk/dports/python/py-scipy/Portfile 2011-11-07 07:56:49 UTC (rev 86931) @@ -121,8 +121,8 @@ if {${name} == ${subport}} { livecheck.type regex - livecheck.url http://sourceforge.net/projects/scipy/files/ - livecheck.regex "files\/scipy\/(\\d+(?:\\.\\d+)*)\/scipy" + livecheck.url http://sourceforge.net/api/file/index/project-name/scipy/rss + livecheck.regex "scipy\/(\\d+(?:\\.\\d+)*)\]" } else { livecheck.type none }

1 0

[86930] contrib/Pallet/MPActionsController.m
by jmr＠macports.org 07 Nov '11

07 Nov '11

Revision: 86930 http://trac.macports.org/changeset/86930 Author: jmr(a)macports.org Date: 2011-11-06 23:53:28 -0800 (Sun, 06 Nov 2011) Log Message: ----------- Pallet: get default Tcl package path from MacPorts.framework when no value previously set Modified Paths: -------------- contrib/Pallet/MPActionsController.m Modified: contrib/Pallet/MPActionsController.m =================================================================== --- contrib/Pallet/MPActionsController.m 2011-11-07 07:22:31 UTC (rev 86929) +++ contrib/Pallet/MPActionsController.m 2011-11-07 07:53:28 UTC (rev 86930) @@ -313,7 +313,24 @@ NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; NSString *pkgPath = [defaults objectForKey:@"PKGPath"]; if (pkgPath == nil) { - [self openPreferences:self]; + NSFileManager *fileManager = [NSFileManager defaultManager]; + BOOL existsAsDirectory = NO; + BOOL containsMacPortsTcl = NO; + NSString *macportsDir; + NSString *macportsFile; + macportsDir = [[MPMacPorts PKGPath] stringByAppendingPathComponent:@"macports1.0"]; + macportsFile = [macportsDir stringByAppendingPathComponent:@"macports.tcl"]; + [fileManager fileExistsAtPath:macportsDir isDirectory:&existsAsDirectory]; + if (existsAsDirectory) { + containsMacPortsTcl = [fileManager fileExistsAtPath:macportsFile isDirectory:nil]; + } + if (containsMacPortsTcl) { + [defaults setObject:[MPMacPorts PKGPath] forKey:@"PKGPath"]; + [[MPActionLauncher sharedInstance] + performSelectorInBackground:@selector(loadPorts) withObject:nil]; + } else { + [self openPreferences:self]; + } } else { [MPMacPorts setPKGPath:pkgPath]; [[MPActionLauncher sharedInstance]

1 0

[MacPorts] ram modified
by MacPorts 07 Nov '11

07 Nov '11

Changed page "ram" by ram(a)macports.org from 95.211.99.66* Page URL: <https://trac.macports.org/wiki/ram> Diff URL: <https://trac.macports.org/wiki/ram?action=diff&version=85> Revision 85 -------8<------8<------8<------8<------8<------8<------8<------8<-------- Index: ram ========================================================================= --- ram (version: 84) +++ ram (version: 85) @@ -13,6 +13,7 @@ * [source:trunk/dports/archivers/pbzip2 archivers/pbzip2] * [source:trunk/dports/devel/autoconf devel/autoconf] * [source:trunk/dports/devel/flashbake devel/flashbake] + * [source:trunk/dports/devel/libtool devel/libtool] * [source:trunk/dports/devel/gc-utils devel/gc-utils] * [source:trunk/dports/math/fftw-3 math/fftw-3] * [source:trunk/dports/math/fftw-3-long math/fftw-3-long] -------8<------8<------8<------8<------8<------8<------8<------8<-------- * The IP shown here might not mean anything if the user or the server is behind a proxy. -- MacPorts <http://www.macports.org/> Ports system for Mac OS This is an automated message. Someone at http://www.macports.org/ added your email address to be notified of changes on ram. If it was not you, please report to .

1 0

[86929] trunk/dports/devel/libtool/Portfile
by ram＠macports.org 07 Nov '11

07 Nov '11

Revision: 86929 http://trac.macports.org/changeset/86929 Author: ram(a)macports.org Date: 2011-11-06 23:22:31 -0800 (Sun, 06 Nov 2011) Log Message: ----------- devel/libtool: take maintainership Modified Paths: -------------- trunk/dports/devel/libtool/Portfile Modified: trunk/dports/devel/libtool/Portfile =================================================================== --- trunk/dports/devel/libtool/Portfile 2011-11-07 07:00:48 UTC (rev 86928) +++ trunk/dports/devel/libtool/Portfile 2011-11-07 07:22:31 UTC (rev 86929) @@ -9,7 +9,7 @@ # distributed with dependents have a licensing exception that allows # distrbution under the same terms as the rest of the program. license libtool -maintainers nomaintainer +maintainers ram openmaintainer description GNU Libtool - The GNU Portable Library Tool long_description \

1 0

[86928] trunk/dports/devel/MacPorts_Framework/Portfile
by jmr＠macports.org 07 Nov '11

07 Nov '11

Revision: 86928 http://trac.macports.org/changeset/86928 Author: jmr(a)macports.org Date: 2011-11-06 23:00:48 -0800 (Sun, 06 Nov 2011) Log Message: ----------- MacPorts_Framework: update to latest svn revision Modified Paths: -------------- trunk/dports/devel/MacPorts_Framework/Portfile Modified: trunk/dports/devel/MacPorts_Framework/Portfile =================================================================== --- trunk/dports/devel/MacPorts_Framework/Portfile 2011-11-07 06:54:09 UTC (rev 86927) +++ trunk/dports/devel/MacPorts_Framework/Portfile 2011-11-07 07:00:48 UTC (rev 86928) @@ -5,6 +5,7 @@ name MacPorts_Framework version 1.2.1 +revision 1 categories devel macports framework license BSD maintainers juanger armahg @@ -16,11 +17,10 @@ #master_sites #distname ${name} #checksums md5 c586fd603d9978b306aee428ea39e329 -platforms macosx fetch.type svn -svn.url http://svn.macosforge.org/repository/macports/contrib/MacPorts_Framework -svn.revision 73027 +svn.url https://svn.macosforge.org/repository/macports/contrib/MacPorts_Framework +svn.revision 86927 worksrcdir MacPorts_Framework

1 0

[86927] contrib/MacPorts_Framework/MPInterpreter.m
by jmr＠macports.org 07 Nov '11

07 Nov '11

Revision: 86927 http://trac.macports.org/changeset/86927 Author: jmr(a)macports.org Date: 2011-11-06 22:54:09 -0800 (Sun, 06 Nov 2011) Log Message: ----------- MacPorts_Framework: check for macports1.0 under /opt/local/share/macports/Tcl as well as /Library/Tcl (#27911) Modified Paths: -------------- contrib/MacPorts_Framework/MPInterpreter.m Modified: contrib/MacPorts_Framework/MPInterpreter.m =================================================================== --- contrib/MacPorts_Framework/MPInterpreter.m 2011-11-07 06:45:13 UTC (rev 86926) +++ contrib/MacPorts_Framework/MPInterpreter.m 2011-11-07 06:54:09 UTC (rev 86927) @@ -39,7 +39,8 @@ #include "MPHelperCommon.h" #include "MPHelperNotificationsProtocol.h" static AuthorizationRef internalMacPortsAuthRef; -static NSString* PKGPath = @"/Library/Tcl"; +static NSString* GenericPKGPath = @"/Library/Tcl"; +static NSString* PKGPath = @"/opt/local/share/macports/Tcl"; static NSTask* aTask; #pragma mark - @@ -303,6 +304,18 @@ #pragma mark API methods - (id) init { + NSFileManager *fileManager = [NSFileManager defaultManager]; + BOOL existsAsDirectory = NO; + BOOL containsMacPortsTcl = NO; + NSString *macportsDir = [PKGPath stringByAppendingPathComponent:@"macports1.0"]; + NSString *macportsFile = [macportsDir stringByAppendingPathComponent:@"macports.tcl"]; + [fileManager fileExistsAtPath:macportsDir isDirectory:&existsAsDirectory]; + if (existsAsDirectory) { + containsMacPortsTcl = [fileManager fileExistsAtPath:macportsFile isDirectory:nil]; + } + if (!containsMacPortsTcl) { + return [self initWithPkgPath:GenericPKGPath portOptions:nil]; + } return [self initWithPkgPath:PKGPath portOptions:nil]; }

1 0