lxlauncher: update to 0.2.5

[youri <youri.mout%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	youri <youri.mout%gmail.com@localhost>
Pushed By:	youri
Date:		Tue Apr 5 19:24:26 2016 +0200
Changeset:	bdb04e251d3972f6fde12d026a8b2bfad42ee93a

Modified Files:
	lxlauncher/Makefile
	lxlauncher/PLIST
	lxlauncher/distinfo
Removed Files:
	lxlauncher/patches/patch-Makefile.in

Log Message:
lxlauncher: update to 0.2.5

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

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

diffstat:
 lxlauncher/Makefile                  | 26 +++++++++++++++++---------
 lxlauncher/PLIST                     |  7 ++++---
 lxlauncher/distinfo                  |  8 ++++----
 lxlauncher/patches/patch-Makefile.in | 21 ---------------------
 4 files changed, 25 insertions(+), 37 deletions(-)

diffs:
diff --git a/lxlauncher/Makefile b/lxlauncher/Makefile
index a1fde86..0693c08 100644
--- a/lxlauncher/Makefile
+++ b/lxlauncher/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.4 2015/05/21 17:27:06 blef Exp $
 
-DISTNAME=	lxlauncher-0.2.4
+DISTNAME=	lxlauncher-0.2.5
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=lxde/}
 EXTRACT_SUFX=	.tar.xz
@@ -8,20 +8,28 @@ EXTRACT_SUFX=	.tar.xz
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://wiki.lxde.org/en/LXLauncher
 COMMENT=	Program launcher for small screens
+LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	lxmenu-data-[0-9]*:../../wip/lxmenu-data
 
-LICENSE=	gnu-gpl-v2
-
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	intltool pkg-config
 
-OWN_DIRS+=	${PKG_SYSCONFDIR}/xdg/lxlauncher ${PKG_SYSCONFDIR}/xdg/menus
-EGDIR=		${PREFIX}/share/examples/xdg/lxlauncher
-INSTALLATION_DIRS= share/examples/xdg/lxlauncher
-CONF_FILES=	${EGDIR}/gtkrc ${PKG_SYSCONFDIR}/xdg/lxlauncher/gtkrc
-CONF_FILES+=	${EGDIR}/settings.conf ${PKG_SYSCONFDIR}/xdg/lxlauncher/settings.conf
-CONF_FILES+=	${EGDIR}/lxlauncher-applications.menu ${PKG_SYSCONFDIR}/xdg/menus/lxlauncher-applications.menu
+PKG_SYSCONFSUBDIR=	xdg
+MAKE_DIRS+=	${PKG_SYSCONFDIR}/lxlauncher \
+		${PKG_SYSCONFDIR}/menus
+
+EGDIR=		share/examples/lxde
+CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/${EGDIR}
+
+CONF_FILES=	${EGDIR}/xdg/lxlauncher/gtkrc			\
+		${PKG_SYSCONFDIR}/lxlauncher/gtkrc 		\
+		${EGDIR}/xdg/lxlauncher/gtk.css			\
+		${PKG_SYSCONFDIR}/lxlauncher/gtk.css 		\
+		${EGDIR}/xdg/lxlauncher/settings.conf		\
+		${PKG_SYSCONFDIR}/lxlauncher/settings.conf	\
+		${EGDIR}/xdg/menus/lxlauncher-applications.menu \
+		${PKG_SYSCONFDIR}/menus/lxlauncher-applications.menu
 
 .include "../../sysutils/menu-cache/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/lxlauncher/PLIST b/lxlauncher/PLIST
index 610d474..4a587ae 100644
--- a/lxlauncher/PLIST
+++ b/lxlauncher/PLIST
@@ -7,6 +7,7 @@ share/desktop-directories/lxde-play.directory
 share/desktop-directories/lxde-science.directory
 share/desktop-directories/lxde-webmail.directory
 share/desktop-directories/lxde-work.directory
-share/examples/xdg/lxlauncher/gtkrc
-share/examples/xdg/lxlauncher/lxlauncher-applications.menu
-share/examples/xdg/lxlauncher/settings.conf
+share/examples/lxde/xdg/lxlauncher/gtkrc
+share/examples/lxde/xdg/lxlauncher/gtk.css
+share/examples/lxde/xdg/lxlauncher/settings.conf
+share/examples/lxde/xdg/menus/lxlauncher-applications.menu
diff --git a/lxlauncher/distinfo b/lxlauncher/distinfo
index 302caa5..6d84df8 100644
--- a/lxlauncher/distinfo
+++ b/lxlauncher/distinfo
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.2 2015/05/21 17:27:06 blef Exp $
 
-SHA1 (lxlauncher-0.2.4.tar.xz) = ab75339b1de5fe0fdbff12462272b0cbdea58df1
-RMD160 (lxlauncher-0.2.4.tar.xz) = 97f38c8f6d243b5f3492bcce94c9b3c77d3f5a56
-Size (lxlauncher-0.2.4.tar.xz) = 129156 bytes
-SHA1 (patch-Makefile.in) = aa834c781297a20994189a12ae844ec5e711eae1
+SHA1 (lxlauncher-0.2.5.tar.xz) = a0a1e13e0d4f2d03502eddb7d71e77e66b444f92
+RMD160 (lxlauncher-0.2.5.tar.xz) = 71260905ec0293ab046072f85650ab5facf3df42
+SHA512 (lxlauncher-0.2.5.tar.xz) = 3f57755ad6feeeb1daa61c29f142b997f8175ff0863d1749b3e28b83744d03e06a7f0bb373fdcd48364e307840dd05cd23b92109c75523e32d3eae8e183ed6cf
+Size (lxlauncher-0.2.5.tar.xz) = 131428 bytes
diff --git a/lxlauncher/patches/patch-Makefile.in b/lxlauncher/patches/patch-Makefile.in
deleted file mode 100644
index 1b4595b..0000000
--- a/lxlauncher/patches/patch-Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.1 2015/05/21 17:27:50 blef Exp $
-
-do the share/examples dance for the benefit of pkgsrc config file handling
-
---- Makefile.in.orig	2014-10-20 10:25:58.000000000 -0700
-+++ Makefile.in	2015-05-21 10:03:33.000000000 -0700
-@@ -355,12 +355,12 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = src po
--confdir = $(sysconfdir)/xdg/lxlauncher
-+confdir = ${prefix}/share/examples/xdg/lxlauncher
- conf_in_files = settings.conf.in
- conf_DATA = $(conf_in_files:.conf.in=.conf)
- themedir = $(confdir)
- theme_DATA = gtkrc
--menufiledir = $(sysconfdir)/xdg/menus
-+menufiledir = ${prefix}/share/examples/xdg/lxlauncher
- menufile_DATA = \
- 	data/lxlauncher-applications.menu
-