Update xmovie port.

	1) Fix URL.
	2) Use graphics/linux-jpeg library.

PR:		18151
Submitted by:	maintainer

6 files changed, 10 insertions, 32 deletions

diff --git a/multimedia/linux-xmovie/Makefile b/multimedia/linux-xmovie/Makefile
index 0d5f5ec26c22..91d5a4a4a420 100644
--- a/multimedia/linux-xmovie/Makefile
+++ b/multimedia/linux-xmovie/Makefile
@@ -14,15 +14,17 @@ MASTER_SITES=	http://people.FreeBSD.org/~imura/distfiles/
 DISTNAME=	${PORTNAME}-i586-${PORTVERSION}
 
 PATCH_SITES=	${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
-PATCHFILES=	${RPM_LIBJPEG} ${RPM_LIBPNG}
+PATCHFILES=	${RPM_LIBPNG}
 
 MAINTAINER=	sanpei@sanpei.org
 
 BUILD_DEPENDS=	rpm:${PORTSDIR}/misc/rpm
-RUN_DEPENDS=    /compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
+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
 
 ONLY_FOR_ARCHS=	i386
 DOC_DIR=	${PREFIX}/share/doc/xmovie
+LINUX_BASE=	/compat/linux
 NO_BUILD=	yes
 USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/xmovie-i586
@@ -37,7 +39,6 @@ RPM_MIRRORS=            \
 	ftp://ftp.is.co.za/linux/distributions/redhat/__DIR__/ \
 	ftp://mirror.aarnet.edu.au/pub/linux/redhat/__DIR__/
 STDDIR=		redhat-6.1/${MACHINE_ARCH}/RedHat/RPMS
-RPM_LIBJPEG=	libjpeg-6b-9.i386.rpm
 RPM_LIBPNG=	libpng-1.0.3-4.i386.rpm
 DBPATH=		/var/lib/rpm
 LINUX_PREFIX=	/compat/linux
diff --git a/multimedia/linux-xmovie/pkg-descr b/multimedia/linux-xmovie/pkg-descr
index 36457d8a7433..3b2a4309b1ec 100644
--- a/multimedia/linux-xmovie/pkg-descr
+++ b/multimedia/linux-xmovie/pkg-descr
@@ -2,7 +2,7 @@
 
   QuickTime and DVD movie player
 
-WWW: http://heroine.linuxbox.com/xmovie.html
+WWW: http://heroine.linuxave.net/xmovie.html
 
   documentation is in /usr/X11R6/share/doc/xmovie/.
 
diff --git a/multimedia/linux-xmovie/pkg-plist b/multimedia/linux-xmovie/pkg-plist
index 2ef4ca62736d..0c5920c2f2ba 100644
--- a/multimedia/linux-xmovie/pkg-plist
+++ b/multimedia/linux-xmovie/pkg-plist
@@ -4,18 +4,6 @@ share/doc/xmovie/README
 share/doc/xmovie/index.html
 @dirrm share/doc/xmovie
 @cwd /compat/linux
-usr/bin/cjpeg
-usr/bin/djpeg
-usr/bin/jpegtran
-usr/bin/rdjpgcom
-usr/bin/wrjpgcom
-usr/lib/libjpeg.so.62.0.0
-usr/man/man1/cjpeg.1
-usr/man/man1/djpeg.1
-usr/man/man1/jpegtran.1
-usr/man/man1/rdjpgcom.1
-usr/man/man1/wrjpgcom.1
-usr/lib/libjpeg.so.62
 usr/doc/libpng-1.0.3/CHANGES
 usr/doc/libpng-1.0.3/README
 usr/doc/libpng-1.0.3/TODO
diff --git a/multimedia/xmovie/Makefile b/multimedia/xmovie/Makefile
index 0d5f5ec26c22..91d5a4a4a420 100644
--- a/multimedia/xmovie/Makefile
+++ b/multimedia/xmovie/Makefile
@@ -14,15 +14,17 @@ MASTER_SITES=	http://people.FreeBSD.org/~imura/distfiles/
 DISTNAME=	${PORTNAME}-i586-${PORTVERSION}
 
 PATCH_SITES=	${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
-PATCHFILES=	${RPM_LIBJPEG} ${RPM_LIBPNG}
+PATCHFILES=	${RPM_LIBPNG}
 
 MAINTAINER=	sanpei@sanpei.org
 
 BUILD_DEPENDS=	rpm:${PORTSDIR}/misc/rpm
-RUN_DEPENDS=    /compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
+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
 
 ONLY_FOR_ARCHS=	i386
 DOC_DIR=	${PREFIX}/share/doc/xmovie
+LINUX_BASE=	/compat/linux
 NO_BUILD=	yes
 USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/xmovie-i586
@@ -37,7 +39,6 @@ RPM_MIRRORS=            \
 	ftp://ftp.is.co.za/linux/distributions/redhat/__DIR__/ \
 	ftp://mirror.aarnet.edu.au/pub/linux/redhat/__DIR__/
 STDDIR=		redhat-6.1/${MACHINE_ARCH}/RedHat/RPMS
-RPM_LIBJPEG=	libjpeg-6b-9.i386.rpm
 RPM_LIBPNG=	libpng-1.0.3-4.i386.rpm
 DBPATH=		/var/lib/rpm
 LINUX_PREFIX=	/compat/linux
diff --git a/multimedia/xmovie/pkg-descr b/multimedia/xmovie/pkg-descr
index 36457d8a7433..3b2a4309b1ec 100644
--- a/multimedia/xmovie/pkg-descr
+++ b/multimedia/xmovie/pkg-descr
@@ -2,7 +2,7 @@
 
   QuickTime and DVD movie player
 
-WWW: http://heroine.linuxbox.com/xmovie.html
+WWW: http://heroine.linuxave.net/xmovie.html
 
   documentation is in /usr/X11R6/share/doc/xmovie/.
 
diff --git a/multimedia/xmovie/pkg-plist b/multimedia/xmovie/pkg-plist
index 2ef4ca62736d..0c5920c2f2ba 100644
--- a/multimedia/xmovie/pkg-plist
+++ b/multimedia/xmovie/pkg-plist
@@ -4,18 +4,6 @@ share/doc/xmovie/README
 share/doc/xmovie/index.html
 @dirrm share/doc/xmovie
 @cwd /compat/linux
-usr/bin/cjpeg
-usr/bin/djpeg
-usr/bin/jpegtran
-usr/bin/rdjpgcom
-usr/bin/wrjpgcom
-usr/lib/libjpeg.so.62.0.0
-usr/man/man1/cjpeg.1
-usr/man/man1/djpeg.1
-usr/man/man1/jpegtran.1
-usr/man/man1/rdjpgcom.1
-usr/man/man1/wrjpgcom.1
-usr/lib/libjpeg.so.62
 usr/doc/libpng-1.0.3/CHANGES
 usr/doc/libpng-1.0.3/README
 usr/doc/libpng-1.0.3/TODO