use graphics/linux-png

6 files changed, 6 insertions, 80 deletions

diff --git a/multimedia/linux-xmovie/Makefile b/multimedia/linux-xmovie/Makefile
index e96acb2..2ff1c71 100644
--- a/multimedia/linux-xmovie/Makefile
+++ b/multimedia/linux-xmovie/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmovie
 PORTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	graphics linux
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	imura
@@ -14,14 +15,11 @@ MASTER_SITE_SUBDIR=	imura
 # MASTER_SITES=	http://heroine.linuxbox.com/
 DISTNAME=	${PORTNAME}-i586-${PORTVERSION}
 
-PATCH_SITES=	${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
-PATCHFILES=	${RPM_LIBPNG}
-
 MAINTAINER=	sanpei@FreeBSD.org
 
-BUILD_DEPENDS=	rpm:${PORTSDIR}/misc/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/libjpeg.so.62.0.0:${PORTSDIR}/graphics/linux-jpeg \
+		${LINUX_BASE}/usr/lib/libpng.so.2.1.0.3:${PORTSDIR}/graphics/linux-png
 
 ONLY_FOR_ARCHS=	i386
 DOC_DIR=	${PREFIX}/share/doc/xmovie
@@ -34,34 +32,10 @@ WRKSRC=		${WRKDIR}/xmovie-i586
 # /usr/bin/strip which then brands the binary as a FreeBSD ELF one.
 STRIP=
 
-RPM_MIRRORS=            \
-	ftp://ftp.freesoftware.com/pub/linux/redhat/__DIR__/ \
-	ftp://ftp.redhat.com/redhat/__DIR__/ \
-	ftp://ftp.infomagic.com/pub/mirrors/linux/RedHat/__DIR__/ \
-	ftp://ftp.crc.ca/mirrors/by-site/ftp.redhat.com/redhat/__DIR__/ \
-	ftp://ftp.nluug.nl/site/ftp.redhat.com/redhat/__DIR__/ \
-	ftp://mirror.nucba.ac.jp/mirror/redhat/__DIR__/ \
-	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_LIBPNG=	libpng-1.0.3-4.i386.rpm
-DBPATH=		/var/lib/rpm
-LINUX_PREFIX=	/compat/linux
-RPMFLAGS=	--ignoreos --root ${LINUX_PREFIX} --dbpath ${DBPATH} \
-		--nodeps --replacepkgs
-RPMDIR=		${DISTDIR}
-
 do-patch:
 	@${DO_NADA}
 
 do-install:
-#
-# Install Linux libraries
-#
-	@for R in ${PATCHFILES}; do \
-		${ECHO} $$R; \
-		rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
-	done
 	@${INSTALL_PROGRAM} ${WRKSRC}/xmovie ${PREFIX}/bin
 	@brandelf -t Linux ${PREFIX}/bin/xmovie
 	@${INSTALL_PROGRAM} ${WRKSRC}/mpeg2toc ${PREFIX}/bin
diff --git a/multimedia/linux-xmovie/distinfo b/multimedia/linux-xmovie/distinfo
index 110f06b..7e5e653 100644
--- a/multimedia/linux-xmovie/distinfo
+++ b/multimedia/linux-xmovie/distinfo
@@ -1,3 +1 @@
 MD5 (xmovie-i586-1.3.1.tar.gz) = 86ede3a9e34d2d9f72a55a4bd65733f0
-MD5 (libjpeg-6b-9.i386.rpm) = 453feddfadcdb1b96c2a3bb843e3ec80
-MD5 (libpng-1.0.3-4.i386.rpm) = 97a6022e9fb046372da34eeb413ddecc
diff --git a/multimedia/linux-xmovie/pkg-plist b/multimedia/linux-xmovie/pkg-plist
index 0c5920c..0cd4f49 100644
--- a/multimedia/linux-xmovie/pkg-plist
+++ b/multimedia/linux-xmovie/pkg-plist
@@ -3,12 +3,3 @@ bin/mpeg2toc
 share/doc/xmovie/README
 share/doc/xmovie/index.html
 @dirrm share/doc/xmovie
-@cwd /compat/linux
-usr/doc/libpng-1.0.3/CHANGES
-usr/doc/libpng-1.0.3/README
-usr/doc/libpng-1.0.3/TODO
-usr/doc/libpng-1.0.3/example.c
-usr/doc/libpng-1.0.3/libpng.txt
-usr/lib/libpng.so.2.1.0.3
-usr/lib/libpng.so.2
-usr/man/man5/png.5
diff --git a/multimedia/xmovie/Makefile b/multimedia/xmovie/Makefile
index e96acb2..2ff1c71 100644
--- a/multimedia/xmovie/Makefile
+++ b/multimedia/xmovie/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmovie
 PORTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	graphics linux
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	imura
@@ -14,14 +15,11 @@ MASTER_SITE_SUBDIR=	imura
 # MASTER_SITES=	http://heroine.linuxbox.com/
 DISTNAME=	${PORTNAME}-i586-${PORTVERSION}
 
-PATCH_SITES=	${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
-PATCHFILES=	${RPM_LIBPNG}
-
 MAINTAINER=	sanpei@FreeBSD.org
 
-BUILD_DEPENDS=	rpm:${PORTSDIR}/misc/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/libjpeg.so.62.0.0:${PORTSDIR}/graphics/linux-jpeg \
+		${LINUX_BASE}/usr/lib/libpng.so.2.1.0.3:${PORTSDIR}/graphics/linux-png
 
 ONLY_FOR_ARCHS=	i386
 DOC_DIR=	${PREFIX}/share/doc/xmovie
@@ -34,34 +32,10 @@ WRKSRC=		${WRKDIR}/xmovie-i586
 # /usr/bin/strip which then brands the binary as a FreeBSD ELF one.
 STRIP=
 
-RPM_MIRRORS=            \
-	ftp://ftp.freesoftware.com/pub/linux/redhat/__DIR__/ \
-	ftp://ftp.redhat.com/redhat/__DIR__/ \
-	ftp://ftp.infomagic.com/pub/mirrors/linux/RedHat/__DIR__/ \
-	ftp://ftp.crc.ca/mirrors/by-site/ftp.redhat.com/redhat/__DIR__/ \
-	ftp://ftp.nluug.nl/site/ftp.redhat.com/redhat/__DIR__/ \
-	ftp://mirror.nucba.ac.jp/mirror/redhat/__DIR__/ \
-	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_LIBPNG=	libpng-1.0.3-4.i386.rpm
-DBPATH=		/var/lib/rpm
-LINUX_PREFIX=	/compat/linux
-RPMFLAGS=	--ignoreos --root ${LINUX_PREFIX} --dbpath ${DBPATH} \
-		--nodeps --replacepkgs
-RPMDIR=		${DISTDIR}
-
 do-patch:
 	@${DO_NADA}
 
 do-install:
-#
-# Install Linux libraries
-#
-	@for R in ${PATCHFILES}; do \
-		${ECHO} $$R; \
-		rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
-	done
 	@${INSTALL_PROGRAM} ${WRKSRC}/xmovie ${PREFIX}/bin
 	@brandelf -t Linux ${PREFIX}/bin/xmovie
 	@${INSTALL_PROGRAM} ${WRKSRC}/mpeg2toc ${PREFIX}/bin
diff --git a/multimedia/xmovie/distinfo b/multimedia/xmovie/distinfo
index 110f06b..7e5e653 100644
--- a/multimedia/xmovie/distinfo
+++ b/multimedia/xmovie/distinfo
@@ -1,3 +1 @@
 MD5 (xmovie-i586-1.3.1.tar.gz) = 86ede3a9e34d2d9f72a55a4bd65733f0
-MD5 (libjpeg-6b-9.i386.rpm) = 453feddfadcdb1b96c2a3bb843e3ec80
-MD5 (libpng-1.0.3-4.i386.rpm) = 97a6022e9fb046372da34eeb413ddecc
diff --git a/multimedia/xmovie/pkg-plist b/multimedia/xmovie/pkg-plist
index 0c5920c..0cd4f49 100644
--- a/multimedia/xmovie/pkg-plist
+++ b/multimedia/xmovie/pkg-plist
@@ -3,12 +3,3 @@ bin/mpeg2toc
 share/doc/xmovie/README
 share/doc/xmovie/index.html
 @dirrm share/doc/xmovie
-@cwd /compat/linux
-usr/doc/libpng-1.0.3/CHANGES
-usr/doc/libpng-1.0.3/README
-usr/doc/libpng-1.0.3/TODO
-usr/doc/libpng-1.0.3/example.c
-usr/doc/libpng-1.0.3/libpng.txt
-usr/lib/libpng.so.2.1.0.3
-usr/lib/libpng.so.2
-usr/man/man5/png.5