o Update to 1.9.8.1

o Take over maintainership
o Replace comment file with COMMENT variable

4 files changed, 16 insertions, 25 deletions

diff --git a/multimedia/linux-xmovie/Makefile b/multimedia/linux-xmovie/Makefile
index c24993cee500..dfbb1eba3386 100644
--- a/multimedia/linux-xmovie/Makefile
+++ b/multimedia/linux-xmovie/Makefile
@@ -6,42 +6,37 @@
 #
 
 PORTNAME=	xmovie
-PORTVERSION=	1.6.1
-PORTREVISION=	1
+PORTVERSION=	1.9.8.1
 CATEGORIES=	graphics linux
-MASTER_SITES=	http://heroines.sourceforge.net/
-DISTFILES=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}.i386.rpm
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	heroines
+DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}.i386.rpm
+EXTRACT_SUFX=
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	lioux@FreeBSD.org
+COMMENT=	A movie player for AVI, MPEG-2/4 and MOV movies
 
 BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm
-RUN_DEPENDS=	${LINUX_BASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base \
-		${LINUX_BASE}/usr/lib/libjpeg.so.62.0.0:${PORTSDIR}/graphics/linux-jpeg \
-		${LINUX_BASE}/usr/lib/libpng.so.2.1.0.14:${PORTSDIR}/graphics/linux-png
 
 ONLY_FOR_ARCHS=	i386
-DOC_DIR=	${PREFIX}/share/doc/xmovie
+USE_LINUX=	yes
 EXTRACT_CMD=	rpm2cpio
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS= | cpio -id --quiet
-LINUX_BASE=	/compat/linux
 NO_BUILD=	yes
 USE_X_PREFIX=	yes
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}/usr/bin
+
+BRANDELF?=	/usr/bin/brandelf
 
 # Linux binary should not be stripped by INSTALL_PROGRAM as it uses
 # /usr/bin/strip which then brands the binary as a FreeBSD ELF one.
 STRIP=
 
-do-patch:
-	@${DO_NADA}
+pre-install:
+	@${BRANDELF} -t Linux ${WRKSRC}/${PORTNAME}
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/usr/local/bin/xmovie ${PREFIX}/bin
-	@brandelf -t Linux ${PREFIX}/bin/xmovie
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOC_DIR}
-	@${INSTALL_DATA} ${WRKSRC}/usr/doc/xmovie-${PORTVERSION:R}/README ${DOC_DIR}/README
-	@${INSTALL_DATA} ${WRKSRC}/usr/doc/xmovie-${PORTVERSION:R}/index.html ${DOC_DIR}/index.html
-.endif
+	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+
 .include <bsd.port.mk>
diff --git a/multimedia/linux-xmovie/distinfo b/multimedia/linux-xmovie/distinfo
index 53253cda1340..5fc488adfc69 100644
--- a/multimedia/linux-xmovie/distinfo
+++ b/multimedia/linux-xmovie/distinfo
@@ -1 +1 @@
-MD5 (xmovie-1.6-1.i386.rpm) = b97371151a9b45721c3c7ef8cc7ddb4b
+MD5 (xmovie-1.9.8-1.i386.rpm) = e3d18c8e761b824d210d416662c80dd0
diff --git a/multimedia/linux-xmovie/pkg-comment b/multimedia/linux-xmovie/pkg-comment
deleted file mode 100644
index cd1622636da8..000000000000
--- a/multimedia/linux-xmovie/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A movie player for MPEG-2 and Quicktime movies
diff --git a/multimedia/linux-xmovie/pkg-plist b/multimedia/linux-xmovie/pkg-plist
index f78026a32692..532a7ce43d02 100644
--- a/multimedia/linux-xmovie/pkg-plist
+++ b/multimedia/linux-xmovie/pkg-plist
@@ -1,4 +1 @@
 bin/xmovie
-share/doc/xmovie/README
-share/doc/xmovie/index.html
-@dirrm share/doc/xmovie