October 2012 - macports-changes - lists.macosforge.org

[99286] trunk/dports/devel/libdlna
by jeremyhu＠macports.org 31 Oct '12

31 Oct '12

Revision: 99286 http://trac.macports.org//changeset/99286 Author: jeremyhu(a)macports.org Date: 2012-10-30 21:07:13 -0700 (Tue, 30 Oct 2012) Log Message: ----------- libdlna: Fix build with newer ffmpeg (#36830). Modified Paths: -------------- trunk/dports/devel/libdlna/Portfile Added Paths: ----------- trunk/dports/devel/libdlna/files/patch-src-profiles.c.diff Modified: trunk/dports/devel/libdlna/Portfile =================================================================== --- trunk/dports/devel/libdlna/Portfile 2012-10-31 04:01:23 UTC (rev 99285) +++ trunk/dports/devel/libdlna/Portfile 2012-10-31 04:07:13 UTC (rev 99286) @@ -23,6 +23,7 @@ checksums md5 2c974f95b711e5fd07f78fc4ebfcca66 patchfiles patch-configure.diff \ + patch-src-profiles.c.diff \ patch-src-profiles.h.diff \ patch-src-av_mpeg4_part2.c.diff \ patch-src-av_mpeg4_part10.c.diff \ Added: trunk/dports/devel/libdlna/files/patch-src-profiles.c.diff =================================================================== --- trunk/dports/devel/libdlna/files/patch-src-profiles.c.diff (rev 0) +++ trunk/dports/devel/libdlna/files/patch-src-profiles.c.diff 2012-10-31 04:07:13 UTC (rev 99286) @@ -0,0 +1,45 @@ +--- src/profiles.c.orig 2012-10-30 14:12:10.000000000 -0600 ++++ src/profiles.c 2012-10-30 14:13:49.000000000 -0600 +@@ -204,14 +204,24 @@ + + for (i = 0; i < ctx->nb_streams; i++) + { ++#if LIBAVFORMAT_BUILD < 4621 + if (audio_stream == -1 && + ctx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) ++#else ++ if (audio_stream == -1 && ++ ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) ++#endif + { + audio_stream = i; + continue; + } ++#if LIBAVFORMAT_BUILD < 4621 + else if (video_stream == -1 && + ctx->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO) ++#else ++ else if (video_stream == -1 && ++ ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO) ++#endif + { + video_stream = i; + continue; +@@ -280,7 +290,7 @@ + if (!dlna->inited) + dlna = dlna_init (); + +- if (av_open_input_file (&ctx, filename, NULL, 0, NULL) != 0) ++ if (avformat_open_input (&ctx, filename, NULL, NULL) != 0) + { + if (dlna->verbosity) + fprintf (stderr, "can't open file: %s\n", filename); +@@ -334,7 +344,7 @@ + p = p->next; + } + +- av_close_input_file (ctx); ++ avformat_close_input (ctx); + free (codecs); + return profile; + }

1 0

[99285] trunk/dports/multimedia/transcode
by jeremyhu＠macports.org 31 Oct '12

31 Oct '12

Revision: 99285 http://trac.macports.org//changeset/99285 Author: jeremyhu(a)macports.org Date: 2012-10-30 21:01:23 -0700 (Tue, 30 Oct 2012) Log Message: ----------- transcode: Fix building with newer ffmpeg (#36606) Modified Paths: -------------- trunk/dports/multimedia/transcode/Portfile Added Paths: ----------- trunk/dports/multimedia/transcode/files/patch-ffmpeg-0.11.diff Modified: trunk/dports/multimedia/transcode/Portfile =================================================================== --- trunk/dports/multimedia/transcode/Portfile 2012-10-31 02:36:22 UTC (rev 99284) +++ trunk/dports/multimedia/transcode/Portfile 2012-10-31 04:01:23 UTC (rev 99285) @@ -50,7 +50,8 @@ platforms darwin patchfiles patch-configure.diff \ - patch-avilib-avidump.c.diff + patch-avilib-avidump.c.diff \ + patch-ffmpeg-0.11.diff configure.args --disable-mmx \ --enable-libmpeg2 \ Added: trunk/dports/multimedia/transcode/files/patch-ffmpeg-0.11.diff =================================================================== --- trunk/dports/multimedia/transcode/files/patch-ffmpeg-0.11.diff (rev 0) +++ trunk/dports/multimedia/transcode/files/patch-ffmpeg-0.11.diff 2012-10-31 04:01:23 UTC (rev 99285) @@ -0,0 +1,310 @@ +Fix build with ffmpeg 0.11. +https://bugs.gentoo.org/show_bug.cgi?id=419551 +Author: Brennan Shacklett + +Index: encode/encode_lavc.c +=================================================================== +--- encode/encode_lavc.c.orig ++++ encode/encode_lavc.c +@@ -114,6 +114,7 @@ struct tclavcprivatedata_ { + + AVFrame ff_venc_frame; + AVCodecContext ff_vcontext; ++ AVDictionary ** ff_opts; + + AVCodec *ff_vcodec; + +@@ -1036,14 +1037,10 @@ static void tc_lavc_dispatch_settings(TC + SET_FLAG(pd, mv0); + SET_FLAG(pd, cbp); + SET_FLAG(pd, qpel); +- SET_FLAG(pd, alt); +- SET_FLAG(pd, vdpart); + SET_FLAG(pd, naq); + SET_FLAG(pd, ilme); + SET_FLAG(pd, ildct); + SET_FLAG(pd, aic); +- SET_FLAG(pd, aiv); +- SET_FLAG(pd, umv); + SET_FLAG(pd, psnr); + SET_FLAG(pd, trell); + SET_FLAG(pd, gray); +@@ -1064,6 +1061,18 @@ static void tc_lavc_dispatch_settings(TC + pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT; + pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME; + } ++ if (pd->confdata.flags.alt) { ++ av_dict_set(pd->ff_opts, "alternate_scan", "1", 0); ++ } ++ if (pd->confdata.flags.vdpart) { ++ av_dict_set(pd->ff_opts, "data_partitioning", "1", 0); ++ } ++ if (pd->confdata.flags.umv) { ++ av_dict_set(pd->ff_opts, "umv", "1", 0); ++ } ++ if (pd->confdata.flags.aiv) { ++ av_dict_set(pd->ff_opts, "aiv", "1", 0); ++ } + } + + #undef SET_FLAG +@@ -1184,18 +1193,18 @@ static int tc_lavc_read_config(TCLavcPri + { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 }, + { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD }, + { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL }, +- { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN }, ++ { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 }, + { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME }, + { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_DCT }, + { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_NORMALIZE_AQP }, +- { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART }, ++ { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 }, + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC }, + #else + { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED }, + #endif +- { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIV }, +- { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV }, ++ { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, 1 }, ++ { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, 1 }, + { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR }, + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT }, +@@ -1387,7 +1396,7 @@ static int tc_lavc_configure(TCModuleIns + pd->confdata.thread_count, + (pd->confdata.thread_count > 1) ?"s" :""); + } +- avcodec_thread_init(&pd->ff_vcontext, pd->confdata.thread_count); ++ pd->ff_vcontext.thread_count = pd->confdata.thread_count; + + pd->ff_vcodec = avcodec_find_encoder(FF_VCODEC_ID(pd)); + if (pd->ff_vcodec == NULL) { +@@ -1397,11 +1406,11 @@ static int tc_lavc_configure(TCModuleIns + } + + TC_LOCK_LIBAVCODEC; +- ret = avcodec_open(&pd->ff_vcontext, pd->ff_vcodec); ++ ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, pd->ff_opts); + TC_UNLOCK_LIBAVCODEC; + + if (ret < 0) { +- tc_log_error(MOD_NAME, "avcodec_open() failed"); ++ tc_log_error(MOD_NAME, "avcodec_open2() failed"); + goto failed; + } + /* finally, pass up the extradata, if any */ +Index: export/export_ffmpeg.c +=================================================================== +--- export/export_ffmpeg.c.orig ++++ export/export_ffmpeg.c +@@ -122,6 +122,7 @@ static uint8_t *img_buffer = + static AVFrame *lavc_convert_frame = NULL; + + static AVCodec *lavc_venc_codec = NULL; ++static AVDictionary **lavc_venc_opts = NULL; + static AVFrame *lavc_venc_frame = NULL; + static AVCodecContext *lavc_venc_context; + static avi_t *avifile = NULL; +@@ -180,7 +181,7 @@ static char *tc_strchrnul(const char *s, + + + /* START: COPIED FROM ffmpeg-0.5_p22846(ffmpeg.c, cmdutils.c) */ +-#include <libavcodec/opt.h> ++#include <libavutil/opt.h> + #include <libavutil/avstring.h> + #include <libswscale/swscale.h> + +@@ -470,7 +471,6 @@ MOD_init + } + + TC_LOCK_LIBAVCODEC; +- avcodec_init(); + avcodec_register_all(); + TC_UNLOCK_LIBAVCODEC; + +@@ -634,7 +634,7 @@ MOD_init + lavc_param_rc_max_rate = 2516; + lavc_param_rc_buffer_size = 224 * 8; + lavc_param_rc_buffer_aggressivity = 99; +- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET; ++ lavc_param_scan_offset = 1; + + break; + +@@ -674,7 +674,7 @@ MOD_init + + lavc_param_rc_buffer_size = 224 * 8; + lavc_param_rc_buffer_aggressivity = 99; +- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET; ++ lavc_param_scan_offset = 1; + + break; + +@@ -887,7 +887,7 @@ MOD_init + lavc_venc_context->thread_count); + } + +- avcodec_thread_init(lavc_venc_context, lavc_param_threads); ++ lavc_venc_context->thread_count = lavc_param_threads; + + if (lavc_param_intra_matrix) { + char *tmp; +@@ -1065,15 +1065,10 @@ MOD_init + lavc_venc_context->flags |= lavc_param_closedgop; + lavc_venc_context->flags |= lavc_param_trunc; + lavc_venc_context->flags |= lavc_param_aic; +- lavc_venc_context->flags |= lavc_param_umv; + lavc_venc_context->flags |= lavc_param_v4mv; +- lavc_venc_context->flags |= lavc_param_data_partitioning; + lavc_venc_context->flags |= lavc_param_cbp; + lavc_venc_context->flags |= lavc_param_mv0; + lavc_venc_context->flags |= lavc_param_qp_rd; +- lavc_venc_context->flags |= lavc_param_scan_offset; +- lavc_venc_context->flags |= lavc_param_ss; +- lavc_venc_context->flags |= lavc_param_alt; + lavc_venc_context->flags |= lavc_param_ilme; + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + lavc_venc_context->flags |= lavc_param_trell; +@@ -1203,7 +1198,6 @@ MOD_init + + lavc_venc_context->me_method = ME_ZERO + lavc_param_vme; + +- + /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */ + if (lavc_param_video_preset) { + avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context; +@@ -1241,20 +1235,39 @@ MOD_init + } + } + ++ if (lavc_param_scan_offset) { ++ av_dict_set(lavc_venc_opts, "scan_offset", "1", 0); ++ } ++ ++ if (lavc_param_ss) { ++ av_dict_set(lavc_venc_opts, "structured_slices", "1", 0); ++ } ++ ++ if (lavc_param_alt) { ++ av_dict_set(lavc_venc_opts, "alternate_scan", "1", 0); ++ } ++ ++ if (lavc_param_umv) { ++ av_dict_set(lavc_venc_opts, "umv", "1", 0); ++ } ++ ++ if (lavc_param_data_partitioning) { ++ av_dict_set(lavc_venc_opts, "vdpart", "1", 0); ++ } + + //-- open codec -- + //---------------- + TC_LOCK_LIBAVCODEC; +- ret = avcodec_open(lavc_venc_context, lavc_venc_codec); ++ ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, lavc_venc_opts); + TC_UNLOCK_LIBAVCODEC; + if (ret < 0) { + tc_log_warn(MOD_NAME, "could not open FFMPEG codec"); + return TC_EXPORT_ERROR; + } + +- if (lavc_venc_context->codec->encode == NULL) { ++ if (av_codec_is_encoder(lavc_venc_context->codec) == 0) { + tc_log_warn(MOD_NAME, "could not open FFMPEG codec " +- "(lavc_venc_context->codec->encode == NULL)"); ++ "(av_codec_is_encoder(lavc_venc_context->codec) == 0)"); + return TC_EXPORT_ERROR; + } + +Index: export/ffmpeg_cfg.c +=================================================================== +--- export/ffmpeg_cfg.c.orig ++++ export/ffmpeg_cfg.c +@@ -160,9 +160,9 @@ TCConfigEntry lavcopts_conf[]={ + {"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, + {"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000}, + {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, +- {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART}, ++ {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, 1}, + // {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0}, +- {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART}, ++ {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY}, + {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1}, + {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0}, + {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0}, +@@ -211,7 +211,7 @@ TCConfigEntry lavcopts_conf[]={ + #else + {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED}, + #endif +- {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV}, ++ {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, 1}, + {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, + {"pbias", &lavc_param_pbias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, + {"coder", &lavc_param_coder, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, +@@ -223,9 +223,9 @@ TCConfigEntry lavcopts_conf[]={ + {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, + {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD}, + {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16}, +- {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_SLICE_STRUCT}, +- {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_SVCD_SCAN_OFFSET}, +- {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN}, ++ {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1}, ++ {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1}, ++ {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, 1}, + {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME}, + {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, + {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, +Index: import/decode_lavc.c +=================================================================== +--- import/decode_lavc.c.orig ++++ import/decode_lavc.c +@@ -181,7 +181,7 @@ void decode_lavc(decode_t *decode) + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + lavc_dec_context->error_resilience = 2; + #else +- lavc_dec_context->error_recognition = 2; ++ lavc_dec_context->err_recognition = 2; + #endif + lavc_dec_context->error_concealment = 3; + lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; +Index: import/import_ffmpeg.c +=================================================================== +--- import/import_ffmpeg.c.orig ++++ import/import_ffmpeg.c +@@ -314,7 +314,7 @@ do_avi: + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + lavc_dec_context->error_resilience = 2; + #else +- lavc_dec_context->error_recognition = 2; ++ lavc_dec_context->err_recognition = 2; + #endif + lavc_dec_context->error_concealment = 3; + lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; +Index: import/probe_ffmpeg.c +=================================================================== +--- import/probe_ffmpeg.c.orig ++++ import/probe_ffmpeg.c +@@ -99,8 +99,8 @@ void probe_ffmpeg(info_t *ipipe) + + TC_INIT_LIBAVCODEC; + +- ret = av_open_input_file(&lavf_dmx_context, ipipe->name, +- NULL, 0, NULL); ++ ret = avformat_open_input(&lavf_dmx_context, ipipe->name, ++ NULL, NULL); + if (ret != 0) { + tc_log_error(__FILE__, "unable to open '%s'" + " (libavformat failure)", +Index: libtc/tcavcodec.h +=================================================================== +--- libtc/tcavcodec.h.orig ++++ libtc/tcavcodec.h +@@ -53,7 +53,6 @@ extern pthread_mutex_t tc_libavcodec_mut + + #define TC_INIT_LIBAVCODEC do { \ + TC_LOCK_LIBAVCODEC; \ +- avcodec_init(); \ + avcodec_register_all(); \ + TC_UNLOCK_LIBAVCODEC; \ + } while (0)

1 0

[99284] trunk/dports/gnome/gstreamer/Portfile
by rmstonecipher＠macports.org 31 Oct '12

31 Oct '12

Revision: 99284 http://trac.macports.org//changeset/99284 Author: rmstonecipher(a)macports.org Date: 2012-10-30 19:36:22 -0700 (Tue, 30 Oct 2012) Log Message: ----------- gnome/gstreamer clarified description per ticket #34042 Modified Paths: -------------- trunk/dports/gnome/gstreamer/Portfile Modified: trunk/dports/gnome/gstreamer/Portfile =================================================================== --- trunk/dports/gnome/gstreamer/Portfile 2012-10-31 02:32:47 UTC (rev 99283) +++ trunk/dports/gnome/gstreamer/Portfile 2012-10-31 02:36:22 UTC (rev 99284) @@ -10,10 +10,10 @@ version 0.10.36 revision 2 description \ - GStreamer is a development framework for creating multimedia applications. + GStreamer is a library for constructing graphs of media-handling components. long_description \ - GStreamer is the core library. It contains the headers, core library files, \ - and core elements. + The applications it supports range from simple Ogg/Vorbis playback, audio/video \ + streaming to complex audio (mixing) and video (non-linear editing) processing. maintainers rmstonecipher openmaintainer categories gnome platforms darwin

1 0

[99283] trunk/dports/science/netcdf
by takeshi＠macports.org 31 Oct '12

31 Oct '12

Revision: 99283 http://trac.macports.org//changeset/99283 Author: takeshi(a)macports.org Date: 2012-10-30 19:32:47 -0700 (Tue, 30 Oct 2012) Log Message: ----------- netcdf: updated for 4.2.1.1, which fixes the problem with nc-config concerning information on Fortran, closing #36800. added livecheck Modified Paths: -------------- trunk/dports/science/netcdf/Portfile trunk/dports/science/netcdf/files/patch-configure.diff Modified: trunk/dports/science/netcdf/Portfile =================================================================== --- trunk/dports/science/netcdf/Portfile 2012-10-31 01:48:04 UTC (rev 99282) +++ trunk/dports/science/netcdf/Portfile 2012-10-31 02:32:47 UTC (rev 99283) @@ -5,9 +5,7 @@ name netcdf epoch 2 -set realversion 4.2 -version ${realversion}.0 -revision 4 +version 4.2.1.1 maintainers takeshi openmaintainer platforms darwin categories science @@ -24,10 +22,9 @@ master_sites ftp://ftp.unidata.ucar.edu/pub/netcdf/ \ http://www.gfd-dennou.org/arch/netcdf/unidata-mirror/ \ ftp://www.gfd-dennou.org/arch/netcdf/unidata-mirror/ -checksums md5 e7790bb23d8bc23689f19f5cec81d71e \ - sha1 9b3e15f3d6d21611e60ec6383adb57c30bf734fe \ - rmd160 698fe12ba8857f3cb46be6e809842a8dd8245160 -worksrcdir ${name}-${realversion} +checksums md5 5eebcf19e6ac78a61c73464713cbfafc \ + sha1 76631cb4e6b767c224338415cf6e5f5ff9bd1238 \ + rmd160 400d20e0afe7b37db7b24f9e5c19e585e0b15b3c patchfiles patch-configure.diff @@ -92,3 +89,7 @@ As of version 4.2 c++ and fortran interfaces are separate ports,\ netcdf-cxx and netcdf-fortran, respectively. " + +livecheck.type regex +livecheck.url http://www.unidata.ucar.edu/downloads/${name}/ +livecheck.regex {The netCDF C library and utilities, version ([0-9]+\.[0-9]+\.[0-9]+[\.]*[0-9]*)} Modified: trunk/dports/science/netcdf/files/patch-configure.diff =================================================================== --- trunk/dports/science/netcdf/files/patch-configure.diff 2012-10-31 01:48:04 UTC (rev 99282) +++ trunk/dports/science/netcdf/files/patch-configure.diff 2012-10-31 02:32:47 UTC (rev 99283) @@ -1,6 +1,6 @@ ---- configure.orig 2012-06-30 20:38:38.000000000 +0900 -+++ configure 2012-06-30 20:39:28.000000000 +0900 -@@ -16168,6 +16168,7 @@ +--- configure.orig 2012-08-04 05:12:31.000000000 +0900 ++++ configure 2012-10-31 11:27:35.000000000 +0900 +@@ -16556,6 +16556,7 @@ else USE_SZIP_TRUE='#' USE_SZIP_FALSE=

1 0

[99282] trunk/dports/aqua/BGHUDAppKit/Portfile
by jmr＠macports.org 31 Oct '12

31 Oct '12

Revision: 99282 http://trac.macports.org//changeset/99282 Author: jmr(a)macports.org Date: 2012-10-30 18:48:04 -0700 (Tue, 30 Oct 2012) Log Message: ----------- BGHUDAppKit: license Modified Paths: -------------- trunk/dports/aqua/BGHUDAppKit/Portfile Modified: trunk/dports/aqua/BGHUDAppKit/Portfile =================================================================== --- trunk/dports/aqua/BGHUDAppKit/Portfile 2012-10-31 01:04:56 UTC (rev 99281) +++ trunk/dports/aqua/BGHUDAppKit/Portfile 2012-10-31 01:48:04 UTC (rev 99282) @@ -7,6 +7,7 @@ github.setup binarygod BGHUDAppKit 0.7 revision 1 categories aqua devel +license BSD maintainers jeremyhu openmaintainer homepage http://cocoacontrols.com/platforms/mac-os-x/controls/bghudappkit

1 0

[99281] trunk/dports/python
by jmr＠macports.org 31 Oct '12

31 Oct '12

Revision: 99281 http://trac.macports.org//changeset/99281 Author: jmr(a)macports.org Date: 2012-10-30 18:04:56 -0700 (Tue, 30 Oct 2012) Log Message: ----------- py25-gnome, py26-gnome: rev bump for libpng 1.5 Modified Paths: -------------- trunk/dports/python/py25-gnome/Portfile trunk/dports/python/py26-gnome/Portfile Modified: trunk/dports/python/py25-gnome/Portfile =================================================================== --- trunk/dports/python/py25-gnome/Portfile 2012-10-31 00:51:41 UTC (rev 99280) +++ trunk/dports/python/py25-gnome/Portfile 2012-10-31 01:04:56 UTC (rev 99281) @@ -6,7 +6,7 @@ name py25-gnome set my_name gnome-python version 2.28.1 -revision 1 +revision 2 set branch [join [lrange [split $version .] 0 1] .] categories python gnome license LGPL-2.1+ Modified: trunk/dports/python/py26-gnome/Portfile =================================================================== --- trunk/dports/python/py26-gnome/Portfile 2012-10-31 00:51:41 UTC (rev 99280) +++ trunk/dports/python/py26-gnome/Portfile 2012-10-31 01:04:56 UTC (rev 99281) @@ -6,7 +6,7 @@ name py26-gnome set my_name gnome-python version 2.28.1 -revision 2 +revision 3 set branch [join [lrange [split $version .] 0 1] .] categories python gnome license LGPL-2.1+

1 0

[99280] trunk/dports/science/cdf/Portfile
by jmr＠macports.org 31 Oct '12

31 Oct '12

Revision: 99280 http://trac.macports.org//changeset/99280 Author: jmr(a)macports.org Date: 2012-10-30 17:51:41 -0700 (Tue, 30 Oct 2012) Log Message: ----------- cdf: license Modified Paths: -------------- trunk/dports/science/cdf/Portfile Modified: trunk/dports/science/cdf/Portfile =================================================================== --- trunk/dports/science/cdf/Portfile 2012-10-31 00:51:14 UTC (rev 99279) +++ trunk/dports/science/cdf/Portfile 2012-10-31 00:51:41 UTC (rev 99280) @@ -13,6 +13,7 @@ maintainers ryandesign openmaintainer platforms darwin categories science +license Noncommercial description CDF: Common Data Format

1 0

[99279] trunk/base/portmgr/jobs/port_binary_distributable.tcl
by jmr＠macports.org 31 Oct '12

31 Oct '12

Revision: 99279 http://trac.macports.org//changeset/99279 Author: jmr(a)macports.org Date: 2012-10-30 17:51:14 -0700 (Tue, 30 Oct 2012) Log Message: ----------- honour license_noconflict in dependencies as well as the top-level port Modified Paths: -------------- trunk/base/portmgr/jobs/port_binary_distributable.tcl Modified: trunk/base/portmgr/jobs/port_binary_distributable.tcl =================================================================== --- trunk/base/portmgr/jobs/port_binary_distributable.tcl 2012-10-31 00:38:21 UTC (rev 99278) +++ trunk/base/portmgr/jobs/port_binary_distributable.tcl 2012-10-31 00:51:14 UTC (rev 99279) @@ -255,9 +255,14 @@ } } + # skip deps that are explicitly stated to not conflict + array unset aPort_noconflict_ports + foreach noconflict_port [lindex $aPortInfo 3] { + set aPort_noconflict_ports($noconflict_port) 1 + } # add its deps to the list foreach possiblyNewPort [lindex $aPortInfo 0] { - if {![info exists portSeen($possiblyNewPort)]} { + if {![info exists portSeen($possiblyNewPort)] && ![info exists aPort_noconflict_ports($possiblyNewPort)]} { lappend portList $possiblyNewPort } }

1 0

[99278] trunk/dports/lang
by jmr＠macports.org 31 Oct '12

31 Oct '12

Revision: 99278 http://trac.macports.org//changeset/99278 Author: jmr(a)macports.org Date: 2012-10-30 17:38:21 -0700 (Tue, 30 Oct 2012) Log Message: ----------- gcc*: add license_noconflict for dependencies that have licenses with known conflicts, so that dependents of gcc don't register incorrect license conflicts. Ports that depend on gcc and also use gmp, mpfr or ppl directly should depend on them directly. Modified Paths: -------------- trunk/dports/lang/gcc42/Portfile trunk/dports/lang/gcc43/Portfile trunk/dports/lang/gcc44/Portfile trunk/dports/lang/gcc45/Portfile trunk/dports/lang/gcc46/Portfile trunk/dports/lang/gcc47/Portfile trunk/dports/lang/gcc48/Portfile Modified: trunk/dports/lang/gcc42/Portfile =================================================================== --- trunk/dports/lang/gcc42/Portfile 2012-10-31 00:11:18 UTC (rev 99277) +++ trunk/dports/lang/gcc42/Portfile 2012-10-31 00:38:21 UTC (rev 99278) @@ -44,6 +44,7 @@ depends_run port:gcc_select port:ld64 port:cctools path:lib/libstdc\\\\+\\\\+.6.dylib:libstdcxx depends_skip_archcheck-append gcc_select ld64 cctools +license_noconflict gmp mpfr set major 4.2 Modified: trunk/dports/lang/gcc43/Portfile =================================================================== --- trunk/dports/lang/gcc43/Portfile 2012-10-31 00:11:18 UTC (rev 99277) +++ trunk/dports/lang/gcc43/Portfile 2012-10-31 00:38:21 UTC (rev 99278) @@ -57,6 +57,7 @@ depends_run port:gcc_select port:ld64 port:cctools path:lib/libstdc\\\\+\\\\+.6.dylib:libstdcxx depends_skip_archcheck-append gcc_select ld64 cctools +license_noconflict gmp mpfr patchfiles Make-lang.in.diff darwin10.diff i386_multilib.diff ppc_fde_encoding.diff patch.dir ${workpath}/gcc-${version} Modified: trunk/dports/lang/gcc44/Portfile =================================================================== --- trunk/dports/lang/gcc44/Portfile 2012-10-31 00:11:18 UTC (rev 99277) +++ trunk/dports/lang/gcc44/Portfile 2012-10-31 00:38:21 UTC (rev 99278) @@ -58,6 +58,7 @@ depends_run port:gcc_select port:ld64 port:cctools path:lib/libstdc\\\\+\\\\+.6.dylib:libstdcxx depends_skip_archcheck-append gcc_select ld64 cctools +license_noconflict gmp mpfr patchfiles ppc_fde_encoding.diff patch.dir ${workpath}/gcc-${version} Modified: trunk/dports/lang/gcc45/Portfile =================================================================== --- trunk/dports/lang/gcc45/Portfile 2012-10-31 00:11:18 UTC (rev 99277) +++ trunk/dports/lang/gcc45/Portfile 2012-10-31 00:38:21 UTC (rev 99278) @@ -63,6 +63,7 @@ depends_run port:gcc_select port:ld64 port:cctools path:lib/libstdc\\\\+\\\\+.6.dylib:libstdcxx depends_skip_archcheck-append gcc_select ld64 cctools +license_noconflict gmp mpfr ppl patchfiles ppc_fde_encoding.diff patch.dir ${workpath}/gcc-${version} Modified: trunk/dports/lang/gcc46/Portfile =================================================================== --- trunk/dports/lang/gcc46/Portfile 2012-10-31 00:11:18 UTC (rev 99277) +++ trunk/dports/lang/gcc46/Portfile 2012-10-31 00:38:21 UTC (rev 99278) @@ -51,6 +51,7 @@ depends_run port:gcc_select port:ld64 port:cctools path:lib/libstdc\\\\+\\\\+.6.dylib:libstdcxx depends_skip_archcheck-append gcc_select ld64 cctools +license_noconflict gmp mpfr ppl patchfiles gcc-4.6-cloog_lang_c.patch patch.dir ${workpath}/gcc-${version} Modified: trunk/dports/lang/gcc47/Portfile =================================================================== --- trunk/dports/lang/gcc47/Portfile 2012-10-31 00:11:18 UTC (rev 99277) +++ trunk/dports/lang/gcc47/Portfile 2012-10-31 00:38:21 UTC (rev 99278) @@ -50,6 +50,7 @@ depends_run port:gcc_select port:ld64 port:cctools path:lib/libstdc\\\\+\\\\+.6.dylib:libstdcxx depends_skip_archcheck-append gcc_select ld64 cctools +license_noconflict gmp mpfr ppl patchfiles ppc_fde_encoding.diff gcc-PR-53453.patch patch.dir ${workpath}/gcc-${version} Modified: trunk/dports/lang/gcc48/Portfile =================================================================== --- trunk/dports/lang/gcc48/Portfile 2012-10-31 00:11:18 UTC (rev 99277) +++ trunk/dports/lang/gcc48/Portfile 2012-10-31 00:38:21 UTC (rev 99278) @@ -36,6 +36,7 @@ depends_run port:gcc_select port:ld64 port:cctools port:libstdcxx-devel depends_skip_archcheck-append gcc_select ld64 cctools +license_noconflict gmp mpfr ppl patchfiles libstdc++-configure-timespec.patch patch.dir ${workpath}/gcc-${version}

1 0

[99277] trunk/dports/gnome/gnome-python-extras/Portfile
by jmr＠macports.org 31 Oct '12

31 Oct '12

Revision: 99277 http://trac.macports.org//changeset/99277 Author: jmr(a)macports.org Date: 2012-10-30 17:11:18 -0700 (Tue, 30 Oct 2012) Log Message: ----------- gnome-python-extras: license Modified Paths: -------------- trunk/dports/gnome/gnome-python-extras/Portfile Modified: trunk/dports/gnome/gnome-python-extras/Portfile =================================================================== --- trunk/dports/gnome/gnome-python-extras/Portfile 2012-10-31 00:06:55 UTC (rev 99276) +++ trunk/dports/gnome/gnome-python-extras/Portfile 2012-10-31 00:11:18 UTC (rev 99277) @@ -7,6 +7,7 @@ version 2.25.3 set branch [join [lrange [split ${version} .] 0 1] .] categories gnome python +license GPL-2+ platforms darwin maintainers landonf openmaintainer

1 0