4 files changed, 42 insertions, 9 deletions

diff --git a/multimedia/deforaos-player/Makefile b/multimedia/deforaos-player/Makefile
index 1d6bc5b62923..1dbbde821110 100644
--- a/multimedia/deforaos-player/Makefile
+++ b/multimedia/deforaos-player/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	player
-PORTVERSION=	0.1.4
+PORTVERSION=	0.1.6
 CATEGORIES=	multimedia
-MASTER_SITES=	http://www.defora.org/os/download/download/3708/
+MASTER_SITES=	http://www.defora.org/os/download/download/4297/
 PKGNAMEPREFIX=	deforaos-
 DISTNAME=	Player-${PORTVERSION}
 
@@ -13,13 +13,18 @@ COMMENT=	DeforaOS desktop media player
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	System:${PORTSDIR}/devel/deforaos-libsystem \
-		Desktop:${PORTSDIR}/x11/deforaos-libdesktop
+BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
+		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+LIB_DEPENDS=	libSystem.so:${PORTSDIR}/devel/deforaos-libsystem \
+		libDesktop.so:${PORTSDIR}/x11/deforaos-libdesktop
 RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
 
 MAKE_ARGS+=	PREFIX=${PREFIX}
-USE_GNOME=	gtk20 desktopfileutils
-USES=		pkgconfig gettext
+USE_GNOME=	gtk20
+USES=		desktop-file-utils gettext pkgconfig
+
+MAKE_ENV+=	MANDIR=${STAGEDIR}${MANPREFIX}/man
+
+post-install: compress-man
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/multimedia/deforaos-player/distinfo b/multimedia/deforaos-player/distinfo
index e7213c6f75be..90a94871fabf 100644
--- a/multimedia/deforaos-player/distinfo
+++ b/multimedia/deforaos-player/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Player-0.1.4.tar.gz) = 4b8b50f252895b47669c304ede8e7e218d7ce4774fc495008371284269e5bfd7
-SIZE (Player-0.1.4.tar.gz) = 37215
+SHA256 (Player-0.1.6.tar.gz) = ac208e9d07b56b55d3085bd0637ad26e17e25c927e1a7b577a9f96e6ae1da7df
+SIZE (Player-0.1.6.tar.gz) = 41827
diff --git a/multimedia/deforaos-player/files/patch-doc__Makefile b/multimedia/deforaos-player/files/patch-doc__Makefile
new file mode 100644
index 000000000000..850f7a35aeb0
--- /dev/null
+++ b/multimedia/deforaos-player/files/patch-doc__Makefile
@@ -0,0 +1,23 @@
+--- doc/Makefile.orig	2013-11-01 13:11:04.895668592 +0100
++++ doc/Makefile	2013-11-01 13:12:00.005665722 +0100
+@@ -1,4 +1,4 @@
+-TARGETS	= index.html player.1 player.html playerctl.1 playerctl.html
++TARGETS	= player.1 playerctl.1
+ PREFIX	= /usr/local
+ DESTDIR	=
+ RM	= rm -f
+@@ -33,14 +33,10 @@
+ 
+ install: $(TARGETS)
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "player.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "player.html"
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "playerctl.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "playerctl.html"
+ 
+ uninstall:
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "player.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "player.html"
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "playerctl.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "playerctl.html"
+ 
+ .PHONY: all clean distclean install uninstall
diff --git a/multimedia/deforaos-player/pkg-plist b/multimedia/deforaos-player/pkg-plist
index 3385e1fb5c92..17f4d3754f46 100644
--- a/multimedia/deforaos-player/pkg-plist
+++ b/multimedia/deforaos-player/pkg-plist
@@ -1,5 +1,10 @@
 bin/player
+bin/playerctl
+include/Desktop/Player.h
+man/man1/player.1.gz
+man/man1/playerctl.1.gz
 share/Player/splash.png
 share/applications/player.desktop
 share/locale/fr/LC_MESSAGES/Player.mo
+@dirrmtry include/Desktop
 @dirrm share/Player