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

[96031] trunk/dports/lang
by mww＠macports.org 29 Jul '12

29 Jul '12

Revision: 96031 https://trac.macports.org/changeset/96031 Author: mww(a)macports.org Date: 2012-07-29 05:38:08 -0700 (Sun, 29 Jul 2012) Log Message: ----------- ocaml3-camlp5: new port (clone camlp5 for ocaml3) Modified Paths: -------------- trunk/dports/lang/ocaml3-camlp5/Portfile Added Paths: ----------- trunk/dports/lang/ocaml3-camlp5/ Modified: trunk/dports/lang/ocaml3-camlp5/Portfile =================================================================== --- trunk/dports/lang/camlp5/Portfile 2012-07-02 08:39:58 UTC (rev 94908) +++ trunk/dports/lang/ocaml3-camlp5/Portfile 2012-07-29 12:38:08 UTC (rev 96031) @@ -2,7 +2,7 @@ PortSystem 1.0 -name camlp5 +name ocaml3-camlp5 version 6.06 categories lang ml license BSD @@ -27,13 +27,23 @@ checksums rmd160 fefa727e756266d3b0697df494042c327f32294d \ sha256 763f89ee6cde4ca063a50708c3fe252d55ea9f8037e3ae9801690411ea6180c5 -depends_build port:ocaml +distname camlp5-${version} + +depends_build port:ocaml3 extract.suffix .tgz +configure.env-append PATH=${prefix}/libexec/ocaml3:$env(PATH) configure.pre_args --prefix "${prefix}" \ + --bindir "${prefix}/libexec/ocaml3" \ + --libdir "${prefix}/lib/ocaml3" \ --mandir "${prefix}/share/man" +build.env-append PATH=${prefix}/libexec/ocaml3:$env(PATH) build.target world.opt use_parallel_build no +post-destroot { + delete ${destroot}${prefix}/share/man +} + # ocaml is not universal universal_variant no

1 0

[96030] trunk/dports/lang
by mww＠macports.org 29 Jul '12

29 Jul '12

Revision: 96030 https://trac.macports.org/changeset/96030 Author: mww(a)macports.org Date: 2012-07-29 04:42:36 -0700 (Sun, 29 Jul 2012) Log Message: ----------- ocaml3: re-add version 3 of OCaml as compatibility version Modified Paths: -------------- trunk/dports/lang/ocaml3/Portfile Added Paths: ----------- trunk/dports/lang/ocaml3/ Modified: trunk/dports/lang/ocaml3/Portfile =================================================================== --- trunk/dports/lang/ocaml/Portfile 2012-06-24 21:00:12 UTC (rev 94598) +++ trunk/dports/lang/ocaml3/Portfile 2012-07-29 11:42:36 UTC (rev 96030) @@ -2,17 +2,19 @@ PortSystem 1.0 -name ocaml -epoch 1 +name ocaml3 version 3.12.1 -revision 7 # When updating ocaml, also update camlp5 to a compatible version (c.f. #26769, #20219, #18292) set major_vers [join [lrange [split ${version} .] 0 1] .] platforms darwin -maintainers mww openmaintainer categories lang ml +license {QPL LGPL} description Objective Caml is an implementation of the ML language -license {QPL LGPL} +maintainers mww openmaintainer +long_description \ + Objective Caml is an implementation of the ML language, based on \ + the Caml Light dialect extended with a complete class-based object \ + system and a powerful module system in the style of Standard ML. homepage http://www.ocaml.org/ master_sites http://caml.inria.fr/pub/distrib/ocaml-${major_vers}/ \ ftp://ftp.inria.fr/INRIA/Projects/cristal/ocaml/ocaml-${major_vers} @@ -20,11 +22,7 @@ sha1 29b44117b116b1a5bc54a8b4514af483793a769f \ rmd160 61d38c0785491c8790ac02ab78fb2f26ea490fc1 -long_description \ - Objective Caml is an implementation of the ML language, based on \ - the Caml Light dialect extended with a complete class-based object \ - system and a powerful module system in the style of Standard ML. - +distname ocaml-${version} use_bzip2 yes depends_lib port:ncurses port:xorg-libX11 @@ -39,7 +37,8 @@ # Configure. configure.pre_args -prefix ${prefix} configure.args -no-tk -cc ${configure.cc} -aspp \"${configure.cc} -c\" \ - -x11include \"${prefix}/include\" -x11lib \"${prefix}/lib\" + -x11include \"${prefix}/include\" -x11lib \"${prefix}/lib\" \ + -bindir ${prefix}/libexec/${name} -libdir ${prefix}/lib/${name} # Building. build.target world.opt @@ -47,15 +46,16 @@ # Install. destroot.target install -destroot.destdir BINDIR=${destroot}${prefix}/bin \ - LIBDIR=${destroot}${prefix}/lib/ocaml \ +destroot.destdir BINDIR=${destroot}${prefix}/libexec/${name} \ + LIBDIR=${destroot}${prefix}/lib/${name} \ MANDIR=${destroot}${prefix}/share/man post-destroot { # Change "ld.conf" to remove ${destroot} in paths. - reinplace "s:${destroot}::g" ${destroot}${prefix}/lib/ocaml/ld.conf + reinplace "s:${destroot}::g" ${destroot}${prefix}/lib/${name}/ld.conf xinstall -d ${destroot}${docdir} xinstall -m 0644 -W ${worksrcpath} Changes LICENSE README ${destroot}${docdir} + delete ${destroot}${prefix}/share/man } # Variants. @@ -70,4 +70,4 @@ livecheck.type regex livecheck.url http://caml.inria.fr/download.en.html -livecheck.regex "ocaml-\[0-9\.]+/ocaml-(\[0-9\.\]+).tar" +livecheck.regex "ocaml-\[0-9\.]+/ocaml-(3\[0-9\.\]+).tar"

1 0

[96029] trunk/dports/gnome/libgnomeuimm
by devans＠macports.org 29 Jul '12

29 Jul '12

Revision: 96029 https://trac.macports.org/changeset/96029 Author: devans(a)macports.org Date: 2012-07-29 04:33:15 -0700 (Sun, 29 Jul 2012) Log Message: ----------- libghomeuimm: disable building of broken example. Modified Paths: -------------- trunk/dports/gnome/libgnomeuimm/Portfile Added Paths: ----------- trunk/dports/gnome/libgnomeuimm/files/ trunk/dports/gnome/libgnomeuimm/files/patch-examples-Makefile.in.diff Modified: trunk/dports/gnome/libgnomeuimm/Portfile =================================================================== --- trunk/dports/gnome/libgnomeuimm/Portfile 2012-07-29 11:14:36 UTC (rev 96028) +++ trunk/dports/gnome/libgnomeuimm/Portfile 2012-07-29 11:33:15 UTC (rev 96029) @@ -33,6 +33,8 @@ port:gnome-vfsmm \ port:libgnomeui +patchfiles patch-examples-Makefile.in.diff + livecheck.type regex livecheck.url http://ftp.gnome.org/pub/gnome/sources/${name}/${branch}/ livecheck.regex {LATEST-IS-(\d+(?:\.\d+)*)} Added: trunk/dports/gnome/libgnomeuimm/files/patch-examples-Makefile.in.diff =================================================================== --- trunk/dports/gnome/libgnomeuimm/files/patch-examples-Makefile.in.diff (rev 0) +++ trunk/dports/gnome/libgnomeuimm/files/patch-examples-Makefile.in.diff 2012-07-29 11:33:15 UTC (rev 96029) @@ -0,0 +1,11 @@ +--- examples/Makefile.in.orig 2012-07-29 04:20:53.000000000 -0700 ++++ examples/Makefile.in 2012-07-29 04:21:59.000000000 -0700 +@@ -221,7 +221,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = druid gnome-hello iconlist menu uiinfo ++SUBDIRS = druid gnome-hello menu uiinfo + EXTRA_DIST = Makefile.am_fragment + all: all-recursive +

1 0

[96028] trunk/dports/devel/git-core/Portfile
by raimue＠macports.org 29 Jul '12

29 Jul '12

Revision: 96028 https://trac.macports.org/changeset/96028 Author: raimue(a)macports.org Date: 2012-07-29 04:14:36 -0700 (Sun, 29 Jul 2012) Log Message: ----------- devel/git-core: Split installation of +doc variant, so this works now when running extract and destroot in separate steps, closes #29707 Modified Paths: -------------- trunk/dports/devel/git-core/Portfile Modified: trunk/dports/devel/git-core/Portfile =================================================================== --- trunk/dports/devel/git-core/Portfile 2012-07-29 10:21:57 UTC (rev 96027) +++ trunk/dports/devel/git-core/Portfile 2012-07-29 11:14:36 UTC (rev 96028) @@ -87,12 +87,6 @@ } set docdestroot ${destroot}${prefix}/share/doc/${name} xinstall -d ${docdestroot} - if {[variant_isset doc]} { - system "cd ${docdestroot} && ${extract.cmd} ${extract.pre_args} \ - ${distpath}/git-htmldocs-${version}${extract.suffix} \ - ${extract.post_args}" - } - file copy ${worksrcpath}/contrib ${docdestroot} foreach badfile [exec find ${destroot} -name perllocal.pod] { @@ -125,6 +119,21 @@ checksums-append git-htmldocs-${version}${extract.suffix} \ rmd160 20193aec11c1f0d14ccd534fb8c5c94569db8f80 \ sha256 c68de95ceb7ef73b1a6f0a1ab7e52942dc8e71accfec366c71072dcbf3365e0f + + post-extract { + file mkdir ${workpath}/htmldocs + system -W ${workpath}/htmldocs "${extract.cmd} ${extract.pre_args} \ + ${distpath}/git-htmldocs-${version}${extract.suffix} \ + ${extract.post_args}" + } + + post-destroot { + set docdestroot ${destroot}${prefix}/share/doc/${name} + xinstall -d ${docdestroot} + foreach f [glob ${workpath}/htmldocs/*] { + file copy ${f} ${docdestroot} + } + } } variant gitweb description {Install gitweb.cgi} {

1 0

[96027] trunk/dports/net/dns2tcp/Portfile
by raimue＠macports.org 29 Jul '12

29 Jul '12

Revision: 96027 https://trac.macports.org/changeset/96027 Author: raimue(a)macports.org Date: 2012-07-29 03:21:57 -0700 (Sun, 29 Jul 2012) Log Message: ----------- net/dns2tcp: Update to version 0.5.2, closes #33923 Modified Paths: -------------- trunk/dports/net/dns2tcp/Portfile Modified: trunk/dports/net/dns2tcp/Portfile =================================================================== --- trunk/dports/net/dns2tcp/Portfile 2012-07-29 10:17:42 UTC (rev 96026) +++ trunk/dports/net/dns2tcp/Portfile 2012-07-29 10:21:57 UTC (rev 96027) @@ -3,7 +3,7 @@ PortSystem 1.0 name dns2tcp -version 0.4 +version 0.5.2 categories net maintainers nomaintainer description TCP over DNS tunnel @@ -16,9 +16,8 @@ homepage http://www.hsc.fr/ressources/outils/dns2tcp/ platforms darwin -# redirects 0.4 tarball to 0.5, ticket #31448 -master_sites -#master_sites ${homepage}downloads/ -checksums md5 221f557b069560e3a466cd94de7d8415 +master_sites ${homepage}downloads/ +checksums rmd160 2838d73800013e7763195e92410a2da2a6336c24 \ + sha256 ea9ef59002b86519a43fca320982ae971e2df54cdc54cdb35562c751704278d9 configure.args --mandir=${prefix}/share/man

1 0

[96026] trunk/dports/net/dns2tcp/Portfile
by raimue＠macports.org 29 Jul '12

29 Jul '12

Revision: 96026 https://trac.macports.org/changeset/96026 Author: raimue(a)macports.org Date: 2012-07-29 03:17:42 -0700 (Sun, 29 Jul 2012) Log Message: ----------- net/dns2tcp: Port abandoned after more than 3 months on ticket #33923 Modified Paths: -------------- trunk/dports/net/dns2tcp/Portfile Modified: trunk/dports/net/dns2tcp/Portfile =================================================================== --- trunk/dports/net/dns2tcp/Portfile 2012-07-29 08:49:44 UTC (rev 96025) +++ trunk/dports/net/dns2tcp/Portfile 2012-07-29 10:17:42 UTC (rev 96026) @@ -5,7 +5,7 @@ name dns2tcp version 0.4 categories net -maintainers coderpunks.org:ralf +maintainers nomaintainer description TCP over DNS tunnel long_description \ Dns2tcp is a tool for relaying TCP connections over DNS. There is no \

1 0

[96025] contrib/buildbot
by jmr＠macports.org 29 Jul '12

29 Jul '12

Revision: 96025 https://trac.macports.org/changeset/96025 Author: jmr(a)macports.org Date: 2012-07-29 01:49:44 -0700 (Sun, 29 Jul 2012) Log Message: ----------- buildbot: second try at uploading archives from different slaves to unique paths on the master, cf. r95987, r96019 Revision Links: -------------- https://trac.macports.org/changeset/95987 https://trac.macports.org/changeset/96019 Modified Paths: -------------- contrib/buildbot/deploy_archives.sh contrib/buildbot/master.cfg Modified: contrib/buildbot/deploy_archives.sh =================================================================== --- contrib/buildbot/deploy_archives.sh 2012-07-29 08:24:58 UTC (rev 96024) +++ contrib/buildbot/deploy_archives.sh 2012-07-29 08:49:44 UTC (rev 96025) @@ -12,7 +12,12 @@ # path where archives get uploaded to buildmaster if [[ -z "$ULPATH" ]]; then - ULPATH="./archive_staging" + # workaround for buildbot not accepting WithProperties in env + if [[ -n "$1" ]]; then + ULPATH="$1" + else + ULPATH="./archive_staging" + fi fi # private key to use for signing Modified: contrib/buildbot/master.cfg =================================================================== --- contrib/buildbot/master.cfg 2012-07-29 08:24:58 UTC (rev 96024) +++ contrib/buildbot/master.cfg 2012-07-29 08:49:44 UTC (rev 96025) @@ -237,14 +237,13 @@ 'ULPATH': ulpath})) # upload archives from build slave to master from buildbot.steps.transfer import DirectoryUpload -ports_factory.addStep(DirectoryUpload(slavesrc=ulpath, masterdest=ulpath)) +ports_factory.addStep(DirectoryUpload(slavesrc=ulpath, masterdest=WithProperties(ulpath_unique))) # sign generated binaries and sync to download server (if distributable) from buildbot.steps.master import MasterShellCommand -ports_factory.addStep(MasterShellCommand(command=["./deploy_archives.sh"], +ports_factory.addStep(MasterShellCommand(command=["./deploy_archives.sh", WithProperties(ulpath_unique)], name="deploy archives", description="deploy archives", env={'PRIVKEY': privkey, - 'ULPATH': ulpath, 'DLHOST': dlhost, 'DLPATH': dlpath}))

1 0

[96024] contrib/buildbot/master.cfg
by jmr＠macports.org 29 Jul '12

29 Jul '12

Revision: 96024 https://trac.macports.org/changeset/96024 Author: jmr(a)macports.org Date: 2012-07-29 01:24:58 -0700 (Sun, 29 Jul 2012) Log Message: ----------- buildbot: update our MailNotifier subclass to match upstream changes Modified Paths: -------------- contrib/buildbot/master.cfg Modified: contrib/buildbot/master.cfg =================================================================== --- contrib/buildbot/master.cfg 2012-07-29 08:17:32 UTC (rev 96023) +++ contrib/buildbot/master.cfg 2012-07-29 08:24:58 UTC (rev 96024) @@ -364,11 +364,11 @@ if interesting: interestedUsers.add(c.who) + dl = [] for u in interestedUsers: d = defer.maybeDeferred(self.lookup.getAddress, u) - d.addCallback(self.recipients.append) - self.dl.append(d) - return defer.DeferredList(self.dl) + dl.append(d) + return defer.gatherResults(dl) mn = PortsMailNotifier(fromaddr="noreply(a)macports.org", lookup="", relayhost="localhost", builders=ports_buildernames, mode="failing")

1 0

[96023] contrib/buildbot/master.cfg
by jmr＠macports.org 29 Jul '12

29 Jul '12

Revision: 96023 https://trac.macports.org/changeset/96023 Author: jmr(a)macports.org Date: 2012-07-29 01:17:32 -0700 (Sun, 29 Jul 2012) Log Message: ----------- buildbot: update config for 0.8.6 to allow forced builds again Modified Paths: -------------- contrib/buildbot/master.cfg Modified: contrib/buildbot/master.cfg =================================================================== --- contrib/buildbot/master.cfg 2012-07-29 02:37:49 UTC (rev 96022) +++ contrib/buildbot/master.cfg 2012-07-29 08:17:32 UTC (rev 96023) @@ -111,6 +111,7 @@ ports_buildernames = ["buildports-"+plat for plat in build_platforms] from buildbot.schedulers.basic import SingleBranchScheduler +from buildbot.schedulers.forcesched import ForceScheduler c['schedulers'] = [SingleBranchScheduler( name="base", treeStableTimer=None, @@ -120,7 +121,10 @@ name="ports", treeStableTimer=None, change_filter = portsfilter, - builderNames=ports_buildernames) + builderNames=ports_buildernames), + ForceScheduler( + name="force", + builderNames=ports_buildernames+base_buildernames) ] ####### BUILDERS

1 0

[96022] trunk/dports/editors/abiword-x11/Portfile
by devans＠macports.org 29 Jul '12

29 Jul '12

Revision: 96022 https://trac.macports.org/changeset/96022 Author: devans(a)macports.org Date: 2012-07-28 19:37:49 -0700 (Sat, 28 Jul 2012) Log Message: ----------- abiword-x11: add license. Modified Paths: -------------- trunk/dports/editors/abiword-x11/Portfile Modified: trunk/dports/editors/abiword-x11/Portfile =================================================================== --- trunk/dports/editors/abiword-x11/Portfile 2012-07-29 02:04:43 UTC (rev 96021) +++ trunk/dports/editors/abiword-x11/Portfile 2012-07-29 02:37:49 UTC (rev 96022) @@ -7,6 +7,7 @@ set dname abiword version 2.8.6 revision 1 +license GPL description A word processor with gnome support. long_description A word processor with gnome support. maintainers nomaintainer

1 0