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

[79776] trunk/dports/mail/libmilter/Portfile
by dluke＠macports.org 25 Jun '11

25 Jun '11

Revision: 79776 http://trac.macports.org/changeset/79776 Author: dluke(a)macports.org Date: 2011-06-25 06:57:17 -0700 (Sat, 25 Jun 2011) Log Message: ----------- - Fix universal build (#29901 - thanks to pixilla) - whitespace cleanup Modified Paths: -------------- trunk/dports/mail/libmilter/Portfile Modified: trunk/dports/mail/libmilter/Portfile =================================================================== --- trunk/dports/mail/libmilter/Portfile 2011-06-25 12:22:40 UTC (rev 79775) +++ trunk/dports/mail/libmilter/Portfile 2011-06-25 13:57:17 UTC (rev 79776) @@ -1,14 +1,13 @@ # $Id$ - PortSystem 1.0 -name libmilter +name libmilter set major_version 8.14 -version ${major_version}.5 -categories mail -maintainers geeklair.net:dluke +version ${major_version}.5 +categories mail +maintainers geeklair.net:dluke platforms darwin -description libmilter library from Sendmail +description libmilter library from Sendmail long_description Sendmail's Content Management API (milter) provides \ third-party programs to access mail messages as they \ are being processed by the Mail Transfer Agent (MTA), \ @@ -18,9 +17,9 @@ configured and composed in an end-user's MTA \ configuration file -homepage http://www.sendmail.org/doc/sendmail-current/libmilter/docs/ -master_sites ftp://ftp.sendmail.org/pub/sendmail/ -distname sendmail.${version} +homepage http://www.sendmail.org/doc/sendmail-current/libmilter/docs/ +master_sites ftp://ftp.sendmail.org/pub/sendmail/ +distname sendmail.${version} checksums md5 02ccfc331cc81ed00ec8bb5ecfc69018 \ sha1 86dd2a8ad5eac892cd02cf67792a25efccacc100 \ @@ -28,17 +27,20 @@ worksrcdir sendmail-${version} +set arch_flags "${configure.cc_archflags}" +post-patch { + file copy ${worksrcpath}/devtools/OS/Darwin.10.x \ + ${worksrcpath}/devtools/Site/site.config.m4 + reinplace "s|-DDARWIN=100000|-DDARWIN=${os.major}0000|" \ + ${worksrcpath}/devtools/Site/site.config.m4 + if [variant_isset universal] { + reinplace "s|\${Extra_CC_Flags}|${arch_flags}|" \ + ${worksrcpath}/devtools/Site/site.config.m4 + } +} + use_configure no -platform darwin 10 { - pre-build { - file copy ${worksrcpath}/devtools/OS/Darwin.9.x \ - ${worksrcpath}/devtools/Site/site.config.m4 - } - - } - - build { system "cd ${worksrcpath}/${name} && \ ./Build -O ${worksrcpath}/macports" @@ -46,22 +48,22 @@ close [open ${worksrcpath}/include/sm_os.h a] system "cd ${worksrcpath}/macports/*/${name} && \ - ${configure.compiler} ${configure.cflags} \ + ${configure.compiler} ${configure.cflags} ${arch_flags}\ -fno-common -DNOT_SENDMAIL -Dsm_snprintf=snprintf \ -D_THREAD_SAFE -DBIND_8_COMPAT -DXP_MT \ -I${worksrcpath}/include \ -I${worksrcpath}/sendmail -c *.c" set x {} - fs-traverse object ${worksrcpath}/macports { - if {[file isfile ${object}] && [regexp ".o$" ${object}]} { - lappend x ${object} - } - } + fs-traverse object ${worksrcpath}/macports { + if {[file isfile ${object}] && [regexp ".o$" ${object}]} { + lappend x ${object} + } + } set objects [join ${x} " "] - system "${configure.compiler} ${configure.cflags} -dynamiclib \ + system "${configure.compiler} ${configure.cflags} ${arch_flags} -dynamiclib \ -install_name ${prefix}/lib/${name}.dylib \ -compatibility_version ${major_version} \ -current_version ${version} \ @@ -75,3 +77,7 @@ "${destroot}${prefix}/include/" file delete "${destroot}${prefix}/include/${name}/milter.h" } + +variant universal { + set arch_flags "${configure.universal_cflags}" +}

1 0

[79775] trunk/dports
by ciserlohn＠macports.org 25 Jun '11

25 Jun '11

Revision: 79775 http://trac.macports.org/changeset/79775 Author: ciserlohn(a)macports.org Date: 2011-06-25 05:22:40 -0700 (Sat, 25 Jun 2011) Log Message: ----------- Changed maintainers to macports handle Modified Paths: -------------- trunk/dports/aqua/FScript/Portfile trunk/dports/devel/fossil/Portfile trunk/dports/devel/play/Portfile trunk/dports/net/ejabberd/Portfile trunk/dports/www/yaws/Portfile Modified: trunk/dports/aqua/FScript/Portfile =================================================================== --- trunk/dports/aqua/FScript/Portfile 2011-06-25 11:52:12 UTC (rev 79774) +++ trunk/dports/aqua/FScript/Portfile 2011-06-25 12:22:40 UTC (rev 79775) @@ -9,7 +9,7 @@ categories aqua lang platforms darwin license BSD -maintainers googlemail.com:ciserlohn +maintainers ciserlohn description Open-source interactive Cocoa scripting environment long_description F-Script is an open-source interactive and scripting \ Modified: trunk/dports/devel/fossil/Portfile =================================================================== --- trunk/dports/devel/fossil/Portfile 2011-06-25 11:52:12 UTC (rev 79774) +++ trunk/dports/devel/fossil/Portfile 2011-06-25 12:22:40 UTC (rev 79775) @@ -8,7 +8,7 @@ categories devel platforms darwin license BSD -maintainers googlemail.com:ciserlohn +maintainers ciserlohn description Simple, high-reliability, distributed software configuration management Modified: trunk/dports/devel/play/Portfile =================================================================== --- trunk/dports/devel/play/Portfile 2011-06-25 11:52:12 UTC (rev 79774) +++ trunk/dports/devel/play/Portfile 2011-06-25 12:22:40 UTC (rev 79775) @@ -9,7 +9,7 @@ categories devel java www platforms darwin license Apache-2 -maintainers googlemail.com:ciserlohn +maintainers ciserlohn supported_archs noarch description Rapid webapplication development framework Modified: trunk/dports/net/ejabberd/Portfile =================================================================== --- trunk/dports/net/ejabberd/Portfile 2011-06-25 11:52:12 UTC (rev 79774) +++ trunk/dports/net/ejabberd/Portfile 2011-06-25 12:22:40 UTC (rev 79775) @@ -6,7 +6,7 @@ version 2.1.8 categories net platforms darwin -maintainers googlemail.com:ciserlohn +maintainers ciserlohn description ejabberd is an XMPP application server. long_description ${description} ejabberd stands for "Erlang Jabber Daemon" Modified: trunk/dports/www/yaws/Portfile =================================================================== --- trunk/dports/www/yaws/Portfile 2011-06-25 11:52:12 UTC (rev 79774) +++ trunk/dports/www/yaws/Portfile 2011-06-25 12:22:40 UTC (rev 79775) @@ -6,7 +6,7 @@ name yaws version 1.90 categories www -maintainers googlemail.com:ciserlohn +maintainers ciserlohn platforms darwin description Webserver for dynamic content written in Erlang long_description Yaws is a high performance HTTP server for dynamic content \

1 0

[79774] trunk/base/src/registry2.0/Makefile
by afb＠macports.org 25 Jun '11

25 Jun '11

Revision: 79774 http://trac.macports.org/changeset/79774 Author: afb(a)macports.org Date: 2011-06-25 04:52:12 -0700 (Sat, 25 Jun 2011) Log Message: ----------- make sure that test can find library (on freebsd) Modified Paths: -------------- trunk/base/src/registry2.0/Makefile Modified: trunk/base/src/registry2.0/Makefile =================================================================== --- trunk/base/src/registry2.0/Makefile 2011-06-25 11:41:47 UTC (rev 79773) +++ trunk/base/src/registry2.0/Makefile 2011-06-25 11:52:12 UTC (rev 79774) @@ -6,7 +6,7 @@ ../cregistry/cregistry.a #graph.o graphobj.o -SHLIB_NAME= registry${SHLIB_SUFFIX} +SHLIB_NAME= ./registry${SHLIB_SUFFIX} INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/registry2.0 include ../../Mk/macports.autoconf.mk

1 0

[79773] trunk/base/src/pextlib1.0/Pextlib.c
by afb＠macports.org 25 Jun '11

25 Jun '11

Revision: 79773 http://trac.macports.org/changeset/79773 Author: afb(a)macports.org Date: 2011-06-25 04:41:47 -0700 (Sat, 25 Jun 2011) Log Message: ----------- make sure to remove linux segfault workaround var Modified Paths: -------------- trunk/base/src/pextlib1.0/Pextlib.c Modified: trunk/base/src/pextlib1.0/Pextlib.c =================================================================== --- trunk/base/src/pextlib1.0/Pextlib.c 2011-06-25 11:41:08 UTC (rev 79772) +++ trunk/base/src/pextlib1.0/Pextlib.c 2011-06-25 11:41:47 UTC (rev 79773) @@ -399,6 +399,7 @@ #ifndef __APPLE__ /* Crashes on Linux without this. */ setenv("MACPORTS_DUMMY", "", 0); + unsetenv("MACPORTS_DUMMY"); #endif } else { (void) unsetenv(name);

1 0

[79772] trunk/base/src/pextlib1.0/fs-traverse.c
by afb＠macports.org 25 Jun '11

25 Jun '11

Revision: 79772 http://trac.macports.org/changeset/79772 Author: afb(a)macports.org Date: 2011-06-25 04:41:08 -0700 (Sat, 25 Jun 2011) Log Message: ----------- fix tails with trailing slash, on other platforms Modified Paths: -------------- trunk/base/src/pextlib1.0/fs-traverse.c Modified: trunk/base/src/pextlib1.0/fs-traverse.c =================================================================== --- trunk/base/src/pextlib1.0/fs-traverse.c 2011-06-25 11:40:35 UTC (rev 79771) +++ trunk/base/src/pextlib1.0/fs-traverse.c 2011-06-25 11:41:08 UTC (rev 79772) @@ -146,6 +146,8 @@ xpath = "."; } else if (*(xpath + tlen) == '/') { xpath += tlen + 1; + } else if (*(target + tlen - 1) == '/') { + xpath += tlen; } }

1 0

[79771] trunk/base/src/pextlib1.0/Makefile
by afb＠macports.org 25 Jun '11

25 Jun '11

Revision: 79771 http://trac.macports.org/changeset/79771 Author: afb(a)macports.org Date: 2011-06-25 04:40:35 -0700 (Sat, 25 Jun 2011) Log Message: ----------- make sure that test can find library (on freebsd) Modified Paths: -------------- trunk/base/src/pextlib1.0/Makefile Modified: trunk/base/src/pextlib1.0/Makefile =================================================================== --- trunk/base/src/pextlib1.0/Makefile 2011-06-25 09:44:44 UTC (rev 79770) +++ trunk/base/src/pextlib1.0/Makefile 2011-06-25 11:40:35 UTC (rev 79771) @@ -4,7 +4,7 @@ sha1cmd.o curl.o rmd160cmd.o sha256cmd.o readline.o uid.o \ tracelib.o tty.o readdir.o pipe.o flock.o \ system.o mktemp.o realpath.o -SHLIB_NAME= Pextlib${SHLIB_SUFFIX} +SHLIB_NAME= ./Pextlib${SHLIB_SUFFIX} INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/pextlib1.0 include ../../Mk/macports.autoconf.mk

1 0

[79770] trunk/dports/math/octave-devel
by michaelld＠macports.org 25 Jun '11

25 Jun '11

Revision: 79770 http://trac.macports.org/changeset/79770 Author: michaelld(a)macports.org Date: 2011-06-25 02:44:44 -0700 (Sat, 25 Jun 2011) Log Message: ----------- octave-devel: Fixes ticket #29919. Update to 3.4.2; add in support for latest fltk-devel; remove cruft. Modified Paths: -------------- trunk/dports/math/octave-devel/Portfile trunk/dports/math/octave-devel/files/patch-configure.diff Modified: trunk/dports/math/octave-devel/Portfile =================================================================== --- trunk/dports/math/octave-devel/Portfile 2011-06-25 09:07:25 UTC (rev 79769) +++ trunk/dports/math/octave-devel/Portfile 2011-06-25 09:44:44 UTC (rev 79770) @@ -4,7 +4,7 @@ PortSystem 1.0 name octave-devel -version 3.4.0 +version 3.4.2 conflicts octave categories math science maintainers michaelld openmaintainer @@ -23,14 +23,15 @@ distname octave-${version} use_bzip2 yes -checksums md5 c8144cee1d37e645d3368a8e8a5f1856 \ - sha1 936a8fc962abd96e7568fb5909ec2a4d7997a1a8 \ - rmd160 8448fc8277e19dab8dbc5c0121e673e9198c74ec +checksums md5 31c744ab4555a2bf04d5e644b93f9b51 \ + sha1 12cac29ef7d1ab8374980e1e2fd14637b2f15ba5 \ + rmd160 ad2222ad0b3e0f1dd6db1ff8ca93c0666b95e3a0 depends_build port:bison \ port:flex \ port:gawk \ port:gperf \ + port:grep \ port:gsed \ path:bin/perl:perl5 \ port:texinfo @@ -56,58 +57,29 @@ port:SuiteSparse # allow non-Apple compilers to work with FLTK by removing the -arch -# flag, which means this port cannot easy compile as universal. +# flag, which means this port cannot easily compile as universal. patchfiles-append patch-configure.diff universal_variant no -configure.args --without-x \ - --enable-shared \ - --enable-dl \ +configure.args --disable-dependency-tracking \ + --without-x \ --disable-docs \ - --disable-openmp + --with-cholmod="-lcholmod -lmetis" -# do not build static libraries; just shared -# --enable-static - -### the following are probably not necessary (except possibly the -### 'cholmod' one), but are included for completion. Ordering is the -### same as in './configure --help'. -configure.args-append \ - --enable-readline \ - --enable-extra-warning-flags \ - --with-qhull \ - --with-z \ - --with-hdf5 \ - --with-fftw3 \ - --with-fftw3f \ - --with-glpk \ - --with-curl \ - --with-blas \ - --with-lapack \ - --with-qrupdate \ - --with-amd \ - --with-camd \ - --with-colamd \ - --with-ccolamd \ - --with-cholmod="-lcholmod -lmetis" \ - --with-cxsparse \ - --with-umfpack \ - --with-arpack - -### the following are probably not necessary, but are included for -### completion. # octave uses a number of other ports to create sources from template: -# perl, gawk, gsed, flex, bison, texinfo. python is not used if perl -# is available, so clear it out. FLTK doesn't work as of 1.3.x-r7794, -# so disable it entirely (via "no" here and a configure patch). +# perl, gawk, gsed, flex, bison, texinfo. Make sure these are the +# MacPorts' versions. Python is not used if perl is available, so +# clear it out. grep is checked for in 'configure', but not used +# except inside that script; include it here for completion. configure.perl ${prefix}/bin/perl configure.python ' ' configure.awk ${prefix}/bin/gawk -configure.env-append SED="${prefix}/bin/gsed" \ +configure.env-append GREP="${prefix}/bin/grep" \ + FLTK_CONFIG=no \ + SED="${prefix}/bin/gsed" \ TEXI2DVI="${prefix}/bin/texi2dvi" \ - TEXI2PDF="${prefix}/bin/texi2pdf" \ - FLTK_CONFIG=no + TEXI2PDF="${prefix}/bin/texi2pdf" configure.cppflags configure.ldflags @@ -125,13 +97,16 @@ configure.f77 "${prefix}/bin/g95" } -# check for default variant +# check for GCC / G95 variants. The default here must match the +# default found in the 'arpack' and 'atlas' ports. + +# check for setting the default variant (gcc44) if { ![variant_isset gcc43] && ![variant_isset gcc44] && \ ![variant_isset gcc45] && ![variant_isset g95] } { default_variants +gcc44 } -# check for just -gcc44 +# check if the user disabled just the default variant: -gcc44 if { ![variant_isset gcc43] && ![variant_isset gcc44] && \ ![variant_isset gcc45] && ![variant_isset g95] } { error "You cannot use the variant -gcc44 alone." @@ -177,19 +152,12 @@ configure.objcflags-append -g3 -O0 } -#variant fltk description {Include FLTK option} { -# depends_lib-append port:fltk-devel -# post-patch { -# # fix use of #include Fl -> FL -# reinplace "/include/s,Fl/,FL/,g" -# ${worksrcpath}/src/DLD-FUNCTIONS/__init_fltk__.cc -# } -#} +# FLTK does work as of 1.3.x-r8635, so allow it as an option +variant fltk description {Include FLTK for graphical front-end} { + depends_lib-append port:fltk-devel + configure.env-delete FLTK_CONFIG=no +} -#if {![variant_isset fltk]} { -# configure.env-append FLTK_CONFIG=no -#} - livecheck.type regex livecheck.url http://www.gnu.org/software/octave/news.html livecheck.regex Version (\\d+(\\.\\d+)*) Modified: trunk/dports/math/octave-devel/files/patch-configure.diff =================================================================== --- trunk/dports/math/octave-devel/files/patch-configure.diff 2011-06-25 09:07:25 UTC (rev 79769) +++ trunk/dports/math/octave-devel/files/patch-configure.diff 2011-06-25 09:44:44 UTC (rev 79770) @@ -1,6 +1,6 @@ ---- configure.orig 2011-01-15 04:08:46.000000000 -0500 -+++ configure 2011-01-19 10:06:38.000000000 -0500 -@@ -32346,6 +32346,21 @@ +--- configure.orig 2011-06-25 10:04:48.000000000 +0200 ++++ configure 2011-06-25 10:05:19.000000000 +0200 +@@ -33171,6 +33171,21 @@ ## fltk (www.fltk.org) @@ -22,7 +22,7 @@ # Check whether --with-fltk-prefix was given. if test "${with_fltk_prefix+set}" = set; then : -@@ -32422,6 +32437,7 @@ +@@ -33247,6 +33262,7 @@ $as_echo "no" >&6; } fi @@ -30,7 +30,7 @@ warn_fltk_config="" -@@ -32432,11 +32448,29 @@ +@@ -33257,11 +33273,29 @@ else FLTK_CFLAGS="`$FLTK_CONFIG $fltkconf_args --use-gl --cflags`" FLTK_LDFLAGS="`$FLTK_CONFIG $fltkconf_args --use-gl --ldflags`"

1 0

[79769] trunk/dports/graphics/libQGLViewer/Portfile
by raphael＠macports.org 25 Jun '11

25 Jun '11

Revision: 79769 http://trac.macports.org/changeset/79769 Author: raphael(a)macports.org Date: 2011-06-25 02:07:25 -0700 (Sat, 25 Jun 2011) Log Message: ----------- libQGLViewer: * update to 2.3.10 * don't override global description of x11 variant Modified Paths: -------------- trunk/dports/graphics/libQGLViewer/Portfile Modified: trunk/dports/graphics/libQGLViewer/Portfile =================================================================== --- trunk/dports/graphics/libQGLViewer/Portfile 2011-06-25 08:10:10 UTC (rev 79768) +++ trunk/dports/graphics/libQGLViewer/Portfile 2011-06-25 09:07:25 UTC (rev 79769) @@ -4,7 +4,7 @@ PortSystem 1.0 name libQGLViewer -version 2.3.9 +version 2.3.10 platforms darwin maintainers raphael openmaintainer license GPL-2+ Commercial @@ -23,14 +23,13 @@ easy to extend. master_sites ${homepage}src/ -checksums md5 a882cb3a8da4ee904a33b46ebb44f905 \ - sha1 687c6a5deb616871adf51dc9d89132fe49321820 \ - rmd160 691077851f1f7852103779ae6457baeeec6e7578 +checksums sha1 80c923ae103f725b9e5a7d343d1b88182dae0ed7 \ + rmd160 4ff77bb9910656a60ae0af35a866a6f757027003 patchfiles patch-QGLViewer.pro.diff \ patch-designerPlugin.pro.diff -variant x11 description {Use X11 for visualization} {} +variant x11 {} if {![variant_isset x11]} { PortGroup qt4 1.0

1 0

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

25 Jun '11

Revision: 79768 http://trac.macports.org/changeset/79768 Author: jeremyhu(a)macports.org Date: 2011-06-25 01:10:10 -0700 (Sat, 25 Jun 2011) Log Message: ----------- VLC: darwin11 build fix Modified Paths: -------------- trunk/dports/multimedia/VLC/Portfile Modified: trunk/dports/multimedia/VLC/Portfile =================================================================== --- trunk/dports/multimedia/VLC/Portfile 2011-06-25 08:05:30 UTC (rev 79767) +++ trunk/dports/multimedia/VLC/Portfile 2011-06-25 08:10:10 UTC (rev 79768) @@ -272,6 +272,11 @@ } } +# The real fix is to add a fdatasync prototype since it's the +# *prototype* that is missing ... but this will do for now. platform darwin 10 { patchfiles-append patch-fdatasync_sl.diff } +platform darwin 11 { + patchfiles-append patch-fdatasync_sl.diff +}

1 0

[79767] trunk/dports/aqua/gimp-app/Portfile
by jeremyhu＠macports.org 25 Jun '11

25 Jun '11

Revision: 79767 http://trac.macports.org/changeset/79767 Author: jeremyhu(a)macports.org Date: 2011-06-25 01:05:30 -0700 (Sat, 25 Jun 2011) Log Message: ----------- gimp-app: Adjust to build with newer XCode Modified Paths: -------------- trunk/dports/aqua/gimp-app/Portfile Modified: trunk/dports/aqua/gimp-app/Portfile =================================================================== --- trunk/dports/aqua/gimp-app/Portfile 2011-06-25 08:01:52 UTC (rev 79766) +++ trunk/dports/aqua/gimp-app/Portfile 2011-06-25 08:05:30 UTC (rev 79767) @@ -41,7 +41,7 @@ post-destroot { xinstall -m 755 \ - ${worksrcpath}/build/Release/ScriptExec.app/Contents/MacOS/ScriptExec \ + ${destroot}${applications_dir}/ScriptExec.app/Contents/MacOS/ScriptExec \ ${gimpapp}/Contents/MacOS/GIMP ln -s ${prefix}/bin/gimp ${gimpapp}/Contents/Resources/script

1 0