Revision: 118273 https://trac.macports.org/changeset/118273 Author: devans@macports.org Date: 2014-03-28 09:13:01 -0700 (Fri, 28 Mar 2014) Log Message: ----------- GNOME-3/stable: update remaining ports to release 3.12 versions. Modified Paths: -------------- users/devans/GNOME-3/stable/dports/devel/atk/Portfile users/devans/GNOME-3/stable/dports/devel/geoclue2/Portfile users/devans/GNOME-3/stable/dports/devel/glade/Portfile users/devans/GNOME-3/stable/dports/gnome/anjuta/Portfile users/devans/GNOME-3/stable/dports/gnome/baobab/Portfile users/devans/GNOME-3/stable/dports/gnome/devhelp/Portfile users/devans/GNOME-3/stable/dports/gnome/eog-plugins/Portfile users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile users/devans/GNOME-3/stable/dports/gnome/gdl3/Portfile users/devans/GNOME-3/stable/dports/gnome/gdm/Portfile users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-configure.ac.diff users/devans/GNOME-3/stable/dports/gnome/gedit-plugins/Portfile users/devans/GNOME-3/stable/dports/gnome/gnome-backgrounds/Portfile users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/Portfile users/devans/GNOME-3/stable/dports/gnome/gnome-devel-docs/Portfile users/devans/GNOME-3/stable/dports/gnome/gnome-font-viewer/Portfile users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/Portfile users/devans/GNOME-3/stable/dports/gnome/gnome-system-monitor/Portfile users/devans/GNOME-3/stable/dports/gnome/totem-pl-parser/Portfile users/devans/GNOME-3/stable/dports/net/libgrss/Portfile Added Paths: ----------- users/devans/GNOME-3/stable/dports/devel/glade/ users/devans/GNOME-3/stable/dports/devel/gvfs/Portfile users/devans/GNOME-3/stable/dports/gnome/baobab/ users/devans/GNOME-3/stable/dports/gnome/baobab/files/patch-configure.ac.diff users/devans/GNOME-3/stable/dports/gnome/gdl3/ users/devans/GNOME-3/stable/dports/gnome/gdm/Portfile-3.12.0 users/devans/GNOME-3/stable/dports/gnome/gedit/Portfile users/devans/GNOME-3/stable/dports/gnome/gedit/files/patch-configure.ac.diff users/devans/GNOME-3/stable/dports/gnome/gedit-plugins/files/ users/devans/GNOME-3/stable/dports/gnome/gedit-plugins/files/patch-configure.ac.diff Removed Paths: ------------- users/devans/GNOME-3/stable/dports/devel/gvfs/Portfile-1.19.90 users/devans/GNOME-3/stable/dports/gnome/baobab/files/autogen.sh users/devans/GNOME-3/stable/dports/gnome/baobab/files/patch-src-Makefile.am.diff users/devans/GNOME-3/stable/dports/gnome/gdm/Portfile-3.11.92.1 users/devans/GNOME-3/stable/dports/gnome/gedit/Portfile-3.11.92 users/devans/GNOME-3/stable/dports/gnome/gedit/files/autogen.sh users/devans/GNOME-3/stable/dports/gnome/gedit/files/patch-configure.diff users/devans/GNOME-3/stable/dports/gnome/gedit/files/patch-gedit-gedit-app.c.diff users/devans/GNOME-3/stable/dports/gnome/totem-pl-parser/files/patch-configure.ac.diff Property Changed: ---------------- users/devans/GNOME-3/stable/dports/devel/atk/Portfile users/devans/GNOME-3/stable/dports/gnome/devhelp/Portfile users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/Portfile users/devans/GNOME-3/stable/dports/gnome/totem-pl-parser/ Modified: users/devans/GNOME-3/stable/dports/devel/atk/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/devel/atk/Portfile 2014-03-28 15:18:24 UTC (rev 118272) +++ users/devans/GNOME-3/stable/dports/devel/atk/Portfile 2014-03-28 16:13:01 UTC (rev 118273) @@ -1,5 +1,5 @@ # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 -# $Id: Portfile 111623 2013-09-27 14:46:09Z cal@macports.org $ +# $Id$ PortSystem 1.0 Property changes on: users/devans/GNOME-3/stable/dports/devel/atk/Portfile ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native Modified: users/devans/GNOME-3/stable/dports/devel/geoclue2/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/devel/geoclue2/Portfile 2014-03-28 15:18:24 UTC (rev 118272) +++ users/devans/GNOME-3/stable/dports/devel/geoclue2/Portfile 2014-03-28 16:13:01 UTC (rev 118273) @@ -49,7 +49,7 @@ --disable-wifi-source post-activate { - system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas" + system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas" } livecheck.type regex Property changes on: users/devans/GNOME-3/stable/dports/devel/glade ___________________________________________________________________ Added: svn:mergeinfo + /branches/mld-qt-481/dports/devel/glade:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856 /users/cal/ports/devel/glade:96570-97031 Modified: users/devans/GNOME-3/stable/dports/devel/glade/Portfile =================================================================== --- trunk/dports/devel/glade/Portfile 2014-03-27 09:19:29 UTC (rev 118250) +++ users/devans/GNOME-3/stable/dports/devel/glade/Portfile 2014-03-28 16:13:01 UTC (rev 118273) @@ -4,7 +4,7 @@ PortSystem 1.0 name glade -version 3.16.1 +version 3.18.1 license LGPL-2+ GPL-2+ set branch [join [lrange [split ${version} .] 0 1] .] description Glade is a RAD tool to enable quick & easy development of user interfaces \ @@ -18,8 +18,8 @@ use_xz yes -checksums rmd160 80d315f8c749bff750eee5085c93d5a2db0a5e8f \ - sha256 994ac258bc100d3907ed40a2880c3144f13997b324477253e812d59f2716523f +checksums rmd160 28bb2caac22b57d20bf9e2d06cea75407b328d45 \ + sha256 9d5f141c4469a5a0a3f93fadb901b847030bc7318e80a8a6a0f09df7f194fc28 depends_skip_archcheck devhelp Copied: users/devans/GNOME-3/stable/dports/devel/gvfs/Portfile (from rev 118250, users/devans/GNOME-3/stable/dports/devel/gvfs/Portfile-1.19.90) =================================================================== --- users/devans/GNOME-3/stable/dports/devel/gvfs/Portfile (rev 0) +++ users/devans/GNOME-3/stable/dports/devel/gvfs/Portfile 2014-03-28 16:13:01 UTC (rev 118273) @@ -0,0 +1,104 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 +# $Id$ + +PortSystem 1.0 + +name gvfs +version 1.20.0 +set branch [join [lrange [split ${version} .] 0 1] .] +maintainers nomaintainer +categories devel +# trashlib code used in the daemon is GPL +license {LGPL GPL-3} +platforms darwin +description The Gnome Virtual File System. + +long_description \ + gvfs is a userspace virtual filesystem designed \ + to work with the i/o abstractions of gio (a new \ + library available with glib). It installs several \ + modules that are automatically used by applications \ + using the APIs of libgio. The gvfs model differs \ + from e.g. gnome-vfs in that filesystems must be \ + mounted before they are used. There is a central \ + daemon (gvfsd) that handles coordinting mounts, and \ + then each mount is (typically) in its own daemon \ + process (although mounts can share daemon process). \ + gvfs comes with a set of backends, including trash \ + support, sftp, smb, http, dav and others. There is \ + a set of command line programs starting with gvfs- \ + that lets you run commands (like cat, ls, stat, etc) \ + on files in the gvfs. + +homepage https://wiki.gnome.org/Projects/gvfs +master_sites gnome:sources/${name}/${branch}/ + +use_xz yes + +checksums rmd160 17f179d15a191b4c6c9342f312943f82424546ba \ + sha256 532a75fe105950a4da449d06b4fef73fb2f17ed795f731db3785c83e360e7e41 + +depends_build port:pkgconfig \ + port:intltool \ + port:gnome-doc-utils + +depends_lib port:gtk3 \ + port:gettext \ + path:lib/pkgconfig/glib-2.0.pc:glib2 \ + port:libarchive \ + port:libgcrypt \ + port:openssh \ + port:libsoup \ + port:libxml2 \ + port:libsecret \ + port:gnome-online-accounts + +# update m4/intltool.m4 and autoreconf + +pre-configure { + copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4 +} + +use_autoreconf yes +autoreconf.args -fvi + +configure.args --disable-avahi \ + --disable-fuse \ + --disable-hal \ + --disable-cdda \ + --disable-obexftp \ + --disable-gphoto2 \ + --disable-samba \ + --disable-udev \ + --disable-gdu \ + --disable-udisks2 \ + --disable-libsystemd-login \ + --disable-gudev \ + --disable-afc \ + --disable-bluray \ + --disable-libmtp \ + --enable-goa \ + --enable-http \ + --enable-archive \ + --enable-afp \ + --disable-silent-rules + +test.run yes +test.target check + +destroot.keepdirs ${destroot}${prefix}/share/gvfs/remote-volume-monitors + +post-destroot { + xinstall -d ${destroot}${prefix}/share/gvfs/remote-volume-monitors + set docdir ${prefix}/share/doc/${name} + xinstall -d ${destroot}${docdir} + xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING MAINTAINERS NEWS README \ + ${destroot}${docdir} +} + +post-activate { + system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas" + system "${prefix}/bin/gio-querymodules ${prefix}/lib/gio/modules" +} + +livecheck.type gnome-with-unstable Deleted: users/devans/GNOME-3/stable/dports/devel/gvfs/Portfile-1.19.90 =================================================================== --- users/devans/GNOME-3/stable/dports/devel/gvfs/Portfile-1.19.90 2014-03-28 15:18:24 UTC (rev 118272) +++ users/devans/GNOME-3/stable/dports/devel/gvfs/Portfile-1.19.90 2014-03-28 16:13:01 UTC (rev 118273) @@ -1,104 +0,0 @@ -# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 -# $Id$ - -PortSystem 1.0 - -name gvfs -version 1.19.90 -set branch [join [lrange [split ${version} .] 0 1] .] -maintainers nomaintainer -categories devel -# trashlib code used in the daemon is GPL -license {LGPL GPL-3} -platforms darwin -description The Gnome Virtual File System. - -long_description \ - gvfs is a userspace virtual filesystem designed \ - to work with the i/o abstractions of gio (a new \ - library available with glib). It installs several \ - modules that are automatically used by applications \ - using the APIs of libgio. The gvfs model differs \ - from e.g. gnome-vfs in that filesystems must be \ - mounted before they are used. There is a central \ - daemon (gvfsd) that handles coordinting mounts, and \ - then each mount is (typically) in its own daemon \ - process (although mounts can share daemon process). \ - gvfs comes with a set of backends, including trash \ - support, sftp, smb, http, dav and others. There is \ - a set of command line programs starting with gvfs- \ - that lets you run commands (like cat, ls, stat, etc) \ - on files in the gvfs. - -homepage https://wiki.gnome.org/Projects/gvfs -master_sites gnome:sources/${name}/${branch}/ - -use_xz yes - -checksums rmd160 e4e8bdf96d6adcc92e49ffd1ddd2a09e68cf3b71 \ - sha256 3a59fb24f05549dee332efc811b85a74868ef755899f201b78a98340b196567c - -depends_build port:pkgconfig \ - port:intltool \ - port:gnome-doc-utils - -depends_lib port:gtk3 \ - port:gettext \ - path:lib/pkgconfig/glib-2.0.pc:glib2 \ - port:libarchive \ - port:libgcrypt \ - port:openssh \ - port:libsoup \ - port:libxml2 \ - port:libsecret \ - port:gnome-online-accounts - -# update m4/intltool.m4 and autoreconf - -pre-configure { - copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4 -} - -use_autoreconf yes -autoreconf.args -fvi - -configure.args --disable-avahi \ - --disable-fuse \ - --disable-hal \ - --disable-cdda \ - --disable-obexftp \ - --disable-gphoto2 \ - --disable-samba \ - --disable-udev \ - --disable-gdu \ - --disable-udisks2 \ - --disable-libsystemd-login \ - --disable-gudev \ - --disable-afc \ - --disable-bluray \ - --disable-libmtp \ - --enable-goa \ - --enable-http \ - --enable-archive \ - --enable-afp \ - --disable-silent-rules - -test.run yes -test.target check - -destroot.keepdirs ${destroot}${prefix}/share/gvfs/remote-volume-monitors - -post-destroot { - xinstall -d ${destroot}${prefix}/share/gvfs/remote-volume-monitors - set docdir ${prefix}/share/doc/${name} - xinstall -d ${destroot}${docdir} - xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING MAINTAINERS NEWS README \ - ${destroot}${docdir} -} - -post-activate { - system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas" - system "${prefix}/bin/gio-querymodules ${prefix}/lib/gio/modules" -} - -livecheck.type gnome-with-unstable Modified: users/devans/GNOME-3/stable/dports/gnome/anjuta/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/anjuta/Portfile 2014-03-28 15:18:24 UTC (rev 118272) +++ users/devans/GNOME-3/stable/dports/gnome/anjuta/Portfile 2014-03-28 16:13:01 UTC (rev 118273) @@ -5,7 +5,7 @@ PortGroup muniversal 1.0 name anjuta -version 3.11.92 +version 3.12.0 license GPL-2+ set branch [join [lrange [split ${version} .] 0 1] .] description A GNOME/GTK IDE @@ -18,8 +18,8 @@ use_xz yes -checksums rmd160 4021f89b350864ca04416920c81efda6d7afca62 \ - sha256 2a1bd681b5e8c65e7fa09d84f06edd205748fa923de26536bb30001cb7f41196 +checksums rmd160 96f8240a4de55b173631397978abd8aad66400ef \ + sha256 880efe7274d015a07aec2c5bdfebe27e313f76f1f524bd9309b5e3ecd29bda1f depends_build port:pkgconfig \ port:intltool \ Property changes on: users/devans/GNOME-3/stable/dports/gnome/baobab ___________________________________________________________________ Added: svn:mergeinfo + /branches/mld-qt-481/dports/gnome/baobab:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856 /users/rmstonecipher/gnome/baobab:102363-103172 Modified: users/devans/GNOME-3/stable/dports/gnome/baobab/Portfile =================================================================== --- trunk/dports/gnome/baobab/Portfile 2014-03-28 11:42:13 UTC (rev 118271) +++ users/devans/GNOME-3/stable/dports/gnome/baobab/Portfile 2014-03-28 16:13:01 UTC (rev 118273) @@ -4,7 +4,7 @@ PortSystem 1.0 name baobab -version 3.10.1 +version 3.12.0 license GPL-2 GFDL-1.1 set branch [join [lrange [split ${version} .] 0 1] .] description GNOME disk usage analyzer. @@ -23,16 +23,13 @@ use_xz yes -checksums rmd160 9af4c29eb67bb2444c9f35788a9688bd779a53b5 \ - sha256 23ce8e4847ce5f1c8230e757532d94c84e6e273d6ec8fca20eecaed5f96563f9 +checksums rmd160 09d8d8877dbe88ca839efbbaf10cb2103936e033 \ + sha256 538c9d452ecfe93353e90e6781aa7bf241ab9f1f8e27e7b3a614cf31a3576b0a depends_build port:pkgconfig \ port:intltool \ port:itstool \ - port:yelp-tools \ - port:autoconf \ - port:automake \ - port:libtool + port:yelp-tools depends_lib port:desktop-file-utils \ port:gnome-icon-theme \ @@ -43,16 +40,16 @@ depends_run port:gnome-settings-daemon \ port:yelp -patchfiles patch-src-Makefile.am.diff +patchfiles patch-configure.ac.diff -# use autogen.sh from upstream git to update m4/intltool.m4 using intltoolize and autoreconf +# update m4/intltool.m4 and autoreconf -post-patch { - xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath} - file delete -force ${worksrcpath}/m4 +pre-configure { + copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4 } -configure.cmd ./autogen.sh +use_autoreconf yes +autoreconf.args -fvi configure.args --disable-schemas-compile \ --disable-silent-rules Deleted: users/devans/GNOME-3/stable/dports/gnome/baobab/files/autogen.sh =================================================================== --- trunk/dports/gnome/baobab/files/autogen.sh 2014-03-28 11:42:13 UTC (rev 118271) +++ users/devans/GNOME-3/stable/dports/gnome/baobab/files/autogen.sh 2014-03-28 16:13:01 UTC (rev 118273) @@ -1,34 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -test -n "$srcdir" || srcdir=`dirname "$0"` -test -n "$srcdir" || srcdir=. - -OLDDIR=`pwd` -cd $srcdir - -AUTORECONF=`which autoreconf` -if test -z $AUTORECONF; then - echo "*** No autoreconf found, please install it ***" - exit 1 -fi - -INTLTOOLIZE=`which intltoolize` -if test -z $INTLTOOLIZE; then - echo "*** No intltoolize found, please install the intltool package ***" - exit 1 -fi - -GNOMEDOC=`which yelp-build` -if test -z $GNOMEDOC; then - echo "*** The tools to build the documentation are not found," - echo " please install the yelp-tools package ***" - exit 1 -fi - -autopoint --force || exit $? -AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose - -cd $OLDDIR -test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" - Added: users/devans/GNOME-3/stable/dports/gnome/baobab/files/patch-configure.ac.diff =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/baobab/files/patch-configure.ac.diff (rev 0) +++ users/devans/GNOME-3/stable/dports/gnome/baobab/files/patch-configure.ac.diff 2014-03-28 16:13:01 UTC (rev 118273) @@ -0,0 +1,14 @@ +--- configure.ac.orig 2014-03-28 07:40:20.000000000 -0700 ++++ configure.ac 2014-03-28 07:41:37.000000000 -0700 +@@ -17,8 +17,9 @@ + # i18n stuff + IT_PROG_INTLTOOL(0.40.0) + +-AM_GNU_GETTEXT([external]) +-AM_GNU_GETTEXT_VERSION([0.17]) ++dnl AM_GNU_GETTEXT macros cannot be used with IT_PROG_INTLTOOL ++dnl AM_GNU_GETTEXT([external]) ++dnl AM_GNU_GETTEXT_VERSION([0.17]) + + GETTEXT_PACKAGE=AC_PACKAGE_NAME + AC_SUBST([GETTEXT_PACKAGE]) Deleted: users/devans/GNOME-3/stable/dports/gnome/baobab/files/patch-src-Makefile.am.diff =================================================================== --- trunk/dports/gnome/baobab/files/patch-src-Makefile.am.diff 2014-03-28 11:42:13 UTC (rev 118271) +++ users/devans/GNOME-3/stable/dports/gnome/baobab/files/patch-src-Makefile.am.diff 2014-03-28 16:13:01 UTC (rev 118273) @@ -1,14 +0,0 @@ ---- src/Makefile.am.orig 2013-09-04 03:24:23.000000000 -0700 -+++ src/Makefile.am 2014-03-06 12:34:40.000000000 -0800 -@@ -43,11 +43,8 @@ - AM_CFLAGS = \ - $(BAOBAB_CFLAGS) \ - -Wall \ -- -Wno-unused-but-set-variable \ -- -Wno-unused-variable \ - $(NULL) - --baobab_LDFLAGS = -export-dynamic - baobab_LDADD = \ - -lm \ - $(BAOBAB_LIBS) \ Modified: users/devans/GNOME-3/stable/dports/gnome/devhelp/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/devhelp/Portfile 2014-03-28 15:18:24 UTC (rev 118272) +++ users/devans/GNOME-3/stable/dports/gnome/devhelp/Portfile 2014-03-28 16:13:01 UTC (rev 118273) @@ -1,5 +1,5 @@ # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4 -# $Id: Portfile 117644 2014-03-07 00:14:42Z devans@macports.org $ +# $Id$ PortSystem 1.0 @@ -93,4 +93,6 @@ system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas" } -livecheck.type gnome +# this is the last version that will build on darwin < 13 + +livecheck.type none Property changes on: users/devans/GNOME-3/stable/dports/gnome/devhelp/Portfile ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native Modified: users/devans/GNOME-3/stable/dports/gnome/eog-plugins/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/eog-plugins/Portfile 2014-03-28 15:18:24 UTC (rev 118272) +++ users/devans/GNOME-3/stable/dports/gnome/eog-plugins/Portfile 2014-03-28 16:13:01 UTC (rev 118273) @@ -4,7 +4,7 @@ PortSystem 1.0 name eog-plugins -version 3.11.92 +version 3.12.0 license GPL-2+ set branch [join [lrange [split ${version} .] 0 1] .] description Extra plugins for the Eye of GNOME image viewer @@ -18,8 +18,8 @@ use_xz yes -checksums rmd160 ac9cb5b5c77818957839f9d1b6712e76817f3139 \ - sha256 7d954383659a86971f02f0cef4ce0713dfe404a38697681f0682d1aa60e95662 +checksums rmd160 c1bded4b72f9dada2328b1c636a7da4e22900e2a \ + sha256 3f6c4e0dd63c1003f31c08636b6540cf0312b9b42e2e621c96b946c72e3d9742 depends_build port:pkgconfig \ port:intltool Modified: users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile 2014-03-28 15:18:24 UTC (rev 118272) +++ users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile 2014-03-28 16:13:01 UTC (rev 118273) @@ -1,5 +1,5 @@ # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4 -# $Id: Portfile 117326 2014-02-22 04:50:33Z devans@macports.org $ +# $Id$ PortSystem 1.0 @@ -103,4 +103,6 @@ depends_lib-delete port:nss } -livecheck.type gnome +# this is the last version that will build on darwin < 13 + +livecheck.type none Property changes on: users/devans/GNOME-3/stable/dports/gnome/epiphany/Portfile ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native Property changes on: users/devans/GNOME-3/stable/dports/gnome/gdl3 ___________________________________________________________________ Added: svn:mergeinfo + /branches/mld-qt-481/dports/gnome/gdl3:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856 /users/rmstonecipher/gnome/gdl3:102363-103172 Modified: users/devans/GNOME-3/stable/dports/gnome/gdl3/Portfile =================================================================== --- trunk/dports/gnome/gdl3/Portfile 2014-03-28 10:13:15 UTC (rev 118270) +++ users/devans/GNOME-3/stable/dports/gnome/gdl3/Portfile 2014-03-28 16:13:01 UTC (rev 118273) @@ -5,7 +5,7 @@ name gdl3 set gname gdl -version 3.10.0 +version 3.12.0 license LGPL set branch [join [lrange [split ${version} .] 0 1] .] categories gnome devel @@ -23,8 +23,8 @@ distname ${gname}-${version} use_xz yes -checksums rmd160 3e08cbe532d54de26d5d2b9091db51e5878cc92d \ - sha256 4e0d6f66115ba3b0f3cd2495d8a95c6714d701f89d556bb691bd0c0a62a1c760 +checksums rmd160 ca9be1ed082e8f4e85567df0ffb643861da76ac4 \ + sha256 4770f959f31ed5e616fe623c284e8dd6136e49902d19b6e37938d34be4f6b88d depends_build port:pkgconfig \ port:intltool \ @@ -34,9 +34,6 @@ port:gobject-introspection \ port:libxml2 -patchfiles patch-return.diff \ - patch-gdl-gdl-dock-object.h.diff - # update m4/intltool.m4 and autoreconf pre-configure { Modified: users/devans/GNOME-3/stable/dports/gnome/gdm/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gdm/Portfile 2014-03-28 15:18:24 UTC (rev 118272) +++ users/devans/GNOME-3/stable/dports/gnome/gdm/Portfile 2014-03-28 16:13:01 UTC (rev 118273) @@ -56,7 +56,6 @@ post-patch { reinplace "s|@MP_PREFIX@|${prefix}|" ${worksrcpath}/configure.ac - file attributes ${worksrcpath}/install-sh -permissions +x } use_parallel_build no Deleted: users/devans/GNOME-3/stable/dports/gnome/gdm/Portfile-3.11.92.1 =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gdm/Portfile-3.11.92.1 2014-03-28 15:18:24 UTC (rev 118272) +++ users/devans/GNOME-3/stable/dports/gnome/gdm/Portfile-3.11.92.1 2014-03-28 16:13:01 UTC (rev 118273) @@ -1,108 +0,0 @@ -# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 -# $Id: Portfile 117912 2014-03-17 03:26:10Z devans@macports.org $ - -# TODO: figure out how to make PAM happy without blowing a large hole -# in the security of the OS or touching PAM - -PortSystem 1.0 - -name gdm -version 3.11.92.1 -license GPL-2 -set branch [join [lrange [split ${version} .] 0 1] .] -description The Gnome Display Manager is a re-implementation of the well known xdm program. -long_description \ - The Gnome Display Manager is a re-implementation of the well \ - known xdm program. It displays a X11-based graphical login screen. -maintainers nomaintainer -categories gnome -platforms darwin -homepage https://wiki.gnome.org/Projects/GDM -master_sites gnome:sources/${name}/${branch}/ - -use_xz yes - -checksums rmd160 6403ac087921c79aa7cd5f751b1b7a0c02ceabc3 \ - sha256 731d72f43b01fc0f36ecfed80d9d04c62e7c537fa5d13078bc56114692213014 - -depends_build port:pkgconfig \ - port:intltool \ - port:itstool - -depends_lib port:desktop-file-utils \ - port:gtk3 \ - port:dconf \ - port:accountsservice \ - port:nss \ - port:libcanberra \ - port:upower \ - port:fontconfig \ - port:gobject-introspection \ - port:iso-codes \ - port:xorg-libX11 \ - port:xorg-libXau \ - port:xorg-libXrandr \ - port:xorg-libXdmcp \ - port:xorg-libXi \ - port:xorg-libXinerama \ - port:xorg-libXevie - -depends_run port:gnome-session \ - port:gnome-settings-daemon - -#patchfiles patch-daemon.diff -patchfiles patch-daemon-gdm-session-worker.c.diff \ - patch-configure.ac.diff - -post-patch { - reinplace "s|@MP_PREFIX@|${prefix}|" ${worksrcpath}/configure.ac - file attributes ${worksrcpath}/install-sh -permissions +x -} - -use_parallel_build no - -# update m4/intltool.m4 and autoreconf - -pre-configure { - copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4 -} - -use_autoreconf yes -autoreconf.args -fvi - -configure.args --enable-ipv6 \ - --without-console-kit \ - --without-plymouth \ - --disable-systemd-journal \ - --disable-wayland-support \ - --disable-schemas-compile \ - --disable-silent-rules - -startupitem.create yes -startupitem.name gdm -startupitem.init XDG_DATA_DIRS=${prefix}/share -startupitem.start ${prefix}/sbin/gdm -startupitem.stop ${prefix}/sbin/gdm-stop -startupitem.restart ${prefix}/sbin/gdm-restart - -post-destroot { - xinstall -m 644 ${filespath}/pam.sample ${destroot}${prefix}/etc/gdm - xinstall ${filespath}/macports-gdm-util ${destroot}${prefix}/bin -} - -universal_variant no - -pre-activate { - addgroup gdm - adduser gdm gid=[existsgroup gdm] realname=GNOME\ Display\ Manager -} - -post-activate { - system "${prefix}/bin/update-desktop-database ${prefix}/share/applications" - system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor" - system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas" - file mkdir ${prefix}/var/gdm - file attributes ${prefix}/var/gdm -owner gdm -group gdm -} - -livecheck.type gnome-with-unstable Copied: users/devans/GNOME-3/stable/dports/gnome/gdm/Portfile-3.12.0 (from rev 118250, users/devans/GNOME-3/stable/dports/gnome/gdm/Portfile-3.11.92.1) =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gdm/Portfile-3.12.0 (rev 0) +++ users/devans/GNOME-3/stable/dports/gnome/gdm/Portfile-3.12.0 2014-03-28 16:13:01 UTC (rev 118273) @@ -0,0 +1,108 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 +# $Id: Portfile 117912 2014-03-17 03:26:10Z devans@macports.org $ + +# TODO: figure out how to make PAM happy without blowing a large hole +# in the security of the OS or touching PAM + +PortSystem 1.0 + +name gdm +version 3.12.0 +license GPL-2 +set branch [join [lrange [split ${version} .] 0 1] .] +description The Gnome Display Manager is a re-implementation of the well known xdm program. +long_description \ + The Gnome Display Manager is a re-implementation of the well \ + known xdm program. It displays a X11-based graphical login screen. +maintainers nomaintainer +categories gnome +platforms darwin +homepage https://wiki.gnome.org/Projects/GDM +master_sites gnome:sources/${name}/${branch}/ + +use_xz yes + +checksums rmd160 79c2b44a8c84d1a0790eb255e10f0511641d29c3 \ + sha256 74889819a0c55577fd04236b5308de5f1fcf1992b221c71d02d91a1e564a5d87 + +depends_build port:pkgconfig \ + port:intltool \ + port:itstool + +depends_lib port:desktop-file-utils \ + port:gtk3 \ + port:dconf \ + port:accountsservice \ + port:nss \ + port:libcanberra \ + port:upower \ + port:fontconfig \ + port:gobject-introspection \ + port:iso-codes \ + port:xorg-libX11 \ + port:xorg-libXau \ + port:xorg-libXrandr \ + port:xorg-libXdmcp \ + port:xorg-libXi \ + port:xorg-libXinerama \ + port:xorg-libXevie + +depends_run port:gnome-session \ + port:gnome-settings-daemon + +#patchfiles patch-daemon.diff +patchfiles patch-daemon-gdm-session-worker.c.diff \ + patch-configure.ac.diff + +post-patch { + reinplace "s|@MP_PREFIX@|${prefix}|" ${worksrcpath}/configure.ac + file attributes ${worksrcpath}/install-sh -permissions +x +} + +use_parallel_build no + +# update m4/intltool.m4 and autoreconf + +pre-configure { + copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4 +} + +use_autoreconf yes +autoreconf.args -fvi + +configure.args --enable-ipv6 \ + --without-console-kit \ + --without-plymouth \ + --disable-systemd-journal \ + --disable-wayland-support \ + --disable-schemas-compile \ + --disable-silent-rules + +startupitem.create yes +startupitem.name gdm +startupitem.init XDG_DATA_DIRS=${prefix}/share +startupitem.start ${prefix}/sbin/gdm +startupitem.stop ${prefix}/sbin/gdm-stop +startupitem.restart ${prefix}/sbin/gdm-restart + +post-destroot { + xinstall -m 644 ${filespath}/pam.sample ${destroot}${prefix}/etc/gdm + xinstall ${filespath}/macports-gdm-util ${destroot}${prefix}/bin +} + +universal_variant no + +pre-activate { + addgroup gdm + adduser gdm gid=[existsgroup gdm] realname=GNOME\ Display\ Manager +} + +post-activate { + system "${prefix}/bin/update-desktop-database ${prefix}/share/applications" + system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor" + system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas" + file mkdir ${prefix}/var/gdm + file attributes ${prefix}/var/gdm -owner gdm -group gdm +} + +livecheck.type gnome-with-unstable Modified: users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-configure.ac.diff =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-configure.ac.diff 2014-03-28 15:18:24 UTC (rev 118272) +++ users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-configure.ac.diff 2014-03-28 16:13:01 UTC (rev 118273) @@ -1,6 +1,6 @@ ---- configure.ac.orig 2014-03-15 07:56:54.000000000 -0700 -+++ configure.ac 2014-03-15 08:00:06.000000000 -0700 -@@ -499,6 +499,7 @@ +--- configure.ac.orig 2014-02-21 05:24:30.000000000 -0800 ++++ configure.ac 2014-03-28 08:44:04.000000000 -0700 +@@ -496,6 +496,7 @@ AC_CHECK_LIB(pam, pam_syslog, [AC_DEFINE(HAVE_PAM_SYSLOG, [], [Define to 1 if you have the pam_syslog function])]) dnl test whether struct pam_message is const (Linux) or not (Sun) @@ -8,7 +8,7 @@ if test "x$have_pam" = "xyes"; then pam_appl_h="$ac_pam_includes/security/pam_appl.h" AC_MSG_CHECKING(for const pam_message) -@@ -1217,7 +1218,17 @@ +@@ -1222,7 +1223,17 @@ # and /usr/X11 since they often symlink to each other, and configure # should use the more stable location (the real directory) if possible. # Added: users/devans/GNOME-3/stable/dports/gnome/gedit/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gedit/Portfile (rev 0) +++ users/devans/GNOME-3/stable/dports/gnome/gedit/Portfile 2014-03-28 16:13:01 UTC (rev 118273) @@ -0,0 +1,102 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4 +# $Id$ + +PortSystem 1.0 + +name gedit +version 3.12.0 +license GPL-2 +set branch [join [lrange [split ${version} .] 0 1] .] +description GNOME editor. +long_description \ + ${description} +maintainers devans openmaintainer +categories gnome editors +platforms darwin +homepage https://wiki.gnome.org/Apps/Gedit +master_sites gnome:sources/${name}/${branch}/ + +use_xz yes + +checksums rmd160 661d2e961172f6b616be71350104b71582dcd516 \ + sha256 6028d535d50c85017739b84e7fe94ad5a1940064bb315375d5d1d6ed99eb38c2 + +depends_build port:pkgconfig \ + port:intltool \ + port:itstool \ + port:yelp-tools \ + port:gnome-common \ + port:gtk-doc + +depends_lib port:desktop-file-utils \ + port:gnome-icon-theme \ + port:gnome-icon-theme-symbolic \ + port:gsettings-desktop-schemas \ + port:gtk3 \ + port:gvfs \ + port:gtksourceview3 \ + port:libpeas \ + port:libsoup \ + port:libxml2 \ + port:enchant \ + port:iso-codes \ + port:zeitgeist \ + port:vala + +depends_run port:gnome-settings-daemon \ + port:yelp + +patchfiles patch-configure.ac.diff + +# update m4/intltool.m4 and autoreconf + +pre-configure { + copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4 +} + +use_autoreconf yes +autoreconf.args -fvi + +configure.cflags-append \ + -Wno-error=format-nonliteral + +configure.args --enable-zeitgeist \ + --disable-python \ + --disable-schemas-compile \ + --disable-silent-rules + +# minimum python version is 3.2.3 + +variant python32 conflicts python33 python34 description {Use python 3.2} { + depends_lib-append port:py32-gobject3 + configure.python ${prefix}/bin/python3.2 + set python_framework ${frameworks_dir}/Python.framework/Versions/3.2 + configure.pkg_config_path ${python_framework}/lib/pkgconfig + configure.args-replace --disable-python --enable-python +} + +variant python33 conflicts python32 python34 description {Use python 3.3} { + depends_lib-append port:py33-gobject3 + configure.python ${prefix}/bin/python3.3 + set python_framework ${frameworks_dir}/Python.framework/Versions/3.3 + configure.pkg_config_path ${python_framework}/lib/pkgconfig + configure.args-replace --disable-python --enable-python +} + +variant python34 conflicts python32 python33 description {Use python 3.3} { + depends_lib-append port:py34-gobject3 + configure.python ${prefix}/bin/python3.4 + set python_framework ${frameworks_dir}/Python.framework/Versions/3.4 + configure.pkg_config_path ${python_framework}/lib/pkgconfig + configure.args-replace --disable-python --enable-python +} + +if {![variant_isset python32] && ![variant_isset python34]} { + default_variants +python33 +} + +post-activate { + system "${prefix}/bin/update-desktop-database ${prefix}/share/applications" +} + +livecheck.type gnome-with-unstable Property changes on: users/devans/GNOME-3/stable/dports/gnome/gedit/Portfile ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native Deleted: users/devans/GNOME-3/stable/dports/gnome/gedit/Portfile-3.11.92 =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gedit/Portfile-3.11.92 2014-03-28 15:18:24 UTC (rev 118272) +++ users/devans/GNOME-3/stable/dports/gnome/gedit/Portfile-3.11.92 2014-03-28 16:13:01 UTC (rev 118273) @@ -1,98 +0,0 @@ -# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4 -# $Id$ - -PortSystem 1.0 - -name gedit -version 3.11.92 -license GPL-2 -set branch [join [lrange [split ${version} .] 0 1] .] -description GNOME editor. -long_description \ - ${description} -maintainers devans openmaintainer -categories gnome editors -platforms darwin -homepage https://wiki.gnome.org/Apps/Gedit -master_sites gnome:sources/${name}/${branch}/ - -use_xz yes - -checksums rmd160 25a173d8a6b1e27f8156bf0e2e0280f361655149 \ - sha256 6b2c7566a098e3ebef44debb3e06c4dcfe8eef3b3e29f4233d1ee90f6a77a7c8 - -depends_build port:pkgconfig \ - port:intltool \ - port:itstool \ - port:yelp-tools \ - port:automake \ - port:autoconf \ - port:libtool \ - port:gnome-common \ - port:gtk-doc - -depends_lib port:desktop-file-utils \ - port:gnome-icon-theme \ - port:gnome-icon-theme-symbolic \ - port:gsettings-desktop-schemas \ - port:gtk3 \ - port:gvfs \ - port:gtksourceview3 \ - port:libpeas \ - port:libsoup \ - port:libxml2 \ - port:enchant \ - port:iso-codes \ - port:zeitgeist - -depends_run port:gnome-settings-daemon \ - port:yelp - -pre-patch { - copy ${worksrcpath}/gedit ${worksrcpath}/gedit.orig -} - -patchfiles patch-configure.diff \ - patch-gedit-gedit-app.c.diff - -# use autogen.sh from upstream git to update intltool.m4 using intltoolize and autoreconf - -post-patch { - xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath} -} - -configure.cmd ./autogen.sh - -configure.cflags-append \ - -Wno-format-nonliteral - -configure.args --enable-zeitgeist \ - --disable-python \ - --disable-schemas-compile \ - --disable-silent-rules - -# minimum python version is 3.2.3 - -variant python32 description {Use python 3.2} { - depends_lib-append port:py32-gobject3 - configure.python ${prefix}/bin/python3.2 - set python_framework ${frameworks_dir}/Python.framework/Versions/3.2 - configure.pkg_config_path ${python_framework}/lib/pkgconfig - configure.args-replace --disable-python --enable-python -} - -variant python33 description {Use python 3.3} { - depends_lib-append port:py33-gobject3 - configure.python ${prefix}/bin/python3.3 - set python_framework ${frameworks_dir}/Python.framework/Versions/3.3 - configure.pkg_config_path ${python_framework}/lib/pkgconfig - configure.args-replace --disable-python --enable-python -} - -default_variants +python32 - -post-activate { - system "${prefix}/bin/update-desktop-database ${prefix}/share/applications" -} - -livecheck.type gnome-with-unstable Deleted: users/devans/GNOME-3/stable/dports/gnome/gedit/files/autogen.sh =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gedit/files/autogen.sh 2014-03-28 15:18:24 UTC (rev 118272) +++ users/devans/GNOME-3/stable/dports/gnome/gedit/files/autogen.sh 2014-03-28 16:13:01 UTC (rev 118273) @@ -1,42 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -test -n "$srcdir" || srcdir=`dirname "$0"` -test -n "$srcdir" || srcdir=. - -OLDDIR=`pwd` -cd $srcdir - -AUTORECONF=`which autoreconf` -if test -z $AUTORECONF; then - echo "*** No autoreconf found, please intall it ***" - exit 1 -fi - -INTLTOOLIZE=`which intltoolize` -if test -z $INTLTOOLIZE; then - echo "*** No intltoolize found, please install the intltool package ***" - exit 1 -fi - -GNOMEDOC=`which yelp-build` -if test -z $GNOMEDOC; then - echo "*** The tools to build the documentation are not found," - echo " please intall the yelp-tools package ***" - exit 1 -fi - -GTKDOCIZE=`which gtkdocize` -if test -z $GTKDOCIZE; then - echo "*** No GTK-Doc found, please install it ***" - exit 1 -fi - -git submodule update --init --recursive - -gtkdocize || exit $? -autopoint --force || exit $? -AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose - -cd $OLDDIR -test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" Added: users/devans/GNOME-3/stable/dports/gnome/gedit/files/patch-configure.ac.diff =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gedit/files/patch-configure.ac.diff (rev 0) +++ users/devans/GNOME-3/stable/dports/gnome/gedit/files/patch-configure.ac.diff 2014-03-28 16:13:01 UTC (rev 118273) @@ -0,0 +1,14 @@ +--- configure.ac.orig 2014-03-24 01:12:17.000000000 -0700 ++++ configure.ac 2014-03-28 05:05:08.000000000 -0700 +@@ -165,8 +165,9 @@ + + IT_PROG_INTLTOOL([0.50.1]) + +-AM_GNU_GETTEXT_VERSION([0.18]) +-AM_GNU_GETTEXT([external]) ++dnl AM_GNU_GETTEXT macros cannot be used with IT_PROG_INTLTOOL ++dnl AM_GNU_GETTEXT_VERSION([0.18]) ++dnl AM_GNU_GETTEXT([external]) + + AC_SUBST([GETTEXT_PACKAGE], [gedit]) + AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE", [Define to the gettext package name.]) Deleted: users/devans/GNOME-3/stable/dports/gnome/gedit/files/patch-configure.diff =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gedit/files/patch-configure.diff 2014-03-28 15:18:24 UTC (rev 118272) +++ users/devans/GNOME-3/stable/dports/gnome/gedit/files/patch-configure.diff 2014-03-28 16:13:01 UTC (rev 118273) @@ -1,14 +0,0 @@ ---- configure.orig 2014-01-21 14:52:42.000000000 -0800 -+++ configure 2014-01-29 14:54:13.000000000 -0800 -@@ -16457,9 +16457,9 @@ - - - -- PYTHON_PREFIX='${prefix}' -+ PYTHON_PREFIX=`$PYTHON -c 'import sys; print(sys.prefix);'` - -- PYTHON_EXEC_PREFIX='${exec_prefix}' -+ PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print(sys.exec_prefix);'` - - - Deleted: users/devans/GNOME-3/stable/dports/gnome/gedit/files/patch-gedit-gedit-app.c.diff =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gedit/files/patch-gedit-gedit-app.c.diff 2014-03-28 15:18:24 UTC (rev 118272) +++ users/devans/GNOME-3/stable/dports/gnome/gedit/files/patch-gedit-gedit-app.c.diff 2014-03-28 16:13:01 UTC (rev 118273) @@ -1,38 +0,0 @@ ---- gedit/gedit-app.c.orig 2014-01-11 05:54:03.000000000 -0800 -+++ gedit/gedit-app.c 2014-01-31 12:12:54.000000000 -0800 -@@ -96,7 +96,7 @@ - static gboolean new_window = FALSE; - static gboolean new_document = FALSE; - static gchar *geometry = NULL; --static gboolean wait = FALSE; -+static gboolean gwait = FALSE; - static gboolean gapplication_service = FALSE; - static gboolean standalone = FALSE; - static gchar **remaining_args = NULL; -@@ -171,7 +171,7 @@ - /* Wait for closing documents */ - { - "wait", 'w', 0, G_OPTION_ARG_NONE, -- &wait, -+ &gwait, - N_("Open files and block process until files are closed"), - NULL - }, -@@ -811,7 +811,7 @@ - new_window = FALSE; - new_document = FALSE; - geometry = NULL; -- wait = FALSE; -+ gwait = FALSE; - standalone = FALSE; - remaining_args = NULL; - encoding = NULL; -@@ -874,7 +874,7 @@ - } - else - { -- if (wait) -+ if (gwait) - { - command_line = cl; - } Modified: users/devans/GNOME-3/stable/dports/gnome/gedit-plugins/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gedit-plugins/Portfile 2014-03-28 15:18:24 UTC (rev 118272) +++ users/devans/GNOME-3/stable/dports/gnome/gedit-plugins/Portfile 2014-03-28 16:13:01 UTC (rev 118273) @@ -4,7 +4,7 @@ PortSystem 1.0 name gedit-plugins -version 3.10.1 +version 3.12.0 license GPL-2 set branch [join [lrange [split ${version} .] 0 1] .] description Plug-ins for GEdit @@ -18,40 +18,58 @@ use_xz yes -checksums rmd160 9b498995e473099dcef2be53f42bffbde5917ba2 \ - sha256 b30e30d5a0efb9a711c6583748b37c1ed3e45222505e08f920b78c6de0bc4a9d +checksums rmd160 88ddf0c8621339211276258964c26a324f5efec0 \ + sha256 3d54ec3df4f763ce60fb019fe7cc2be42c2c5e92bc321c4e69df55bec31dc484 depends_build port:pkgconfig \ port:intltool depends_lib port:gtk3 \ port:gtksourceview3 \ - port:libpeas + port:libpeas \ + port:gedit -# port:gedit +patchfiles patch-configure.ac.diff +# update m4/intltool.m4 and autoreconf + +pre-configure { + copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4 +} + +use_autoreconf yes +autoreconf.args -fvi + configure.args --disable-schemas-compile -variant python26 conflicts python27 description {Use python 2.6} { - configure.python ${prefix}/bin/python2.6 - configure.args-append --enable-python - depends_lib-append port:dbus-python26 - set python_framework ${frameworks_dir}/Python.framework/Versions/2.6 +variant python32 conflicts python33 python34 description {Use python 3.2} { + depends_lib-append port:py32-gobject3 + configure.python ${prefix}/bin/python3.2 + set python_framework ${frameworks_dir}/Python.framework/Versions/3.2 configure.pkg_config_path ${python_framework}/lib/pkgconfig + configure.args-replace --disable-python --enable-python } -variant python27 conflicts python26 description {Use python 2.7} { - configure.python ${prefix}/bin/python2.7 - configure.args-append --enable-python - depends_lib-append port:dbus-python27 - set python_framework ${frameworks_dir}/Python.framework/Versions/2.7 +variant python33 conflicts python32 python34 description {Use python 3.3} { + depends_lib-append port:py33-gobject3 + configure.python ${prefix}/bin/python3.3 + set python_framework ${frameworks_dir}/Python.framework/Versions/3.3 configure.pkg_config_path ${python_framework}/lib/pkgconfig + configure.args-replace --disable-python --enable-python } -if {![variant_isset python26]} { - default_variants +python27 +variant python34 conflicts python32 python33 description {Use python 3.3} { + depends_lib-append port:py34-gobject3 + configure.python ${prefix}/bin/python3.4 + set python_framework ${frameworks_dir}/Python.framework/Versions/3.4 + configure.pkg_config_path ${python_framework}/lib/pkgconfig + configure.args-replace --disable-python --enable-python } +if {![variant_isset python32] && ![variant_isset python34]} { + default_variants +python33 +} + post-activate { system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas" } Added: users/devans/GNOME-3/stable/dports/gnome/gedit-plugins/files/patch-configure.ac.diff =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gedit-plugins/files/patch-configure.ac.diff (rev 0) +++ users/devans/GNOME-3/stable/dports/gnome/gedit-plugins/files/patch-configure.ac.diff 2014-03-28 16:13:01 UTC (rev 118273) @@ -0,0 +1,14 @@ +--- configure.ac.orig 2014-03-28 04:53:08.000000000 -0700 ++++ configure.ac 2014-03-28 04:54:10.000000000 -0700 +@@ -51,8 +51,9 @@ + # ================================================================ + IT_PROG_INTLTOOL([0.40.0]) + +-AM_GNU_GETTEXT_VERSION([0.17]) +-AM_GNU_GETTEXT([external]) ++dnl AM_GNU_GETTEXT macros cannot be used with IT_PROG_INTLTOOL ++dnl AM_GNU_GETTEXT_VERSION([0.17]) ++dnl AM_GNU_GETTEXT([external]) + + GETTEXT_PACKAGE=gedit-plugins + AC_SUBST(GETTEXT_PACKAGE) Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-backgrounds/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gnome-backgrounds/Portfile 2014-03-28 15:18:24 UTC (rev 118272) +++ users/devans/GNOME-3/stable/dports/gnome/gnome-backgrounds/Portfile 2014-03-28 16:13:01 UTC (rev 118273) @@ -10,7 +10,7 @@ categories gnome license GPL-2 installs_libs no -platforms darwin +platforms darwin supported_archs noarch description A collection of backgrounds for GNOME 2. Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile 2014-03-28 15:18:24 UTC (rev 118272) +++ users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile 2014-03-28 16:13:01 UTC (rev 118273) @@ -1,5 +1,5 @@ # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 -# $Id: Portfile 117321 2014-02-22 02:34:30Z devans@macports.org $ +# $Id$ PortSystem 1.0 @@ -102,4 +102,6 @@ system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor" } -livecheck.type gnome +# this is the last version that will build on darwin < 13 + +livecheck.type none Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnome-control-center/Portfile ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/Portfile 2014-03-28 15:18:24 UTC (rev 118272) +++ users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/Portfile 2014-03-28 16:13:01 UTC (rev 118273) @@ -41,7 +41,7 @@ port:xorg-libXext \ port:xorg-libXrandr \ port:xkeyboard-config \ - port:xorg-libxkbfile + port:xorg-libxkbfile pre-patch { copy ${worksrcpath}/libgnome-desktop/libgsystem ${worksrcpath}/libgnome-desktop/libgsystem.orig Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-devel-docs/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gnome-devel-docs/Portfile 2014-03-28 15:18:24 UTC (rev 118272) +++ users/devans/GNOME-3/stable/dports/gnome/gnome-devel-docs/Portfile 2014-03-28 16:13:01 UTC (rev 118273) @@ -4,7 +4,7 @@ PortSystem 1.0 name gnome-devel-docs -version 3.11.92 +version 3.12.0 license GFDL-1.1 set branch [join [lrange [split ${version} .] 0 1] .] description The GNOME Developer Documentation Package @@ -26,8 +26,8 @@ use_xz yes -checksums rmd160 04bae1d2d2a2c2c335725e036ee8a90e79b02e75 \ - sha256 a613a52151fe45711dbc2bfd2326deb70fa9ff9532e5d3d7deaf74591e743f80 +checksums rmd160 b9c758d6bf29fa6aa60913e9bc3946ff216c1a79 \ + sha256 8d88b91f5a1257ad3420f9e51f557a445e918c5c125f76df2d3028a89d9271de depends_build port:itstool \ port:libxml2 Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-font-viewer/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gnome-font-viewer/Portfile 2014-03-28 15:18:24 UTC (rev 118272) +++ users/devans/GNOME-3/stable/dports/gnome/gnome-font-viewer/Portfile 2014-03-28 16:13:01 UTC (rev 118273) @@ -4,8 +4,7 @@ PortSystem 1.0 name gnome-font-viewer -version 3.10.0 -revision 1 +version 3.12.0 license GPL-2 set branch [join [lrange [split ${version} .] 0 1] .] description GNOME font viewer and thumbnailer. @@ -19,8 +18,8 @@ use_xz yes -checksums rmd160 6f91268183f7ae4bca1083aba3d51271b7e1849b \ - sha256 3928350f58ac6c95f44b64cba1a5f03437b19d9b2645a7b01176067504fdd652 +checksums rmd160 03e310381eb710ac329a3e0dd4b61a9bf7b2f36a \ + sha256 fca50711b7bd4edd1213dd4f05a309911cd1e832974142944c06d52ae07cbe45 depends_build port:pkgconfig \ port:intltool Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/Portfile 2014-03-28 15:18:24 UTC (rev 118272) +++ users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/Portfile 2014-03-28 16:13:01 UTC (rev 118273) @@ -1,5 +1,5 @@ # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4 -# $Id: Portfile 117360 2014-02-24 01:59:47Z devans@macports.org $ +# $Id$ PortSystem 1.0 @@ -68,5 +68,6 @@ } } -livecheck.type gnome +# this is the last version that will build on darwin < 13 +livecheck.type none Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnome-online-accounts/Portfile ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-system-monitor/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gnome-system-monitor/Portfile 2014-03-28 15:18:24 UTC (rev 118272) +++ users/devans/GNOME-3/stable/dports/gnome/gnome-system-monitor/Portfile 2014-03-28 16:13:01 UTC (rev 118273) @@ -4,7 +4,7 @@ PortSystem 1.0 name gnome-system-monitor -version 3.11.92 +version 3.12.0 license GPL-2+ set branch [join [lrange [split ${version} .] 0 1] .] description A system monitor. @@ -20,13 +20,10 @@ use_xz yes -checksums rmd160 3948ca158b804937d71b0fad1ffaf432741dd69c \ - sha256 22b9525d50d9cf2ad5c6923fb0b275dec897ada0077cbb6f35a7665c8d560131 +checksums rmd160 882a58f8d8dbcc5d910b62c03c9bc7754698d03e \ + sha256 e2f10547f297002a02f667c4b399242fa82ed1753e0b80ee7c2bbf7034fe3097 depends_build port:pkgconfig \ - port:autoconf \ - port:automake \ - port:libtool \ port:intltool \ port:gnome-common \ port:itstool \ @@ -65,4 +62,4 @@ system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas" } -livecheck.type gnome-with-unstable +livecheck.type gnome Property changes on: users/devans/GNOME-3/stable/dports/gnome/totem-pl-parser ___________________________________________________________________ Modified: svn:mergeinfo - /branches/mld-qt-481/dports/gnome/totem-pl-parser:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856 /trunk/dports/gnome/totem-pl-parser:108265-117245 /users/rmstonecipher/gnome/totem-pl-parser:102363-103172 + /branches/mld-qt-481/dports/gnome/totem-pl-parser:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856 /trunk/dports/gnome/totem-pl-parser:108265-118250 /users/rmstonecipher/gnome/totem-pl-parser:102363-103172 Modified: users/devans/GNOME-3/stable/dports/gnome/totem-pl-parser/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/totem-pl-parser/Portfile 2014-03-28 15:18:24 UTC (rev 118272) +++ users/devans/GNOME-3/stable/dports/gnome/totem-pl-parser/Portfile 2014-03-28 16:13:01 UTC (rev 118273) @@ -4,7 +4,7 @@ PortSystem 1.0 name totem-pl-parser -version 3.10.1 +version 3.10.2 set branch [join [lrange [split ${version} .] 0 1] .] categories gnome license LGPL-2+ @@ -20,8 +20,8 @@ use_xz yes -checksums rmd160 eb1a3a59f1c994c50d8332e716c8cfd98ee53f13 \ - sha256 13d20222e7230eff1b22acc2b6b54d3c910590782a3ac39b859857407fb5e413 +checksums rmd160 ff55e3dabeba14632803ac6bbdb3572d2ffd290f \ + sha256 38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469 depends_build port:pkgconfig \ port:intltool \ @@ -35,8 +35,7 @@ port:gmime \ port:gobject-introspection -patchfiles patch-plparse-plparser.symbols.diff \ - patch-configure.ac.diff +patchfiles patch-plparse-plparser.symbols.diff # update m4/intltool.m4 and autoreconf Deleted: users/devans/GNOME-3/stable/dports/gnome/totem-pl-parser/files/patch-configure.ac.diff =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/totem-pl-parser/files/patch-configure.ac.diff 2014-03-28 15:18:24 UTC (rev 118272) +++ users/devans/GNOME-3/stable/dports/gnome/totem-pl-parser/files/patch-configure.ac.diff 2014-03-28 16:13:01 UTC (rev 118273) @@ -1,17 +0,0 @@ ---- configure.ac.orig 2014-02-19 15:15:07.000000000 -0800 -+++ configure.ac 2014-02-19 15:19:33.000000000 -0800 -@@ -8,12 +8,13 @@ AC_INIT([totem-pl-parser], - [totem_version_major.totem_version_minor.totem_version_micro], - [http://bugzilla.gnome.org/enter_bug.cgi?product=totem-pl-parser&component=Ge...]) - -+AM_INIT_AUTOMAKE([1.9 dist-xz no-dist-gzip check-news subdir-objects]) -+ - AC_CONFIG_SRCDIR([plparse/totem-pl-parser.c]) - AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_MACRO_DIR([m4]) - AC_USE_SYSTEM_EXTENSIONS - --AM_INIT_AUTOMAKE([1.9 dist-xz no-dist-gzip check-news subdir-objects]) - AM_MAINTAINER_MODE([enable]) - - # Enable silent build when available (Automake 1.11) Modified: users/devans/GNOME-3/stable/dports/net/libgrss/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/net/libgrss/Portfile 2014-03-28 15:18:24 UTC (rev 118272) +++ users/devans/GNOME-3/stable/dports/net/libgrss/Portfile 2014-03-28 16:13:01 UTC (rev 118273) @@ -40,7 +40,7 @@ post-patch { file mkdir ${worksrcpath}/po touch ${worksrcpath}/po/POTFILES.in -} +} configure.cmd ./autogen.sh