Update to 2.13.15:

 Features

        * Add "include NoDisplay" flag (Mark McLoughlin)

 Fixes

        * Fix issue where menu wouldn't fully reload after lots of
          file change events (Mark McLoughlin, Frederic Crozat)
        * Remove some unused code (Kjartan Maraas)
        * Fix incorrect escaping of C format string (The Written Word)

  Translators

       * Rostislav Raykov (bg)
       * Mahay Alam Khan (bn)
       * Jordi Mallach (ca)
       * Miloslav Trmac (cs)
       * Adam Weinberger (en_CA)
       * Francisco Javier F. Serrador (es)
       * Priit Laes (et)
       * Iñaki Larrañaga (eu)
       * Ilkka Tuohela (fi)
       * Christophe Merlet (RedFox) (fr)
       * Ignacio Casal Quinteiro (gl)
       * Ankit Patel (gu)
       * Gabor Kelemen (hu)
       * Francesco Marletta (it)
       * Erdal Ronahî (ku)
       * Timur Jamakeev (ky)
       * Kjartan Maraas (nb, no)
       * Tino Meinen (nl)
       * Marcel Telka (sk)
       * Christian Rose (sv)
       * Y.Kiran Chandra (te)
       * Theppitak Karoonboonyanan (th)
       * Abduxukur Abdurixit (ug)
       * Clytie Siddall (vi)
       * Woodman Tuen (zh_HK, zh_TW)

5 files changed, 18 insertions, 26 deletions

diff --git a/sysutils/gnome-menus/Makefile b/sysutils/gnome-menus/Makefile
index d16293a22bc..9a72a3b7587 100644
--- a/sysutils/gnome-menus/Makefile
+++ b/sysutils/gnome-menus/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2006/03/06 00:18:11 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2006/03/30 21:11:51 jmmv Exp $
 #
 
-DISTNAME=	gnome-menus-2.12.0
-PKGREVISION=	4
+DISTNAME=	gnome-menus-2.13.5
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-menus/2.12/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-menus/2.13/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
@@ -19,6 +18,8 @@ USE_PKGLOCALEDIR=	yes
 
 CONFIGURE_ARGS+=	--disable-python
 
+INSTALL_MAKE_FLAGS+=	menudir=${EXAMPLEDIR}
+
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/libmenu/libgnome-menu.pc.in
 
 EXAMPLEDIR=		${PREFIX}/share/examples/gnome-menus/xdg/menus
diff --git a/sysutils/gnome-menus/PLIST b/sysutils/gnome-menus/PLIST
index 293e94ba0da..a4ac73914f8 100644
--- a/sysutils/gnome-menus/PLIST
+++ b/sysutils/gnome-menus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2005/10/12 21:52:30 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/03/30 21:11:51 jmmv Exp $
 bin/gnome-menu-spec-test
 include/gnome-menus/gmenu-tree.h
 lib/libgnome-menu.la
@@ -25,6 +25,7 @@ share/examples/gnome-menus/xdg/menus/preferences.menu
 share/examples/gnome-menus/xdg/menus/settings.menu
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gnome-menus.mo
+${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/gnome-menus.mo
@@ -49,6 +50,8 @@ ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gnome-menus.mo
+${PKGLOCALEDIR}/locale/ku/LC_MESSAGES/gnome-menus.mo
+${PKGLOCALEDIR}/locale/ky/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/mr/LC_MESSAGES/gnome-menus.mo
@@ -70,12 +73,15 @@ ${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnome-menus.mo
+${PKGLOCALEDIR}/locale/te/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/th/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnome-menus.mo
+${PKGLOCALEDIR}/locale/ug/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/xh/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gnome-menus.mo
+${PKGLOCALEDIR}/locale/zh_HK/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
 @dirrm share/examples/gnome-menus/xdg/menus
 @dirrm share/examples/gnome-menus/xdg
diff --git a/sysutils/gnome-menus/buildlink3.mk b/sysutils/gnome-menus/buildlink3.mk
index aabdb391973..7e7b89380a5 100644
--- a/sysutils/gnome-menus/buildlink3.mk
+++ b/sysutils/gnome-menus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:50 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/03/30 21:11:51 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_MENUS_BUILDLINK3_MK:=	${GNOME_MENUS_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-menus}
 BUILDLINK_PACKAGES+=	gnome-menus
 
 .if !empty(GNOME_MENUS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-menus+=		gnome-menus>=2.12.0
-BUILDLINK_RECOMMENDED.gnome-menus?=	gnome-menus>=2.12.0nb3
+BUILDLINK_DEPENDS.gnome-menus+=		gnome-menus>=2.13.5
 BUILDLINK_PKGSRCDIR.gnome-menus?=	../../sysutils/gnome-menus
 .endif	# GNOME_MENUS_BUILDLINK3_MK
 
diff --git a/sysutils/gnome-menus/distinfo b/sysutils/gnome-menus/distinfo
index 36b6ec56dc6..82add2fbbeb 100644
--- a/sysutils/gnome-menus/distinfo
+++ b/sysutils/gnome-menus/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2005/10/12 21:52:30 jmmv Exp $
+$NetBSD: distinfo,v 1.5 2006/03/30 21:11:51 jmmv Exp $
 
-SHA1 (gnome-menus-2.12.0.tar.bz2) = bc6012c52c27fcd0506742cde93c00e00bf545fe
-RMD160 (gnome-menus-2.12.0.tar.bz2) = 72caca74259e2cb7ab212f314933354c9bee6a31
-Size (gnome-menus-2.12.0.tar.bz2) = 393280 bytes
-SHA1 (patch-aa) = 8dd7584a5ff414960cac661643fdfa734338d3a7
+SHA1 (gnome-menus-2.13.5.tar.bz2) = 962b5963eff7fbfcd8de843ef4016dda52d23066
+RMD160 (gnome-menus-2.13.5.tar.bz2) = 458363ef3f709888e9413596acded2a1ca345f0d
+Size (gnome-menus-2.13.5.tar.bz2) = 401534 bytes
diff --git a/sysutils/gnome-menus/patches/patch-aa b/sysutils/gnome-menus/patches/patch-aa
deleted file mode 100644
index a740e461b2b..00000000000
--- a/sysutils/gnome-menus/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/03/22 16:10:12 jmmv Exp $
-
---- layout/Makefile.in.orig	2005-01-10 18:46:19.000000000 +0100
-+++ layout/Makefile.in
-@@ -190,7 +190,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- NULL = 
- 
--menudir = $(sysconfdir)/xdg/menus
-+menudir = $(datadir)/examples/$(PACKAGE)/xdg/menus
- 
- menu_DATA = \
- 	applications.menu		\