pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

lxpanel: update to 0.8.2



Module Name:	pkgsrc-wip
Committed By:	youri <youri%NetBSD.org@localhost>
Pushed By:	youri
Date:		Tue Apr 5 16:02:23 2016 +0200
Changeset:	46d77ab7dbb098819a36be4e6c109fb1a3fe18ec

Modified Files:
	lxpanel/Makefile
	lxpanel/PLIST

Log Message:
lxpanel: update to 0.8.2

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

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

diffstat:
 lxpanel/Makefile | 30 ++++++++++++++++++++++++------
 lxpanel/PLIST    | 10 +++++-----
 2 files changed, 29 insertions(+), 11 deletions(-)

diffs:
diff --git a/lxpanel/Makefile b/lxpanel/Makefile
index 76af236..6e95f41 100644
--- a/lxpanel/Makefile
+++ b/lxpanel/Makefile
@@ -8,15 +8,16 @@ EXTRACT_SUFX=	.tar.xz
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://lxde.org/
 COMMENT=	Lightweight X11 desktop panel from LXDE
+LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	lxmenu-data-[0-9]*:../../wip/lxmenu-data
 
-LICENSE=	gnu-gpl-v2
-
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	perl pkg-config intltool
-CONFIGURE_ARGS+=--with-plugins=none
+LXDE_CONF=		share/examples/lxde
+GNU_CONFIGURE=		yes
+USE_LIBTOOL=		yes
+USE_TOOLS+=		perl pkg-config intltool
+CONFIGURE_ARGS+=	--with-plugins=none
+CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/${LXDE_CONF}
 # plugins may be comma separated:
 # possible:
 #Possible plugins are:
@@ -27,6 +28,23 @@ CONFIGURE_ARGS+=--with-plugins=none
 
 PKGCONFIG_OVERRIDE+=	lxpanel.pc.in
 
+PKG_SYSCONFSUBDIR=	xdg
+
+MAKE_DIRS+=	${PKG_SYSCONFDIR}/lxpanel/default/panels 	\
+		${PKG_SYSCONFDIR}/lxpanel/config		\
+		${PKG_SYSCONFDIR}/lxpanel/two_panels/panels
+
+CONF_FILES= ${LXDE_CONF}/xdg/lxpanel/default/config		\
+	${PKG_SYSCONFDIR}/lxpanel/default/config 		\
+	${LXDE_CONF}/xdg/lxpanel/default/panels/panel  		\
+	${PKG_SYSCONFDIR}/lxpanel/default/panels/panel 	\
+	${LXDE_CONF}/xdg/lxpanel/two_panels/config 			\
+	${PKG_SYSCONFDIR}/lxpanel/two_panels/config 		\
+	${LXDE_CONF}/xdg/lxpanel/two_panels/panels/bottom 	\
+	${PKG_SYSCONFDIR}/lxpanel/two_panels/panels/bottom 	\
+	${LXDE_CONF}/xdg/lxpanel/two_panels/panels/top 		\
+	${PKG_SYSCONFDIR}/lxpanel/two_panels/panels/top
+
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libwnck/buildlink3.mk"
 .include "../../sysutils/menu-cache/buildlink3.mk"
diff --git a/lxpanel/PLIST b/lxpanel/PLIST
index d6a9cab..597d4c0 100644
--- a/lxpanel/PLIST
+++ b/lxpanel/PLIST
@@ -1,11 +1,6 @@
 @comment $NetBSD$
 bin/lxpanel
 bin/lxpanelctl
-etc/xdg/lxpanel/default/config
-etc/xdg/lxpanel/default/panels/panel
-etc/xdg/lxpanel/two_panels/config
-etc/xdg/lxpanel/two_panels/panels/bottom
-etc/xdg/lxpanel/two_panels/panels/top
 include/lxpanel/conf.h
 include/lxpanel/icon-grid.h
 include/lxpanel/misc.h
@@ -15,6 +10,11 @@ lib/lxpanel/liblxpanel.la
 lib/pkgconfig/lxpanel.pc
 man/man1/lxpanel.1
 man/man1/lxpanelctl.1
+share/examples/lxde/xdg/lxpanel/default/config
+share/examples/lxde/xdg/lxpanel/default/panels/panel
+share/examples/lxde/xdg/lxpanel/two_panels/config
+share/examples/lxde/xdg/lxpanel/two_panels/panels/bottom
+share/examples/lxde/xdg/lxpanel/two_panels/panels/top
 share/lxpanel/images/background.png
 share/lxpanel/images/capslock-off.png
 share/lxpanel/images/capslock-on.png


Home | Main Index | Thread Index | Old Index