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

[79953] trunk/dports/audio/daapd
by jmr＠macports.org 30 Jun '11

30 Jun '11

Revision: 79953 http://trac.macports.org/changeset/79953 Author: jmr(a)macports.org Date: 2011-06-30 01:25:06 -0700 (Thu, 30 Jun 2011) Log Message: ----------- daapd: fix build (#25577) Modified Paths: -------------- trunk/dports/audio/daapd/Portfile trunk/dports/audio/daapd/files/patch-daaplib-src-makefile trunk/dports/audio/daapd/files/patch-makefile trunk/dports/audio/daapd/files/patch-select.h Added Paths: ----------- trunk/dports/audio/daapd/files/patch-ip_acl.c trunk/dports/audio/daapd/files/patch-libhttpd-Site.mm.in Modified: trunk/dports/audio/daapd/Portfile =================================================================== --- trunk/dports/audio/daapd/Portfile 2011-06-30 08:17:48 UTC (rev 79952) +++ trunk/dports/audio/daapd/Portfile 2011-06-30 08:25:06 UTC (rev 79953) @@ -26,18 +26,29 @@ port:libid3tag \ port:howl -patchfiles patch-daapd.cc patch-daapd.8 patch-daaplib-src-makefile patch-select.h patch-makefile +patchfiles patch-daapd.cc patch-daapd.8 patch-daaplib-src-makefile \ + patch-select.h patch-makefile patch-ip_acl.c \ + patch-libhttpd-Site.mm.in post-extract { # Convert DOS to UNIX line endings so we can patch reinplace "s|\r||g" ${worksrcpath}/daaplib/src/makefile } +if {${configure.compiler} != "gcc-4.0"} { + configure.cxxflags-append -ffriend-injection +} + post-patch { reinplace s|@PREFIX@|${prefix}|g ${worksrcpath}/daapd.cc \ ${worksrcpath}/daapd.8 \ ${worksrcpath}/daaplib/src/makefile \ ${worksrcpath}/makefile + reinplace s|@CXX@|${configure.cxx}|g ${worksrcpath}/makefile \ + ${worksrcpath}/daaplib/src/makefile + reinplace "s|@CFLAGS@|${configure.cxxflags} ${configure.cxx_archflags}|g" \ + ${worksrcpath}/makefile \ + ${worksrcpath}/daaplib/src/makefile } destroot { @@ -48,6 +59,7 @@ } use_configure no +use_parallel_build no livecheck.type regex livecheck.regex ${name}-(\[0-9.a-z\]+)${extract.suffix} Modified: trunk/dports/audio/daapd/files/patch-daaplib-src-makefile =================================================================== --- trunk/dports/audio/daapd/files/patch-daaplib-src-makefile 2011-06-30 08:17:48 UTC (rev 79952) +++ trunk/dports/audio/daapd/files/patch-daaplib-src-makefile 2011-06-30 08:25:06 UTC (rev 79953) @@ -1,6 +1,12 @@ ---- daaplib/src/makefile.orig 2006-03-05 07:39:36.000000000 -0600 -+++ daaplib/src/makefile 2010-07-07 22:49:56.000000000 -0500 -@@ -8,8 +8,8 @@ +--- daaplib/src/makefile.orig 2011-06-30 13:03:38.000000000 +1000 ++++ daaplib/src/makefile 2011-06-30 13:06:05.000000000 +1000 +@@ -1,4 +1,4 @@ +-CC = g++ ++CC = @CXX@ + AR = ar + CP = cp + RM = rm +@@ -8,10 +8,10 @@ LIBS = LIBPATH = @@ -9,5 +15,8 @@ +LIBDEPLOY = @PREFIX@/lib +INCDEPLOY = @PREFIX@/include INCPATH = ../include - CFLAGS = -Wall -Wno-multichar +-CFLAGS = -Wall -Wno-multichar ++CFLAGS = @CFLAGS@ -Wall -Wno-multichar + .cpp.o: + $(CC) $(CFLAGS) -I$(INCPATH) -c $< Added: trunk/dports/audio/daapd/files/patch-ip_acl.c =================================================================== --- trunk/dports/audio/daapd/files/patch-ip_acl.c (rev 0) +++ trunk/dports/audio/daapd/files/patch-ip_acl.c 2011-06-30 08:25:06 UTC (rev 79953) @@ -0,0 +1,10 @@ +--- libhttpd/src/ip_acl.c.orig 2006-03-06 00:39:36.000000000 +1100 ++++ libhttpd/src/ip_acl.c 2011-06-30 17:49:16.000000000 +1000 +@@ -24,6 +24,7 @@ + #include <stdlib.h> + #include <string.h> + #include <strings.h> ++#include <sys/types.h> + + #if defined(_WIN32) + #else Added: trunk/dports/audio/daapd/files/patch-libhttpd-Site.mm.in =================================================================== --- trunk/dports/audio/daapd/files/patch-libhttpd-Site.mm.in (rev 0) +++ trunk/dports/audio/daapd/files/patch-libhttpd-Site.mm.in 2011-06-30 08:25:06 UTC (rev 79953) @@ -0,0 +1,10 @@ +--- libhttpd/Site.mm.in.orig 2006-03-06 00:39:37.000000000 +1100 ++++ libhttpd/Site.mm.in 2011-06-30 18:12:13.000000000 +1000 +@@ -37,5 +37,5 @@ + # Any other CFlags required + EXTRA_CFLAGS= + +-CFLAGS= -g -I$(TOP)/ -I/usr/local/include $(EXTRA_CFLAGS) -D$(OS_TYPE) +-LDLIBS= -L/usr/local/lib -L$(TOP)/lib @LIBS@ $(EXTRA_LIBS) ++CFLAGS= -g -I$(TOP)/ @CFLAGS@ $(EXTRA_CFLAGS) -D$(OS_TYPE) ++LDLIBS= -L$(TOP)/lib @LIBS@ $(EXTRA_LIBS) Modified: trunk/dports/audio/daapd/files/patch-makefile =================================================================== --- trunk/dports/audio/daapd/files/patch-makefile 2011-06-30 08:17:48 UTC (rev 79952) +++ trunk/dports/audio/daapd/files/patch-makefile 2011-06-30 08:25:06 UTC (rev 79953) @@ -1,6 +1,13 @@ ---- makefile.orig 2006-03-05 07:39:37.000000000 -0600 -+++ makefile 2010-07-07 23:09:13.000000000 -0500 -@@ -14,16 +14,16 @@ +--- makefile.orig 2006-03-06 00:39:37.000000000 +1100 ++++ makefile 2011-06-30 13:31:16.000000000 +1000 +@@ -8,22 +8,22 @@ + # no need to touch anything below this line + # ----------------------------------------- + +-CC = g++ ++CC = @CXX@ + MAKE = $(MAKE_COMMAND) + TARGET = daapd DEPS = daaplib_ libhttpd_ OBJS = daapd.o db.o dboutput.o songcache.o parsemp3.o util.o LIBS = -ldaaplib -lhttpd-persistent -lid3tag -lz @@ -11,7 +18,7 @@ +LIBPATH = -L. -L./daaplib/src -L./libhttpd/src -L@PREFIX@/lib +INCPATH = -I. -I./daaplib/include -I./libhttpd/src -I@PREFIX@/include +DEPLOY = @PREFIX@ -+CFLAGS = -Wall -Wno-multichar $(PTHREAD_CFLAGS) ++CFLAGS = @CFLAGS@ -Wall -Wno-multichar $(PTHREAD_CFLAGS) # HOWL ifeq ($(HOWL_ENABLE),1) @@ -23,3 +30,12 @@ endif HOWLRECENT := $(word $(words $(HOWLDIRS)),$(HOWLDIRS) ) INCPATH := $(INCPATH) -I$(HOWLRECENT) +@@ -71,7 +71,7 @@ + cd daaplib/src && $(MAKE) + + libhttpd_: +- if test ! -e libhttpd/Site.mm; then cd libhttpd && ./configure; fi ++ if test ! -e libhttpd/Site.mm; then cd libhttpd && env CC="$(CC)" CXX="$(CC)" CFLAGS="$(CFLAGS)" ./configure; fi + cd libhttpd && $(MAKE) + + clean: Modified: trunk/dports/audio/daapd/files/patch-select.h =================================================================== --- trunk/dports/audio/daapd/files/patch-select.h 2011-06-30 08:17:48 UTC (rev 79952) +++ trunk/dports/audio/daapd/files/patch-select.h 2011-06-30 08:25:06 UTC (rev 79953) @@ -1,11 +1,127 @@ ---- libhttpd/src/select.h.orig 2006-03-05 08:00:38.000000000 -0600 -+++ libhttpd/src/select.h 2010-07-07 22:45:33.000000000 -0500 +--- libhttpd/src/select.h.orig 2011-06-30 17:41:19.000000000 +1000 ++++ libhttpd/src/select.h 2011-06-30 17:37:20.000000000 +1000 @@ -38,7 +38,7 @@ #ifdef __APPLE__ #ifndef _SOCKLEN_T - typedef int socklen_t; -+ typedef __uint32_t socklen_t; ++ typedef unsigned int socklen_t; #define _SOCKLEN_T #endif #endif +@@ -68,6 +68,8 @@ struct Client { + + struct httpd; + ++#define NULL_ITERATOR static_cast<ClientIterator>(0) ++ + class Clients { + protected: + std::list<Client> clientList; +@@ -81,7 +83,7 @@ protected: + c++; + } + +- return 0; ++ return NULL_ITERATOR; + } + + +@@ -154,7 +156,7 @@ public: + + void erase( const int fDesc ) { + ClientIterator c; +- if ((c = locateFDesc(fDesc)) != 0) { ++ if ((c = locateFDesc(fDesc)) != NULL_ITERATOR) { + clientList.erase(c); + close(fDesc); + } +@@ -162,14 +164,14 @@ public: + + void finish( const int fDesc ) { + ClientIterator c; +- if ((c = locateFDesc(fDesc)) != 0) { ++ if ((c = locateFDesc(fDesc)) != NULL_ITERATOR) { + c->finished = true; + } + } + + void address( const int fDesc, char address[HTTP_IP_ADDR_LEN] ) { + ClientIterator c; +- if ((c = locateFDesc(fDesc)) != 0) { ++ if ((c = locateFDesc(fDesc)) != NULL_ITERATOR) { + strncpy(address, c->address, HTTP_IP_ADDR_LEN); + } + } +@@ -180,7 +182,7 @@ public: + + int readBuf(const int fDesc, char *destBuf, const uint len) { + ClientIterator c; +- if ((c = locateFDesc(fDesc)) == 0) { ++ if ((c = locateFDesc(fDesc)) == NULL_ITERATOR) { + // printf("unknown client id %d\n", fDesc); + return 0; + } +@@ -192,7 +194,7 @@ public: + + int readLine(const int fDesc, char *destBuf, const uint len) { + ClientIterator c; +- if ((c = locateFDesc(fDesc)) == 0) { ++ if ((c = locateFDesc(fDesc)) == NULL_ITERATOR) { + // printf("unknown client id %d\n", fDesc); + return 0; + } +@@ -217,7 +219,7 @@ public: + int handleWrite(int socket) { + int bytesWritten; + ClientIterator c; +- if ((c = locateFDesc(socket)) == 0) { ++ if ((c = locateFDesc(socket)) == NULL_ITERATOR) { + // printf("unknown client id %d\n", socket); + return 2; + } +@@ -260,7 +262,7 @@ public: + return 1; + } else { + ClientIterator c; +- if ((c = locateFDesc(fDesc)) == 0) { ++ if ((c = locateFDesc(fDesc)) == NULL_ITERATOR) { + // printf("unknown client id %d\n", fDesc); + return 2; + } +@@ -304,7 +306,7 @@ public: + + void doWrite(const int fDesc, const char* string, const uint len) { + ClientIterator c; +- if ((c = locateFDesc(fDesc)) == 0) { ++ if ((c = locateFDesc(fDesc)) == NULL_ITERATOR) { + //printf("unknown client id %d\n", fDesc); + return; + } +@@ -318,7 +320,7 @@ public: + + void doWrite(const int fDesc, const char* string) { + ClientIterator c; +- if ((c = locateFDesc(fDesc)) == 0) { ++ if ((c = locateFDesc(fDesc)) == NULL_ITERATOR) { + //printf("unknown client id %d\n", fDesc); + return; + } +@@ -351,7 +353,7 @@ public: + + void queueFile(const int socket, const int pendingFile ) { + ClientIterator c; +- if ((c = locateFDesc(socket)) == 0) { ++ if ((c = locateFDesc(socket)) == NULL_ITERATOR) { + // printf("unknown client id %d\n", socket); + return; + } +@@ -360,7 +362,7 @@ public: + + void subscribe(const int fDesc) { + ClientIterator c; +- if ((c = locateFDesc(fDesc)) == 0) { ++ if ((c = locateFDesc(fDesc)) == NULL_ITERATOR) { + //printf("unknown client id %d\n", fDesc); + return; + }

1 0

[79952] trunk/dports/multimedia/ffmpeg/Portfile
by jeremyhu＠macports.org 30 Jun '11

30 Jun '11

Revision: 79952 http://trac.macports.org/changeset/79952 Author: jeremyhu(a)macports.org Date: 2011-06-30 01:17:48 -0700 (Thu, 30 Jun 2011) Log Message: ----------- ffmpeg: Version bump to 0.7.1 This version fixes some clang and llvm-gcc build failures. 0.7.1 is API and ABI compatible with 0.6.x, so it doesn't require changes to other ports. Modified Paths: -------------- trunk/dports/multimedia/ffmpeg/Portfile Modified: trunk/dports/multimedia/ffmpeg/Portfile =================================================================== --- trunk/dports/multimedia/ffmpeg/Portfile 2011-06-30 07:00:12 UTC (rev 79951) +++ trunk/dports/multimedia/ffmpeg/Portfile 2011-06-30 08:17:48 UTC (rev 79952) @@ -7,8 +7,7 @@ name ffmpeg conflicts ffmpeg-devel epoch 1 -version 0.6.3 -revision 1 +version 0.7.1 license nonfree GPL-2+ LGPL-2.1+ categories multimedia maintainers devans openmaintainer @@ -50,12 +49,9 @@ use_bzip2 yes -checksums sha1 25dd82e8a3627a1a9d4464e15685720215fecb3c \ - rmd160 623bf7c60ad7dd4febdac5ae5ef12566fb8dbf38 +checksums sha1 d006cf0fb61d654c0845240da868ecf3a94c043f \ + rmd160 6539f725d869b97a1821636bd1416312970a6457 -patchfiles patch-libswscale-swscale.h.diff \ - patch-Makefile.diff - depends_build port:pkgconfig \ port:gmake \ port:texi2html @@ -89,13 +85,12 @@ configure.args \ --enable-gpl \ --enable-postproc \ - --enable-swscale --enable-avfilter --enable-avfilter-lavf \ + --enable-swscale --enable-avfilter \ --enable-libmp3lame \ --enable-libvorbis \ --enable-libtheora \ --enable-libdirac --enable-libschroedinger \ --enable-libfaac \ - --enable-libfaad \ --enable-libxvid \ --enable-libx264 \ --enable-libvpx \

1 0

[79951] trunk/dports/x11/winetricks/Portfile
by ryandesign＠macports.org 30 Jun '11

30 Jun '11

Revision: 79951 http://trac.macports.org/changeset/79951 Author: ryandesign(a)macports.org Date: 2011-06-30 00:00:12 -0700 (Thu, 30 Jun 2011) Log Message: ----------- winetricks: update to 20110629 Modified Paths: -------------- trunk/dports/x11/winetricks/Portfile Modified: trunk/dports/x11/winetricks/Portfile =================================================================== --- trunk/dports/x11/winetricks/Portfile 2011-06-30 06:36:25 UTC (rev 79950) +++ trunk/dports/x11/winetricks/Portfile 2011-06-30 07:00:12 UTC (rev 79951) @@ -4,7 +4,7 @@ PortSystem 1.0 name winetricks -version 20110628 +version 20110629 categories x11 maintainers ryandesign license LGPL-2+ @@ -24,8 +24,8 @@ systems have all the needed redistributable runtime \ libraries or fonts. -checksums sha1 25a55f433e8ff385c26bfa49f1066d25ff8812b9 \ - rmd160 6be9616239d33e9bce3faff2b95d3ee02362742d +checksums sha1 11b09bc4137dc4cd78806631dcca465002a2dd0a \ + rmd160 4a6db8a8d79487b2d2327e91f4665e0996a55ab7 depends_run path:bin/zenity:zenity \ path:bin/wine:wine \

1 0

[79950] trunk/dports/multimedia/VLC09/Portfile
by jeremyhu＠macports.org 30 Jun '11

30 Jun '11

Revision: 79950 http://trac.macports.org/changeset/79950 Author: jeremyhu(a)macports.org Date: 2011-06-29 23:36:25 -0700 (Wed, 29 Jun 2011) Log Message: ----------- VLC09: Fix ffmpeg removal for no_ffmpeg variant Modified Paths: -------------- trunk/dports/multimedia/VLC09/Portfile Modified: trunk/dports/multimedia/VLC09/Portfile =================================================================== --- trunk/dports/multimedia/VLC09/Portfile 2011-06-30 06:36:07 UTC (rev 79949) +++ trunk/dports/multimedia/VLC09/Portfile 2011-06-30 06:36:25 UTC (rev 79950) @@ -170,7 +170,7 @@ } variant no_ffmpeg description {disable FFmpeg support} { - depends_lib-delete port:ffmpeg + depends_lib-delete path:lib/libavcodec.dylib:ffmpeg configure.args-append --disable-avcodec --disable-avformat \ --disable-postproc --disable-swscale }

1 0

[79949] trunk/dports/multimedia/VLC/Portfile
by jeremyhu＠macports.org 30 Jun '11

30 Jun '11

Revision: 79949 http://trac.macports.org/changeset/79949 Author: jeremyhu(a)macports.org Date: 2011-06-29 23:36:07 -0700 (Wed, 29 Jun 2011) Log Message: ----------- VLC: Fix ffmpeg removal for no_ffmpeg variant Modified Paths: -------------- trunk/dports/multimedia/VLC/Portfile Modified: trunk/dports/multimedia/VLC/Portfile =================================================================== --- trunk/dports/multimedia/VLC/Portfile 2011-06-30 05:12:53 UTC (rev 79948) +++ trunk/dports/multimedia/VLC/Portfile 2011-06-30 06:36:07 UTC (rev 79949) @@ -205,7 +205,7 @@ } variant no_ffmpeg description {disable FFmpeg support} { - depends_lib-delete port:ffmpeg + depends_lib-delete path:lib/libavcodec.dylib:ffmpeg configure.args-append --disable-avcodec --disable-avformat \ --disable-postproc --disable-swscale }

1 0

[79948] trunk/dports/perl/p5-locale-gettext/Portfile
by jeremyhu＠macports.org 30 Jun '11

30 Jun '11

Revision: 79948 http://trac.macports.org/changeset/79948 Author: jeremyhu(a)macports.org Date: 2011-06-29 22:12:53 -0700 (Wed, 29 Jun 2011) Log Message: ----------- p5-locale-gettext: Fall back from clang to llvm-gcc for now Modified Paths: -------------- trunk/dports/perl/p5-locale-gettext/Portfile Modified: trunk/dports/perl/p5-locale-gettext/Portfile =================================================================== --- trunk/dports/perl/p5-locale-gettext/Portfile 2011-06-30 05:10:17 UTC (rev 79947) +++ trunk/dports/perl/p5-locale-gettext/Portfile 2011-06-30 05:12:53 UTC (rev 79948) @@ -36,6 +36,13 @@ patch-cpan-rt-35680-1.diff \ patch-cpan-rt-35680-2.diff +# BUILD FIX TODO +# doesn't build with clang as of 2011.06.27 +# This looks like a bug in this package's build system +if {${configure.compiler} == "clang"} { + configure.compiler llvm-gcc-4.2 +} + configure.cc ${configure.cc} ${configure.cflags} ${configure.ldflags} \ ${archflags}

1 0

[79947] trunk/dports/mail/gnupg2/Portfile
by jeremyhu＠macports.org 30 Jun '11

30 Jun '11

Revision: 79947 http://trac.macports.org/changeset/79947 Author: jeremyhu(a)macports.org Date: 2011-06-29 22:10:17 -0700 (Wed, 29 Jun 2011) Log Message: ----------- gnupg2: clang build fix dev timeout Modified Paths: -------------- trunk/dports/mail/gnupg2/Portfile Modified: trunk/dports/mail/gnupg2/Portfile =================================================================== --- trunk/dports/mail/gnupg2/Portfile 2011-06-30 05:07:35 UTC (rev 79946) +++ trunk/dports/mail/gnupg2/Portfile 2011-06-30 05:10:17 UTC (rev 79947) @@ -35,6 +35,10 @@ configure.args --disable-agent +# glib fails to find the right stdint.h It picks clang's internal one rather +# than the system header +configure.env gl_cv_absolute_stdint_h=/usr/include/stdint.h + depends_lib port:libiconv \ port:gettext \ port:zlib \

1 0

[79946] trunk/dports/graphics/babl
by jeremyhu＠macports.org 30 Jun '11

30 Jun '11

Revision: 79946 http://trac.macports.org/changeset/79946 Author: jeremyhu(a)macports.org Date: 2011-06-29 22:07:35 -0700 (Wed, 29 Jun 2011) Log Message: ----------- babl: clang build fix dev timeout via email Modified Paths: -------------- trunk/dports/graphics/babl/Portfile Added Paths: ----------- trunk/dports/graphics/babl/files/ trunk/dports/graphics/babl/files/clang.patch Modified: trunk/dports/graphics/babl/Portfile =================================================================== --- trunk/dports/graphics/babl/Portfile 2011-06-30 05:03:42 UTC (rev 79945) +++ trunk/dports/graphics/babl/Portfile 2011-06-30 05:07:35 UTC (rev 79946) @@ -29,6 +29,8 @@ depends_build port:w3m \ port:librsvg +patchfiles clang.patch + platform darwin { if {$build_arch == "x86_64"} { configure.args-append --build=${build_arch}-apple-${os.platform}${os.version} Added: trunk/dports/graphics/babl/files/clang.patch =================================================================== --- trunk/dports/graphics/babl/files/clang.patch (rev 0) +++ trunk/dports/graphics/babl/files/clang.patch 2011-06-30 05:07:35 UTC (rev 79946) @@ -0,0 +1,20 @@ +--- extensions/sse-fixups.c.orig 2011-06-28 20:01:39.000000000 -0700 ++++ extensions/sse-fixups.c 2011-06-28 20:01:29.000000000 -0700 +@@ -21,7 +21,7 @@ + + #include "config.h" + +-#if defined(__GNUC__) && (__GNUC__ >= 4) && defined(USE_SSE) && defined(USE_MMX) ++#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 4) && defined(USE_SSE) && defined(USE_MMX) + + #include <stdint.h> + #include <stdlib.h> +@@ -173,7 +173,7 @@ int init (void); + int + init (void) + { +-#if defined(__GNUC__) && (__GNUC__ >= 4) && defined(USE_SSE) && defined(USE_MMX) ++#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 4) && defined(USE_SSE) && defined(USE_MMX) + + Babl *rgbaF_linear = babl_format_new ( + babl_model ("RGBA"),

1 0

[79945] trunk/dports/gnome/gnome-utils
by jeremyhu＠macports.org 30 Jun '11

30 Jun '11

Revision: 79945 http://trac.macports.org/changeset/79945 Author: jeremyhu(a)macports.org Date: 2011-06-29 22:03:42 -0700 (Wed, 29 Jun 2011) Log Message: ----------- gnome-utils: Fix invalid return statements caught by clang Modified Paths: -------------- trunk/dports/gnome/gnome-utils/Portfile Added Paths: ----------- trunk/dports/gnome/gnome-utils/files/bad-return.patch Modified: trunk/dports/gnome/gnome-utils/Portfile =================================================================== --- trunk/dports/gnome/gnome-utils/Portfile 2011-06-30 02:39:29 UTC (rev 79944) +++ trunk/dports/gnome/gnome-utils/Portfile 2011-06-30 05:03:42 UTC (rev 79945) @@ -5,7 +5,7 @@ name gnome-utils version 2.30.0 -revision 2 +revision 3 set branch [join [lrange [split ${version} .] 0 1] .] description GNOME utilities long_description Utilities for the GNOME 2.0 desktop. @@ -31,7 +31,8 @@ use_bzip2 yes patchfiles patch-gnome-dictionary-libgdict-Makefile.am.diff \ - patch-gsearchtool-libgnomeui-deprecated-Makefile.am.diff + patch-gsearchtool-libgnomeui-deprecated-Makefile.am.diff \ + bad-return.patch use_autoreconf yes Added: trunk/dports/gnome/gnome-utils/files/bad-return.patch =================================================================== --- trunk/dports/gnome/gnome-utils/files/bad-return.patch (rev 0) +++ trunk/dports/gnome/gnome-utils/files/bad-return.patch 2011-06-30 05:03:42 UTC (rev 79945) @@ -0,0 +1,20 @@ +--- baobab/src/baobab-chart.c.orig 2011-06-29 17:57:18.000000000 -0700 ++++ baobab/src/baobab-chart.c 2011-06-29 17:59:33.000000000 -0700 +@@ -1823,7 +1823,7 @@ baobab_chart_can_zoom_in (GtkWidget *cha + BaobabChartPrivate *priv; + BaobabChartClass *class; + +- g_return_if_fail (BAOBAB_IS_CHART (chart)); ++ g_return_val_if_fail (BAOBAB_IS_CHART (chart), 0); + + priv = BAOBAB_CHART (chart)->priv; + class = BAOBAB_CHART_GET_CLASS (chart); +@@ -1849,7 +1849,7 @@ baobab_chart_can_zoom_out (GtkWidget *ch + BaobabChartPrivate *priv; + BaobabChartClass *class; + +- g_return_if_fail (BAOBAB_IS_CHART (chart)); ++ g_return_val_if_fail (BAOBAB_IS_CHART (chart), 0); + + priv = BAOBAB_CHART (chart)->priv; + class = BAOBAB_CHART_GET_CLASS (chart);

1 0

[79944] branches/release_2_0
by jmr＠macports.org 30 Jun '11

30 Jun '11

Revision: 79944 http://trac.macports.org/changeset/79944 Author: jmr(a)macports.org Date: 2011-06-29 19:39:29 -0700 (Wed, 29 Jun 2011) Log Message: ----------- merge r79943 from trunk: add fallbacks for default configure.compiler when targeting older OS versions and using newer dev tools Revision Links: -------------- http://trac.macports.org/changeset/79943 Modified Paths: -------------- branches/release_2_0/base/src/port1.0/portconfigure.tcl Property Changed: ---------------- branches/release_2_0/ branches/release_2_0/base/ branches/release_2_0/base/portmgr/fedora/macports.spec branches/release_2_0/base/src/pextlib1.0/sha2.c branches/release_2_0/base/src/pextlib1.0/sha2.h branches/release_2_0/base/src/pextlib1.0/sha256cmd.c branches/release_2_0/base/src/pextlib1.0/sha256cmd.h branches/release_2_0/base/src/registry2.0/receipt_sqlite.tcl Property changes on: branches/release_2_0 ___________________________________________________________________ Modified: svn:mergeinfo - /trunk:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864 + /trunk:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943 Property changes on: branches/release_2_0/base ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /branches/universal-sanity/base:51872-52323 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79771-79774,79782,79787,79864 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 + /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /branches/universal-sanity/base:51872-52323 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79771-79774,79782,79787,79864,79943 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 Property changes on: branches/release_2_0/base/portmgr/fedora/macports.spec ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base/portmgr/fedora/macports.spec:37343-46937 /branches/universal-sanity/base/portmgr/fedora/macports.spec:51872-52323 /branches/variant-descs-14482/base/portmgr/fedora/macports.spec:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/portmgr/fedora/macports.spec:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864 /trunk/base/portmgr/fedora/macports.spec.in:30388-57826 /users/perry/base-bugs_and_notes/portmgr/fedora/macports.spec:45682-46060 /users/perry/base-select/portmgr/fedora/macports.spec:44044-44692 + /branches/gsoc08-privileges/base/portmgr/fedora/macports.spec:37343-46937 /branches/universal-sanity/base/portmgr/fedora/macports.spec:51872-52323 /branches/variant-descs-14482/base/portmgr/fedora/macports.spec:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/portmgr/fedora/macports.spec:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943 /trunk/base/portmgr/fedora/macports.spec.in:30388-57826 /users/perry/base-bugs_and_notes/portmgr/fedora/macports.spec:45682-46060 /users/perry/base-select/portmgr/fedora/macports.spec:44044-44692 Property changes on: branches/release_2_0/base/src/pextlib1.0/sha2.c ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base/src/pextlib1.0/sha2.c:37343-46937 /branches/universal-sanity/base/src/pextlib1.0/sha2.c:51872-52323 /branches/variant-descs-14482/base/src/pextlib1.0/sha2.c:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/pextlib1.0/sha2.c:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864 /users/perry/base-bugs_and_notes/src/pextlib1.0/sha2.c:45682-46060 /users/perry/base-select/src/pextlib1.0/sha2.c:44044-44692 + /branches/gsoc08-privileges/base/src/pextlib1.0/sha2.c:37343-46937 /branches/universal-sanity/base/src/pextlib1.0/sha2.c:51872-52323 /branches/variant-descs-14482/base/src/pextlib1.0/sha2.c:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/pextlib1.0/sha2.c:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943 /users/perry/base-bugs_and_notes/src/pextlib1.0/sha2.c:45682-46060 /users/perry/base-select/src/pextlib1.0/sha2.c:44044-44692 Property changes on: branches/release_2_0/base/src/pextlib1.0/sha2.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base/src/pextlib1.0/sha2.h:37343-46937 /branches/universal-sanity/base/src/pextlib1.0/sha2.h:51872-52323 /branches/variant-descs-14482/base/src/pextlib1.0/sha2.h:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/pextlib1.0/sha2.h:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864 /users/perry/base-bugs_and_notes/src/pextlib1.0/sha2.h:45682-46060 /users/perry/base-select/src/pextlib1.0/sha2.h:44044-44692 + /branches/gsoc08-privileges/base/src/pextlib1.0/sha2.h:37343-46937 /branches/universal-sanity/base/src/pextlib1.0/sha2.h:51872-52323 /branches/variant-descs-14482/base/src/pextlib1.0/sha2.h:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/pextlib1.0/sha2.h:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943 /users/perry/base-bugs_and_notes/src/pextlib1.0/sha2.h:45682-46060 /users/perry/base-select/src/pextlib1.0/sha2.h:44044-44692 Property changes on: branches/release_2_0/base/src/pextlib1.0/sha256cmd.c ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base/src/pextlib1.0/rmd160cmd.c:37343-46937 /branches/gsoc09-logging/base/src/pextlib1.0/sha256cmd.c:51231-60371 /branches/universal-sanity/base/src/pextlib1.0/rmd160cmd.c:51872-52323 /branches/variant-descs-14482/base/src/pextlib1.0/rmd160cmd.c:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/pextlib1.0/sha256cmd.c:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864 /users/perry/base-bugs_and_notes/src/pextlib1.0/rmd160cmd.c:45682-46060 /users/perry/base-select/src/pextlib1.0/rmd160cmd.c:44044-44692 + /branches/gsoc08-privileges/base/src/pextlib1.0/rmd160cmd.c:37343-46937 /branches/gsoc09-logging/base/src/pextlib1.0/sha256cmd.c:51231-60371 /branches/universal-sanity/base/src/pextlib1.0/rmd160cmd.c:51872-52323 /branches/variant-descs-14482/base/src/pextlib1.0/rmd160cmd.c:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/pextlib1.0/sha256cmd.c:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943 /users/perry/base-bugs_and_notes/src/pextlib1.0/rmd160cmd.c:45682-46060 /users/perry/base-select/src/pextlib1.0/rmd160cmd.c:44044-44692 Property changes on: branches/release_2_0/base/src/pextlib1.0/sha256cmd.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base/src/pextlib1.0/rmd160cmd.h:37343-46937 /branches/gsoc09-logging/base/src/pextlib1.0/sha256cmd.h:51231-60371 /branches/universal-sanity/base/src/pextlib1.0/rmd160cmd.h:51872-52323 /branches/variant-descs-14482/base/src/pextlib1.0/rmd160cmd.h:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/pextlib1.0/sha256cmd.h:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864 /users/perry/base-bugs_and_notes/src/pextlib1.0/rmd160cmd.h:45682-46060 /users/perry/base-select/src/pextlib1.0/rmd160cmd.h:44044-44692 + /branches/gsoc08-privileges/base/src/pextlib1.0/rmd160cmd.h:37343-46937 /branches/gsoc09-logging/base/src/pextlib1.0/sha256cmd.h:51231-60371 /branches/universal-sanity/base/src/pextlib1.0/rmd160cmd.h:51872-52323 /branches/variant-descs-14482/base/src/pextlib1.0/rmd160cmd.h:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/pextlib1.0/sha256cmd.h:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943 /users/perry/base-bugs_and_notes/src/pextlib1.0/rmd160cmd.h:45682-46060 /users/perry/base-select/src/pextlib1.0/rmd160cmd.h:44044-44692 Modified: branches/release_2_0/base/src/port1.0/portconfigure.tcl =================================================================== --- branches/release_2_0/base/src/port1.0/portconfigure.tcl 2011-06-30 02:29:09 UTC (rev 79943) +++ branches/release_2_0/base/src/port1.0/portconfigure.tcl 2011-06-30 02:39:29 UTC (rev 79944) @@ -352,11 +352,26 @@ # internal function to determine the default compiler proc portconfigure::configure_get_default_compiler {args} { - global macosx_deployment_target + global macosx_deployment_target developer_dir switch -exact ${macosx_deployment_target} { "10.4" - - "10.5" { return gcc-4.0 } - "10.6" { return gcc-4.2 } + "10.5" { + if {![file executable /usr/bin/gcc-4.0]} { + if {[file executable /usr/bin/gcc-4.2]} { + return gcc-4.2 + } elseif {[file executable ${developer_dir}/usr/bin/llvm-gcc-4.2]} { + return llvm-gcc-4.2 + } + } + return gcc-4.0 + } + "10.6" { + if {![file executable /usr/bin/gcc-4.2] && + [file executable ${developer_dir}/usr/bin/llvm-gcc-4.2]} { + return llvm-gcc-4.2 + } + return gcc-4.2 + } "10.7" { return llvm-gcc-4.2 } default { return gcc } } Property changes on: branches/release_2_0/base/src/registry2.0/receipt_sqlite.tcl ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base/src/registry1.0/receipt_sqlite.tcl:37343-46937 /branches/gsoc09-logging/base/src/registry1.0/receipt_sqlite.tcl:51231-60371 /branches/universal-sanity/base/src/registry1.0/receipt_sqlite.tcl:51872-52323 /branches/variant-descs-14482/base/src/registry1.0/receipt_sqlite.tcl:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/registry2.0/receipt_sqlite.tcl:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864 /users/perry/base-bugs_and_notes/src/registry1.0/receipt_sqlite.tcl:45682-46060 /users/perry/base-select/src/registry1.0/receipt_sqlite.tcl:44044-44692 + /branches/gsoc08-privileges/base/src/registry1.0/receipt_sqlite.tcl:37343-46937 /branches/gsoc09-logging/base/src/registry1.0/receipt_sqlite.tcl:51231-60371 /branches/universal-sanity/base/src/registry1.0/receipt_sqlite.tcl:51872-52323 /branches/variant-descs-14482/base/src/registry1.0/receipt_sqlite.tcl:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/registry2.0/receipt_sqlite.tcl:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943 /users/perry/base-bugs_and_notes/src/registry1.0/receipt_sqlite.tcl:45682-46060 /users/perry/base-select/src/registry1.0/receipt_sqlite.tcl:44044-44692

1 0