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

[72963] trunk/dports/python/py26-rpy2/Portfile
by jowens＠macports.org 31 Oct '10

31 Oct '10

Revision: 72963 http://trac.macports.org/changeset/72963 Author: jowens(a)macports.org Date: 2010-10-30 18:48:09 -0700 (Sat, 30 Oct 2010) Log Message: ----------- version bump to 2.1.7 Modified Paths: -------------- trunk/dports/python/py26-rpy2/Portfile Modified: trunk/dports/python/py26-rpy2/Portfile =================================================================== --- trunk/dports/python/py26-rpy2/Portfile 2010-10-31 00:37:54 UTC (rev 72962) +++ trunk/dports/python/py26-rpy2/Portfile 2010-10-31 01:48:09 UTC (rev 72963) @@ -5,7 +5,7 @@ PortGroup python26 1.0 name py26-rpy2 -version 2.1.4 +version 2.1.7 categories-append science platforms darwin maintainers nomaintainer @@ -19,9 +19,9 @@ master_sites sourceforge:rpy \ http://pypi.python.org/packages/source/r/rpy2/ distname rpy2-${version} -checksums md5 cf4e0d80ba498a6d76f107531966478d \ - sha1 2099d543f9bfdaac2dd5c2f6a5d370b84a22db82 \ - rmd160 692d062ed4af6bb9d19d615c33735681550b39d5 +checksums md5 e8e8db05f13644ce04784888156af471 \ + sha1 3e065877e689a4f5a23c630f9e1fe12aafbe9122 \ + rmd160 67fbff8146780e082a9d8bc9205264e38aef990c # To continue using your custom R installation instead of MacPorts' R, # you have to remove this dependency line and make sure that your R

1 0

[72962] trunk/dports/editors/abiword-x11/Portfile
by devans＠macports.org 31 Oct '10

31 Oct '10

Revision: 72962 http://trac.macports.org/changeset/72962 Author: devans(a)macports.org Date: 2010-10-30 17:37:54 -0700 (Sat, 30 Oct 2010) Log Message: ----------- abiword-x11: not universal. Modified Paths: -------------- trunk/dports/editors/abiword-x11/Portfile Modified: trunk/dports/editors/abiword-x11/Portfile =================================================================== --- trunk/dports/editors/abiword-x11/Portfile 2010-10-31 00:36:17 UTC (rev 72961) +++ trunk/dports/editors/abiword-x11/Portfile 2010-10-31 00:37:54 UTC (rev 72962) @@ -33,6 +33,12 @@ configure.args --disable-default-plugins +# +# port wv is not universal +# + +universal_variant no + livecheck.type regex livecheck.url http://www.abisource.com/downloads/${dname}/ livecheck.regex ">(\[0-9\]+\\.\[0-9\]*\[02468\]\\.\[0-9\]+)/<"

1 0

[72961] trunk/dports/textproc/wv/Portfile
by devans＠macports.org 31 Oct '10

31 Oct '10

Revision: 72961 http://trac.macports.org/changeset/72961 Author: devans(a)macports.org Date: 2010-10-30 17:36:17 -0700 (Sat, 30 Oct 2010) Log Message: ----------- wv: not universal. Modified Paths: -------------- trunk/dports/textproc/wv/Portfile Modified: trunk/dports/textproc/wv/Portfile =================================================================== --- trunk/dports/textproc/wv/Portfile 2010-10-30 20:57:23 UTC (rev 72960) +++ trunk/dports/textproc/wv/Portfile 2010-10-31 00:36:17 UTC (rev 72961) @@ -22,5 +22,13 @@ patch { reinplace "s|-pedantic||g" ${worksrcpath}/configure } + configure.args --mandir=${prefix}/share/man + +# +# wv is not universal +# + +universal_variant no + livecheck.regex "<title>${name} (.*) released.*</title>"

1 0

[72960] trunk/dports/x11/ico/Portfile
by jeremyhu＠macports.org 30 Oct '10

30 Oct '10

Revision: 72960 http://trac.macports.org/changeset/72960 Author: jeremyhu(a)macports.org Date: 2010-10-30 13:57:23 -0700 (Sat, 30 Oct 2010) Log Message: ----------- ico: Bump to 1.0.3 Modified Paths: -------------- trunk/dports/x11/ico/Portfile Modified: trunk/dports/x11/ico/Portfile =================================================================== --- trunk/dports/x11/ico/Portfile 2010-10-30 20:40:39 UTC (rev 72959) +++ trunk/dports/x11/ico/Portfile 2010-10-30 20:57:23 UTC (rev 72960) @@ -2,8 +2,7 @@ PortSystem 1.0 name ico -version 1.0.2 -revision 1 +version 1.0.3 categories x11 graphics maintainers jeremyhu openmaintainer description Animate an icosahedron or other polyhedron @@ -19,9 +18,9 @@ master_sites http://xorg.freedesktop.org/archive/individual/app/ use_bzip2 yes -checksums md5 5711827c5c2563620b56c33aababbc63 \ - sha1 64940e202d8d53b6c036ad17bc5af9f4823f7fb0 \ - rmd160 1da19b7c31afdaa3411f9368b0de95b85b1d5f49 +checksums md5 9574a53c122b3a6e85bbf3476ebf8ee8 \ + sha1 f5a73d6626b9d4016423594ad18b3073b556e3bf \ + rmd160 c4210e8607f01fd8ddeb596d0f58ce01ee1df0dd depends_build port:pkgconfig

1 0

[72959] trunk/dports/math/k3dsurf/Portfile
by jmr＠macports.org 30 Oct '10

30 Oct '10

Revision: 72959 http://trac.macports.org/changeset/72959 Author: jmr(a)macports.org Date: 2010-10-30 13:40:39 -0700 (Sat, 30 Oct 2010) Log Message: ----------- k3dsurf: whitespace Modified Paths: -------------- trunk/dports/math/k3dsurf/Portfile Modified: trunk/dports/math/k3dsurf/Portfile =================================================================== --- trunk/dports/math/k3dsurf/Portfile 2010-10-30 20:37:43 UTC (rev 72958) +++ trunk/dports/math/k3dsurf/Portfile 2010-10-30 20:40:39 UTC (rev 72959) @@ -1,36 +1,36 @@ # $Id$ -PortSystem 1.0 +PortSystem 1.0 -name k3dsurf -version 0.6.2 -categories math graphics science -maintainers nomaintainer -description Multidimensional surface visualizer +name k3dsurf +version 0.6.2 +categories math graphics science +maintainers nomaintainer +description Multidimensional surface visualizer long_description \ - K3DSurf is a program to visualize and manipulate multidimensional \ - surfaces by using mathematical equations. It's also a "modeler" for \ - POV-Ray in the area of parametric surfaces. + K3DSurf is a program to visualize and manipulate multidimensional \ + surfaces by using mathematical equations. It's also a "modeler" for \ + POV-Ray in the area of parametric surfaces. -platforms darwin +platforms darwin supported_archs i386 ppc -homepage http://k3dsurf.sourceforge.net/ -master_sites sourceforge +homepage http://k3dsurf.sourceforge.net/ +master_sites sourceforge -checksums md5 a7328ffde8453bb8c9977e46eaa170e6 \ - sha1 6e63885cbdd174dc0d9828bf0fc3723461ffb58e +checksums md5 a7328ffde8453bb8c9977e46eaa170e6 \ + sha1 6e63885cbdd174dc0d9828bf0fc3723461ffb58e -depends_lib port:qt3-mac +depends_lib port:qt3-mac configure { - system "cd ${worksrcpath} && qmake" + system "cd ${worksrcpath} && qmake" } -build.env QTDIR=${prefix} +build.env QTDIR=${prefix} destroot { - xinstall -m 755 -d ${destroot}${applications_dir} - file copy ${worksrcpath}/bin/k3dsurf.app \ - ${destroot}${applications_dir} + xinstall -m 755 -d ${destroot}${applications_dir} + file copy ${worksrcpath}/bin/k3dsurf.app \ + ${destroot}${applications_dir} }

1 0

[72958] trunk/dports/math/k3dsurf/Portfile
by jmr＠macports.org 30 Oct '10

30 Oct '10

Revision: 72958 http://trac.macports.org/changeset/72958 Author: jmr(a)macports.org Date: 2010-10-30 13:37:43 -0700 (Sat, 30 Oct 2010) Log Message: ----------- k3dsurf: update to 0.6.2 (fixes #19239) Modified Paths: -------------- trunk/dports/math/k3dsurf/Portfile Modified: trunk/dports/math/k3dsurf/Portfile =================================================================== --- trunk/dports/math/k3dsurf/Portfile 2010-10-30 20:26:02 UTC (rev 72957) +++ trunk/dports/math/k3dsurf/Portfile 2010-10-30 20:37:43 UTC (rev 72958) @@ -1,8 +1,9 @@ # $Id$ PortSystem 1.0 + name k3dsurf -version 0.5.3 +version 0.6.2 categories math graphics science maintainers nomaintainer description Multidimensional surface visualizer @@ -12,11 +13,13 @@ POV-Ray in the area of parametric surfaces. platforms darwin +supported_archs i386 ppc homepage http://k3dsurf.sourceforge.net/ master_sites sourceforge -checksums md5 21101394945588551fefb5f62063f523 +checksums md5 a7328ffde8453bb8c9977e46eaa170e6 \ + sha1 6e63885cbdd174dc0d9828bf0fc3723461ffb58e depends_lib port:qt3-mac @@ -27,8 +30,7 @@ build.env QTDIR=${prefix} destroot { - xinstall -m 755 -d ${destroot}/Applications/MacPorts + xinstall -m 755 -d ${destroot}${applications_dir} file copy ${worksrcpath}/bin/k3dsurf.app \ - ${destroot}/Applications/MacPorts + ${destroot}${applications_dir} } -

1 0

[72957] trunk/dports
by jmr＠macports.org 30 Oct '10

30 Oct '10

Revision: 72957 http://trac.macports.org/changeset/72957 Author: jmr(a)macports.org Date: 2010-10-30 13:26:02 -0700 (Sat, 30 Oct 2010) Log Message: ----------- set supported_archs for qt3-mac dependents Modified Paths: -------------- trunk/dports/devel/qtc-qtsharp/Portfile trunk/dports/devel/qtsharp/Portfile trunk/dports/net/wap11gui/Portfile trunk/dports/python/py26-pyqt3/Portfile trunk/dports/science/qucs/Portfile Modified: trunk/dports/devel/qtc-qtsharp/Portfile =================================================================== --- trunk/dports/devel/qtc-qtsharp/Portfile 2010-10-30 20:16:17 UTC (rev 72956) +++ trunk/dports/devel/qtc-qtsharp/Portfile 2010-10-30 20:26:02 UTC (rev 72957) @@ -6,6 +6,7 @@ version 0.7a categories devel platforms darwin +supported_archs i386 ppc maintainers nomaintainer description Intermediate C++ glue for Qt C# bindings long_description A cross-platform GUI toolkit for Mono and Portable.Net which provides set of classes that bind any CIL language to the Qt toolkit. Modified: trunk/dports/devel/qtsharp/Portfile =================================================================== --- trunk/dports/devel/qtsharp/Portfile 2010-10-30 20:16:17 UTC (rev 72956) +++ trunk/dports/devel/qtsharp/Portfile 2010-10-30 20:26:02 UTC (rev 72957) @@ -6,6 +6,7 @@ version 0.7.1 categories devel platforms darwin +supported_archs i386 ppc maintainers nomaintainer description Qt bindings for C# long_description A cross-platform GUI toolkit for Mono and Portable.Net which provides set of classes that bind any CIL language to the Qt toolkit. Modified: trunk/dports/net/wap11gui/Portfile =================================================================== --- trunk/dports/net/wap11gui/Portfile 2010-10-30 20:16:17 UTC (rev 72956) +++ trunk/dports/net/wap11gui/Portfile 2010-10-30 20:26:02 UTC (rev 72957) @@ -33,6 +33,7 @@ ![file isfile ${prefix}/include/qt3/qt_x11.h]} { depends_lib-delete path:include/qt3/qt_x11.h:qt3 depends_lib-append path:include/qt3/qt_mac.h:qt3-mac + supported_archs i386 ppc } patchfiles-append patch-admin-ltmain.sh \ Modified: trunk/dports/python/py26-pyqt3/Portfile =================================================================== --- trunk/dports/python/py26-pyqt3/Portfile 2010-10-30 20:16:17 UTC (rev 72956) +++ trunk/dports/python/py26-pyqt3/Portfile 2010-10-30 20:26:02 UTC (rev 72957) @@ -5,6 +5,7 @@ name py26-pyqt3 version 3.17.4 platforms macosx +supported_archs i386 ppc categories python devel maintainers blair description PyQt is a set of Python bindings for the Qt toolkit Modified: trunk/dports/science/qucs/Portfile =================================================================== --- trunk/dports/science/qucs/Portfile 2010-10-30 20:16:17 UTC (rev 72956) +++ trunk/dports/science/qucs/Portfile 2010-10-30 20:26:02 UTC (rev 72957) @@ -8,6 +8,7 @@ categories science electronics maintainers rowue platforms darwin +supported_archs i386 ppc description an integrated circuit simulator long_description Qucs is an integrated circuit simulator. \ You can setup an circut with graphical user interface. \

1 0

[72956] trunk/dports/x11/fstobdf/Portfile
by jeremyhu＠macports.org 30 Oct '10

30 Oct '10

Revision: 72956 http://trac.macports.org/changeset/72956 Author: jeremyhu(a)macports.org Date: 2010-10-30 13:16:17 -0700 (Sat, 30 Oct 2010) Log Message: ----------- fstobdf: Bump to 1.0.4 Modified Paths: -------------- trunk/dports/x11/fstobdf/Portfile Modified: trunk/dports/x11/fstobdf/Portfile =================================================================== --- trunk/dports/x11/fstobdf/Portfile 2010-10-30 20:13:56 UTC (rev 72955) +++ trunk/dports/x11/fstobdf/Portfile 2010-10-30 20:16:17 UTC (rev 72956) @@ -2,8 +2,7 @@ PortSystem 1.0 name fstobdf -version 1.0.3 -revision 1 +version 1.0.4 categories x11 graphics maintainers jeremyhu openmaintainer description Convert font from X11 server to BDF @@ -19,9 +18,9 @@ master_sites http://xorg.freedesktop.org/archive/individual/app/ use_bzip2 yes -checksums md5 49a6225380f6c18fff664a043cd569b1 \ - sha1 c7f9184afe3f7526a51b4e19722af8451b33d873 \ - rmd160 aa9041e19b33044e67b28206c9945c08a9a25577 +checksums md5 fc1f42aac16d6b76c79a1a3a0fb6a53b \ + sha1 5310493f53277fd196f93bbb7f2a204cad8997b7 \ + rmd160 a4434bb2f1e5ab2bbde96ac7f43ed023b3e8327d depends_build port:pkgconfig

1 0

[72955] trunk/dports/aqua/qt3-mac
by jmr＠macports.org 30 Oct '10

30 Oct '10

Revision: 72955 http://trac.macports.org/changeset/72955 Author: jmr(a)macports.org Date: 2010-10-30 13:13:56 -0700 (Sat, 30 Oct 2010) Log Message: ----------- qt3-mac: update to 3.3.8b, fix build on 10.6 (#21459), remove bogus symlink (#2255) Modified Paths: -------------- trunk/dports/aqua/qt3-mac/Portfile trunk/dports/aqua/qt3-mac/files/fix_install_names.sh trunk/dports/aqua/qt3-mac/files/qt3-leopard.diff Added Paths: ----------- trunk/dports/aqua/qt3-mac/files/dlcompat.diff trunk/dports/aqua/qt3-mac/files/patch-qmake_Makefile.unix.diff trunk/dports/aqua/qt3-mac/files/reinplace_support.diff Modified: trunk/dports/aqua/qt3-mac/Portfile =================================================================== --- trunk/dports/aqua/qt3-mac/Portfile 2010-10-30 20:12:56 UTC (rev 72954) +++ trunk/dports/aqua/qt3-mac/Portfile 2010-10-30 20:13:56 UTC (rev 72955) @@ -3,22 +3,20 @@ PortSystem 1.0 name qt3-mac -version 3.3.8 -revision 1 +version 3.3.8b categories aqua maintainers blair openmaintainer description Qt Tool Kit (Native Aqua Version) long_description This is Qt, TrollTech's C++ toolkit for writing \ cross-platform GUI applications. homepage http://qt.nokia.com/ -master_sites ftp://ftp.trolltech.com/qt/source/ \ - http://ftp.silug.org/mirrors/ftp.trolltech.com/qt/source/ \ - macports:blair +master_sites trolltech distname qt-mac-free-${version} -checksums md5 dc8013ea4e5b54849f1ed5eedf6b03a3 \ - sha1 b4835adbf5afc15042ce25270e684df395fe897c \ - rmd160 dd2bfc62488e2d0dd500df4899aeaf28738bd8b0 +checksums md5 307eebaa3ee3653595116ad6de36167c \ + sha1 b366c077179c2e95c04c35da013a282f6b270ada \ + rmd160 a71ec4140371c88bf5e29c1c2886f02d643a4a57 platforms darwin +supported_archs i386 ppc destroot.violate_mtree yes depends_lib port:zlib port:libpng port:libmng @@ -70,21 +68,41 @@ platform darwin { patchfiles patch-src-qt_install.pri \ patch-mkspecs-qmake.conf \ - qt3-leopard.diff + patch-qmake_Makefile.unix.diff \ + qt3-leopard.diff \ + reinplace_support.diff \ + dlcompat.diff + configure.args-append -ldl + post-patch { + reinplace s|__CC__|${configure.cc}| ${worksrcpath}/mkspecs/macx-g++/qmake.conf + reinplace s|__CXX__|${configure.cxx}| ${worksrcpath}/mkspecs/macx-g++/qmake.conf \ + ${worksrcpath}/config.tests/mac/mac_version.test + if {[variant_isset universal]} { + set archflags ${configure.universal_cflags} + } else { + set archflags ${configure.cc_archflags} + } + reinplace s/__ARCHFLAGS__/${archflags}/ ${worksrcpath}/mkspecs/macx-g++/qmake.conf \ + ${worksrcpath}/config.tests/mac/mac_version.test + if {!${configure.pipe}} { + reinplace s/-pipe// ${worksrcpath}/mkspecs/macx-g++/qmake.conf + } + } post-destroot { - system "sh ${filespath}/fix_install_names.sh '${prefix}' '${destroot}'" + system "sh ${filespath}/fix_install_names.sh '${prefix}' '${destroot}' '${frameworks_dir}'" set appPath ${destroot}${applications_dir}/Qt3 xinstall -d -m 0755 ${appPath} foreach app {assistant designer linguist qtconfig} { system "mv -v ${destroot}${prefix}/bin/${app}.app \ ${appPath}/${app}.app" } - if {![file exists ${destroot}${prefix}/lib/libqt.dylib]} { - set majorver [strsed ${version} {s/\.[0-9]*\.[0-9]*$//}] - set minorver [strsed ${version} {s/\.[0-9]*$//}] - system "ln -s libqt-mt.${version}.dylib ${destroot}${prefix}/lib/libqt.dylib" - system "ln -s libqt-mt.${version}.dylib ${destroot}${prefix}/lib/libqt.${majorver}.dylib" - system "ln -s libqt-mt.${version}.dylib ${destroot}${prefix}/lib/libqt.${minorver}.dylib" + regexp {[0-9.]+} $version baseversion + set majorver [lindex [split ${baseversion} .] 0] + set minorver [join [lrange [split ${baseversion} .] 0 1] .] + foreach libname "libqt libqt.${majorver} libqt.${minorver}" { + if {![file exists "${destroot}${prefix}/lib/${libname}.dylib"]} { + ln -s libqt-mt.${baseversion}.dylib "${destroot}${prefix}/lib/${libname}.dylib" + } } } } Added: trunk/dports/aqua/qt3-mac/files/dlcompat.diff =================================================================== --- trunk/dports/aqua/qt3-mac/files/dlcompat.diff (rev 0) +++ trunk/dports/aqua/qt3-mac/files/dlcompat.diff 2010-10-30 20:13:56 UTC (rev 72955) @@ -0,0 +1,43 @@ +--- src/network/qdns.cpp.orig 2008-01-16 06:08:57.000000000 +1100 ++++ src/network/qdns.cpp 2010-10-31 05:23:32.000000000 +1100 +@@ -79,7 +79,7 @@ + #include "qcleanuphandler.h" + #include <limits.h> + #ifdef Q_OS_MAC +-#include "../3rdparty/dlcompat/dlfcn.h" ++#include <dlfcn.h> + #endif + + //#define QDNS_DEBUG +@@ -113,7 +113,7 @@ + typedef int (*PtrRes_init)(); + static PtrRes_init ptrRes_init = 0; + if (!ptrRes_init) +- ptrRes_init = (PtrRes_init)DL_PREFIX(dlsym)(RTLD_NEXT, "res_init"); ++ ptrRes_init = (PtrRes_init)dlsym(RTLD_NEXT, "res_init"); + if (ptrRes_init) + return (*ptrRes_init)(); + else +--- src/qt_professional.pri.orig 2008-01-16 06:08:57.000000000 +1100 ++++ src/qt_professional.pri 2010-10-31 05:25:25.000000000 +1100 +@@ -25,7 +25,6 @@ + unix { + NETWORK_H = $$NETWORK_CPP + } +- mac:INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/dlcompat + INCLUDEPATH += $$QT_SOURCE_TREE/src/network + include( $$QT_SOURCE_TREE/src/network/qt_network.pri ) + DEFINES *= QT_MODULE_NETWORK +--- src/tools/qt_tools.pri.orig 2008-01-16 06:08:57.000000000 +1100 ++++ src/tools/qt_tools.pri 2010-10-31 05:29:29.000000000 +1100 +@@ -101,10 +101,6 @@ + $$TOOLS_CPP/qwaitcondition_unix.cpp + + mac:!x11:!embedded:SOURCES += $$TOOLS_CPP/qsettings_mac.cpp +- mac { +- SOURCES+=3rdparty/dlcompat/dlfcn.c +- INCLUDEPATH+=3rdparty/dlcompat +- } + unix:SOURCES += $$TOOLS_CPP/qlibrary_unix.cpp + + SOURCES += $$TOOLS_CPP/qbitarray.cpp \ Modified: trunk/dports/aqua/qt3-mac/files/fix_install_names.sh =================================================================== --- trunk/dports/aqua/qt3-mac/files/fix_install_names.sh 2010-10-30 20:12:56 UTC (rev 72954) +++ trunk/dports/aqua/qt3-mac/files/fix_install_names.sh 2010-10-30 20:13:56 UTC (rev 72955) @@ -2,14 +2,15 @@ PREFIX="$1"; shift DESTROOT="$1"; shift +FRAMEWORKS_DIR="$1"; shift LIBS="libqt-mt.3.dylib libqui.1.dylib" -if [ -z "$PREFIX" ] || [ -z "$DESTROOT" ]; then - echo "usage: $0 <prefix> <destroot>" +if [ -z "$PREFIX" ] || [ -z "$DESTROOT" ] || [ -z "$FRAMEWORKS_DIR" ]; then + echo "usage: $0 <prefix> <destroot> <frameworks_dir>" exit 1 fi -(set -x; install_name_tool -id "/Library/Frameworks/Qt.framework/Qt" "${DESTROOT}/Library/Frameworks/Qt.framework/Qt") +(set -x; install_name_tool -id "/Library/Frameworks/Qt.framework/Qt" "${DESTROOT}${FRAMEWORKS_DIR}/Qt.framework/Qt") for lib in $LIBS; do (set -x; install_name_tool -id "${PREFIX}/lib/${lib}" "${DESTROOT}${PREFIX}/lib/${lib}") Added: trunk/dports/aqua/qt3-mac/files/patch-qmake_Makefile.unix.diff =================================================================== --- trunk/dports/aqua/qt3-mac/files/patch-qmake_Makefile.unix.diff (rev 0) +++ trunk/dports/aqua/qt3-mac/files/patch-qmake_Makefile.unix.diff 2010-10-30 20:13:56 UTC (rev 72955) @@ -0,0 +1,11 @@ +--- qmake/Makefile.unix.orig 2008-01-16 06:08:58.000000000 +1100 ++++ qmake/Makefile.unix 2010-10-31 06:53:45.000000000 +1100 +@@ -49,7 +49,7 @@ + -cp -f @BUILD_PATH@/bin/qmake @QT_INSTALL_BINS@ + [ -d @QT_INSTALL_DATA@ ] || mkdir -p @QT_INSTALL_DATA@ + -cp -R -f @SOURCE_PATH@/mkspecs @QT_INSTALL_DATA@ +- -ln -s -f @QMAKESPEC@ @QT_INSTALL_DATA@/mkspecs/default ++# -ln -s -f @QMAKESPEC@ @QT_INSTALL_DATA@/mkspecs/default + + clean:: + rm -f $(OBJS) $(QOBJS) Modified: trunk/dports/aqua/qt3-mac/files/qt3-leopard.diff =================================================================== --- trunk/dports/aqua/qt3-mac/files/qt3-leopard.diff 2010-10-30 20:12:56 UTC (rev 72954) +++ trunk/dports/aqua/qt3-mac/files/qt3-leopard.diff 2010-10-30 20:13:56 UTC (rev 72955) @@ -22,7 +22,7 @@ =================================================================== --- src/tools/qglobal.h 2008-03-25 22:34:33.000000000 -0600 +++ src/tools/qglobal.h 2008-03-25 22:35:07.000000000 -0600 -@@ -186,7 +186,10 @@ +@@ -186,7 +186,13 @@ # if !defined(MAC_OS_X_VERSION_10_4) # define MAC_OS_X_VERSION_10_4 MAC_OS_X_VERSION_10_3 + 1 # endif @@ -30,7 +30,10 @@ +# if !defined(MAC_OS_X_VERSION_10_5) +# define MAC_OS_X_VERSION_10_5 MAC_OS_X_VERSION_10_4 + 1 +# endif -+# if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5) ++# if !defined(MAC_OS_X_VERSION_10_6) ++# define MAC_OS_X_VERSION_10_6 MAC_OS_X_VERSION_10_5 + 1 ++# endif ++# if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_6) # error "This version of Mac OS X is unsupported" # endif #endif Added: trunk/dports/aqua/qt3-mac/files/reinplace_support.diff =================================================================== --- trunk/dports/aqua/qt3-mac/files/reinplace_support.diff (rev 0) +++ trunk/dports/aqua/qt3-mac/files/reinplace_support.diff 2010-10-30 20:13:56 UTC (rev 72955) @@ -0,0 +1,52 @@ +--- mkspecs/macx-g++/qmake.conf.orig 2010-10-31 04:42:49.000000000 +1100 ++++ mkspecs/macx-g++/qmake.conf 2010-10-31 04:46:16.000000000 +1100 +@@ -8,7 +8,7 @@ + CONFIG += qt warn_on release resource_fork incremental global_init_link_order lib_version_first plugin_no_soname link_prl + QMAKE_INCREMENTAL_STYLE = sublibs + +-QMAKE_CC = cc ++QMAKE_CC = __CC__ + QMAKE_LEX = flex + QMAKE_LEXFLAGS = + QMAKE_YACC = yacc +@@ -17,7 +17,7 @@ + QMAKE_YACC_HEADER = $base.tab.h + QMAKE_YACC_SOURCE = $base.tab.c + QMAKE_RESOURCE = /Developer/Tools/Rez +-QMAKE_CFLAGS = -pipe ++QMAKE_CFLAGS = -pipe __ARCHFLAGS__ + QMAKE_CFLAGS_DEPS = -M + QMAKE_CFLAGS_WARN_ON = -Wall -W + QMAKE_CFLAGS_WARN_OFF = -w +@@ -27,7 +27,7 @@ + QMAKE_EXTENSION_SHLIB = dylib + QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses + +-QMAKE_CXX = c++ ++QMAKE_CXX = __CXX__ + QMAKE_CXXFLAGS = $$QMAKE_CFLAGS + QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS + QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON +@@ -45,7 +45,7 @@ + + QMAKE_LINK = $$QMAKE_CXX + QMAKE_LINK_SHLIB = $$QMAKE_CXX +-QMAKE_LFLAGS = -headerpad_max_install_names ++QMAKE_LFLAGS = -headerpad_max_install_names __ARCHFLAGS__ + #QMAKE_LFLAGS_PREBIND = -seg1addr 0x90000000 + QMAKE_LFLAGS_RELEASE = + QMAKE_LFLAGS_DEBUG = +--- config.tests/mac/mac_version.test.orig 2010-10-31 04:42:49.000000000 +1100 ++++ config.tests/mac/mac_version.test 2010-10-31 04:54:48.000000000 +1100 +@@ -27,9 +27,9 @@ + + COMPILE_ERROR=yes + if [ "$VERBOSE" = "yes" ]; then +- c++ $TSTFILE -o tst_mac_version -framework Carbon >&2 && COMPILE_ERROR=no ++ __CXX__ $TSTFILE -o tst_mac_version __ARCHFLAGS__ -framework Carbon >&2 && COMPILE_ERROR=no + else +- c++ $TSTFILE -o tst_mac_version -framework Carbon >/dev/null 2>&1 && COMPILE_ERROR=no ++ __CXX__ $TSTFILE -o tst_mac_version __ARCHFLAGS__ -framework Carbon >/dev/null 2>&1 && COMPILE_ERROR=no + fi + + # done

1 0

[72954] trunk/dports/x11/fslsfonts/Portfile
by jeremyhu＠macports.org 30 Oct '10

30 Oct '10

Revision: 72954 http://trac.macports.org/changeset/72954 Author: jeremyhu(a)macports.org Date: 2010-10-30 13:12:56 -0700 (Sat, 30 Oct 2010) Log Message: ----------- fslsfonts: Bump to 1.0.3 Modified Paths: -------------- trunk/dports/x11/fslsfonts/Portfile Modified: trunk/dports/x11/fslsfonts/Portfile =================================================================== --- trunk/dports/x11/fslsfonts/Portfile 2010-10-30 20:11:05 UTC (rev 72953) +++ trunk/dports/x11/fslsfonts/Portfile 2010-10-30 20:12:56 UTC (rev 72954) @@ -2,8 +2,7 @@ PortSystem 1.0 name fslsfonts -version 1.0.2 -revision 1 +version 1.0.3 categories x11 graphics maintainers jeremyhu openmaintainer description List fonts served by X11 font server @@ -15,9 +14,9 @@ master_sites http://xorg.freedesktop.org/archive/individual/app/ use_bzip2 yes -checksums md5 a61be25c87ee42169ee4dc8344acc9e2 \ - sha1 707710c9360b0554ee1ab9a2ef388025a6a8a27a \ - rmd160 dbe9f1b343723d5f2a408bd966f96d290d330863 +checksums md5 9b50d967ac6d4bae9bffb62a5e527a50 \ + sha1 00177564597ac629207ca597f663b689902817df \ + rmd160 7106f9a5f8cc2ef0fe13a090fcf89b9c8daaa8c2 depends_build port:pkgconfig

1 0