[113038] users/devans/GNOME-3/stable/dports/gnome/alacarte

Wed Nov 6 20:43:17 PST 2013

Revision: 113038
          https://trac.macports.org/changeset/113038
Author:   devans at macports.org
Date:     2013-11-06 20:43:17 -0800 (Wed, 06 Nov 2013)
Log Message:
-----------
GNOME-3/stable/dports: update alacarte to version 3.10.0, make 'gnome-' the default menu file prefix in the absence of XDG_MENU_PREFIX.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/gnome/alacarte/Portfile
    users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-Makefile.in.diff
    users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-configure.diff

Added Paths:
-----------
    users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-Alacarte-MenuEditor.py.diff

Modified: users/devans/GNOME-3/stable/dports/gnome/alacarte/Portfile
===================================================================

--- users/devans/GNOME-3/stable/dports/gnome/alacarte/Portfile	2013-11-07 03:57:32 UTC (rev 113037)
+++ users/devans/GNOME-3/stable/dports/gnome/alacarte/Portfile	2013-11-07 04:43:17 UTC (rev 113038)
@@ -1,10 +1,10 @@
 # -*- 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
+PortSystem      1.0
 
 name            alacarte
-version         3.7.90
+version         3.10.0
 epoch           1
 license         GPL-2+
 set branch      [join [lrange [split ${version} .] 0 1] .]
@@ -21,8 +21,8 @@
 
 use_xz          yes
 
-checksums       rmd160  3c15988d6e45b50e8f490968d4a0311531dbb585 \
-                sha256  379ae48422ff6bc7b9657d1f9968a83ee4eb8f8c69964dbb8ce2dac6e0b5ccf0
+checksums       rmd160  2ad11884d64d337d36cf222e29e1fe7781ea660b \
+                sha256  bdc91981859a5076ae38a213892074e1263629835702920d47f6ee2bb76179f1
 
 supported_archs noarch
 
@@ -37,7 +37,8 @@
                 port:yelp
 
 patchfiles      patch-Makefile.in.diff \
-                patch-configure.diff
+                patch-configure.diff \
+                patch-Alacarte-MenuEditor.py.diff
 
 post-destroot {
     move ${destroot}${prefix}/bin/alacarte.py ${destroot}${prefix}/bin/alacarte
@@ -45,6 +46,13 @@
 
 # python3 is not supported
 
+variant python26 description {Use python 2.6} {
+    depends_lib-append          port:py26-gobject3
+    configure.python            ${prefix}/bin/python2.6
+    set python_prefix           ${frameworks_dir}/Python.framework/Versions/2.6
+    configure.pkg_config_path   ${python_prefix}/lib/pkgconfig
+}
+
 variant python27 description {Use python 2.7} {
     depends_lib-append          port:py27-gobject3
     configure.python            ${prefix}/bin/python2.7
@@ -52,7 +60,9 @@
     configure.pkg_config_path   ${python_prefix}/lib/pkgconfig
 }
 
-default_variants +python27
+if {![variant_isset python26]} {
+    default_variants +python27
+}
 
 notes "
     Be sure to set the following environment variables:
@@ -69,4 +79,4 @@
     system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
 }
 
-livecheck.type  gnome-with-unstable
+livecheck.type  gnome

Added: users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-Alacarte-MenuEditor.py.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-Alacarte-MenuEditor.py.diff	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-Alacarte-MenuEditor.py.diff	2013-11-07 04:43:17 UTC (rev 113038)
@@ -0,0 +1,11 @@
+--- Alacarte/MenuEditor.py.orig	2013-11-06 20:24:01.000000000 -0800
++++ Alacarte/MenuEditor.py	2013-11-06 20:25:00.000000000 -0800
+@@ -24,7 +24,7 @@
+ from Alacarte import util
+ 
+ def get_default_menu():
+-    prefix = os.environ.get('XDG_MENU_PREFIX', '')
++    prefix = os.environ.get('XDG_MENU_PREFIX', 'gnome-')
+     return prefix + 'applications.menu'
+ 
+ class MenuEditor(object):

Modified: users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-Makefile.in.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-Makefile.in.diff	2013-11-07 03:57:32 UTC (rev 113037)
+++ users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-Makefile.in.diff	2013-11-07 04:43:17 UTC (rev 113038)
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2013-02-27 18:09:36.000000000 -0800
-+++ Makefile.in	2013-08-30 21:40:56.000000000 -0700
-@@ -328,8 +328,8 @@
+--- Makefile.in.orig	2013-09-24 10:08:35.000000000 -0700
++++ Makefile.in	2013-11-06 16:10:24.000000000 -0800
+@@ -356,8 +356,8 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  SUBDIRS = data po Alacarte
@@ -11,7 +11,7 @@
  DISTCLEANFILES = ChangeLog
  EXTRA_DIST = \
  	alacarte.in \
-@@ -840,11 +840,11 @@
+@@ -867,11 +867,11 @@
  	tags-am uninstall uninstall-am uninstall-binSCRIPTS
  
  

Modified: users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-configure.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-configure.diff	2013-11-07 03:57:32 UTC (rev 113037)
+++ users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-configure.diff	2013-11-07 04:43:17 UTC (rev 113038)
@@ -1,6 +1,6 @@
---- configure.orig	2013-02-27 18:09:34.000000000 -0800
-+++ configure	2013-08-30 21:40:56.000000000 -0700
-@@ -5856,9 +5856,9 @@
+--- configure.orig	2013-09-24 10:08:36.000000000 -0700
++++ configure	2013-11-06 16:10:24.000000000 -0800
+@@ -5861,9 +5861,9 @@
  
  
  
@@ -12,7 +12,7 @@
  
  
  
-@@ -5931,9 +5931,9 @@
+@@ -5936,9 +5936,9 @@
  
  
  
@@ -24,7 +24,7 @@
  
  
  
-@@ -6006,9 +6006,9 @@
+@@ -6011,9 +6011,9 @@
  
  
  
@@ -36,7 +36,7 @@
  
  
  
-@@ -6081,9 +6081,9 @@
+@@ -6086,9 +6086,9 @@
  
  
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131106/c8311ce7/attachment.html>
