[144133] trunk/dports/xfce

2 Jan 2016

Revision: 144133
          https://trac.macports.org/changeset/144133
Author:   afb@macports.org
Date:     2016-01-02 15:33:23 -0800 (Sat, 02 Jan 2016)
Log Message:
-----------
mass upgrade from Xfce 4.6.2 to Xfce 4.12 (#31203)

Modified Paths:
--------------
    trunk/dports/xfce/Terminal/Portfile
    trunk/dports/xfce/Thunar/Portfile
    trunk/dports/xfce/exo/Portfile
    trunk/dports/xfce/garcon/Portfile
    trunk/dports/xfce/gtk-xfce-engine/Portfile
    trunk/dports/xfce/libxfce4menu/Portfile
    trunk/dports/xfce/libxfce4ui/Portfile
    trunk/dports/xfce/libxfce4util/Portfile
    trunk/dports/xfce/libxfcegui4/Portfile
    trunk/dports/xfce/mousepad/Portfile
    trunk/dports/xfce/orage/Portfile
    trunk/dports/xfce/ristretto/Portfile
    trunk/dports/xfce/squeeze/Portfile
    trunk/dports/xfce/vte-gtk2-xfce/Portfile
    trunk/dports/xfce/xfce/Portfile
    trunk/dports/xfce/xfce4-appfinder/Portfile
    trunk/dports/xfce/xfce4-dev-tools/Portfile
    trunk/dports/xfce/xfce4-panel/Portfile
    trunk/dports/xfce/xfce4-session/Portfile
    trunk/dports/xfce/xfce4-settings/Portfile
    trunk/dports/xfce/xfce4-terminal/Portfile
    trunk/dports/xfce/xfconf/Portfile
    trunk/dports/xfce/xfdesktop/Portfile
    trunk/dports/xfce/xfwm4/Portfile

Added Paths:
-----------
    trunk/dports/xfce/garcon/
    trunk/dports/xfce/libxfce4ui/
    trunk/dports/xfce/tumbler/
    trunk/dports/xfce/tumbler/Portfile
    trunk/dports/xfce/vte-gtk2-xfce/
    trunk/dports/xfce/vte-gtk2-xfce/files/patch-getpt.diff
    trunk/dports/xfce/xfce4-session/files/
    trunk/dports/xfce/xfce4-session/files/patch-launchd.diff
    trunk/dports/xfce/xfce4-session/files/patch-sleep.diff
    trunk/dports/xfce/xfce4-terminal/

Removed Paths:
-------------
    trunk/dports/xfce/Terminal/files/
    trunk/dports/xfce/Thunar/files/
    trunk/dports/xfce/garcon/files/
    trunk/dports/xfce/libxfce4menu/files/
    trunk/dports/xfce/vte-gtk2-xfce/files/patch-configure.in.diff
    trunk/dports/xfce/xfce-utils/
    trunk/dports/xfce/xfce4-axiom-theme/
    trunk/dports/xfce/xfce4-corner-plugin/
    trunk/dports/xfce/xfce4-icon-theme/
    trunk/dports/xfce/xfce4-panel/files/
    trunk/dports/xfce/xfce4-xkb-plugin/
    trunk/dports/xfce/xfprint/
    trunk/dports/xfce/xfwm4-themes/

Modified: trunk/dports/xfce/Terminal/Portfile
===================================================================

--- trunk/dports/xfce/Terminal/Portfile	2016-01-02 22:11:59 UTC (rev 144132)
+++ trunk/dports/xfce/Terminal/Portfile	2016-01-02 23:33:23 UTC (rev 144133)
@@ -3,6 +3,10 @@
 
 PortSystem 1.0
 
+# This port can be removed on Jan 1, 2017
+replaced_by     xfce4-terminal
+PortGroup       obsolete 1.0
+
 name            Terminal
 version         0.4.5
 revision        3
@@ -15,22 +19,3 @@
 description     Terminal is a modern terminal emulator for the Unix/Linux desktop.
 long_description ${description}
 homepage        http://goodies.xfce.org/projects/applications/terminal
-master_sites    http://www.xfce.org/archive/src/apps/terminal/0.4/
-use_bzip2       yes
-checksums       md5 3c707628e2e97c6d9566cd74d400036a \
-                sha1 8c23799922700b1f74dc7b7e029eec192d8ff62c \
-                rmd160 f0cbfdfabc5c3037508e3b52e938c3d62bc8c14b
-
-depends_build   port:intltool port:pkgconfig
-depends_lib     port:exo port:vte-gtk2-compat port:dbus port:gtk2 \
-                path:include/glib-2.0/gio/gio.h:glib2 port:hicolor-icon-theme \
-                port:desktop-file-utils
-
-configure.args  --enable-dbus
-
-patchfiles      patch-terminal-Makefile.in
-
-post-activate {
-    system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
-    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
-}

Modified: trunk/dports/xfce/Thunar/Portfile
===================================================================
--- trunk/dports/xfce/Thunar/Portfile	2016-01-02 22:11:59 UTC (rev 144132)
+++ trunk/dports/xfce/Thunar/Portfile	2016-01-02 23:33:23 UTC (rev 144133)
@@ -4,8 +4,8 @@
 PortSystem 1.0
 
 name            Thunar
-version         1.0.2
-revision        5
+version         1.6.6
+set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      xfce
 platforms       darwin
 license         GPL-2+ LGPL-2+
@@ -13,11 +13,11 @@
 description     Thunar is a modern file manager for the Unix/Linux desktop
 long_description ${description}
 homepage        http://www.xfce.org/
-master_sites    http://www.ca-us.xfce.org/archive/xfce-4.6.2/src/
+master_sites    http://archive.xfce.org/src/xfce/thunar/${branch}/
 use_bzip2       yes
-checksums       md5 c91073202d373a1f9951a1240083c36d \
-                sha1 f7ae00c32402e4bc502aba15477b78e2c558c7c3 \
-                rmd160 c5b98203353cef7312b736053e5a7678d0644272
+checksums       md5 27a5343174593dd0067906c922e6af96 \
+                sha1 9d7ba73376efa1ecb580b227cfc4fd29fe4b8ecb \
+                sha256 b9a55104b18ae01c5190d7ea02cbd7ba56d7affed9df416bf7fec6dff2d889b2
 
 configure.args  --enable-dbus --enable-startup-notification \
                 --enable-pcre --enable-exif
@@ -27,8 +27,6 @@
                 port:shared-mime-info port:desktop-file-utils \
                 port:startup-notification
 
-patchfiles      patch-thunar-metafile.c patch-thunar-vfs-exec.c
-
 variant quartz conflicts x11 {
     configure.args-delete --enable-startup-notification
     configure.args-append --disable-startup-notification
@@ -38,7 +36,4 @@
 
 platform darwin {
         configure.args-append --disable-visibility
-        if {${os.major} >= 10} {
-            patchfiles-append patch-configure-snow.diff
-        }
 }

Modified: trunk/dports/xfce/exo/Portfile
===================================================================
--- trunk/dports/xfce/exo/Portfile	2016-01-02 22:11:59 UTC (rev 144132)
+++ trunk/dports/xfce/exo/Portfile	2016-01-02 23:33:23 UTC (rev 144133)
@@ -4,8 +4,8 @@
 PortSystem 1.0
 
 name            exo
-version         0.3.107
-revision        3
+version         0.10.3
+set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      xfce
 platforms       darwin
 license         GPL-2+ LGPL-2+
@@ -13,21 +13,20 @@
 description     libexo is targeted at application development for Xfce
 long_description ${description}
 homepage        http://www.xfce.org/
-master_sites    http://www.ca-us.xfce.org/archive/xfce-4.6.2/src/
+master_sites    http://archive.xfce.org/src/xfce/${name}/${branch}/
 use_bzip2       yes
-checksums       md5 3a92cca0c99ee940db4410891c9e8498 \
-                sha1 5121f433b14c5840706cedbc220284a4516e83df \
-                rmd160 d9c97d73c543a411fe09688eb3fdc7ad7b49a5f9
+checksums       md5 d45b7e18e3a73e4a7b2ec6ef7943de17 \
+                sha1 d625b1981da2f3c162643af5917ae342eeb8b90c \
+                sha256 95704b14ef9065268c3aa9a7c0bacbe0ddb490a183a4f5ab13bba4a1722826bd
 
 configure.args  --mandir=${prefix}/share/man --disable-python
 
 depends_build   port:pkgconfig port:intltool
-depends_lib     port:p5.16-uri port:libxfce4util port:gtk2
+depends_lib     port:p5.22-uri port:libxfce4util port:gtk2
 
 patchfiles      exo-mmintrin.diff
 
-configure.perl  ${prefix}/bin/perl5.16
-configure.args  --disable-notifications
+configure.perl  ${prefix}/bin/perl5.22
 
 platform darwin {
         configure.args-append --disable-visibility

Modified: trunk/dports/xfce/garcon/Portfile
===================================================================
--- trunk/dports/xfce/libxfce4menu/Portfile	2016-01-01 16:17:08 UTC (rev 144090)
+++ trunk/dports/xfce/garcon/Portfile	2016-01-02 23:33:23 UTC (rev 144133)
@@ -3,8 +3,9 @@
 
 PortSystem 1.0
 
-name            libxfce4menu
-version         4.6.2
+name            garcon
+version         0.4.0
+set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      xfce
 platforms       darwin
 license         LGPL-2+ GFDL-1.1+
@@ -12,16 +13,13 @@
 description     a freedesktop.org compliant menu implementation for Xfce
 long_description ${description}
 homepage        http://www.xfce.org/
-master_sites    http://www.ca-us.xfce.org/archive/xfce-${version}/src/
+master_sites    http://archive.xfce.org/src/xfce/${name}/${branch}/
 use_bzip2       yes
-checksums       md5 ff10cacb76803ee37159e3a43345f0d1 \
-                sha1 32a85c1ad31360347d5a2f240c4ddc08b444d124 \
-                rmd160 34f69c9993ecc9ad60be086d856017cbb84c42d5
+checksums       md5 aba62b80787aac295083bf7afd419ffb \
+                sha1 9978c7f3181f7d8fd930cce74293d2a360743182 \
+                sha256 787dc859713b6518992d760d4b858fb02e8a30705e6f6e871d7a14cc97bca972
 
 configure.args  --mandir=${prefix}/share/man
 
 depends_build   path:bin/pkg-config:pkgconfig port:intltool
 depends_lib     port:libxfce4util port:gtk2
-
-patchfiles      patch-xfce-menu-item-cache.c
-

Modified: trunk/dports/xfce/gtk-xfce-engine/Portfile
===================================================================
--- trunk/dports/xfce/gtk-xfce-engine/Portfile	2016-01-02 22:11:59 UTC (rev 144132)
+++ trunk/dports/xfce/gtk-xfce-engine/Portfile	2016-01-02 23:33:23 UTC (rev 144133)
@@ -4,8 +4,8 @@
 PortSystem 1.0
 
 name            gtk-xfce-engine
-version         2.6.0
-revision        2
+version         2.10.0
+set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      xfce
 platforms       darwin
 license         GPL-2+
@@ -13,11 +13,11 @@
 description     Port of xfce engine to GTK+-2.0
 long_description ${description}
 homepage        http://www.xfce.org/
-master_sites    http://www.ca-us.xfce.org/archive/xfce-4.6.2/src/
+master_sites    http://archive.xfce.org/src/xfce/${name}/${branch}/
 use_bzip2       yes
-checksums       md5 e836705d2933d0a77c6628285e10d982 \
-                sha1 a7be2f330833d150c5fb37f68a4c2138348b5446 \
-                rmd160 07f4ff278056f7714e99da8420268dd950b15a91
+checksums       md5 f9079bd22e44ffd74b8b9c7849260b82 \
+                sha1 4046ecd36886f4f7399a64230e516bd0e697448f \
+                sha256 c1c3b301bd2f2eecf9bb0500d88d96c04ba37bf44d3971f951f4d3d0bbb41967
 
 depends_build   port:pkgconfig
 depends_lib     port:gtk2

Modified: trunk/dports/xfce/libxfce4menu/Portfile
===================================================================
--- trunk/dports/xfce/libxfce4menu/Portfile	2016-01-02 22:11:59 UTC (rev 144132)
+++ trunk/dports/xfce/libxfce4menu/Portfile	2016-01-02 23:33:23 UTC (rev 144133)
@@ -3,8 +3,13 @@
 
 PortSystem 1.0
 
+# This port can be removed on Jan 1, 2017
+replaced_by     garcon
+PortGroup       obsolete 1.0
+
 name            libxfce4menu
 version         4.6.2
+revision        0
 categories      xfce
 platforms       darwin
 license         LGPL-2+ GFDL-1.1+
@@ -12,16 +17,3 @@
 description     a freedesktop.org compliant menu implementation for Xfce
 long_description ${description}
 homepage        http://www.xfce.org/
-master_sites    http://www.ca-us.xfce.org/archive/xfce-${version}/src/
-use_bzip2       yes
-checksums       md5 ff10cacb76803ee37159e3a43345f0d1 \
-                sha1 32a85c1ad31360347d5a2f240c4ddc08b444d124 \
-                rmd160 34f69c9993ecc9ad60be086d856017cbb84c42d5
-
-configure.args  --mandir=${prefix}/share/man
-
-depends_build   path:bin/pkg-config:pkgconfig port:intltool
-depends_lib     port:libxfce4util port:gtk2
-
-patchfiles      patch-xfce-menu-item-cache.c
-

Modified: trunk/dports/xfce/libxfce4ui/Portfile
===================================================================
--- trunk/dports/xfce/libxfcegui4/Portfile	2016-01-01 16:17:08 UTC (rev 144090)
+++ trunk/dports/xfce/libxfce4ui/Portfile	2016-01-02 23:33:23 UTC (rev 144133)
@@ -3,31 +3,32 @@
 
 PortSystem 1.0
 
-name            libxfcegui4
-version         4.6.4
-revision        3
+name            libxfce4ui
+version         4.12.1
+set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      xfce
 platforms       darwin
 license         LGPL-2+
 maintainers     afb
-description     various gtk widgets for xfce
+description     commonly used Xfce widgets
 long_description ${description}
 homepage        http://www.xfce.org/
-master_sites    http://www.ca-us.xfce.org/archive/xfce-4.6.2/src/
+master_sites    http://archive.xfce.org/src/xfce/${name}/${branch}/
 use_bzip2       yes
-checksums       md5 88de59b222cb9977f93a4c61011c1e1f \
-                sha1 a12c79f8fa14c5d1fc0fca5615a451b7d23f8695 \
-                rmd160 4d790c3990372aa82581450e1b2a2dfd36df293b
+checksums       md5 ea9fad7d059fe8f531fe8db42dabb5a9 \
+                sha1 ef687867bd087b5fc2befee0e8ca1a281f6bf165 \
+                sha256 3d619811bfbe7478bb984c16543d980cadd08586365a7bc25e59e3ca6384ff43
 
-configure.args  --enable-startup-notification \
-                --x-include=${prefix}/include --x-lib=${prefix}/lib
-
 depends_build   port:intltool \
                 port:pkgconfig
-depends_lib     port:libxfce4util \
+depends_lib     port:gtk2 \
+                port:libxfce4util \
                 port:xfconf \
-                path:lib/pkgconfig/gladeui-1.0.pc:glade3 \
                 port:libglade2 \
-                port:gtk-xfce-engine \
-                port:libxml2 \
                 port:startup-notification
+
+configure.args  --disable-gtk3 --disable-gladeui
+
+platform darwin {
+        configure.args-append --disable-visibility
+}

Modified: trunk/dports/xfce/libxfce4util/Portfile
===================================================================
--- trunk/dports/xfce/libxfce4util/Portfile	2016-01-02 22:11:59 UTC (rev 144132)
+++ trunk/dports/xfce/libxfce4util/Portfile	2016-01-02 23:33:23 UTC (rev 144133)
@@ -4,7 +4,8 @@
 PortSystem 1.0
 
 name            libxfce4util
-version         4.6.2
+version         4.12.1
+set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      xfce
 platforms       darwin
 license         LGPL-2+
@@ -12,11 +13,11 @@
 description     Utility library for the Xfce4 desktop environment
 long_description ${description}
 homepage        http://www.xfce.org/
-master_sites    http://www.ca-us.xfce.org/archive/xfce-${version}/src/
+master_sites    http://http://archive.xfce.org/src/xfce/${name}/${branch}/
 use_bzip2       yes
-checksums       md5 9c3129d827d480f0906c575e7a13f1e9 \
-                sha1 00d890df32d9ae172f45f95c030ca1a74c14e93f \
-                rmd160 145e5ccdf49f60891f9d0d6e969aafc71e33ef11
+checksums       md5 4eb012b6c1292ceedb3a83ebfc1ff08d \
+                sha1 fbea10b13db55c1f7756ec36ea7c8e84ca781492 \
+                sha256 876bdefa2e13cbf68b626b2158892fb93e824e1ef59cf951123a96cefbc8881d
 
 depends_build   path:bin/pkg-config:pkgconfig port:intltool
 depends_lib     port:gettext path:lib/pkgconfig/glib-2.0.pc:glib2 \

Modified: trunk/dports/xfce/libxfcegui4/Portfile
===================================================================
--- trunk/dports/xfce/libxfcegui4/Portfile	2016-01-02 22:11:59 UTC (rev 144132)
+++ trunk/dports/xfce/libxfcegui4/Portfile	2016-01-02 23:33:23 UTC (rev 144133)
@@ -3,6 +3,10 @@
 
 PortSystem 1.0
 
+# This port can be removed on Jan 1, 2017
+replaced_by     libxfce4ui
+PortGroup       obsolete 1.0
+
 name            libxfcegui4
 version         4.6.4
 revision        3
@@ -13,21 +17,3 @@
 description     various gtk widgets for xfce
 long_description ${description}
 homepage        http://www.xfce.org/
-master_sites    http://www.ca-us.xfce.org/archive/xfce-4.6.2/src/
-use_bzip2       yes
-checksums       md5 88de59b222cb9977f93a4c61011c1e1f \
-                sha1 a12c79f8fa14c5d1fc0fca5615a451b7d23f8695 \
-                rmd160 4d790c3990372aa82581450e1b2a2dfd36df293b
-
-configure.args  --enable-startup-notification \
-                --x-include=${prefix}/include --x-lib=${prefix}/lib
-
-depends_build   port:intltool \
-                port:pkgconfig
-depends_lib     port:libxfce4util \
-                port:xfconf \
-                path:lib/pkgconfig/gladeui-1.0.pc:glade3 \
-                port:libglade2 \
-                port:gtk-xfce-engine \
-                port:libxml2 \
-                port:startup-notification

Modified: trunk/dports/xfce/mousepad/Portfile
===================================================================
--- trunk/dports/xfce/mousepad/Portfile	2016-01-02 22:11:59 UTC (rev 144132)
+++ trunk/dports/xfce/mousepad/Portfile	2016-01-02 23:33:23 UTC (rev 144133)
@@ -4,8 +4,8 @@
 PortSystem 1.0
 
 name            mousepad
-version         0.2.16
-revision        2
+version         0.4.0
+set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      xfce
 platforms       darwin
 license         GPL-2+
@@ -13,11 +13,21 @@
 description     A text editor for Xfce based on Leafpad
 long_description ${description}
 homepage        http://www.xfce.org/
-master_sites    http://www.ca-us.xfce.org/archive/xfce-4.6.0/src/
+master_sites    http://archive.xfce.org/src/apps/${name}/${branch}/
 use_bzip2       yes
-checksums       md5 d98854edb76d823ac20b266fdf5a64a1 \
-                sha1 4e63033e0a71578f3ec9a0d2e6a505efd0424ef9 \
-                rmd160 673a52a38dfa60388db11322cd08189c1b2c10e3
+checksums       md5 f55314c5dda6323883241e6cf01550a7 \
+                sha1 ebadaadc02184b01230666dc12f8ab90032876f9 \
+                sha256 60114431eac8db6bb6ce18bd38f1630cccb684375b97a445a1b6fd619848d132
 
 depends_build   port:intltool port:pkgconfig
-depends_lib     port:xfconf port:libxfcegui4 
+depends_lib     port:gtk2 port:gtksourceview2 \
+                port:libxfce4util port:libxfce4ui
+
+configure.args  --enable-dbus --disable-gtk3
+
+post-activate {
+    system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
+
+    system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
+}

Modified: trunk/dports/xfce/orage/Portfile
===================================================================
--- trunk/dports/xfce/orage/Portfile	2016-01-02 22:11:59 UTC (rev 144132)
+++ trunk/dports/xfce/orage/Portfile	2016-01-02 23:33:23 UTC (rev 144133)
@@ -4,8 +4,8 @@
 PortSystem 1.0
 
 name            orage
-version         4.6.1
-revision        2
+version         4.12.1
+set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      xfce
 platforms       darwin
 license         GPL-2+
@@ -13,13 +13,11 @@
 description     Time-managing application for the Xfce desktop environment
 long_description ${description}
 homepage        http://www.xfce.org/
-master_sites    http://www.ca-us.xfce.org/archive/xfce-${version}/src/
+master_sites    http://archive.xfce.org/src/apps/${name}/${branch}/
 use_bzip2       yes
-checksums       md5 24fa43dd86ec5af5a4766620fd972cf2 \
-                sha1 2db15404197ef9aa6f588c0eebac9fc4f68426df \
-                rmd160 7724992e2e177487c71597a15d7faf7f865bb56b
+checksums       md5 2b7f5d38cb5c6edbcc65d0f52a742e46 \
+                sha1 c856ad30f7a17a732d5cc794ef90aedf98575699 \
+                sha256 3cf9aa441ae83c8688865f82217025cdf3ebaa152cce4571777b8c2aa8dd9062
 
 depends_lib     port:exo port:xfce4-panel
 depends_build   port:xfconf port:intltool port:pkgconfig
-
-configure.args  --disable-libxfce4mcs

Modified: trunk/dports/xfce/ristretto/Portfile
===================================================================
--- trunk/dports/xfce/ristretto/Portfile	2016-01-02 22:11:59 UTC (rev 144132)
+++ trunk/dports/xfce/ristretto/Portfile	2016-01-02 23:33:23 UTC (rev 144133)
@@ -4,7 +4,8 @@
 PortSystem 1.0
 
 name            ristretto
-version         0.0.22
+version         0.8.0
+set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      xfce
 platforms       darwin
 license         GPL-2+
@@ -12,17 +13,18 @@
 description     Ristretto is a fast and lightweight picture-viewer \
                 for the Xfce desktop environment.
 long_description ${description}
-homepage        http://goodies.xfce.org/projects/applications/ristretto
-master_sites    http://goodies.xfce.org/releases/ristretto
-checksums       md5 978ae19472c5a0b7d4b6622a68234a67 \
-                sha1 bddbc8618ba67699ccf5ee4ea0b538b1be7fdb0a \
-                rmd160 a3661a3d7624996d2ebae20f2c86db1968e009a8
+homepage        http://www.xfce.org/
+master_sites    http://archive.xfce.org/src/apps/${name}/${branch}/
+use_bzip2       yes
+checksums       md5 94c778850325a4e5a12e3433c8a05432 \
+                sha1 0f780cd0b3270e258315a737e4bbf332806f14dc \
+                sha256 71625324cecda7199acbc95a3ea5132d0dcbf808771e7a209ea2b9503ae4f328
 
 depends_build   port:intltool port:pkgconfig
-depends_lib     port:gtk2 port:Thunar port:libxfce4util \
-                port:libxfcegui4 port:libexif port:dbus-glib
+depends_lib     port:gtk2 port:xfconf port:cairo port:libxfce4util \
+                port:libxfce4ui port:libexif port:dbus-glib
 
-livecheck.type  regex
-# get the last modified tarball
-livecheck.url   ${master_sites}?C=M\;O=D
-livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
+post-activate {
+    system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
+}

Modified: trunk/dports/xfce/squeeze/Portfile
===================================================================
--- trunk/dports/xfce/squeeze/Portfile	2016-01-02 22:11:59 UTC (rev 144132)
+++ trunk/dports/xfce/squeeze/Portfile	2016-01-02 23:33:23 UTC (rev 144133)
@@ -5,6 +5,7 @@
 
 name            squeeze
 version         0.2.3
+set branch      [join [lrange [split ${version} .] 0 1] .]
 revision        1
 categories      xfce
 platforms       darwin
@@ -13,18 +14,14 @@
 description     Squeeze is a modern and advanced archive manager for the \
 Xfce Desktop Environment.
 long_description ${description}
-homepage        http://squeeze.xfce.org/
-master_sites    ${homepage}/downloads
+homepage        http://www.xfce.org/
+master_sites    http://archive.xfce.org/src/apps/${name}/${branch}/
 use_bzip2       yes
 checksums       md5 bd3cb0648b49be1f146fc4f675606176 \
                 sha1 218f0e61e1d105f1f9aa898a56837f78ce65aaac \
-                rmd160 0833a0681d5c952077bf2f220cd2f07b2df2904f
+                sha256 7b8dc13e0adf72c67bba12e1ed1285ec820946e65d0eec247f7bd159a2cfac2d
 
 depends_build   path:bin/pkg-config:pkgconfig
-depends_lib     port:gtk2 port:libxfce4util port:dbus-glib port:thunar
+depends_lib     port:gtk2 port:libxfce4util port:dbus-glib port:Thunar
 
 patchfiles      patch-internals.diff
-
-livecheck.type  regex
-livecheck.url   ${homepage}/download
-livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}

Added: trunk/dports/xfce/tumbler/Portfile
===================================================================
--- trunk/dports/xfce/tumbler/Portfile	                        (rev 0)
+++ trunk/dports/xfce/tumbler/Portfile	2016-01-02 23:33:23 UTC (rev 144133)
@@ -0,0 +1,29 @@
+# -*- 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            tumbler
+version         0.1.31
+set branch      [join [lrange [split ${version} .] 0 1] .]
+categories      xfce
+platforms       darwin
+license         GPL LGPL
+maintainers     afb
+description     thumbnail management
+long_description ${description}
+homepage        http://www.xfce.org/
+master_sites    http://archive.xfce.org/src/xfce/${name}/${branch}/
+use_bzip2       yes
+checksums       md5 0067054e6f1f90a13f90faadfca1e89e \
+                sha1 cba7b81f8269f30dd6412d133767b6044c470f2c \
+                sha256 d0fd329273ff6ac98885eade4c3d8c87a4dd0816f713646130808bfa90b87173
+
+depends_build   port:intltool \
+                port:pkgconfig
+depends_lib     port:gtk2 port:gdk-pixbuf2 \
+                port:dbus port:dbus-glib
+
+platform darwin {
+        configure.args-append --disable-visibility
+}


Property changes on: trunk/dports/xfce/tumbler/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Modified: trunk/dports/xfce/vte-gtk2-xfce/Portfile
===================================================================
--- trunk/dports/gnome/vte-gtk2-compat/Portfile	2016-01-02 16:03:08 UTC (rev 144123)
+++ trunk/dports/xfce/vte-gtk2-xfce/Portfile	2016-01-02 23:33:23 UTC (rev 144133)
@@ -4,13 +4,13 @@
 PortSystem      1.0
 PortGroup       gobject_introspection 1.0
 
-name            vte-gtk2-compat
+name            vte-gtk2-xfce
 set gname       vte
 version         0.28.2
 revision        1
 set branch      [join [lrange [split $version .] 0 1] .]
-maintainers     devans openmaintainer
-categories      gnome
+maintainers     afb openmaintainer
+categories      xfce
 license         LGPL
 platforms       darwin
 description     Terminal widget with improved accessibility and I18N support.
@@ -42,30 +42,14 @@
 
 gobject_introspection no
 
-patchfiles      patch-configure.in.diff
+patchfiles      patch-getpt.diff
 
-# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
-
-configure.cmd   ./autogen.sh
 configure.args  --with-gtk=2.0 \
                 --disable-Bsymbolic \
                 --disable-python
 
 configure.cflags-append -fstrict-aliasing
 
-variant python27 description {Build Python bindings using Python 2.7} {
-    configure.args-delete --disable-python
-    set python_prefix ${frameworks_dir}/Python.framework/Versions/2.7
-    depends_lib-append port:py27-pygtk
-    configure.python ${prefix}/bin/python2.7
-    configure.pkg_config_path   ${python_prefix}/lib/pkgconfig
-    configure.env               PATH=${python_prefix}/bin:$env(PATH)
-}
-
-# default to optional python27 bindings
-
-default_variants +python27
-
 # rename gnome-pty-helper to avoid a conflict with port vte
 
 post-destroot {

Deleted: trunk/dports/xfce/vte-gtk2-xfce/files/patch-configure.in.diff
===================================================================
--- trunk/dports/gnome/vte-gtk2-compat/files/patch-configure.in.diff	2016-01-02 16:03:08 UTC (rev 144123)
+++ trunk/dports/xfce/vte-gtk2-xfce/files/patch-configure.in.diff	2016-01-02 23:33:23 UTC (rev 144133)
@@ -1,32 +0,0 @@
---- configure.in.orig	2014-07-17 11:19:35.000000000 -0700
-+++ configure.in	2014-07-17 11:28:45.000000000 -0700
-@@ -409,7 +409,7 @@
- esac
- 
- # Search for the required modules.
--
-+	
- # We have a direct dependency on X11 on gdk-x11, see bug #613525
- AC_MSG_CHECKING([for GDK target])
- GDK_TARGET="$($PKG_CONFIG --variable target gdk-$GTK_API_VERSION)"
-@@ -459,8 +459,20 @@
- 
- if $BUILD_PYTHON ; then
- 	AM_PATH_PYTHON
-+	
- 	if test -z "$PYTHON" ; then
- 		BUILD_PYTHON=false
-+	else
-+		dnl Override standard python locations with MacPorts version specific ones
-+
-+		AC_SUBST([PYTHON_PREFIX], [`$PYTHON -c 'import sys; print(sys.prefix);'`])
-+		AC_SUBST([PYTHON_EXEC_PREFIX], [`$PYTHON -c 'import sys; print(sys.exec_prefix)'`])
-+
-+		am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
-+		am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
-+
-+		AC_SUBST([pythondir], [$am_cv_python_pythondir])
-+		AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
- 	fi
- fi
- 

Added: trunk/dports/xfce/vte-gtk2-xfce/files/patch-getpt.diff
===================================================================
--- trunk/dports/xfce/vte-gtk2-xfce/files/patch-getpt.diff	                        (rev 0)
+++ trunk/dports/xfce/vte-gtk2-xfce/files/patch-getpt.diff	2016-01-02 23:33:23 UTC (rev 144133)
@@ -0,0 +1,57 @@
+# adapted from http://svnweb.freebsd.org/ports/head/x11-toolkits/vte/
+--- config.h.in.orig	Wed May 17 10:45:57 2006
++++ config.h.in	Wed May 17 10:46:25 2006
+@@ -106,6 +106,9 @@
+ /* Define to 1 if you have the <GL/glx.h> header file. */
+ #undef HAVE_GL_GLX_H
+ 
++/* Define to 1 if you have the `posix_openpt' function. */
++#undef HAVE_POSIX_OPENPT
++
+ /* Define to 1 if you have the `grantpt' function. */
+ #undef HAVE_GRANTPT
+ 
+--- configure.orig	2010-03-30 14:43:41.000000000 +0200
++++ configure	2010-03-30 14:47:26.000000000 +0200
+@@ -14102,7 +14102,7 @@
+ 
+ 
+ # Check for PTY handling functions.
+-for ac_func in cfmakeraw fork setsid setpgid getpgid getpt grantpt unlockpt ptsname ptsname_r tcgetattr tcsetattr
++for ac_func in cfmakeraw fork setsid setpgid getpgid getpt grantpt posix_openpt unlockpt ptsname ptsname_r tcgetattr tcsetattr
+ do :
+   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+--- src/pty.c.orig	2012-07-20 13:47:16.000000000 +0200
++++ src/pty.c	2012-07-20 14:07:30.000000000 +0200
+@@ -837,7 +837,11 @@
+ _vte_pty_getpt(GError **error)
+ {
+ 	int fd, flags, rv;
+-#ifdef HAVE_GETPT
++
++#ifdef HAVE_POSIX_OPENPT
++	/* Call the system's function for allocating a pty. */
++	fd = posix_openpt(O_RDWR | O_NOCTTY);
++#elif defined(HAVE_GETPT)
+ 	/* Call the system's function for allocating a pty. */
+ 	fd = getpt();
+ #else
+@@ -829,6 +833,9 @@
+                 return -1;
+         }
+ 
++#if defined(__APPLE__) && defined(__MACH__)
++	/* fcntl(F_SETFL) failed */
++#else
+         rv = fcntl(fd, F_GETFL, 0);
+         if (rv < 0) {
+                 int errsv = errno;
+@@ -853,6 +860,7 @@
+                 errno = errsv;
+                 return -1;
+         }
++#endif
+ 
+ 	return fd;
+ }

Modified: trunk/dports/xfce/xfce/Portfile
===================================================================
--- trunk/dports/xfce/xfce/Portfile	2016-01-02 22:11:59 UTC (rev 144132)
+++ trunk/dports/xfce/xfce/Portfile	2016-01-02 23:33:23 UTC (rev 144133)
@@ -4,7 +4,7 @@
 PortSystem 1.0
 
 name            xfce
-version         4.6.2
+version         4.12
 categories      xfce
 platforms       darwin
 license         public-domain
@@ -15,26 +15,22 @@
 It aims to be fast and lightweight, while still being visually appealing and \
 easy to use.
 homepage        http://www.xfce.org/
-master_sites    http://www.ca-us.xfce.org/archive/xfce-${version}/src/
+master_sites    http://archive.xfce.org/xfce/${version}/src/
 
 # depends on MacPorts xfce4
-depends_lib     port:libxfcegui4 \
+depends_lib     port:libxfce4ui \
                 port:gtk-xfce-engine \
                 port:xfconf \
                 port:xfwm4 \
-                port:xfwm4-themes \
                 port:exo \
-                port:xfce-utils \
-                port:xfce4-icon-theme \
+                port:tango-icon-theme \
                 port:xfce4-panel \
                 port:xfce4-appfinder \
+                port:xfce4-session \
+                port:xfce4-settings \
                 port:xfdesktop \
-                port:xfprint \
-                port:orage \
-                port:mousepad \
                 port:Thunar \
-                port:Terminal \
-                port:midori
+                port:tumbler
 
 distfiles
 

Modified: trunk/dports/xfce/xfce4-appfinder/Portfile
===================================================================
--- trunk/dports/xfce/xfce4-appfinder/Portfile	2016-01-02 22:11:59 UTC (rev 144132)
+++ trunk/dports/xfce/xfce4-appfinder/Portfile	2016-01-02 23:33:23 UTC (rev 144133)
@@ -4,8 +4,8 @@
 PortSystem 1.0
 
 name            xfce4-appfinder
-version         4.6.2
-revision        2
+version         4.12.0
+set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      xfce
 platforms       darwin
 license         GPL-2+
@@ -13,14 +13,11 @@
 description     Software to find every application supporting Desktop entry format
 long_description ${description}
 homepage        http://www.xfce.org/
-master_sites    http://www.ca-us.xfce.org/archive/xfce-${version}/src/
+master_sites    http://archive.xfce.org/src/xfce/${name}/${branch}/
 use_bzip2       yes
-checksums       md5 7752e43578b821e35010bcd3762da166 \
-                sha1 2fa2534aa5a6b2fc24942689a0b7bb7cf327feda \
-                rmd160 81dff99b910e3c2c10567341c7189614825ab657
+checksums       md5 0b238b30686388c507c119b12664f1a1 \
+                sha1 c6fe75b140e6c864654e9485e30a4718cdfd7321 \
+                sha256 2ad4a58019a76a6b64a816050db25f96854917c2f2e89d6a9df6c18e6c84c567
 
 depends_build   port:intltool port:xfce4-dev-tools port:pkgconfig
-depends_lib     port:libxfcegui4 port:libxfce4menu port:thunar
-
-# Don't do intltool's INTLTOOL_PERL dance
-configure.cmd   ${prefix}/bin/xdt-autogen
+depends_lib     port:libxfce4ui port:garcon port:Thunar

Modified: trunk/dports/xfce/xfce4-dev-tools/Portfile
===================================================================
--- trunk/dports/xfce/xfce4-dev-tools/Portfile	2016-01-02 22:11:59 UTC (rev 144132)
+++ trunk/dports/xfce/xfce4-dev-tools/Portfile	2016-01-02 23:33:23 UTC (rev 144133)
@@ -4,8 +4,8 @@
 PortSystem 1.0
 
 name            xfce4-dev-tools
-version         4.6.0
-revision        1
+version         4.12.0
+set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      xfce devel
 platforms       darwin
 license         GPL-2+
@@ -13,17 +13,14 @@
 description     A collection of tools and macros for Xfce developer
 long_description ${description}
 homepage        http://www.xfce.org/
-master_sites    http://www.ca-us.xfce.org/archive/xfce-4.6.2/src/
-checksums       md5 c9587fa78e877eee858a33391d0afd62 \
-                sha1 a5a5cbc9e5f84f4939e53e3327c51f4b749c38a2 \
-                rmd160 ff2a5e9c7bd637efdc76b126f8854b934d4862ba
+master_sites    http://archive.xfce.org/src/xfce/${name}/${branch}/
+use_bzip2       yes
+checksums       md5 559202c4d9650e23696c44aa94cfc5a9 \
+                sha1 b769c9bf7982cfb0b8b8491db1dde706aec46c5a \
+                sha256 e2e3a654fe9110df81f8c2483c9cbfa6d656fed15d5e5e717d6ef10bd0f5b5cb
 
 supported_archs noarch
-use_bzip2       yes
 
-depends_lib     port:glib2 port:gtk-doc port:intltool
+depends_lib     path:lib/pkgconfig/glib-2.0.pc:glib2 port:gtk-doc port:intltool
 depends_run     port:autoconf port:libtool port:automake \
                 bin:svn:subversion bin:git:git
-
-patchfiles      patch-xdt-autogen.in
-post-patch      { reinplace "s|@@PREFIX@@|${prefix}|" scripts/xdt-autogen.in }

Modified: trunk/dports/xfce/xfce4-panel/Portfile
===================================================================
--- trunk/dports/xfce/xfce4-panel/Portfile	2016-01-02 22:11:59 UTC (rev 144132)
+++ trunk/dports/xfce/xfce4-panel/Portfile	2016-01-02 23:33:23 UTC (rev 144133)
@@ -4,8 +4,8 @@
 PortSystem 1.0
 
 name            xfce4-panel
-version         4.6.4
-revision        2
+version         4.12.0
+set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      xfce
 platforms       darwin
 license         GPL-2+ LGPL-2+
@@ -13,20 +13,17 @@
 description     The panel of the Xfce Desktop Environment
 long_description ${description}
 homepage        http://www.xfce.org/
-master_sites    http://www.ca-us.xfce.org/archive/xfce-4.6.2/src/
+master_sites    http://archive.xfce.org/src/xfce/${name}/${branch}/
 use_bzip2       yes
-checksums       md5 82f10a42aefca4cc26a6633e7478cc65 \
-                sha1 d2b310c036be84ed9886c06ae35b7a1a8eabfcb8 \
-                rmd160 35eaab8726a447b961024d433845f30804da4751
+checksums       md5 5a333af704e386c90ad829b6baf1a758 \
+                sha1 5f0e51c7948bc4e3c46cad93ee772573a23efbc1 \
+                sha256 30920fc2e2fc26279a82b5261a155c2cc15ab2aa1ced2275684a6ff8261b97b0
 
 depends_build   port:intltool port:pkgconfig
-depends_lib     port:libxfcegui4 port:exo path:lib/pkgconfig/cairo.pc:cairo port:libwnck \
-                port:hicolor-icon-theme port:tango-icon-theme
+depends_lib     port:libxfce4ui port:exo path:lib/pkgconfig/cairo.pc:cairo port:libwnck
 
-configure.args  --enable-startup-notification
+configure.args  --disable-gtk3
 
-patchfiles      config-launcher-icons.diff
-
 platform darwin {
         configure.args-append --disable-visibility
 }

Modified: trunk/dports/xfce/xfce4-session/Portfile
===================================================================
--- trunk/dports/xfce/xfce4-session/Portfile	2016-01-02 22:11:59 UTC (rev 144132)
+++ trunk/dports/xfce/xfce4-session/Portfile	2016-01-02 23:33:23 UTC (rev 144133)
@@ -4,8 +4,8 @@
 PortSystem 1.0
 
 name            xfce4-session
-version         4.6.2
-revision        3
+version         4.12.0
+set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      xfce
 platforms       darwin
 license         GPL-2+
@@ -13,16 +13,17 @@
 description     Session manager for the Xfce desktop environment.
 long_description ${description}
 homepage        http://www.xfce.org/
-master_sites    http://www.ca-us.xfce.org/archive/xfce-${version}/src/
+master_sites    http://archive.xfce.org/src/xfce/${name}/${branch}/
 use_bzip2       yes
-checksums       md5 9d9890130e45e0e9476591ed9ba2c9d5 \
-                sha1 2a5778a1543f97845f118a186e2dbb8a8ea3ff4b \
-                rmd160 3c45028d57aee5950a485d760799d0c74ada735e
+checksums       md5 d75b257bc0954c238d3c82ce498525aa \
+                sha1 c5785f863682f3173100f90946d558f1ebb6df98 \
+                sha256 68c85453b097d3ada573dcb7e72acd06e0fc34531996122c10d20096405b7b06
 
-configure.args  --enable-session-screenshots --disable-gnome
-depends_lib     port:libxfce4util port:libxfcegui4 \
+patchfiles      patch-sleep.diff patch-launchd.diff
+use_autoconf    yes
+# need config.h.in, using autoreconf fails for some reason
+pre-configure   { system -W ${worksrcpath} "autoheader" }
+
+depends_lib     port:libxfce4util port:libxfce4ui \
                 port:libwnck bin:iceauth:iceauth
 depends_build   port:intltool port:xfce4-dev-tools port:pkgconfig
-
-# Don't do intltool's INTLTOOL_PERL dance
-configure.cmd   ${prefix}/bin/xdt-autogen

Added: trunk/dports/xfce/xfce4-session/files/patch-launchd.diff
===================================================================
--- trunk/dports/xfce/xfce4-session/files/patch-launchd.diff	                        (rev 0)
+++ trunk/dports/xfce/xfce4-session/files/patch-launchd.diff	2016-01-02 23:33:23 UTC (rev 144133)
@@ -0,0 +1,15 @@
+--- xfce4-session/main.c.orig	2016-01-02 15:02:42.000000000 +0100
++++ xfce4-session/main.c	2016-01-02 15:04:23.000000000 +0100
+@@ -243,8 +243,12 @@ main (int argc, char **argv)
+   XfsmShutdown     *shutdown_helper;
+   gboolean          succeed = TRUE;
+ 
++#if defined(__APPLE__) && defined(__MACH__)
++  /* dbus is being started by launchd */
++#else
+   if (!xfsm_dbus_require_session (argc, argv))
+     return EXIT_SUCCESS;
++#endif
+ 
+   xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
+ 

Added: trunk/dports/xfce/xfce4-session/files/patch-sleep.diff
===================================================================
--- trunk/dports/xfce/xfce4-session/files/patch-sleep.diff	                        (rev 0)
+++ trunk/dports/xfce/xfce4-session/files/patch-sleep.diff	2016-01-02 23:33:23 UTC (rev 144133)
@@ -0,0 +1,47 @@
+--- configure.ac.orig	2015-02-28 17:28:11.000000000 +0100
++++ configure.ac	2016-01-02 01:37:51.000000000 +0100
+@@ -190,7 +190,8 @@ if test x$with_backend = x; then
+ 		[*-linux*],   [with_backend=linux],
+ 		[*-*freebsd*], [with_backend=freebsd],
+ 		[*-*dragonfly*], [with_backend=freebsd],
+-		[*-openbsd*], [with_backend=openbsd])
++		[*-openbsd*], [with_backend=openbsd],
++		[*-darwin*], [with_backend=darwin])
+ fi
+ AC_DEFINE_UNQUOTED(BACKEND, "$with_backend", [backend])
+ AC_SUBST(BACKEND, "$with_backend")
+@@ -204,6 +205,9 @@ fi
+ if test x$with_backend = xopenbsd; then
+     AC_DEFINE(BACKEND_TYPE_OPENBSD, 1, [OpenBSD suspend/hibernate backend])
+ fi
++if test x$with_backend = xdarwin; then
++    AC_DEFINE(BACKEND_TYPE_DARWIN, 1, [Darwin suspend/hibernate backend])
++fi
+ 
+ dnl check for location Xfce glade files were installed to
+ XFCE_GLADE_CATALOG_PATH="`pkg-config --variable glade_catalogdir libxfce4ui-1`"
+--- xfce4-session/xfsm-shutdown-fallback.c.orig	2015-02-28 17:28:00.000000000 +0100
++++ xfce4-session/xfsm-shutdown-fallback.c	2016-01-02 01:09:29.000000000 +0100
+@@ -291,6 +291,9 @@ xfsm_shutdown_fallback_can_suspend (void
+ #ifdef BACKEND_TYPE_OPENBSD
+   return TRUE;
+ #endif
++#ifdef BACKEND_TYPE_DARWIN
++  return TRUE;
++#endif
+ 
+   return FALSE;
+ }
+--- xfsm-shutdown-helper/main.c.orig	2016-01-02 01:09:14.000000000 +0100
++++ xfsm-shutdown-helper/main.c	2016-01-02 01:28:03.000000000 +0100
+@@ -91,6 +91,10 @@
+ #define UP_BACKEND_SUSPEND_COMMAND	"/usr/sbin/zzz"
+ #define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/ZZZ"
+ #endif
++#ifdef BACKEND_TYPE_DARWIN
++#define UP_BACKEND_SUSPEND_COMMAND "/usr/bin/pmset sleepnow"	/* hibernatemode 0 */
++#define UP_BACKEND_HIBERNATE_COMMAND "/usr/bin/pmset sleepnow"	/* hibernatemode 3 */
++#endif
+ 
+ 
+ static gboolean

Modified: trunk/dports/xfce/xfce4-settings/Portfile
===================================================================
--- trunk/dports/xfce/xfce4-settings/Portfile	2016-01-02 22:11:59 UTC (rev 144132)
+++ trunk/dports/xfce/xfce4-settings/Portfile	2016-01-02 23:33:23 UTC (rev 144133)
@@ -4,8 +4,8 @@
 PortSystem 1.0
 
 name            xfce4-settings
-version         4.6.5
-revision        2
+version         4.12.0
+set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      xfce
 platforms       darwin
 license         GPL-2+
@@ -13,18 +13,15 @@
 description     Settings Manager that replaces the previous xfce-mcs-manager
 long_description ${description}
 homepage        http://www.xfce.org/
-master_sites    http://www.ca-us.xfce.org/archive/xfce-4.6.2/src/
+master_sites    http://archive.xfce.org/src/xfce/${name}/${branch}/
 use_bzip2       yes
-checksums       md5 f988cb732913b5fbc115ad7105d2231e \
-                sha1 c036cc2f3100a46b2649e678dff7c0106b219263 \
-                rmd160 a8155346285921f3087795598989df287be8abb4
+checksums       md5 3eb9ff3862d773287f56f142ab7ec361 \
+                sha1 507a66ed160e44078f81051878c8644d5a5f344e \
+                sha256 04becef105c19d0266cfe8dbf42619e7233c3b9fa99b43dbfc9c6a5959501f81
 
 depends_build   port:intltool port:xfce4-dev-tools port:pkgconfig
-depends_lib     port:libxfcegui4 port:exo port:libwnck port:xorg-libXrandr
+depends_lib     port:libxfce4ui port:exo port:libwnck port:xorg-libXrandr
 
-# Don't do intltool's INTLTOOL_PERL dance
-configure.cmd   ${prefix}/bin/xdt-autogen
-
 platform darwin 8 {
     patchfiles-append           patch-configure.diff
     configure.env-append        PKG_CONFIG_PATH="${prefix}/lib/pkgconfig" \

Modified: trunk/dports/xfce/xfce4-terminal/Portfile
===================================================================
--- trunk/dports/xfce/Terminal/Portfile	2016-01-01 16:17:08 UTC (rev 144090)
+++ trunk/dports/xfce/xfce4-terminal/Portfile	2016-01-02 23:33:23 UTC (rev 144133)
@@ -3,9 +3,9 @@
 
 PortSystem 1.0
 
-name            Terminal
-version         0.4.5
-revision        3
+name            xfce4-terminal
+version         0.6.3
+set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      xfce
 platforms       darwin
 license         GPL-2+
@@ -14,22 +14,20 @@
 platforms       darwin
 description     Terminal is a modern terminal emulator for the Unix/Linux desktop.
 long_description ${description}
-homepage        http://goodies.xfce.org/projects/applications/terminal
-master_sites    http://www.xfce.org/archive/src/apps/terminal/0.4/
+homepage        http://www.xfce.org/
+master_sites    http://archive.xfce.org/src/apps/${name}/${branch}/
 use_bzip2       yes
-checksums       md5 3c707628e2e97c6d9566cd74d400036a \
-                sha1 8c23799922700b1f74dc7b7e029eec192d8ff62c \
-                rmd160 f0cbfdfabc5c3037508e3b52e938c3d62bc8c14b
+checksums       md5 6a2816d8b0933cd707ed456ceb731399 \
+                sha1 4dd4d2bef8101f563487b0230346070930ff689f \
+                sha256 912f4716c2395a14a80620ef982b4af1e2a67a8df9a1ef0b802ecae826057e08
 
 depends_build   port:intltool port:pkgconfig
-depends_lib     port:exo port:vte-gtk2-compat port:dbus port:gtk2 \
+depends_lib     port:exo port:vte-gtk2-xfce port:dbus port:gtk2 \
                 path:include/glib-2.0/gio/gio.h:glib2 port:hicolor-icon-theme \
                 port:desktop-file-utils
 
 configure.args  --enable-dbus
 
-patchfiles      patch-terminal-Makefile.in
-
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
     system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"

Modified: trunk/dports/xfce/xfconf/Portfile
===================================================================
--- trunk/dports/xfce/xfconf/Portfile	2016-01-02 22:11:59 UTC (rev 144132)
+++ trunk/dports/xfce/xfconf/Portfile	2016-01-02 23:33:23 UTC (rev 144133)
@@ -4,7 +4,8 @@
 PortSystem 1.0
 
 name            xfconf
-version         4.6.2
+version         4.12.0
+set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      xfce
 platforms       darwin
 license         GPL-2
@@ -12,11 +13,11 @@
 description     easy-to-use configuration system for xfce
 long_description ${description}
 homepage        http://www.xfce.org/
-master_sites    http://www.ca-us.xfce.org/archive/xfce-${version}/src/
+master_sites    http://archive.xfce.org/src/xfce/${name}/${branch}/
 use_bzip2       yes
-checksums       md5 5ff93c15077c6dbbcd38c437bc1ab2ef \
-                sha1 2b9656a1b7f323d2600ddc929191afb50c8018f8 \
-                rmd160 beaa96507c97fd1cbf0884ce1332c7c0da5684ac
+checksums       md5 8ebfac507b4d6ce3f4bac9d257c2853b \
+                sha1 453b1589f242f293c193b0432accd8888964c3ab \
+                sha256 9910eaea8405336415d4d7f3056403f8c67bc23ba0dce251eac35205c603b156
 
 depends_build   port:intltool \
                 port:pkgconfig
@@ -25,8 +26,6 @@
                 port:xorg-libsm port:xorg-libX11 \
                 port:gtk2
 
-configure.args --x-include=${prefix}/include --x-lib=${prefix}/lib
-
 platform darwin {
         configure.args-append --disable-visibility
 }

Modified: trunk/dports/xfce/xfdesktop/Portfile
===================================================================
--- trunk/dports/xfce/xfdesktop/Portfile	2016-01-02 22:11:59 UTC (rev 144132)
+++ trunk/dports/xfce/xfdesktop/Portfile	2016-01-02 23:33:23 UTC (rev 144133)
@@ -4,8 +4,8 @@
 PortSystem 1.0
 
 name            xfdesktop
-version         4.6.2
-revision        2
+version         4.12.0
+set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      xfce
 platforms       darwin
 license         GPL-2+
@@ -13,18 +13,15 @@
 description     A desktop manager for the Xfce Desktop Environment
 long_description ${description}
 homepage        http://www.xfce.org/
-master_sites    http://www.ca-us.xfce.org/archive/xfce-${version}/src/
+master_sites    http://archive.xfce.org/src/xfce/${name}/${branch}/
 use_bzip2       yes
-checksums       md5 e800ea9fee7a5c5eaf2ae96e23a83e3a \
-                sha1 cefcd1c1386d34386d4e900cbf88b7c24ef3bafb \
-                rmd160 744c6442c612f41f5567713c3e9265ee95dd2898
+checksums       md5 d14545baf39678d3b1c7280f71e9d160 \
+                sha1 9e234072a71fd377755ddcc7a53576a12f10d826 \
+                sha256 6e7a8b87317762214b6407576f6e2c1efcc176c136b4c7b869d18a74c87b7fc7
 
 depends_lib     port:libxml2 \
-                port:Thunar port:libxfcegui4
+                port:Thunar port:libxfce4ui
 
 depends_build   port:xfce4-panel port:libglade2 \
                 port:intltool port:xfce4-dev-tools port:pkgconfig
 
-# Don't do intltool's INTLTOOL_PERL dance
-configure.cmd   ${prefix}/bin/xdt-autogen
-

Modified: trunk/dports/xfce/xfwm4/Portfile
===================================================================
--- trunk/dports/xfce/xfwm4/Portfile	2016-01-02 22:11:59 UTC (rev 144132)
+++ trunk/dports/xfce/xfwm4/Portfile	2016-01-02 23:33:23 UTC (rev 144133)
@@ -4,8 +4,8 @@
 PortSystem 1.0
 
 name            xfwm4
-version         4.6.2
-revision        2
+version         4.12.0
+set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      xfce
 platforms       darwin
 license         GPL-2+
@@ -13,17 +13,14 @@
 description     The window manager for Xfce
 long_description ${description}
 homepage        http://www.xfce.org/
-master_sites    http://www.ca-us.xfce.org/archive/xfce-${version}/src/
+master_sites    http://archive.xfce.org/src/xfce/${name}/${branch}/
 use_bzip2       yes
-checksums       md5 3e6c0c54b028b6ea60e865e55ecdf3f8 \
-                sha1 34514db4531e95a7dbcd7d73c8d97e5cb9d1bf89 \
-                rmd160 445e499ca84846222120d607b80b5eac79b422d7
+checksums       md5 165b4e380eb02e33d6c67774b38f16b1 \
+                sha1 5c3ea9faaa9b45a40ca7ecfff447cdca192534f6 \
+                sha256 29f4cbe2869ae32a6775877ed6bfc4ded7000f013ff7eb70b2639c49f415cc3a
 
 configure.args  --enable-randr --enable-startup-notification \
                 --disable-compositor --disable-xsync
 depends_lib     port:xfconf port:gtk2 port:dbus-glib port:libwnck \
-                port:libglade2 port:libxfcegui4
+                port:libglade2 port:libxfce4ui
 depends_build   port:intltool port:xfce4-dev-tools port:pkgconfig
-
-# Don't do intltool's INTLTOOL_PERL dance
-configure.cmd   ${prefix}/bin/xdt-autogen

    

[144133] trunk/dports/xfce

afb＠macports.org