August 2010 - macports-changes - lists.macosforge.org

[70882] trunk/dports/devel/gtk-osx-application/Portfile
by elelay＠macports.org 24 Aug '10

24 Aug '10

Revision: 70882 http://trac.macports.org/changeset/70882 Author: elelay(a)macports.org Date: 2010-08-24 13:19:54 -0700 (Tue, 24 Aug 2010) Log Message: ----------- updated gtk-osx-application to 0.9.5 Modified Paths: -------------- trunk/dports/devel/gtk-osx-application/Portfile Modified: trunk/dports/devel/gtk-osx-application/Portfile =================================================================== --- trunk/dports/devel/gtk-osx-application/Portfile 2010-08-24 19:41:21 UTC (rev 70881) +++ trunk/dports/devel/gtk-osx-application/Portfile 2010-08-24 20:19:54 UTC (rev 70882) @@ -4,7 +4,7 @@ PortSystem 1.0 name gtk-osx-application -version 0.9.4 +version 0.9.5 categories devel maintainers elelay openmaintainer @@ -21,10 +21,11 @@ master_sites http://sourceforge.net/projects/gtk-osx/files/GTK-OSX Build/ distname ige-mac-integration-${version} +use_bzip2 yes -checksums md5 f224cb52ed82b56dcad3ea9e26cb8ec0 \ - sha1 a69ceb11179c17045027ac6761f033f042dab006 \ - rmd160 16b97c8e819628fdc0aabb94f9bbc8d9e4fe6220 +checksums md5 bd503b6e8626e09471e65cc8bc50ba7a \ + sha1 ae75e3f9270000adc28baaea7e5e1edd407cf90c \ + rmd160 6a28b7f5dc719bab973b72a5404524f9369104fd depends_build port:pkgconfig

1 0

[70881] trunk/dports/archivers/xdelta/Portfile
by perry＠macports.org 24 Aug '10

24 Aug '10

Revision: 70881 http://trac.macports.org/changeset/70881 Author: perry(a)macports.org Date: 2010-08-24 12:41:21 -0700 (Tue, 24 Aug 2010) Log Message: ----------- Committed ryandesign's patch for archivers/xdelta. Addresses #26225. Modified Paths: -------------- trunk/dports/archivers/xdelta/Portfile Modified: trunk/dports/archivers/xdelta/Portfile =================================================================== --- trunk/dports/archivers/xdelta/Portfile 2010-08-24 19:28:35 UTC (rev 70880) +++ trunk/dports/archivers/xdelta/Portfile 2010-08-24 19:41:21 UTC (rev 70881) @@ -4,6 +4,7 @@ name xdelta version 3.0z +revision 1 categories archivers maintainers perry openmaintainer platforms darwin @@ -14,7 +15,7 @@ license GPLv2 homepage http://code.google.com/p/xdelta/ -livecheck.regex "name=xdelta(.+)\.tar\.gz" +livecheck.regex {name=xdelta(.+)\.tar\.gz} livecheck.type regex livecheck.url ${homepage} @@ -25,6 +26,14 @@ use_configure no +variant universal {} +if {[variant_isset universal]} { + set archflags ${configure.universal_cflags} +} else { + set archflags ${configure.cc_archflags} +} + +build.args CC="${configure.cc} ${archflags}" build.target xdelta3 destroot {

1 0

[70880] trunk/dports/graphics
by michaelld＠macports.org 24 Aug '10

24 Aug '10

Revision: 70880 http://trac.macports.org/changeset/70880 Author: michaelld(a)macports.org Date: 2010-08-24 12:28:35 -0700 (Tue, 24 Aug 2010) Log Message: ----------- More robust post-destroot fixing of installed library and plugin. Addresses ticket #26228. Modified Paths: -------------- trunk/dports/graphics/qwt/Portfile trunk/dports/graphics/qwt52/Portfile Modified: trunk/dports/graphics/qwt/Portfile =================================================================== --- trunk/dports/graphics/qwt/Portfile 2010-08-24 19:04:58 UTC (rev 70879) +++ trunk/dports/graphics/qwt/Portfile 2010-08-24 19:28:35 UTC (rev 70880) @@ -56,8 +56,21 @@ destroot.destdir INSTALL_ROOT="${destroot}" post-destroot { - # fix install-name of dynamic library - system "install_name_tool -id ${prefix}/lib/libqwt.${version}.dylib ${destroot}${prefix}/lib/libqwt.${version}.dylib" - system "install_name_tool -change libqwt.5.dylib ${prefix}/lib/libqwt.5.dylib ${destroot}${qt_dir}/plugins/designer/libqwt_designer_plugin.dylib" + # fix install-name of dynamic library & plugin in generic ways + + # (1) fix the install name of the dynamic library + set libqwt_file [exec find ${destroot}${prefix}/lib -type f | \ + sed -e "s@${destroot}@@g"] + system "install_name_tool -id ${libqwt_file} ${destroot}${libqwt_file}" + + # (2) fix the install name of the plugin + set plugin_file [exec find ${destroot}${qt_dir}/plugins/designer -type f | \ + sed -e "s@${destroot}@@g"] + system "install_name_tool -id ${plugin_file} ${destroot}${plugin_file}" + + # (3) fix the plugin dependency on the dynamic library + set plugin_qwt [exec otool -L ${destroot}${plugin_file} | \ + grep "${version}" | awk "{ print \$1 }"] + system "install_name_tool -change ${plugin_qwt} \ + ${prefix}/lib/${plugin_qwt} ${destroot}${plugin_file}" } - Modified: trunk/dports/graphics/qwt52/Portfile =================================================================== --- trunk/dports/graphics/qwt52/Portfile 2010-08-24 19:04:58 UTC (rev 70879) +++ trunk/dports/graphics/qwt52/Portfile 2010-08-24 19:28:35 UTC (rev 70880) @@ -57,9 +57,23 @@ destroot.destdir INSTALL_ROOT="${destroot}" post-destroot { - # fix install-name of dynamic library - system "install_name_tool -id ${prefix}/lib/libqwt.${version}.dylib ${destroot}${prefix}/lib/libqwt.${version}.dylib" - system "install_name_tool -change libqwt.5.dylib ${prefix}/lib/libqwt.5.dylib ${destroot}${qt_dir}/plugins/designer/libqwt_designer_plugin.dylib" + # fix install-name of dynamic library & plugin in generic ways + + # (1) fix the install name of the dynamic library + set libqwt_file [exec find ${destroot}${prefix}/lib -type f | \ + sed -e "s@${destroot}@@g"] + system "install_name_tool -id ${libqwt_file} ${destroot}${libqwt_file}" + + # (2) fix the install name of the plugin + set plugin_file [exec find ${destroot}${qt_dir}/plugins/designer -type f | \ + sed -e "s@${destroot}@@g"] + system "install_name_tool -id ${plugin_file} ${destroot}${plugin_file}" + + # (3) fix the plugin dependency on the dynamic library + set plugin_qwt [exec otool -L ${destroot}${plugin_file} | \ + grep "${version}" | awk "{ print \$1 }"] + system "install_name_tool -change ${plugin_qwt} \ + ${prefix}/lib/${plugin_qwt} ${destroot}${plugin_file}" } livecheck.url http://sourceforge.net/api/file/index/project-id/13693/mtime/desc/rss?path=…

1 0

[70879] trunk/dports/gnome/epiphany/Portfile
by devans＠macports.org 24 Aug '10

24 Aug '10

Revision: 70879 http://trac.macports.org/changeset/70879 Author: devans(a)macports.org Date: 2010-08-24 12:04:58 -0700 (Tue, 24 Aug 2010) Log Message: ----------- epiphany: update to version 2.30.3, no python needed, closes #26166. Modified Paths: -------------- trunk/dports/gnome/epiphany/Portfile Modified: trunk/dports/gnome/epiphany/Portfile =================================================================== --- trunk/dports/gnome/epiphany/Portfile 2010-08-24 18:09:05 UTC (rev 70878) +++ trunk/dports/gnome/epiphany/Portfile 2010-08-24 19:04:58 UTC (rev 70879) @@ -4,7 +4,7 @@ PortSystem 1.0 name epiphany -version 2.28.1 +version 2.30.3 set branch [join [lrange [split ${version} .] 0 1] .] description A GNOME Web browser. long_description A web browser is more than an application, it is a \ @@ -18,9 +18,9 @@ master_sites gnome:sources/${name}/${branch}/ use_bzip2 yes -checksums md5 7a8b885a4894d2a9e979b8cb8898db1e \ - sha1 e15a404e52cdf4fded6a0075f27f46c2ae2a739c \ - rmd160 c3d6a33080711ec3c25c6418aba5eb2047b73384 +checksums md5 6c6f83d07bd6277ddd20d641af253b0c \ + sha1 c4dab25e46e0c02b29a79e7542c097df621aa3ae \ + rmd160 f653d7e0e8bfd698eb283725120f849ab3ab8f53 depends_build port:pkgconfig \ port:intltool \ @@ -28,29 +28,21 @@ port:gnome-doc-utils depends_lib port:gconf \ - port:libxslt \ - port:libglade2 \ - port:libgnomeui \ - port:gnome-desktop \ + port:webkit-gtk \ port:startup-notification \ port:libnotify \ - port:libcanberra \ - port:py25-gtk \ - port:py25-gnome \ - port:enchant \ - port:iso-codes \ - port:webkit-gtk + port:nss \ + port:iso-codes configure.args --with-distributor-name=MacPorts \ + --enable-introspection=no \ --disable-zeroconf \ --disable-network-manager \ --disable-schemas-install \ --disable-scrollkeeper \ - --disable-nss \ - --disable-tests + --disable-tests \ + --without-ca-file -configure.python ${prefix}/bin/python2.5 - pre-configure { reinplace "s|--rpath=|-rpath |g" ${worksrcpath}/configure } @@ -64,6 +56,12 @@ gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas" } +# +# webkit-gtk is not universal +# + +universal_variant no + livecheck.type regex livecheck.url http://ftp.gnome.org/pub/gnome/sources/${name}/${branch}/ livecheck.regex {LATEST-IS-(\d+(?:\.\d+)*)}

1 0

[70878] trunk/dports/audio
by michaelld＠macports.org 24 Aug '10

24 Aug '10

Revision: 70878 http://trac.macports.org/changeset/70878 Author: michaelld(a)macports.org Date: 2010-08-24 11:09:05 -0700 (Tue, 24 Aug 2010) Log Message: ----------- Initial checkin of port 'lastfmlib', YA Last.FM library (along with liblastfm and lastfmsubmit). Addresses ticket #26216. Added Paths: ----------- trunk/dports/audio/lastfmlib/ trunk/dports/audio/lastfmlib/Portfile Added: trunk/dports/audio/lastfmlib/Portfile =================================================================== --- trunk/dports/audio/lastfmlib/Portfile (rev 0) +++ trunk/dports/audio/lastfmlib/Portfile 2010-08-24 18:09:05 UTC (rev 70878) @@ -0,0 +1,24 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; truncate-lines: t; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4 +# $Id: Portfile 67247 2010-05-03 13:05:03Z rmsfisher(a)macports.org $ + +PortSystem 1.0 + +name lastfmlib +version 0.4.0 +categories audio +maintainers scribus.info:petr + +description C/C++ library to scrobble your tracks on Last.fm +long_description \ + lastfmlib is library that provides an implementation of the \ + Last.fm Submissions Protocol v1.2. It allows you to scrobble \ + your tracks on Last.fm + +homepage http://code.google.com/p/lastfmlib/ +platforms darwin +master_sites googlecode +checksums md5 f6f00882c15b8cc703718d22e1b1871f \ + sha1 b9e15e4eb42a9ccd9b3c5373054b0bd51a406fdd \ + rmd160 89b06c754a2b954e2bb8f837faece9dcaaee83c6 + +depends_lib-append port:curl

1 0

[70877] trunk/dports/python/py27-robotframework-ride/Portfile
by jwa＠macports.org 24 Aug '10

24 Aug '10

Revision: 70877 http://trac.macports.org/changeset/70877 Author: jwa(a)macports.org Date: 2010-08-24 10:57:26 -0700 (Tue, 24 Aug 2010) Log Message: ----------- version bump to 0.27 Modified Paths: -------------- trunk/dports/python/py27-robotframework-ride/Portfile Modified: trunk/dports/python/py27-robotframework-ride/Portfile =================================================================== --- trunk/dports/python/py27-robotframework-ride/Portfile 2010-08-24 17:28:37 UTC (rev 70876) +++ trunk/dports/python/py27-robotframework-ride/Portfile 2010-08-24 17:57:26 UTC (rev 70877) @@ -8,7 +8,7 @@ set internal_name robotframework-ride set short_name robotide -version 0.26.1 +version 0.27 categories-append devel maintainers jwa description Robot Framework test case editor @@ -26,9 +26,9 @@ master_sites http://${internal_name}.googlecode.com/files/ distname ${short_name}-${version} -checksums md5 29ad6d10436ca845945694288bec4eb8 \ - sha1 31800dfd774291c7ae5b2e2e21668a719ff629d5 \ - rmd160 feb7edef0da4b81483d2b592660c688dd2ef840c +checksums md5 6e0e4613faa8fca2bce6c65ba8675b0d \ + sha1 3efea93fbfc09d5dad19f8c4286210fbf61d989e \ + rmd160 a37fd3c2a4cc01809137840d86f99d3de31fb907 python.link_binaries no post-destroot {

1 0

[70876] trunk/dports/gnome/libgtop/Portfile
by devans＠macports.org 24 Aug '10

24 Aug '10

Revision: 70876 http://trac.macports.org/changeset/70876 Author: devans(a)macports.org Date: 2010-08-24 10:28:37 -0700 (Tue, 24 Aug 2010) Log Message: ----------- libgtop: update to version 2.28.1. Modified Paths: -------------- trunk/dports/gnome/libgtop/Portfile Modified: trunk/dports/gnome/libgtop/Portfile =================================================================== --- trunk/dports/gnome/libgtop/Portfile 2010-08-24 16:54:20 UTC (rev 70875) +++ trunk/dports/gnome/libgtop/Portfile 2010-08-24 17:28:37 UTC (rev 70876) @@ -4,7 +4,7 @@ PortSystem 1.0 name libgtop -version 2.26.1 +version 2.28.1 set branch [join [lrange [split ${version} .] 0 1] .] description A library for gtop2 long_description \ @@ -18,9 +18,9 @@ homepage http://www.gnome.org/ master_sites gnome:sources/${name}/${branch}/ -checksums md5 49fe5c91a6bbc103a0a05c6854a6cc11 \ - sha1 758bbf69009c6bcfe2765de97e7027124c5a147e \ - rmd160 5177aad953508b20d794d2390204b5b07bc364f5 +checksums md5 994c299b6dba330524a67ea45776b3ab \ + sha1 f0b1f5ee7417cb0b275143fd0956f4753505a21f \ + rmd160 ed04b334810730cd61c7e8b0734e2e5570487753 depends_build port:pkgconfig \ port:gtk-doc

1 0

[70875] trunk/dports/multimedia
by devans＠macports.org 24 Aug '10

24 Aug '10

Revision: 70875 http://trac.macports.org/changeset/70875 Author: devans(a)macports.org Date: 2010-08-24 09:54:20 -0700 (Tue, 24 Aug 2010) Log Message: ----------- ffmpeg, ffmpeg-devel: add missing build dependency on pkgconfig. (#26222) Modified Paths: -------------- trunk/dports/multimedia/ffmpeg/Portfile trunk/dports/multimedia/ffmpeg-devel/Portfile Modified: trunk/dports/multimedia/ffmpeg/Portfile =================================================================== --- trunk/dports/multimedia/ffmpeg/Portfile 2010-08-24 16:38:09 UTC (rev 70874) +++ trunk/dports/multimedia/ffmpeg/Portfile 2010-08-24 16:54:20 UTC (rev 70875) @@ -58,9 +58,8 @@ patch-libswscale-swscale.h.diff \ patch-Makefile.diff -use_parallel_build yes - -depends_build port:gmake \ +depends_build port:pkgconfig \ + port:gmake \ port:texi2html depends_lib port:lame \ Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile =================================================================== --- trunk/dports/multimedia/ffmpeg-devel/Portfile 2010-08-24 16:38:09 UTC (rev 70874) +++ trunk/dports/multimedia/ffmpeg-devel/Portfile 2010-08-24 16:54:20 UTC (rev 70875) @@ -51,9 +51,8 @@ worksrcdir trunk -use_parallel_build yes - -depends_build bin:svn:subversion \ +depends_build port:pkgconfig \ + bin:svn:subversion \ port:gmake \ port:texi2html

1 0

[70874] trunk/dports/devel/grails-devel/Portfile
by snc＠macports.org 24 Aug '10

24 Aug '10

Revision: 70874 http://trac.macports.org/changeset/70874 Author: snc(a)macports.org Date: 2010-08-24 09:38:09 -0700 (Tue, 24 Aug 2010) Log Message: ----------- update version, #26101. maintainer timeout. ui_msg to notes Modified Paths: -------------- trunk/dports/devel/grails-devel/Portfile Modified: trunk/dports/devel/grails-devel/Portfile =================================================================== --- trunk/dports/devel/grails-devel/Portfile 2010-08-24 16:34:40 UTC (rev 70873) +++ trunk/dports/devel/grails-devel/Portfile 2010-08-24 16:38:09 UTC (rev 70874) @@ -1,3 +1,4 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; truncate-lines: t; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4 # $Id$ PortSystem 1.0 @@ -3,5 +4,5 @@ name grails-devel -version 1.3.0.RC2 +version 1.3.4 categories devel java maintainers breskeby @@ -19,9 +20,8 @@ platforms darwin distname grails-${version} master_sites http://dist.codehaus.org/grails -checksums md5 8169725046fb2e7bf1e0bc8a30a465df \ - sha1 57c1568ac5b3392d77b1682d76b090e73b401137 \ - rmd160 c36e73f209f4b36d8e247e99c58c74657b2c93e2 +checksums md5 d4c968cf4869cf7afdaae0b17c85beba \ + sha1 00d7f70e1e2107488b178097c5c3447c27be6e65 worksrcdir grails-${version} set workTarget "" @@ -52,6 +52,7 @@ ${worksrcpath}/conf \ ${worksrcpath}/lib \ ${worksrcpath}/media \ + ${worksrcpath}/plugins \ ${worksrcpath}/scripts \ ${worksrcpath}/src \ ${worksrcpath}/build.properties \ @@ -62,9 +63,7 @@ system "cd ${destroot}${prefix}/bin && ln -s ${prefix}/share/java/grails/bin/startGrails" } -post-activate { - ui_msg "****************************************************************************" - ui_msg "* Remember to set the environment variable GRAILS_HOME to the path to" - ui_msg "* the grails distribution: ${prefix}/share/java/grails" - ui_msg "****************************************************************************" - } +notes "\ + Remember to set the environment variable GRAILS_HOME to the path to\ + the grails distribution:\n\ + ${prefix}/share/java/grails"

1 0

[70873] trunk/dports/net/libproxy
by devans＠macports.org 24 Aug '10

24 Aug '10

Revision: 70873 http://trac.macports.org/changeset/70873 Author: devans(a)macports.org Date: 2010-08-24 09:34:40 -0700 (Tue, 24 Aug 2010) Log Message: ----------- libproxy: revert to previous version, increment epoch, until pkg-config problem in later versions can be resolved.(#26219). Modified Paths: -------------- trunk/dports/net/libproxy/Portfile Added Paths: ----------- trunk/dports/net/libproxy/files/ trunk/dports/net/libproxy/files/patch-fnonblock.diff trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.2.diff trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.diff trunk/dports/net/libproxy/files/patch-libproxy-libproxy-1.0.pc.in.diff trunk/dports/net/libproxy/files/patch-libproxy-modules-pacrunner_webkit.cpp.diff Removed Paths: ------------- trunk/dports/net/libproxy/files/patch-fnonblock.diff trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.2.diff trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.diff trunk/dports/net/libproxy/files/patch-libproxy-libproxy-1.0.pc.in.diff trunk/dports/net/libproxy/files/patch-libproxy-modules-pacrunner_webkit.cpp.diff Modified: trunk/dports/net/libproxy/Portfile =================================================================== --- trunk/dports/net/libproxy/Portfile 2010-08-24 16:31:06 UTC (rev 70872) +++ trunk/dports/net/libproxy/Portfile 2010-08-24 16:34:40 UTC (rev 70873) @@ -6,7 +6,9 @@ PortGroup cmake 1.0 name libproxy -version 0.4.5 +version 0.4.0 +epoch 1 +revision 4 categories net maintainers devans openmaintainer platforms darwin @@ -20,9 +22,9 @@ network resource, how do I reach it? It handles all \ the details, enabling you to get back to programming. -checksums md5 3b1ef3886d6b8ca5425b9e4eca9856e3 \ - sha1 ce4c601037d108c1008b61cdb4839832b0deb6e8 \ - rmd160 6c7ed8d87adc5725aae8f804dc19cd5fbb3c01b5 +checksums md5 b22c95df70a40949e99add5171fc3084 \ + sha1 4d9dc92dd40255a51e541099b39d9852563dbc6a \ + rmd160 9375f6926cf7c301e4f96a018ca5278c7c8c5c45 post-patch { if {![variant_isset kde]} { @@ -40,6 +42,15 @@ port:gconf \ port:python26 +# patch to libproxy/modules/config_gnome.cpp corresponds to upstream commit r628 +# patch to libproxy/CMakeLists.txt corresponds to upstream commit r587 +# patch to libproxy/modules/pacrunner_webkit.cpp corresponds to upstream commits r608 and r616 +# patch to libproxy/libproxy-1.0.pc.in corresponds to upstream commit r622 +patchfiles patch-fnonblock.diff \ + patch-libproxy-CMakeLists.txt.diff \ + patch-libproxy-modules-pacrunner_webkit.cpp.diff \ + patch-libproxy-libproxy-1.0.pc.in.diff + configure.args-append \ -D__pkg_config_checked_KDE4=YES Deleted: trunk/dports/net/libproxy/files/patch-fnonblock.diff =================================================================== --- trunk/dports/net/libproxy/files/patch-fnonblock.diff 2010-08-23 03:30:23 UTC (rev 70838) +++ trunk/dports/net/libproxy/files/patch-fnonblock.diff 2010-08-24 16:34:40 UTC (rev 70873) @@ -1,11 +0,0 @@ ---- libproxy/modules/config_gnome.cpp (revision 627) -+++ libproxy/modules/config_gnome.cpp (revision 628) -@@ -118,7 +118,7 @@ - this->read_data(count); - - // Set the read pipe to non-blocking -- if (fcntl(fileno(this->read), F_SETFL, FNONBLOCK) == -1) { -+ if (fcntl(fileno(this->read), F_SETFL, O_NONBLOCK) == -1) { - fclose(this->read); - fclose(this->write); - kill(this->pid, SIGTERM); Copied: trunk/dports/net/libproxy/files/patch-fnonblock.diff (from rev 70838, trunk/dports/net/libproxy/files/patch-fnonblock.diff) =================================================================== --- trunk/dports/net/libproxy/files/patch-fnonblock.diff (rev 0) +++ trunk/dports/net/libproxy/files/patch-fnonblock.diff 2010-08-24 16:34:40 UTC (rev 70873) @@ -0,0 +1,11 @@ +--- libproxy/modules/config_gnome.cpp (revision 627) ++++ libproxy/modules/config_gnome.cpp (revision 628) +@@ -118,7 +118,7 @@ + this->read_data(count); + + // Set the read pipe to non-blocking +- if (fcntl(fileno(this->read), F_SETFL, FNONBLOCK) == -1) { ++ if (fcntl(fileno(this->read), F_SETFL, O_NONBLOCK) == -1) { + fclose(this->read); + fclose(this->write); + kill(this->pid, SIGTERM); Deleted: trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.2.diff =================================================================== --- trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.2.diff 2010-08-23 03:30:23 UTC (rev 70838) +++ trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.2.diff 2010-08-24 16:34:40 UTC (rev 70873) @@ -1,37 +0,0 @@ ---- libproxy/CMakeLists.txt.orig 2010-04-29 19:25:32.000000000 +0200 -+++ libproxy/CMakeLists.txt 2010-04-29 19:16:58.000000000 +0200 -@@ -96,20 +96,20 @@ - endif() - endif() - --if(APPLE) -- find_library(WEBKIT_LIBRARIES JavaScriptCore) -- find_library(SC_LIBRARIES SystemConfiguration) -- find_library(CF_LIBRARIES CoreFoundation) -- if(WEBKIT_LIBRARIES) -- set(WEBKIT_FOUND 1) -- endif() -- if(SC_LIBRARIES) -- set(SC_FOUND 1) -- endif() -- if(CF_LIBRARIES) -- set(CF_FOUND 1) -- endif() --endif() -+# if(APPLE) -+# find_library(WEBKIT_LIBRARIES JavaScriptCore) -+# find_library(SC_LIBRARIES SystemConfiguration) -+# find_library(CF_LIBRARIES CoreFoundation) -+# if(WEBKIT_LIBRARIES) -+# set(WEBKIT_FOUND 1) -+# endif() -+# if(SC_LIBRARIES) -+# set(SC_FOUND 1) -+# endif() -+# if(CF_LIBRARIES) -+# set(CF_FOUND 1) -+# endif() -+# endif() - - # Build the pacrunner into libproxy unless we are building for multiple engines - set(BIPR 1) Copied: trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.2.diff (from rev 70838, trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.2.diff) =================================================================== --- trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.2.diff (rev 0) +++ trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.2.diff 2010-08-24 16:34:40 UTC (rev 70873) @@ -0,0 +1,37 @@ +--- libproxy/CMakeLists.txt.orig 2010-04-29 19:25:32.000000000 +0200 ++++ libproxy/CMakeLists.txt 2010-04-29 19:16:58.000000000 +0200 +@@ -96,20 +96,20 @@ + endif() + endif() + +-if(APPLE) +- find_library(WEBKIT_LIBRARIES JavaScriptCore) +- find_library(SC_LIBRARIES SystemConfiguration) +- find_library(CF_LIBRARIES CoreFoundation) +- if(WEBKIT_LIBRARIES) +- set(WEBKIT_FOUND 1) +- endif() +- if(SC_LIBRARIES) +- set(SC_FOUND 1) +- endif() +- if(CF_LIBRARIES) +- set(CF_FOUND 1) +- endif() +-endif() ++# if(APPLE) ++# find_library(WEBKIT_LIBRARIES JavaScriptCore) ++# find_library(SC_LIBRARIES SystemConfiguration) ++# find_library(CF_LIBRARIES CoreFoundation) ++# if(WEBKIT_LIBRARIES) ++# set(WEBKIT_FOUND 1) ++# endif() ++# if(SC_LIBRARIES) ++# set(SC_FOUND 1) ++# endif() ++# if(CF_LIBRARIES) ++# set(CF_FOUND 1) ++# endif() ++# endif() + + # Build the pacrunner into libproxy unless we are building for multiple engines + set(BIPR 1) Deleted: trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.diff =================================================================== --- trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.diff 2010-08-23 03:30:23 UTC (rev 70838) +++ trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.diff 2010-08-24 16:34:40 UTC (rev 70873) @@ -1,11 +0,0 @@ ---- libproxy/CMakeLists.txt.orig 2010-03-21 12:22:28.000000000 -0500 -+++ libproxy/CMakeLists.txt 2010-03-21 12:22:54.000000000 -0500 -@@ -137,7 +137,7 @@ - - ### Misc files - # PkgConfig file --if(NOT ${WIN32}) -+if(NOT WIN32) - configure_file(libproxy-1.0.pc.in libproxy-1.0.pc @ONLY) - install(FILES libproxy-1.0.pc DESTINATION ${libdir}/pkgconfig) - endif() Copied: trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.diff (from rev 70838, trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.diff) =================================================================== --- trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.diff (rev 0) +++ trunk/dports/net/libproxy/files/patch-libproxy-CMakeLists.txt.diff 2010-08-24 16:34:40 UTC (rev 70873) @@ -0,0 +1,11 @@ +--- libproxy/CMakeLists.txt.orig 2010-03-21 12:22:28.000000000 -0500 ++++ libproxy/CMakeLists.txt 2010-03-21 12:22:54.000000000 -0500 +@@ -137,7 +137,7 @@ + + ### Misc files + # PkgConfig file +-if(NOT ${WIN32}) ++if(NOT WIN32) + configure_file(libproxy-1.0.pc.in libproxy-1.0.pc @ONLY) + install(FILES libproxy-1.0.pc DESTINATION ${libdir}/pkgconfig) + endif() Deleted: trunk/dports/net/libproxy/files/patch-libproxy-libproxy-1.0.pc.in.diff =================================================================== --- trunk/dports/net/libproxy/files/patch-libproxy-libproxy-1.0.pc.in.diff 2010-08-23 03:30:23 UTC (rev 70838) +++ trunk/dports/net/libproxy/files/patch-libproxy-libproxy-1.0.pc.in.diff 2010-08-24 16:34:40 UTC (rev 70873) @@ -1,13 +0,0 @@ ---- libproxy/libproxy-1.0.pc.in.orig 2010-03-21 12:38:02.000000000 -0500 -+++ libproxy/libproxy-1.0.pc.in 2010-03-21 12:39:16.000000000 -0500 -@@ -2,8 +2,8 @@ - libdir=@libdir@ - includedir=@includedir@ - --Name: libproxy -+Name: libproxy-1.0 - Description: Proxy Configuration Library --Version: @VERSION@ -+Version: @CMAKE_PROJECT_VERSION@ - Libs: -L${libdir} -lproxy - Cflags: -I${includedir} Copied: trunk/dports/net/libproxy/files/patch-libproxy-libproxy-1.0.pc.in.diff (from rev 70838, trunk/dports/net/libproxy/files/patch-libproxy-libproxy-1.0.pc.in.diff) =================================================================== --- trunk/dports/net/libproxy/files/patch-libproxy-libproxy-1.0.pc.in.diff (rev 0) +++ trunk/dports/net/libproxy/files/patch-libproxy-libproxy-1.0.pc.in.diff 2010-08-24 16:34:40 UTC (rev 70873) @@ -0,0 +1,13 @@ +--- libproxy/libproxy-1.0.pc.in.orig 2010-03-21 12:38:02.000000000 -0500 ++++ libproxy/libproxy-1.0.pc.in 2010-03-21 12:39:16.000000000 -0500 +@@ -2,8 +2,8 @@ + libdir=@libdir@ + includedir=@includedir@ + +-Name: libproxy ++Name: libproxy-1.0 + Description: Proxy Configuration Library +-Version: @VERSION@ ++Version: @CMAKE_PROJECT_VERSION@ + Libs: -L${libdir} -lproxy + Cflags: -I${includedir} Deleted: trunk/dports/net/libproxy/files/patch-libproxy-modules-pacrunner_webkit.cpp.diff =================================================================== --- trunk/dports/net/libproxy/files/patch-libproxy-modules-pacrunner_webkit.cpp.diff 2010-08-23 03:30:23 UTC (rev 70838) +++ trunk/dports/net/libproxy/files/patch-libproxy-modules-pacrunner_webkit.cpp.diff 2010-08-24 16:34:40 UTC (rev 70873) @@ -1,16 +0,0 @@ ---- libproxy/modules/pacrunner_webkit.cpp (revision 607) -+++ libproxy/modules/pacrunner_webkit.cpp (revision 616) -@@ -20,7 +20,13 @@ - #include "../extension_pacrunner.hpp" - using namespace libproxy; - -+#ifdef __APPLE__ -+// JavaScriptCore.h requires CoreFoundation -+// This is only found on Mac OS X -+#include <JavaScriptCore/JavaScriptCore.h> -+#else - #include <JavaScriptCore/JavaScript.h> -+#endif - #include "pacutils.h" - - #ifndef INET_ADDRSTRLEN Copied: trunk/dports/net/libproxy/files/patch-libproxy-modules-pacrunner_webkit.cpp.diff (from rev 70838, trunk/dports/net/libproxy/files/patch-libproxy-modules-pacrunner_webkit.cpp.diff) =================================================================== --- trunk/dports/net/libproxy/files/patch-libproxy-modules-pacrunner_webkit.cpp.diff (rev 0) +++ trunk/dports/net/libproxy/files/patch-libproxy-modules-pacrunner_webkit.cpp.diff 2010-08-24 16:34:40 UTC (rev 70873) @@ -0,0 +1,16 @@ +--- libproxy/modules/pacrunner_webkit.cpp (revision 607) ++++ libproxy/modules/pacrunner_webkit.cpp (revision 616) +@@ -20,7 +20,13 @@ + #include "../extension_pacrunner.hpp" + using namespace libproxy; + ++#ifdef __APPLE__ ++// JavaScriptCore.h requires CoreFoundation ++// This is only found on Mac OS X ++#include <JavaScriptCore/JavaScriptCore.h> ++#else + #include <JavaScriptCore/JavaScript.h> ++#endif + #include "pacutils.h" + + #ifndef INET_ADDRSTRLEN

1 0