3 files changed, 33 insertions, 21 deletions

diff --git a/x11/deforaos-panel/Makefile b/x11/deforaos-panel/Makefile
index f182907d283f..c0cf9738726a 100644
--- a/x11/deforaos-panel/Makefile
+++ b/x11/deforaos-panel/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	deforaos-panel
-PORTVERSION=	0.2.17
+PORTVERSION=	0.2.18
 CATEGORIES=	x11
-MASTER_SITES=	http://www.defora.org/os/download/download/4009/
+MASTER_SITES=	http://www.defora.org/os/download/download/4295/
 DISTNAME=	Panel-${PORTVERSION}
 
 MAINTAINER=	olivier@cochard.me
@@ -12,37 +12,28 @@ COMMENT=	DeforaOS desktop panel
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	System:${PORTSDIR}/devel/deforaos-libsystem \
-		Desktop:${PORTSDIR}/x11/deforaos-libdesktop
+LIB_DEPENDS=	libSystem.so:${PORTSDIR}/devel/deforaos-libsystem \
+		libDesktop.so:${PORTSDIR}/x11/deforaos-libdesktop
 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
 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 desktopfileutils
-USES=		pkgconfig gettext
+USE_GNOME=	gtk20
+USES=		desktop-file-utils gettext pkgconfig
 INSTALLS_ICONS=	yes
 MAKE_ARGS+=	PREFIX=${PREFIX}
 
-MAKE_ENV+=	MANDIR=${MANPREFIX}/man
+MAKE_ENV+=	MANDIR=${STAGEDIR}${MANPREFIX}/man
 
-MAN1=	panel-embed.1 \
-	panel-message.1 \
-	panel-notify.1 \
-	panel.1 \
-	panelctl.1
-
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -e 's|/lib/|/libdata/|g' \
 		${WRKSRC}/data/pkgconfig.sh
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${PREFIX}|g' \
 		${WRKSRC}/src/panel.c
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>
diff --git a/x11/deforaos-panel/distinfo b/x11/deforaos-panel/distinfo
index 2f621107e4a2..4db00cb9a0d0 100644
--- a/x11/deforaos-panel/distinfo
+++ b/x11/deforaos-panel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Panel-0.2.17.tar.gz) = ca0f081e0082459b42477baa066aa036c6770d11d4b865963437c6ef985d20ef
-SIZE (Panel-0.2.17.tar.gz) = 109904
+SHA256 (Panel-0.2.18.tar.gz) = e9c7c6bb0196282a571c47a3cdc7d86437291069b83f707ca4387055f22fd941
+SIZE (Panel-0.2.18.tar.gz) = 111036
diff --git a/x11/deforaos-panel/pkg-plist b/x11/deforaos-panel/pkg-plist
index 0034b57cfd05..4b5c515ee53b 100644
--- a/x11/deforaos-panel/pkg-plist
+++ b/x11/deforaos-panel/pkg-plist
@@ -23,6 +23,7 @@ lib/Panel/applets/memory.so
 lib/Panel/applets/mixer.so
 lib/Panel/applets/pager.so
 lib/Panel/applets/phone.so
+lib/Panel/applets/player.so
 lib/Panel/applets/rotate.so
 lib/Panel/applets/separator.so
 lib/Panel/applets/spacer.so
@@ -34,6 +35,11 @@ lib/Panel/applets/usb.so
 lib/Panel/applets/volume.so
 lib/Panel/applets/wpa_supplicant.so
 libdata/pkgconfig/Panel.pc
+man/man1/panel-embed.1.gz
+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
 share/icons/hicolor/16x16/apps/panel-applet-bluetooth.png
 share/icons/hicolor/16x16/apps/panel-applet-desktop.png
@@ -54,5 +60,20 @@ 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
-@dirrm lib/Panel/applets
-@dirrm lib/Panel
+@dirrmtry lib/Panel/applets
+@dirrmtry lib/Panel
+@dirrmtry include/Desktop
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/24x24/apps
+@dirrmtry share/icons/hicolor/24x24
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons