lxmenu-data: Fix menu file installation.

[youri <youri%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	youri <youri%NetBSD.org@localhost>
Pushed By:	youri
Date:		Mon May 23 11:43:42 2016 +0200
Changeset:	87f280a8df11eb00e684a10b0bf8d42299574720

Modified Files:
	lxmenu-data/Makefile
	lxmenu-data/PLIST
	lxmenu-data/distinfo
Added Files:
	lxmenu-data/patches/patch-layout_Makefile.in

Log Message:
lxmenu-data: Fix menu file installation.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=87f280a8df11eb00e684a10b0bf8d42299574720

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 lxmenu-data/Makefile                         |  7 +++--
 lxmenu-data/PLIST                            |  2 +-
 lxmenu-data/distinfo                         |  2 +-
 lxmenu-data/patches/patch-layout_Makefile.in | 38 ++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 6 deletions(-)

diffs:
diff --git a/lxmenu-data/Makefile b/lxmenu-data/Makefile
index 1af6a3f..d1573e8 100644
--- a/lxmenu-data/Makefile
+++ b/lxmenu-data/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=lxde/}
 EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=	youri%NetBSD.org@localhost
 HOMEPAGE=	http://lxde.sourceforge.net/
 COMMENT=	LXDE menu data
 LICENSE=	gnu-gpl-v2
@@ -13,11 +13,10 @@ LICENSE=	gnu-gpl-v2
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake intltool
 
-LXDE_CONF=		share/examples/lxde
-CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/${LXDE_CONF}
+MENU_CONF=		share/examples/menus
 PKG_SYSCONFSUBDIR=	xdg
 
-CONF_FILES=	${LXDE_CONF}/menus/lxde-applications.menu \
+CONF_FILES=	${MENU_CONF}/lxde-applications.menu \
 		${PKG_SYSCONFDIR}/menus/lxde-applications.menu
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lxmenu-data/PLIST b/lxmenu-data/PLIST
index dd8867c..8fe5042 100644
--- a/lxmenu-data/PLIST
+++ b/lxmenu-data/PLIST
@@ -20,4 +20,4 @@ share/desktop-directories/lxde-system-tools.directory
 share/desktop-directories/lxde-system.directory
 share/desktop-directories/lxde-utility-accessibility.directory
 share/desktop-directories/lxde-utility.directory
-share/examples/lxde/menus/lxde-applications.menu
+share/examples/menus/lxde-applications.menu
diff --git a/lxmenu-data/distinfo b/lxmenu-data/distinfo
index 4e69652..85d1d8c 100644
--- a/lxmenu-data/distinfo
+++ b/lxmenu-data/distinfo
@@ -4,4 +4,4 @@ SHA1 (lxmenu-data-0.1.5.tar.xz) = 5c3cba7d2061a490ad62c1e9c3f6120343df7712
 RMD160 (lxmenu-data-0.1.5.tar.xz) = 3da3c8f815f7eaf694291ffb6d7c47b7f7fb4d6e
 SHA512 (lxmenu-data-0.1.5.tar.xz) = ea1a1ad511d9e56c7692a8d96feb52c53aa7bd7595f2312d4f41fc15a12a056551c70d6a2c55a30f849e2ac2fd1a06436751573472ae70e0158e069736578b40
 Size (lxmenu-data-0.1.5.tar.xz) = 199192 bytes
-SHA1 (patch-layout_Makefile.in) = e76f31cce1c49c54b5f32ddb6c34fd6ba6378430
+SHA1 (patch-layout_Makefile.in) = e9a12569ca6bbee269d6ae7a7a4cf5072a0d4286
diff --git a/lxmenu-data/patches/patch-layout_Makefile.in b/lxmenu-data/patches/patch-layout_Makefile.in
new file mode 100644
index 0000000..c528342
--- /dev/null
+++ b/lxmenu-data/patches/patch-layout_Makefile.in
@@ -0,0 +1,38 @@
+$NetBSD$
+
+Handle XDG menu location.
+
+--- layout/Makefile.in.orig	2016-02-20 23:57:47.000000000 +0000
++++ layout/Makefile.in
+@@ -253,6 +253,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ NULL = 
+ menudir = $(sysconfdir)/xdg/menus
++menuexampledir = ${datadir}/examples/menus
+ menu_DATA = \
+ 	lxde-applications.menu		\
+ 	$(NULL)
+@@ -293,18 +294,18 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+ $(am__aclocal_m4_deps):
+ install-menuDATA: $(menu_DATA)
+ 	@$(NORMAL_INSTALL)
+-	@list='$(menu_DATA)'; test -n "$(menudir)" || list=; \
++	@list='$(menu_DATA)'; test -n "$(menuexampledir)" || list=; \
+ 	if test -n "$$list"; then \
+-	  echo " $(MKDIR_P) '$(DESTDIR)$(menudir)'"; \
+-	  $(MKDIR_P) "$(DESTDIR)$(menudir)" || exit 1; \
++	  echo " $(MKDIR_P) '$(DESTDIR)$(menuexampledir)'"; \
++	  $(MKDIR_P) "$(DESTDIR)$(menuexampledir)" || exit 1; \
+ 	fi; \
+ 	for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  echo "$$d$$p"; \
+ 	done | $(am__base_list) | \
+ 	while read files; do \
+-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(menudir)'"; \
+-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(menudir)" || exit $$?; \
++	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(menuexampledir)'"; \
++	  $(INSTALL_DATA) $$files "$(DESTDIR)$(menuexampledir)" || exit $$?; \
+ 	done
+ 
+ uninstall-menuDATA: