Update to the newest release from FC3.

6 files changed, 45 insertions, 90 deletions

diff --git a/graphics/linux-f10-tiff/Makefile b/graphics/linux-f10-tiff/Makefile
index fbe04c1d25db..f555b3dcd857 100644
--- a/graphics/linux-f10-tiff/Makefile
+++ b/graphics/linux-f10-tiff/Makefile
@@ -7,42 +7,29 @@
 
 PORTNAME=	tiff
 PORTVERSION=	3.6.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics linux
-MASTER_SITES=	${MASTER_SITE_SUSE}
-MASTER_SITE_SUBDIR=	i386/update/9.2/rpm/i586
+MASTER_SITES=	${MASTER_SITE_FEDORA_LINUX}
+MASTER_SITE_SUBDIR=	updates/3/${ARCH}
 PKGNAMEPREFIX=	linux-
-DISTNAME=	libtiff-3.6.1-47.6.i586.rpm
-EXTRACT_ONLY=
-EXTRACT_SUFX=
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	TIFF library, Linux/i386 binary
 
-BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
+RUN_DEPENDS=	${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg
 
-DIST_SUBDIR=	rpm/i386/suse/9.2
-DOCDIRS=	usr/share/doc/libtiff-3.6.1
 ONLY_FOR_ARCHS=	amd64 i386
-PLIST=		${WRKDIR}/plist
-PLIST_DIRS=	usr/share/doc/packages/libtiff usr/share/doc/packages
-PLIST_FILES=	usr/lib/libtiff.so.3 usr/lib/libtiff.so.3.6.1 \
-		usr/share/doc/packages/libtiff/COPYRIGHT \
-		usr/share/doc/packages/libtiff/README
-USE_LINUX=	yes
-USE_LINUX_PREFIX=yes
-
-# dummy target so rpm can be in BUILD_DEPENDS
-do-build:
-	@${DO_NADA}
-
-do-install:
-	${MKDIR} ${WRKSRC}
-	@rpm -U --ignorearch --ignoreos --root ${PREFIX} --dbpath /var/lib/rpm \
-		--nodeps --replacepkgs --noscripts ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} \
-		|| ${TRUE}
+RPM_SET=	libtiff-${PORTVERSION}-10.fc3.${ARCH}.rpm
+
+BINFILES=	fax2ps fax2tiff gif2tiff pal2rgb ppm2tiff ras2tiff raw2tiff \
+		rgb2ycbcr thumbnail tiff2bw tiff2pdf tiff2ps tiff2rgba tiffcmp \
+		tiffcp tiffdither tiffdump tiffinfo tiffmedian tiffset tiffsplit
+
+.for file in ${BINFILES}
+BRANDFILES+=	${PREFIX}/usr/bin/${file}
+.endfor
 
 post-install:
-	@chroot ${LINUXBASE} sbin/ldconfig
+	@${BRANDELF} -t Linux ${BRANDFILES}
 
-.include <bsd.port.mk>
+.include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-f10-tiff/distinfo b/graphics/linux-f10-tiff/distinfo
deleted file mode 100644
index e6c3ebf079db..000000000000
--- a/graphics/linux-f10-tiff/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/i386/suse/9.2/libtiff-3.6.1-47.6.i586.rpm) = 6c43fb50321d1d9c4338d1f6ce8a4d26
-SIZE (rpm/i386/suse/9.2/libtiff-3.6.1-47.6.i586.rpm) = 114536
diff --git a/graphics/linux-f8-tiff/Makefile b/graphics/linux-f8-tiff/Makefile
index fbe04c1d25db..f555b3dcd857 100644
--- a/graphics/linux-f8-tiff/Makefile
+++ b/graphics/linux-f8-tiff/Makefile
@@ -7,42 +7,29 @@
 
 PORTNAME=	tiff
 PORTVERSION=	3.6.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics linux
-MASTER_SITES=	${MASTER_SITE_SUSE}
-MASTER_SITE_SUBDIR=	i386/update/9.2/rpm/i586
+MASTER_SITES=	${MASTER_SITE_FEDORA_LINUX}
+MASTER_SITE_SUBDIR=	updates/3/${ARCH}
 PKGNAMEPREFIX=	linux-
-DISTNAME=	libtiff-3.6.1-47.6.i586.rpm
-EXTRACT_ONLY=
-EXTRACT_SUFX=
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	TIFF library, Linux/i386 binary
 
-BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
+RUN_DEPENDS=	${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg
 
-DIST_SUBDIR=	rpm/i386/suse/9.2
-DOCDIRS=	usr/share/doc/libtiff-3.6.1
 ONLY_FOR_ARCHS=	amd64 i386
-PLIST=		${WRKDIR}/plist
-PLIST_DIRS=	usr/share/doc/packages/libtiff usr/share/doc/packages
-PLIST_FILES=	usr/lib/libtiff.so.3 usr/lib/libtiff.so.3.6.1 \
-		usr/share/doc/packages/libtiff/COPYRIGHT \
-		usr/share/doc/packages/libtiff/README
-USE_LINUX=	yes
-USE_LINUX_PREFIX=yes
-
-# dummy target so rpm can be in BUILD_DEPENDS
-do-build:
-	@${DO_NADA}
-
-do-install:
-	${MKDIR} ${WRKSRC}
-	@rpm -U --ignorearch --ignoreos --root ${PREFIX} --dbpath /var/lib/rpm \
-		--nodeps --replacepkgs --noscripts ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} \
-		|| ${TRUE}
+RPM_SET=	libtiff-${PORTVERSION}-10.fc3.${ARCH}.rpm
+
+BINFILES=	fax2ps fax2tiff gif2tiff pal2rgb ppm2tiff ras2tiff raw2tiff \
+		rgb2ycbcr thumbnail tiff2bw tiff2pdf tiff2ps tiff2rgba tiffcmp \
+		tiffcp tiffdither tiffdump tiffinfo tiffmedian tiffset tiffsplit
+
+.for file in ${BINFILES}
+BRANDFILES+=	${PREFIX}/usr/bin/${file}
+.endfor
 
 post-install:
-	@chroot ${LINUXBASE} sbin/ldconfig
+	@${BRANDELF} -t Linux ${BRANDFILES}
 
-.include <bsd.port.mk>
+.include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-f8-tiff/distinfo b/graphics/linux-f8-tiff/distinfo
deleted file mode 100644
index e6c3ebf079db..000000000000
--- a/graphics/linux-f8-tiff/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/i386/suse/9.2/libtiff-3.6.1-47.6.i586.rpm) = 6c43fb50321d1d9c4338d1f6ce8a4d26
-SIZE (rpm/i386/suse/9.2/libtiff-3.6.1-47.6.i586.rpm) = 114536
diff --git a/graphics/linux-tiff/Makefile b/graphics/linux-tiff/Makefile
index fbe04c1d25db..f555b3dcd857 100644
--- a/graphics/linux-tiff/Makefile
+++ b/graphics/linux-tiff/Makefile
@@ -7,42 +7,29 @@
 
 PORTNAME=	tiff
 PORTVERSION=	3.6.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics linux
-MASTER_SITES=	${MASTER_SITE_SUSE}
-MASTER_SITE_SUBDIR=	i386/update/9.2/rpm/i586
+MASTER_SITES=	${MASTER_SITE_FEDORA_LINUX}
+MASTER_SITE_SUBDIR=	updates/3/${ARCH}
 PKGNAMEPREFIX=	linux-
-DISTNAME=	libtiff-3.6.1-47.6.i586.rpm
-EXTRACT_ONLY=
-EXTRACT_SUFX=
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	TIFF library, Linux/i386 binary
 
-BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
+RUN_DEPENDS=	${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg
 
-DIST_SUBDIR=	rpm/i386/suse/9.2
-DOCDIRS=	usr/share/doc/libtiff-3.6.1
 ONLY_FOR_ARCHS=	amd64 i386
-PLIST=		${WRKDIR}/plist
-PLIST_DIRS=	usr/share/doc/packages/libtiff usr/share/doc/packages
-PLIST_FILES=	usr/lib/libtiff.so.3 usr/lib/libtiff.so.3.6.1 \
-		usr/share/doc/packages/libtiff/COPYRIGHT \
-		usr/share/doc/packages/libtiff/README
-USE_LINUX=	yes
-USE_LINUX_PREFIX=yes
-
-# dummy target so rpm can be in BUILD_DEPENDS
-do-build:
-	@${DO_NADA}
-
-do-install:
-	${MKDIR} ${WRKSRC}
-	@rpm -U --ignorearch --ignoreos --root ${PREFIX} --dbpath /var/lib/rpm \
-		--nodeps --replacepkgs --noscripts ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} \
-		|| ${TRUE}
+RPM_SET=	libtiff-${PORTVERSION}-10.fc3.${ARCH}.rpm
+
+BINFILES=	fax2ps fax2tiff gif2tiff pal2rgb ppm2tiff ras2tiff raw2tiff \
+		rgb2ycbcr thumbnail tiff2bw tiff2pdf tiff2ps tiff2rgba tiffcmp \
+		tiffcp tiffdither tiffdump tiffinfo tiffmedian tiffset tiffsplit
+
+.for file in ${BINFILES}
+BRANDFILES+=	${PREFIX}/usr/bin/${file}
+.endfor
 
 post-install:
-	@chroot ${LINUXBASE} sbin/ldconfig
+	@${BRANDELF} -t Linux ${BRANDFILES}
 
-.include <bsd.port.mk>
+.include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-tiff/distinfo b/graphics/linux-tiff/distinfo
deleted file mode 100644
index e6c3ebf079db..000000000000
--- a/graphics/linux-tiff/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/i386/suse/9.2/libtiff-3.6.1-47.6.i586.rpm) = 6c43fb50321d1d9c4338d1f6ce8a4d26
-SIZE (rpm/i386/suse/9.2/libtiff-3.6.1-47.6.i586.rpm) = 114536