lxpanel: Fix config installation and enable a couple of plugins

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: lxpanel: Fix config installation and enable a couple of plugins
From: youri <youri%NetBSD.org@localhost>
Date: Mon, 23 May 2016 09:33:34 +0000
Module Name:	pkgsrc-wip
Committed By:	youri <youri%NetBSD.org@localhost>
Pushed By:	youri
Date:		Mon May 23 11:33:34 2016 +0200
Changeset:	8e2236ed6ed9a7c4cd0fa2465bc7b72752d69668

Modified Files:
	lxpanel/Makefile
	lxpanel/PLIST
	lxpanel/distinfo
Added Files:
	lxpanel/patches/patch-data_Makefile.in
Removed Files:
	lxpanel/TODO

Log Message:
lxpanel: Fix config installation and enable a couple of plugins

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

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

diffstat:
 lxpanel/Makefile                       |  28 +++----
 lxpanel/PLIST                          |  12 +--
 lxpanel/TODO                           |   3 -
 lxpanel/distinfo                       |   1 +
 lxpanel/patches/patch-data_Makefile.in | 134 +++++++++++++++++++++++++++++++++
 5 files changed, 152 insertions(+), 26 deletions(-)

diffs:
diff --git a/lxpanel/Makefile b/lxpanel/Makefile
index 6e95f41..9352e05 100644
--- a/lxpanel/Makefile
+++ b/lxpanel/Makefile
@@ -12,20 +12,11 @@ LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	lxmenu-data-[0-9]*:../../wip/lxmenu-data
 
-LXDE_CONF=		share/examples/lxde
+LXDE_CONF=		share/examples/lxpanel
 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:
-#			 netstatus, netstat, volume, volumealsa,
-#			 cpu, deskno, batt, kbled, xkb, thermal,
-#			 cpufreq, monitors, wnckpager
-# TODO: maybe I need --enable-indicator-support ??
-
+CONFIGURE_ARGS+=	--with-plugins="deskno, xkb, wnckpager"
 PKGCONFIG_OVERRIDE+=	lxpanel.pc.in
 
 PKG_SYSCONFSUBDIR=	xdg
@@ -34,15 +25,15 @@ 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		\
+CONF_FILES= ${LXDE_CONF}/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 			\
+	${LXDE_CONF}/default/panels/panel  			\
+	${PKG_SYSCONFDIR}/lxpanel/default/panels/panel 		\
+	${LXDE_CONF}/two_panels/config 				\
 	${PKG_SYSCONFDIR}/lxpanel/two_panels/config 		\
-	${LXDE_CONF}/xdg/lxpanel/two_panels/panels/bottom 	\
+	${LXDE_CONF}/two_panels/panels/bottom		 	\
 	${PKG_SYSCONFDIR}/lxpanel/two_panels/panels/bottom 	\
-	${LXDE_CONF}/xdg/lxpanel/two_panels/panels/top 		\
+	${LXDE_CONF}/two_panels/panels/top 			\
 	${PKG_SYSCONFDIR}/lxpanel/two_panels/panels/top
 
 .include "../../devel/glib2/buildlink3.mk"
@@ -50,7 +41,8 @@ CONF_FILES= ${LXDE_CONF}/xdg/lxpanel/default/config		\
 .include "../../sysutils/menu-cache/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2-xlib/buildlink3.mk"
-.include "../../wip/libfm/buildlink3.mk"
+.include "../../sysutils/libfm/buildlink3.mk"
+.include "../../sysutils/libfm-extra/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/keybinder/buildlink3.mk"
 
diff --git a/lxpanel/PLIST b/lxpanel/PLIST
index 597d4c0..a9153ab 100644
--- a/lxpanel/PLIST
+++ b/lxpanel/PLIST
@@ -7,14 +7,16 @@ include/lxpanel/misc.h
 include/lxpanel/panel.h
 include/lxpanel/plugin.h
 lib/lxpanel/liblxpanel.la
+lib/lxpanel/plugins/deskno.so
+lib/lxpanel/plugins/xkb.so
 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/examples/lxpanel/default/config
+share/examples/lxpanel/default/panels/panel
+share/examples/lxpanel/two_panels/config
+share/examples/lxpanel/two_panels/panels/bottom
+share/examples/lxpanel/two_panels/panels/top
 share/lxpanel/images/background.png
 share/lxpanel/images/capslock-off.png
 share/lxpanel/images/capslock-on.png
diff --git a/lxpanel/TODO b/lxpanel/TODO
deleted file mode 100644
index dc610c3..0000000
--- a/lxpanel/TODO
+++ /dev/null
@@ -1,3 +0,0 @@
-why check for background image repeatedly?
-
-what uses the share/lxpanel/images ?
diff --git a/lxpanel/distinfo b/lxpanel/distinfo
index a59d2a0..4a650c9 100644
--- a/lxpanel/distinfo
+++ b/lxpanel/distinfo
@@ -4,3 +4,4 @@ SHA1 (lxpanel-0.8.2.tar.xz) = a736b38bb74ed93e151ef5446003c9bcae240717
 RMD160 (lxpanel-0.8.2.tar.xz) = 34e81f35ab0a71177d99d4497f79239e180daddd
 SHA512 (lxpanel-0.8.2.tar.xz) = abab9175c4a4e591a33c39fbc41754e458eea60c79f5a40d56848338b910a867bafed09b4d1f2596a588beb79bfb5efe54c798ff5f7b0ee74f6245a1b0417918
 Size (lxpanel-0.8.2.tar.xz) = 1488548 bytes
+SHA1 (patch-data_Makefile.in) = 9551cbe8f1f5a71d537bbd7e07dfcc688399a85a
diff --git a/lxpanel/patches/patch-data_Makefile.in b/lxpanel/patches/patch-data_Makefile.in
new file mode 100644
index 0000000..3c444da
--- /dev/null
+++ b/lxpanel/patches/patch-data_Makefile.in
@@ -0,0 +1,134 @@
+$NetBSD$
+
+Fix config install.
+
+--- data/Makefile.in.orig	2016-02-20 22:29:21.000000000 +0000
++++ data/Makefile.in
+@@ -309,6 +309,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
++examplesdir = ${datadir}/examples/lxpanel
+ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+@@ -317,19 +318,23 @@ default_config_DATA = \
+ 	default/config
+ 
+ default_configdir = $(sysconfdir)/xdg/lxpanel/default
++default_configexampledir = $(examplesdir)/default
+ default_config_panel_DATA = \
+ 	default/panels/panel
+ 
+ default_config_paneldir = $(sysconfdir)/xdg/lxpanel/default/panels
++default_config_panelexampledir = $(examplesdir)/default/panels
+ two_panels_config_DATA = \
+ 	two_panels/config
+ 
+ two_panels_configdir = $(sysconfdir)/xdg/lxpanel/two_panels
++two_panels_configexampledir = $(examplesdir)/two_panels
+ two_panels_config_panel_DATA = \
+ 	two_panels/panels/bottom \
+ 	two_panels/panels/top
+ 
+ two_panels_config_paneldir = $(sysconfdir)/xdg/lxpanel/two_panels/panels
++two_panels_config_panelexampledir = $(examplesdir)/two_panels/panels
+ uidir = $(datadir)/lxpanel/ui
+ ui_in_files = \
+ 	ui/panel-pref.glade \
+@@ -431,18 +436,18 @@ clean-libtool:
+ 	-rm -rf .libs _libs
+ install-default_configDATA: $(default_config_DATA)
+ 	@$(NORMAL_INSTALL)
+-	@list='$(default_config_DATA)'; test -n "$(default_configdir)" || list=; \
++	@list='$(default_config_DATA)'; test -n "$(default_configexampledir)" || list=; \
+ 	if test -n "$$list"; then \
+-	  echo " $(MKDIR_P) '$(DESTDIR)$(default_configdir)'"; \
+-	  $(MKDIR_P) "$(DESTDIR)$(default_configdir)" || exit 1; \
++	  echo " $(MKDIR_P) '$(DESTDIR)$(default_configexampledir)'"; \
++	  $(MKDIR_P) "$(DESTDIR)$(default_configexampledir)" || 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)$(default_configdir)'"; \
+-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(default_configdir)" || exit $$?; \
++	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(default_configexampledir)'"; \
++	  $(INSTALL_DATA) $$files "$(DESTDIR)$(default_configexampledir)" || exit $$?; \
+ 	done
+ 
+ uninstall-default_configDATA:
+@@ -452,18 +457,18 @@ uninstall-default_configDATA:
+ 	dir='$(DESTDIR)$(default_configdir)'; $(am__uninstall_files_from_dir)
+ install-default_config_panelDATA: $(default_config_panel_DATA)
+ 	@$(NORMAL_INSTALL)
+-	@list='$(default_config_panel_DATA)'; test -n "$(default_config_paneldir)" || list=; \
++	@list='$(default_config_panel_DATA)'; test -n "$(default_config_panelexampledir)" || list=; \
+ 	if test -n "$$list"; then \
+-	  echo " $(MKDIR_P) '$(DESTDIR)$(default_config_paneldir)'"; \
+-	  $(MKDIR_P) "$(DESTDIR)$(default_config_paneldir)" || exit 1; \
++	  echo " $(MKDIR_P) '$(DESTDIR)$(default_config_panelexampledir)'"; \
++	  $(MKDIR_P) "$(DESTDIR)$(default_config_panelexampledir)" || 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)$(default_config_paneldir)'"; \
+-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(default_config_paneldir)" || exit $$?; \
++	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(default_config_panelexampledir)'"; \
++	  $(INSTALL_DATA) $$files "$(DESTDIR)$(default_config_panelexampledir)" || exit $$?; \
+ 	done
+ 
+ uninstall-default_config_panelDATA:
+@@ -494,18 +499,18 @@ uninstall-lxpanel_imagesDATA:
+ 	dir='$(DESTDIR)$(lxpanel_imagesdir)'; $(am__uninstall_files_from_dir)
+ install-two_panels_configDATA: $(two_panels_config_DATA)
+ 	@$(NORMAL_INSTALL)
+-	@list='$(two_panels_config_DATA)'; test -n "$(two_panels_configdir)" || list=; \
++	@list='$(two_panels_config_DATA)'; test -n "$(two_panels_configexampledir)" || list=; \
+ 	if test -n "$$list"; then \
+-	  echo " $(MKDIR_P) '$(DESTDIR)$(two_panels_configdir)'"; \
+-	  $(MKDIR_P) "$(DESTDIR)$(two_panels_configdir)" || exit 1; \
++	  echo " $(MKDIR_P) '$(DESTDIR)$(two_panels_configexampledir)'"; \
++	  $(MKDIR_P) "$(DESTDIR)$(two_panels_configexampledir)" || 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)$(two_panels_configdir)'"; \
+-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(two_panels_configdir)" || exit $$?; \
++	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(two_panels_configexampledir)'"; \
++	  $(INSTALL_DATA) $$files "$(DESTDIR)$(two_panels_configexampledir)" || exit $$?; \
+ 	done
+ 
+ uninstall-two_panels_configDATA:
+@@ -515,18 +520,18 @@ uninstall-two_panels_configDATA:
+ 	dir='$(DESTDIR)$(two_panels_configdir)'; $(am__uninstall_files_from_dir)
+ install-two_panels_config_panelDATA: $(two_panels_config_panel_DATA)
+ 	@$(NORMAL_INSTALL)
+-	@list='$(two_panels_config_panel_DATA)'; test -n "$(two_panels_config_paneldir)" || list=; \
++	@list='$(two_panels_config_panel_DATA)'; test -n "$(two_panels_config_panelexampledir)" || list=; \
+ 	if test -n "$$list"; then \
+-	  echo " $(MKDIR_P) '$(DESTDIR)$(two_panels_config_paneldir)'"; \
+-	  $(MKDIR_P) "$(DESTDIR)$(two_panels_config_paneldir)" || exit 1; \
++	  echo " $(MKDIR_P) '$(DESTDIR)$(two_panels_config_panelexampledir)'"; \
++	  $(MKDIR_P) "$(DESTDIR)$(two_panels_config_panelexampledir)" || 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)$(two_panels_config_paneldir)'"; \
+-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(two_panels_config_paneldir)" || exit $$?; \
++	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(two_panels_config_panelexampledir)'"; \
++	  $(INSTALL_DATA) $$files "$(DESTDIR)$(two_panels_config_panelexampledir)" || exit $$?; \
+ 	done
+ 
+ uninstall-two_panels_config_panelDATA:
Prev by Date: Sync Makefile.
Next by Date: lxmenu-data: Fix menu file installation.
Previous by Thread: remove, updated in pkgsrc.
Next by Thread: lxmenu-data: Fix menu file installation.
Indexes:
Home | Main Index | Thread Index | Old Index