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

[72881] trunk/dports/x11/mesa/Portfile
by devans＠macports.org 29 Oct '10

29 Oct '10

Revision: 72881 http://trac.macports.org/changeset/72881 Author: devans(a)macports.org Date: 2010-10-29 10:33:32 -0700 (Fri, 29 Oct 2010) Log Message: ----------- mesa: update livecheck. Modified Paths: -------------- trunk/dports/x11/mesa/Portfile Modified: trunk/dports/x11/mesa/Portfile =================================================================== --- trunk/dports/x11/mesa/Portfile 2010-10-29 16:30:18 UTC (rev 72880) +++ trunk/dports/x11/mesa/Portfile 2010-10-29 17:33:32 UTC (rev 72881) @@ -150,4 +150,6 @@ } } -livecheck.name Mesa +livecheck.type regex +livecheck.url http://www.buraphalinux.org/download/bls1.4/dvd_source/source/x11/xserver/m… +livecheck.regex "MesaLib-(\\d+\\.\[02468\](?:\\.\\d+)*)${extract.suffix}"

1 0

[72880] trunk/dports/net/nss/Portfile
by devans＠macports.org 29 Oct '10

29 Oct '10

Revision: 72880 http://trac.macports.org/changeset/72880 Author: devans(a)macports.org Date: 2010-10-29 09:30:18 -0700 (Fri, 29 Oct 2010) Log Message: ----------- nss: add livecheck. Modified Paths: -------------- trunk/dports/net/nss/Portfile Modified: trunk/dports/net/nss/Portfile =================================================================== --- trunk/dports/net/nss/Portfile 2010-10-29 16:11:28 UTC (rev 72879) +++ trunk/dports/net/nss/Portfile 2010-10-29 16:30:18 UTC (rev 72880) @@ -97,3 +97,8 @@ reinplace "s,@NSPR_VERSION@,${nspr_version},g" ${destroot}${prefix}/lib/pkgconfig/nss.pc reinplace "s,@NSS_VERSION@,${nss_version},g" ${destroot}${prefix}/lib/pkgconfig/nss.pc } + +livecheck.type regex +livecheck.url http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/ +livecheck.version "${NSS_VMAJOR}_${NSS_VMINOR}_${NSS_VPATCH}" +livecheck.regex {(\d+_\d+(?:_\d+)*)}

1 0

[72879] trunk/dports/aqua/djview/Portfile
by michaelld＠macports.org 29 Oct '10

29 Oct '10

Revision: 72879 http://trac.macports.org/changeset/72879 Author: michaelld(a)macports.org Date: 2010-10-29 09:11:28 -0700 (Fri, 29 Oct 2010) Log Message: ----------- djview: Update to version 4.6. Modified Paths: -------------- trunk/dports/aqua/djview/Portfile Modified: trunk/dports/aqua/djview/Portfile =================================================================== --- trunk/dports/aqua/djview/Portfile 2010-10-29 16:09:51 UTC (rev 72878) +++ trunk/dports/aqua/djview/Portfile 2010-10-29 16:11:28 UTC (rev 72879) @@ -5,8 +5,7 @@ PortGroup qt4 1.0 name djview -version 4.5 -revision 2 +version 4.6 categories aqua graphics www maintainers nomaintainer platforms darwin @@ -23,9 +22,9 @@ master_sites sourceforge:djvu distname ${name}4-${version} -checksums md5 0461a26dbcac33dcc5eb7955ac357504 \ - sha1 d2fd259aa88f80393767f6dec921463da7820143 \ - rmd160 256abad9cc6d661ba19caf209b74d9937eec4bce +checksums md5 642105970467cf0864c0073140d1fa11 \ + sha1 72d98fde9c6406ee714830118d06767b561941fd \ + rmd160 a9116466ba1dc2441ed385928b2f54d71fab525b depends_lib-append \ port:djvulibre

1 0

[72878] trunk/dports/graphics/djvulibre/Portfile
by michaelld＠macports.org 29 Oct '10

29 Oct '10

Revision: 72878 http://trac.macports.org/changeset/72878 Author: michaelld(a)macports.org Date: 2010-10-29 09:09:51 -0700 (Fri, 29 Oct 2010) Log Message: ----------- djvulibre: bump to version 3.5.23 . Modified Paths: -------------- trunk/dports/graphics/djvulibre/Portfile Modified: trunk/dports/graphics/djvulibre/Portfile =================================================================== --- trunk/dports/graphics/djvulibre/Portfile 2010-10-29 16:00:18 UTC (rev 72877) +++ trunk/dports/graphics/djvulibre/Portfile 2010-10-29 16:09:51 UTC (rev 72878) @@ -4,8 +4,7 @@ PortSystem 1.0 name djvulibre -version 3.5.22 -revision 3 +version 3.5.23 categories graphics www platforms darwin maintainers nomaintainer @@ -20,10 +19,10 @@ homepage http://djvu.sourceforge.net/ master_sites sourceforge:djvu -checksums md5 d1513784ce0e4f37d71595dc34c95ec7 \ - sha1 f869d4114052a7df7b8da2d334d124934f1293a6 \ - rmd160 f74cec88c5fbda28976e64669d3e48833b4dfdcd - +checksums md5 0053b9908b9e3d57d0d89b3d065168e9 \ + sha1 b19f6b461515a52eb1048aec81e04dfd836d681f \ + rmd160 66d6dc71cdaa8c2412197f52562c99bef6b924a6 + depends_lib port:libiconv \ port:jpeg \ port:tiff \

1 0

[72877] trunk/dports/aqua/djview/Portfile
by michaelld＠macports.org 29 Oct '10

29 Oct '10

Revision: 72877 http://trac.macports.org/changeset/72877 Author: michaelld(a)macports.org Date: 2010-10-29 09:00:18 -0700 (Fri, 29 Oct 2010) Log Message: ----------- djview: No longer needs "-arch*-arch" qmake work-around. Will build as universal. Modified Paths: -------------- trunk/dports/aqua/djview/Portfile Modified: trunk/dports/aqua/djview/Portfile =================================================================== --- trunk/dports/aqua/djview/Portfile 2010-10-29 15:50:13 UTC (rev 72876) +++ trunk/dports/aqua/djview/Portfile 2010-10-29 16:00:18 UTC (rev 72877) @@ -35,13 +35,11 @@ --disable-desktopfiles \ QMAKESPEC=${qt_mkspecs_dir}/macx-g++ -universal_variant no +universal_variant yes -post-configure { - # fix issue with qmake adding an extra -arch sometimes - reinplace "s|-arch ${build_arch} -arch|-arch ${build_arch}|" \ - ${worksrcpath}/src/Makefile -} +# QMake does not handle this flag. +configure.universal_args-delete --disable-dependency-tracking +configure.args-delete --disable-dependency-tracking destroot { xinstall -m 755 -d ${destroot}${applications_dir}

1 0

[72876] trunk/dports/audio/soundtouch/Portfile
by devans＠macports.org 29 Oct '10

29 Oct '10

Revision: 72876 http://trac.macports.org/changeset/72876 Author: devans(a)macports.org Date: 2010-10-29 08:50:13 -0700 (Fri, 29 Oct 2010) Log Message: ----------- soundtouch: update livecheck url. Modified Paths: -------------- trunk/dports/audio/soundtouch/Portfile Modified: trunk/dports/audio/soundtouch/Portfile =================================================================== --- trunk/dports/audio/soundtouch/Portfile 2010-10-29 13:52:43 UTC (rev 72875) +++ trunk/dports/audio/soundtouch/Portfile 2010-10-29 15:50:13 UTC (rev 72876) @@ -34,6 +34,5 @@ } livecheck.type regex -livecheck.url ${master_sites} +livecheck.url ${homepage}/sourcecode.html livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}" -

1 0

propchange - r72874 svn:log
by michaelld＠macports.org 29 Oct '10

29 Oct '10

Author: michaelld(a)macports.org (original author: michaelld(a)macports.org) Revision: 72874 Property Name: svn:log @@ -1,2 +1,2 @@ -Add in a few more variables; set all variables to 'global' to allow -for use in variants and enbedded stages. +qt4 PortGroup: Add in a few more variables; set all variables to +'global' to allow for use in variants and embedded stages.

1 0

[72875] trunk/dports/textproc/doxygen
by michaelld＠macports.org 29 Oct '10

29 Oct '10

Revision: 72875 http://trac.macports.org/changeset/72875 Author: michaelld(a)macports.org Date: 2010-10-29 06:52:43 -0700 (Fri, 29 Oct 2010) Log Message: ----------- doxygen +wizard: fixed ticket #27057. Rename doxywizard patch file to fix typo in name and add path. Fix wizard variant to use new qt4 portgroup variables. Added comments to better describe what is going on. Modified Paths: -------------- trunk/dports/textproc/doxygen/Portfile Added Paths: ----------- trunk/dports/textproc/doxygen/files/patch-addon_doxywizard_Makefile.in.diff Removed Paths: ------------- trunk/dports/textproc/doxygen/files/patch-Makfile.in.diff Modified: trunk/dports/textproc/doxygen/Portfile =================================================================== --- trunk/dports/textproc/doxygen/Portfile 2010-10-29 13:48:40 UTC (rev 72874) +++ trunk/dports/textproc/doxygen/Portfile 2010-10-29 13:52:43 UTC (rev 72875) @@ -71,29 +71,40 @@ } variant wizard description {Include the GUI wizard based on Qt4} { - PortGroup qt4 1.0 - configure.args-append --with-doxywizard + # use the Qt4 PortGroup, which provides a bunch of variables + # and defines for how Qt4 was installed + PortGroup qt4 1.0 - # on Macs, qmake builds .app directories - patchfiles-append patch-Makfile.in.diff + # tell configure to make the wizard app + configure.args-append --with-doxywizard - post-patch { - reinplace "s|/Developer/qt-4.4.3|${qt_dir}|g" ${worksrcpath}/addon/doxywizard/Makefile.doxywizard - reinplace "s|/Developer/qt/bin/moc|${qt_moc_cmd}|g" ${worksrcpath}/addon/doxywizard/Makefile.doxywizard - reinplace "s|/Developer/qt/bin/qmake|${qt_qmake_cmd}|g" ${worksrcpath}/addon/doxywizard/Makefile.doxywizard - # give doxywizard the more mac-like name of DoxyWizard - reinplace "/^TARGET\[\[:space:\]\]/s%=.*%= DoxyWizard%" ${worksrcpath}/addon/doxywizard/doxywizard.pro.in - reinplace "s|__APPLICATIONS_DIR__|${applications_dir}|" ${worksrcpath}/addon/doxywizard/Makefile.in - reinplace "s|\$(INSTALL)|\$(DESTDIR)\$(INSTALL)|g" ${worksrcpath}/addon/doxywizard/Makefile.in - reinplace "s|QMAKE=qmake|QMAKE=${qt_qmake_cmd}|g" ${worksrcpath}/addon/doxywizard/Makefile.in + # on Macs, qmake builds .app directories; when installing, copy + # this directory to the correct location (via the reinplace below). + patchfiles-append patch-addon_doxywizard_Makefile.in.diff - if { ![variant_isset universal] } { - reinplace "s|x86 ppc|[string map {i386 x86} ${build_arch}]|g" ${worksrcpath}/addon/doxywizard/doxywizard.pro.in - } else { - reinplace "s|x86 ppc|[string map {i386 x86} ${universal_archs}]|g" ${worksrcpath}/addon/doxywizard/doxywizard.pro.in - } - } + post-patch { + # allow for universal building, if desired + reinplace "/CONFIG/s@x86 ppc@${qt_arch_types}@" \ + ${worksrcpath}/addon/doxywizard/doxywizard.pro.in + # give doxywizard the more mac-like name of DoxyWizard + reinplace "/^TARGET\[\[:space:\]\]/s%=.*%= DoxyWizard%" \ + ${worksrcpath}/addon/doxywizard/doxywizard.pro.in + + # fix final install location + reinplace "s|__APPLICATIONS_DIR__|${applications_dir}|" \ + ${worksrcpath}/addon/doxywizard/Makefile.in + + # allow DESTROOT to work + reinplace "s|\$(INSTALL)|\$(DESTDIR)\$(INSTALL)|g" \ + ${worksrcpath}/addon/doxywizard/Makefile.in + + # use the correct QMAKE command; the other should work, but + # this one is guaranteed to. + reinplace "s|QMAKE=qmake|QMAKE=${qt_qmake_cmd}|g" \ + ${worksrcpath}/addon/doxywizard/Makefile.in + } + post-destroot { # allow doxywizard to be called from the command line ln -s ${applications_dir}/DoxyWizard.app/Contents/MacOS/DoxyWizard ${destroot}${prefix}/bin/doxywizard Deleted: trunk/dports/textproc/doxygen/files/patch-Makfile.in.diff =================================================================== --- trunk/dports/textproc/doxygen/files/patch-Makfile.in.diff 2010-10-29 13:48:40 UTC (rev 72874) +++ trunk/dports/textproc/doxygen/files/patch-Makfile.in.diff 2010-10-29 13:52:43 UTC (rev 72875) @@ -1,12 +0,0 @@ ---- addon/doxywizard/Makefile.in.orig 2008-12-06 08:14:58.000000000 -0500 -+++ addon/doxywizard/Makefile.in 2009-01-30 20:39:50.000000000 -0500 -@@ -30,7 +30,8 @@ - - install: - $(INSTTOOL) -d $(INSTALL)/bin -- $(INSTTOOL) -m 755 ../../bin/doxywizard $(INSTALL)/bin -+ $(INSTTOOL) -d $(DESTDIR)__APPLICATIONS_DIR__ -+ /bin/cp -R ../../bin/*.app $(DESTDIR)__APPLICATIONS_DIR__ - $(INSTTOOL) -d $(INSTALL)/$(MAN1DIR) - cat ../../doc/doxywizard.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxywizard.1 - $(INSTTOOL) -m 644 doxywizard.1 $(INSTALL)/$(MAN1DIR)/doxywizard.1 Copied: trunk/dports/textproc/doxygen/files/patch-addon_doxywizard_Makefile.in.diff (from rev 72854, trunk/dports/textproc/doxygen/files/patch-Makfile.in.diff) =================================================================== --- trunk/dports/textproc/doxygen/files/patch-addon_doxywizard_Makefile.in.diff (rev 0) +++ trunk/dports/textproc/doxygen/files/patch-addon_doxywizard_Makefile.in.diff 2010-10-29 13:52:43 UTC (rev 72875) @@ -0,0 +1,12 @@ +--- addon/doxywizard/Makefile.in.orig 2008-12-06 08:14:58.000000000 -0500 ++++ addon/doxywizard/Makefile.in 2009-01-30 20:39:50.000000000 -0500 +@@ -30,7 +30,8 @@ + + install: + $(INSTTOOL) -d $(INSTALL)/bin +- $(INSTTOOL) -m 755 ../../bin/doxywizard $(INSTALL)/bin ++ $(INSTTOOL) -d $(DESTDIR)__APPLICATIONS_DIR__ ++ /bin/cp -R ../../bin/*.app $(DESTDIR)__APPLICATIONS_DIR__ + $(INSTTOOL) -d $(INSTALL)/$(MAN1DIR) + cat ../../doc/doxywizard.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxywizard.1 + $(INSTTOOL) -m 644 doxywizard.1 $(INSTALL)/$(MAN1DIR)/doxywizard.1

1 0

[72874] trunk/dports/_resources/port1.0/group/qt4-1.0.tcl
by michaelld＠macports.org 29 Oct '10

29 Oct '10

Revision: 72874 http://trac.macports.org/changeset/72874 Author: michaelld(a)macports.org Date: 2010-10-29 06:48:40 -0700 (Fri, 29 Oct 2010) Log Message: ----------- Add in a few more variables; set all variables to 'global' to allow for use in variants and enbedded stages. Modified Paths: -------------- trunk/dports/_resources/port1.0/group/qt4-1.0.tcl Modified: trunk/dports/_resources/port1.0/group/qt4-1.0.tcl =================================================================== --- trunk/dports/_resources/port1.0/group/qt4-1.0.tcl 2010-10-29 13:07:01 UTC (rev 72873) +++ trunk/dports/_resources/port1.0/group/qt4-1.0.tcl 2010-10-29 13:48:40 UTC (rev 72874) @@ -36,60 +36,87 @@ # PortGroup qt4 1.0 # standard Qt4 name +global qt_name set qt_name qt4 # standard install directory +global qt_dir set qt_dir ${prefix} # standard Qt documents directory +global qt_docs_dir set qt_docs_dir ${qt_dir}/share/doc/${qt_name} # standard Qt plugins directory +global qt_plugins_dir set qt_plugins_dir ${qt_dir}/share/${qt_name}/plugins # standard Qt mkspecs directory +global qt_mkspecs_dir set qt_mkspecs_dir ${qt_dir}/share/${qt_name}/mkspecs # standard Qt imports directory +global qt_imports_dir set qt_imports_dir ${qt_dir}/share/${qt_name}/imports # standard Qt includes directory +global qt_includes_dir set qt_includes_dir ${qt_dir}/include # standard Qt libraries directory +global qt_libs_dir set qt_libs_dir ${qt_dir}/lib +# standard Qt non-.app executables directory +global qt_bins_dir +set qt_bins_dir ${qt_dir}/bin + +# standard Qt .app executables directory, if created +global qt_apps_dir +set qt_apps_dir ${applications_dir}/Qt + # standard Qt data directory +global qt_data_dir set qt_data_dir ${qt_dir}/share/${qt_name} # standard Qt translations directory +global qt_translations_dir set qt_translations_dir ${qt_dir}/share/${qt_name}/translations # standard Qt sysconf directory +global qt_sysconf_dir set qt_sysconf_dir ${qt_dir}/etc/${qt_name} # standard Qt examples directory +global qt_examples_dir set qt_examples_dir ${qt_dir}/share/${qt_name}/examples # standard Qt demos directory +global qt_demos_dir set qt_demos_dir ${qt_dir}/share/${qt_name}/demos # standard CMake module directory for Qt-related files +global qt_cmake_module_dir set qt_cmake_module_dir ${qt_dir}/share/cmake/modules # standard qmake command location +global qt_qmake_cmd set qt_qmake_cmd ${qt_dir}/bin/qmake # standard moc command location +global qt_moc_cmd set qt_moc_cmd ${qt_dir}/bin/moc # standard uic command location +global qt_uic_cmd set qt_uic_cmd ${qt_dir}/bin/uic # standard lrelease command location +global qt_lrelease_cmd set qt_lrelease_cmd ${qt_dir}/bin/lrelease # standard cmake info for Qt4 +global qt_cmake_defines set qt_cmake_defines \ "-DQT_QT_INCLUDE_DIR=${qt_includes_dir} \ -DQT_LIBRARY_DIR=${qt_libs_dir} \ @@ -97,6 +124,17 @@ -DQT_ZLIB_LIBRARY=${prefix}/lib/libz.dylib \ -DQT_PNG_LIBRARY=${prefix}/lib/libpng.dylib" +# set Qt understood arch types, based on user preference +pre-patch { + global qt_arch_types + if {[variant_exists universal] && [variant_isset universal]} { + set qt_arch_types ${universal_archs} + } else { + set qt_arch_types ${build_arch} + } + set qt_arch_types [string map {i386 x86} ${qt_arch_types}] +} + # allow for both qt4 and qt4 devel depends_lib-append path:bin/qmake:qt4-mac

1 0

[72873] trunk/dports/audio/phonon/Portfile
by snc＠macports.org 29 Oct '10

29 Oct '10

Revision: 72873 http://trac.macports.org/changeset/72873 Author: snc(a)macports.org Date: 2010-10-29 06:07:01 -0700 (Fri, 29 Oct 2010) Log Message: ----------- phonon: lint nitpicks Modified Paths: -------------- trunk/dports/audio/phonon/Portfile Modified: trunk/dports/audio/phonon/Portfile =================================================================== --- trunk/dports/audio/phonon/Portfile 2010-10-29 13:05:55 UTC (rev 72872) +++ trunk/dports/audio/phonon/Portfile 2010-10-29 13:07:01 UTC (rev 72873) @@ -2,9 +2,11 @@ # $Id$ PortSystem 1.0 + # use KDE4 portgroup, but remove depends_lib for phonon # See dports/_resources/port1.0/group/kde4-1.1.tcl for more info. PortGroup kde4 1.1 + depends_lib-delete port:phonon name phonon

1 0