x11/deforaos-panel: update to 0.3.1

PR:		197322
Submitted by:	olivier@cochard.me (maintainer)
Reviewed by:	marino

4 files changed, 28 insertions, 32 deletions

diff --git a/x11/deforaos-panel/Makefile b/x11/deforaos-panel/Makefile
index c0cf9738726a..fb2143b83c18 100644
--- a/x11/deforaos-panel/Makefile
+++ b/x11/deforaos-panel/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	deforaos-panel
-PORTVERSION=	0.2.18
+PORTVERSION=	0.3.1
 CATEGORIES=	x11
-MASTER_SITES=	http://www.defora.org/os/download/download/4295/
+MASTER_SITES=	http://www.defora.org/os/download/download/4338/
 DISTNAME=	Panel-${PORTVERSION}
 
 MAINTAINER=	olivier@cochard.me
@@ -18,15 +18,16 @@ BUILD_DEPENDS=	browser:${PORTSDIR}/x11-fm/deforaos-browser \
 		${LOCALBASE}/include/Desktop/Keyboard.h:${PORTSDIR}/x11/deforaos-keyboard \
 		${LOCALBASE}/include/Desktop/Player.h:${PORTSDIR}/multimedia/deforaos-player \
 		xsltproc:${PORTSDIR}/textproc/libxslt \
-		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
 RUN_DEPENDS=	keyboard:${PORTSDIR}/x11/deforaos-keyboard \
 		${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme \
 		sudo:${PORTSDIR}/security/sudo
 
 USE_GNOME=	gtk20
-USES=		desktop-file-utils gettext pkgconfig
+USES=		gettext pkgconfig
 INSTALLS_ICONS=	yes
 MAKE_ARGS+=	PREFIX=${PREFIX}
+USE_LDCONFIG=	yes
 
 MAKE_ENV+=	MANDIR=${STAGEDIR}${MANPREFIX}/man
 
@@ -36,4 +37,9 @@ post-patch:
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${PREFIX}|g' \
 		${WRKSRC}/src/panel.c
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* \
+		${STAGEDIR}${PREFIX}/lib/Panel/applets/* \
+		${STAGEDIR}${PREFIX}/lib/libPanel.so.0.0
+
 .include <bsd.port.mk>
diff --git a/x11/deforaos-panel/distinfo b/x11/deforaos-panel/distinfo
index 4db00cb9a0d0..23b6320323f9 100644
--- a/x11/deforaos-panel/distinfo
+++ b/x11/deforaos-panel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Panel-0.2.18.tar.gz) = e9c7c6bb0196282a571c47a3cdc7d86437291069b83f707ca4387055f22fd941
-SIZE (Panel-0.2.18.tar.gz) = 111036
+SHA256 (Panel-0.3.1.tar.gz) = 374cfbb67d2c0282603df12a071a3dcee05e130e79e07782e9f176d888e5636a
+SIZE (Panel-0.3.1.tar.gz) = 133677
diff --git a/x11/deforaos-panel/files/patch-doc__Makefile b/x11/deforaos-panel/files/patch-doc__Makefile
deleted file mode 100644
index 556f3022e2ac..000000000000
--- a/x11/deforaos-panel/files/patch-doc__Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./doc/Makefile.orig	2012-10-14 19:00:31.000000000 +0200
-+++ ./doc/Makefile	2012-12-19 03:18:41.829739209 +0100
-@@ -1,4 +1,4 @@
--TARGETS	= panel.1 panel.html panelctl.1 panelctl.html panel-embed.1 panel-embed.html panel-message.1 panel-message.html panel-notify.1 panel-notify.html
-+TARGETS	= panel.1 panelctl.1 panel-embed.1 panel-message.1 panel-notify.1
- PREFIX	= /usr/local
- DESTDIR	=
- RM	?= rm -f
-@@ -47,15 +47,10 @@
- 
- install: $(TARGETS)
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "panel.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "panel.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "panelctl.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "panelctl.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "panel-embed.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "panel-embed.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "panel-message.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "panel-message.html"
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "panel-notify.1"
--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "panel-notify.html"
- 
- uninstall:
- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "panel.1"
diff --git a/x11/deforaos-panel/pkg-plist b/x11/deforaos-panel/pkg-plist
index 6c9685339a57..5892085d9578 100644
--- a/x11/deforaos-panel/pkg-plist
+++ b/x11/deforaos-panel/pkg-plist
@@ -4,7 +4,12 @@ bin/panel-message
 bin/panel-notify
 bin/panelctl
 bin/run
+bin/wifibrowser
 include/Desktop/Panel.h
+lib/libPanel.a
+lib/libPanel.so
+lib/libPanel.so.0
+lib/libPanel.so.0.0
 lib/Panel/applets/battery.so
 lib/Panel/applets/bluetooth.so
 lib/Panel/applets/clock.so
@@ -15,12 +20,12 @@ lib/Panel/applets/desktop.so
 lib/Panel/applets/embed.so
 lib/Panel/applets/gps.so
 lib/Panel/applets/gsm.so
-lib/Panel/applets/keyboard.so
 lib/Panel/applets/lock.so
 lib/Panel/applets/logout.so
 lib/Panel/applets/main.so
 lib/Panel/applets/memory.so
 lib/Panel/applets/mixer.so
+lib/Panel/applets/network.so
 lib/Panel/applets/pager.so
 lib/Panel/applets/phone.so
 lib/Panel/applets/player.so
@@ -32,6 +37,7 @@ lib/Panel/applets/systray.so
 lib/Panel/applets/tasks.so
 lib/Panel/applets/title.so
 lib/Panel/applets/usb.so
+lib/Panel/applets/user.so
 lib/Panel/applets/volume.so
 lib/Panel/applets/wpa_supplicant.so
 libdata/pkgconfig/Panel.pc
@@ -40,7 +46,9 @@ man/man1/panel-message.1.gz
 man/man1/panel-notify.1.gz
 man/man1/panel.1.gz
 man/man1/panelctl.1.gz
-share/applications/panel-settings.desktop
+man/man1/wifibrowser.1.gz
+share/applications/deforaos-panel-settings.desktop
+share/applications/deforaos-wifibrowser.desktop
 share/icons/hicolor/16x16/apps/panel-applet-bluetooth.png
 share/icons/hicolor/16x16/apps/panel-applet-desktop.png
 share/icons/hicolor/16x16/apps/panel-applet-usb.png
@@ -60,3 +68,9 @@ share/icons/hicolor/48x48/apps/panel-applet-desktop.png
 share/icons/hicolor/48x48/apps/panel-settings.png
 share/icons/hicolor/scalable/apps/panel-applet-bluetooth.svg
 share/locale/fr/LC_MESSAGES/Panel.mo
+share/man/html1/panel-embed.html
+share/man/html1/panel-message.html
+share/man/html1/panel-notify.html
+share/man/html1/panel.html
+share/man/html1/panelctl.html
+share/man/html1/wifibrowser.html