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

[81430] trunk/dports/kde
by snc＠macports.org 30 Jul '11

30 Jul '11

Revision: 81430 http://trac.macports.org/changeset/81430 Author: snc(a)macports.org Date: 2011-07-30 11:50:52 -0700 (Sat, 30 Jul 2011) Log Message: ----------- kde4-runtime: create 4.7.0 from kdebase4-runtime Modified Paths: -------------- trunk/dports/kde/kde4-runtime/Portfile Added Paths: ----------- trunk/dports/kde/kde4-runtime/ trunk/dports/kde/kde4-runtime/files/ trunk/dports/kde/kde4-runtime/files/patch-nepomuk-services-storage-datamanagementmodel.h.diff Modified: trunk/dports/kde/kde4-runtime/Portfile =================================================================== --- trunk/dports/kde/kdebase4-runtime/Portfile 2011-07-29 03:00:11 UTC (rev 81293) +++ trunk/dports/kde/kde4-runtime/Portfile 2011-07-30 18:50:52 UTC (rev 81430) @@ -4,9 +4,8 @@ PortSystem 1.0 PortGroup kde4 1.1 -name kdebase4-runtime -version 4.6.5 -revision 1 +name kde4-runtime +version 4.7.0 categories kde kde4 maintainers snc sharky michaelld description Shared data needed by KDE4 programs @@ -16,10 +15,11 @@ homepage http://www.kde.org master_sites kde:stable/${version}/src/ use_bzip2 yes -distname kdebase-runtime-${version} -checksums rmd160 2b7f997b0d1c312d09ff6a968b265332c43dd51a \ - sha256 0ad4ae1139005e3bc0cab6357f366575465fb37828762aff658483e6ddf466e2 +distname kde-runtime-${version} +checksums rmd160 80ad75e71031cd164cbb2837b2a4ba6c6cd5f62d \ + sha256 7cf4dca64b1006e8fb14ee9bd683ce23c39f9d76f2f1ceb65a394024270ca9f2 + depends_lib-append port:kdelibs4 \ port:libssh \ port:qimageblitz \ @@ -32,15 +32,14 @@ port:virtuoso \ port:bison -post-patch { - ln ${worksrcpath}/knotify/Info.plist.template \ - ${worksrcpath}/Info.plist.template -} +patch.pre_args -p1 +patchfiles patch-nepomuk-services-storage-datamanagementmodel.h.diff configure.args-append -DWITH_PulseAudio=OFF \ -DXINE_INCLUDE_DIR=\"\" \ -DXINE_LIBRARY=\"\" \ -DWITH_ALSA=OFF \ + -DWITH_QZeitgeist=OFF \ -DWITH_QNtrack=OFF \ -DWITH_Samba=OFF \ -DKDEBASE_DISABLE_MULTIMEDIA=ON Added: trunk/dports/kde/kde4-runtime/files/patch-nepomuk-services-storage-datamanagementmodel.h.diff =================================================================== --- trunk/dports/kde/kde4-runtime/files/patch-nepomuk-services-storage-datamanagementmodel.h.diff (rev 0) +++ trunk/dports/kde/kde4-runtime/files/patch-nepomuk-services-storage-datamanagementmodel.h.diff 2011-07-30 18:50:52 UTC (rev 81430) @@ -0,0 +1,29 @@ +--- kde-runtime-4.7.0/nepomuk/services/storage/datamanagementmodel.h.orig 2011-07-30 13:33:02.000000000 -0400 ++++ kde-runtime-4.7.0/nepomuk/services/storage/datamanagementmodel.h 2011-07-30 13:39:18.000000000 -0400 +@@ -156,7 +156,7 @@ + const QString& app, + Nepomuk::StoreIdentificationMode identificationMode = Nepomuk::IdentifyNew, + Nepomuk::StoreResourcesFlags flags = Nepomuk::NoStoreResourcesFlags, +- const QHash<QUrl, QVariant>& additionalMetadata = QHash<QUrl, QVariant>() ); ++ const QHash<QUrl, QVariant>& additionalMetadata = (QHash<QUrl, QVariant>())); + + /** + * Merges two resources into one. Properties from \p resource1 +@@ -188,7 +188,7 @@ + const QString& userSerialization = QString(), + Nepomuk::StoreIdentificationMode identificationMode = Nepomuk::IdentifyNew, + Nepomuk::StoreResourcesFlags flags = Nepomuk::NoStoreResourcesFlags, +- const QHash<QUrl, QVariant>& additionalMetadata = QHash<QUrl, QVariant>()); ++ const QHash<QUrl, QVariant>& additionalMetadata = (QHash<QUrl, QVariant>())); + + /** + * Describe a set of resources, i.e. retrieve all their properties. +@@ -200,7 +200,7 @@ + //@} + + private: +- QUrl createGraph(const QString& app = QString(), const QHash<QUrl, QVariant>& additionalMetadata = QHash<QUrl, QVariant>()); ++ QUrl createGraph(const QString& app = QString(), const QHash<QUrl, QVariant>& additionalMetadata = (QHash<QUrl, QVariant>())); + QUrl createGraph(const QString& app, const QMultiHash<QUrl, Soprano::Node>& additionalMetadata); + + /**

1 0

[81429] trunk/dports/kde/kdebase4/Portfile
by snc＠macports.org 30 Jul '11

30 Jul '11

Revision: 81429 http://trac.macports.org/changeset/81429 Author: snc(a)macports.org Date: 2011-07-30 10:06:49 -0700 (Sat, 30 Jul 2011) Log Message: ----------- kdebase4: replaced_by kde4-baseapps Modified Paths: -------------- trunk/dports/kde/kdebase4/Portfile Modified: trunk/dports/kde/kdebase4/Portfile =================================================================== --- trunk/dports/kde/kdebase4/Portfile 2011-07-30 17:06:02 UTC (rev 81428) +++ trunk/dports/kde/kdebase4/Portfile 2011-07-30 17:06:49 UTC (rev 81429) @@ -6,6 +6,8 @@ name kdebase4 version 4.6.5 +revision 1 +replaced_by kde4-baseapps categories kde kde4 maintainers snc sharky description KDE4 applications and libraries from the base package @@ -13,21 +15,12 @@ This port installs the file manager dolphin file manager. platforms darwin homepage http://www.kde.org -master_sites kde:stable/${version}/src/ -use_bzip2 yes -distname kdebase-${version} -checksums rmd160 cef007659a02cbec3bd484aa9eb5a721c5200b4f \ - sha256 542a42fc806673ba46827dcc5616fe53239659107934f1b05bf476e46ecbffd5 -depends_lib-append port:kdelibs4 \ - port:qimageblitz \ - port:kdepimlibs4 \ - port:kdebase4-runtime +distfiles +pre-configure { + ui_error "${name} is provided by kde4-baseapps." + return -code error "obsolete port" +} -configure.args-append -DWITH_XKB=OFF - -universal_variant no - -livecheck.url http://mirrors.ibiblio.org/pub/mirrors/kde/stable/latest/src/ -livecheck.regex kdebase-(\\d+\\.\\d+\\.\\d+)${extract.suffix} +livecheck.type none

1 0

[81428] trunk/dports/kde
by snc＠macports.org 30 Jul '11

30 Jul '11

Revision: 81428 http://trac.macports.org/changeset/81428 Author: snc(a)macports.org Date: 2011-07-30 10:06:02 -0700 (Sat, 30 Jul 2011) Log Message: ----------- kde4-baseapps: create 4.7.0 from kdebase4 Modified Paths: -------------- trunk/dports/kde/kde4-baseapps/Portfile Added Paths: ----------- trunk/dports/kde/kde4-baseapps/ Modified: trunk/dports/kde/kde4-baseapps/Portfile =================================================================== --- trunk/dports/kde/kdebase4/Portfile 2011-07-29 03:00:11 UTC (rev 81293) +++ trunk/dports/kde/kde4-baseapps/Portfile 2011-07-30 17:06:02 UTC (rev 81428) @@ -4,8 +4,8 @@ PortSystem 1.0 PortGroup kde4 1.1 -name kdebase4 -version 4.6.5 +name kde4-baseapps +version 4.7.0 categories kde kde4 maintainers snc sharky description KDE4 applications and libraries from the base package @@ -15,10 +15,11 @@ homepage http://www.kde.org master_sites kde:stable/${version}/src/ use_bzip2 yes -distname kdebase-${version} -checksums rmd160 cef007659a02cbec3bd484aa9eb5a721c5200b4f \ - sha256 542a42fc806673ba46827dcc5616fe53239659107934f1b05bf476e46ecbffd5 +distname kde-baseapps-${version} +checksums rmd160 677365b5bd7af1fe3a1f5e3dc5dd091be362e28b \ + sha256 e15031e14ab6b212401d6f5cf99482eabaa906f08d361ebfd9a26ca5a51bf14a + depends_lib-append port:kdelibs4 \ port:qimageblitz \ port:kdepimlibs4 \

1 0

[81427] trunk/dports/games/blobwars
by jmr＠macports.org 30 Jul '11

30 Jul '11

Revision: 81427 http://trac.macports.org/changeset/81427 Author: jmr(a)macports.org Date: 2011-07-30 05:53:14 -0700 (Sat, 30 Jul 2011) Log Message: ----------- blobwars: don't use sdlmain in the pak tool Modified Paths: -------------- trunk/dports/games/blobwars/Portfile trunk/dports/games/blobwars/files/patch-makefile.diff Added Paths: ----------- trunk/dports/games/blobwars/files/patch-src_pak.h.diff Modified: trunk/dports/games/blobwars/Portfile =================================================================== --- trunk/dports/games/blobwars/Portfile 2011-07-30 12:14:02 UTC (rev 81426) +++ trunk/dports/games/blobwars/Portfile 2011-07-30 12:53:14 UTC (rev 81427) @@ -34,7 +34,7 @@ port:libsdl_net \ port:zlib -patchfiles patch-makefile.diff +patchfiles patch-makefile.diff patch-src_pak.h.diff use_configure no Modified: trunk/dports/games/blobwars/files/patch-makefile.diff =================================================================== --- trunk/dports/games/blobwars/files/patch-makefile.diff 2011-07-30 12:14:02 UTC (rev 81426) +++ trunk/dports/games/blobwars/files/patch-makefile.diff 2011-07-30 12:53:14 UTC (rev 81427) @@ -1,5 +1,5 @@ ---- makefile.orig 2010-03-07 04:58:04.000000000 -0600 -+++ makefile 2010-03-30 04:08:11.000000000 -0500 +--- makefile.orig 2010-03-07 21:58:04.000000000 +1100 ++++ makefile 2011-07-30 22:49:56.000000000 +1000 @@ -8,7 +8,7 @@ USEPAK = 1 @@ -18,6 +18,15 @@ OBJS += CAudio.o OBJS += CBoss.o +@@ -80,7 +80,7 @@ + $(CXX) $(LIBS) $(GAMEOBJS) -o $(PROG) + + pak: $(PAKOBJS) +- $(CXX) $(LIBS) $(PAKOBJS) -o pak ++ $(CXX) -lz $(PAKOBJS) -o pak + + %.mo: %.po + msgfmt -c -o $@ $< @@ -108,9 +108,9 @@ mkdir -p $(ICONDIR)64x64/apps mkdir -p $(DESKTOPDIR) Added: trunk/dports/games/blobwars/files/patch-src_pak.h.diff =================================================================== --- trunk/dports/games/blobwars/files/patch-src_pak.h.diff (rev 0) +++ trunk/dports/games/blobwars/files/patch-src_pak.h.diff 2011-07-30 12:53:14 UTC (rev 81427) @@ -0,0 +1,7 @@ +--- src/pak.h.orig 2009-02-01 22:34:45.000000000 +1100 ++++ src/pak.h 2011-07-30 22:49:14.000000000 +1000 +@@ -21,3 +21,4 @@ + #include <dirent.h> + + #include "headers.h" ++#undef main

1 0

[81426] contrib/mpab/chroot-scripts/installmacports
by jmr＠macports.org 30 Jul '11

30 Jul '11

Revision: 81426 http://trac.macports.org/changeset/81426 Author: jmr(a)macports.org Date: 2011-07-30 05:14:02 -0700 (Sat, 30 Jul 2011) Log Message: ----------- mpab: add nosync flag to sources.conf created for new installs Modified Paths: -------------- contrib/mpab/chroot-scripts/installmacports Modified: contrib/mpab/chroot-scripts/installmacports =================================================================== --- contrib/mpab/chroot-scripts/installmacports 2011-07-30 12:08:57 UTC (rev 81425) +++ contrib/mpab/chroot-scripts/installmacports 2011-07-30 12:14:02 UTC (rev 81426) @@ -13,5 +13,5 @@ cd ${SRC_PREFIX}/base ./configure --prefix=${PREFIX} && make -j2 all && make install && make distclean if [[ $? == 0 ]]; then - echo "file://${SRC_PREFIX}/dports [default]" > ${PREFIX}/etc/macports/sources.conf + echo "file://${SRC_PREFIX}/dports [default,nosync]" > ${PREFIX}/etc/macports/sources.conf fi

1 0

[81425] contrib/mpab/mpsync.sh
by jmr＠macports.org 30 Jul '11

30 Jul '11

Revision: 81425 http://trac.macports.org/changeset/81425 Author: jmr(a)macports.org Date: 2011-07-30 05:08:57 -0700 (Sat, 30 Jul 2011) Log Message: ----------- mpab: don't run portindex in mpsync.sh, mpab does that itself Modified Paths: -------------- contrib/mpab/mpsync.sh Modified: contrib/mpab/mpsync.sh =================================================================== --- contrib/mpab/mpsync.sh 2011-07-30 11:50:59 UTC (rev 81424) +++ contrib/mpab/mpsync.sh 2011-07-30 12:08:57 UTC (rev 81425) @@ -68,9 +68,6 @@ ${dataDir}/${exportDir}/ \ ${chrootPath}${SRC_PREFIX} || exit 1 -echo "Re-creating portindex" -chroot_exec recreateportindex - if [[ "$BASE_UPDATE" == "selfupdate" ]]; then chroot_exec selfupdate elif [[ "$BASE_UPDATE" == "svn" ]]; then

1 0

[81424] trunk/dports/python/py-pil/Portfile
by jmr＠macports.org 30 Jul '11

30 Jul '11

Revision: 81424 http://trac.macports.org/changeset/81424 Author: jmr(a)macports.org Date: 2011-07-30 04:50:59 -0700 (Sat, 30 Jul 2011) Log Message: ----------- py-pil: use subport for doc dir Modified Paths: -------------- trunk/dports/python/py-pil/Portfile Modified: trunk/dports/python/py-pil/Portfile =================================================================== --- trunk/dports/python/py-pil/Portfile 2011-07-30 11:49:17 UTC (rev 81423) +++ trunk/dports/python/py-pil/Portfile 2011-07-30 11:50:59 UTC (rev 81424) @@ -38,9 +38,9 @@ } post-destroot { - xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${name} + xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${subport} xinstall -m 0644 -W ${worksrcpath} BUILDME CHANGES CONTENTS README \ - ${destroot}${prefix}/share/doc/${name} + ${destroot}${prefix}/share/doc/${subport} } }

1 0

[81423] trunk/dports/devel/libsdl_pango/Portfile
by jmr＠macports.org 30 Jul '11

30 Jul '11

Revision: 81423 http://trac.macports.org/changeset/81423 Author: jmr(a)macports.org Date: 2011-07-30 04:49:17 -0700 (Sat, 30 Jul 2011) Log Message: ----------- libsdl_pango: add pkgconfig dep Modified Paths: -------------- trunk/dports/devel/libsdl_pango/Portfile Modified: trunk/dports/devel/libsdl_pango/Portfile =================================================================== --- trunk/dports/devel/libsdl_pango/Portfile 2011-07-30 11:45:03 UTC (rev 81422) +++ trunk/dports/devel/libsdl_pango/Portfile 2011-07-30 11:49:17 UTC (rev 81423) @@ -19,6 +19,7 @@ checksums sha1 c30f2941d476d9362850a150d29cb4a93730af68 \ rmd160 d2531cfbe726d27054ca03978721bcc76413379a +depends_build port:pkgconfig depends_lib path:lib/pkgconfig/sdl.pc:libsdl port:fontconfig path:lib/pkgconfig/pango.pc:pango patchfiles patch-SDL_Pango-0.1.2-API-adds.diff

1 0

[81422] trunk/dports/python/py-redis/Portfile
by jmr＠macports.org 30 Jul '11

30 Jul '11

Revision: 81422 http://trac.macports.org/changeset/81422 Author: jmr(a)macports.org Date: 2011-07-30 04:45:03 -0700 (Sat, 30 Jul 2011) Log Message: ----------- py-redis: doesn't build with 2.4 Modified Paths: -------------- trunk/dports/python/py-redis/Portfile Modified: trunk/dports/python/py-redis/Portfile =================================================================== --- trunk/dports/python/py-redis/Portfile 2011-07-30 11:38:46 UTC (rev 81421) +++ trunk/dports/python/py-redis/Portfile 2011-07-30 11:45:03 UTC (rev 81422) @@ -25,11 +25,10 @@ sha1 378c78b7876047d75406665701542bf8c574a440 \ rmd160 f709b6b96116d42f3a8638025326f8eeb46feffb -python.versions 24 25 26 27 +python.versions 25 26 27 +python.default_version 27 -if {$subport == "py24-redis"} { - depends_lib port:py-setuptools -} elseif {$subport != $name} { +if {$subport != $name} { depends_lib port:py${python.version}-distribute }

1 0

[81421] trunk/dports/python/py-blist/Portfile
by jmr＠macports.org 30 Jul '11

30 Jul '11

Revision: 81421 http://trac.macports.org/changeset/81421 Author: jmr(a)macports.org Date: 2011-07-30 04:38:46 -0700 (Sat, 30 Jul 2011) Log Message: ----------- py-blist: depend on py-ctypes with 2.4 Modified Paths: -------------- trunk/dports/python/py-blist/Portfile Modified: trunk/dports/python/py-blist/Portfile =================================================================== --- trunk/dports/python/py-blist/Portfile 2011-07-30 06:27:01 UTC (rev 81420) +++ trunk/dports/python/py-blist/Portfile 2011-07-30 11:38:46 UTC (rev 81421) @@ -28,7 +28,7 @@ python.versions 24 25 26 27 if {$subport == "py24-blist"} { - depends_lib port:py-setuptools + depends_lib port:py-setuptools port:py-ctypes } elseif {$subport != $name} { depends_lib port:py${python.version}-distribute }

1 0