6 files changed, 39 insertions, 106 deletions

diff --git a/graphics/linux-f8-tiff/Makefile b/graphics/linux-f8-tiff/Makefile
index b15bbcf608b5..640efae1f05a 100644
--- a/graphics/linux-f8-tiff/Makefile
+++ b/graphics/linux-f8-tiff/Makefile
@@ -6,21 +6,46 @@
 #
 
 PORTNAME=	tiff
-PORTVERSION=	3.5.5
-PORTREVISION=	2
+PORTVERSION=	3.6.1
 CATEGORIES=	graphics linux
+MASTER_SITES=	${MASTER_SITE_SUSE}
+MASTER_SITE_SUBDIR=	i386/9.2/suse/i586
+PKGNAMEPREFIX=	linux-
+DISTNAME=	libtiff-3.6.1-47.3.i586.rpm
+EXTRACT_ONLY=
+EXTRACT_SUFX=
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
-COMMENT=	RPM of tiff lib
+COMMENT=	TIFF library, Linux/i386 binary
 
-FORBIDDEN=	http://vuxml.FreeBSD.org/f6680c03-0bd8-11d9-8a8a-000c41e2cdad.html \
-		http://vuxml.FreeBSD.org/8f86d8b5-6025-11d9-a9e7-0001020eed82.html \
-		http://vuxml.FreeBSD.org/fc7e6a42-6012-11d9-a9e7-0001020eed82.html \
-		http://vuxml.FreeBSD.org/14e8f315-600e-11d9-a9e7-0001020eed82.html \
-		http://vuxml.FreeBSD.org/3897a2f8-1d57-11d9-bc4a-000c41e2cdad.html
-DEPRECATED=	${FORBIDDEN}
-EXPIRATION_DATE=2005-02-10
+BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
 
-RPM_SET=	libtiff-${PORTVERSION}-10.${MACHINE_ARCH}.rpm
+DIST_SUBDIR=	rpm/i386/suse/9.2
+DOCDIRS=	usr/share/doc/libtiff-3.6.1
+NO_FILTER_SHLIBS=	yes
+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
+PREFIX=		${LINUXBASE}
+USE_LINUX?=	yes
 
-.include "../../x11-toolkits/linux-gtk/Makefile"
+# 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 ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} \
+		|| ${TRUE}
+
+post-install:
+	@${RM} -f ${LINUXBASE}/etc/ld.so.cache
+	@${FIND} ${LINUXBASE} -name lib -type d | ${SED} 's:${LINUXBASE}::g' \
+		> ${LINUXBASE}/etc/ld.so.conf
+	@chroot ${LINUXBASE} sbin/ldconfig
+
+.include <bsd.port.mk>
diff --git a/graphics/linux-f8-tiff/distinfo b/graphics/linux-f8-tiff/distinfo
new file mode 100644
index 000000000000..75c403bc0d3c
--- /dev/null
+++ b/graphics/linux-f8-tiff/distinfo
@@ -0,0 +1,2 @@
+MD5 (rpm/i386/suse/9.2/libtiff-3.6.1-47.3.i586.rpm) = d384891c5180b8918a4e6d4fdfb9dbf0
+SIZE (rpm/i386/suse/9.2/libtiff-3.6.1-47.3.i586.rpm) = 114387
diff --git a/graphics/linux-f8-tiff/distinfo.alpha b/graphics/linux-f8-tiff/distinfo.alpha
deleted file mode 100644
index 420980829a5a..000000000000
--- a/graphics/linux-f8-tiff/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/libtiff-3.5.5-10.alpha.rpm) = 51aaf90d967a63978f6e9a4e5c35b033
-SIZE (rpm/libtiff-3.5.5-10.alpha.rpm) = 265057
diff --git a/graphics/linux-f8-tiff/distinfo.i386 b/graphics/linux-f8-tiff/distinfo.i386
deleted file mode 100644
index 8d1c833f25e6..000000000000
--- a/graphics/linux-f8-tiff/distinfo.i386
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/libtiff-3.5.5-10.i386.rpm) = 3cba6c6c4d96a9e3bf7a3345ecf535f5
-SIZE (rpm/libtiff-3.5.5-10.i386.rpm) = 200596
diff --git a/graphics/linux-f8-tiff/pkg-plist.alpha b/graphics/linux-f8-tiff/pkg-plist.alpha
deleted file mode 100644
index ccb4b78f1624..000000000000
--- a/graphics/linux-f8-tiff/pkg-plist.alpha
+++ /dev/null
@@ -1,45 +0,0 @@
-usr/bin/fax2ps
-usr/bin/fax2tiff
-usr/bin/gif2tiff
-usr/bin/pal2rgb
-usr/bin/ppm2tiff
-usr/bin/ras2tiff
-usr/bin/rgb2ycbcr
-usr/bin/thumbnail
-usr/bin/tiff2bw
-usr/bin/tiff2ps
-usr/bin/tiff2rgba
-usr/bin/tiffcmp
-usr/bin/tiffcp
-usr/bin/tiffdither
-usr/bin/tiffdump
-usr/bin/tiffinfo
-usr/bin/tiffmedian
-usr/bin/tiffsplit
-usr/lib/libtiff.so.3.5
-usr/share/doc/libtiff-3.5.5/COPYRIGHT
-usr/share/doc/libtiff-3.5.5/README
-usr/share/doc/libtiff-3.5.5/VERSION
-usr/share/man/man1/fax2ps.1.gz
-usr/share/man/man1/fax2tiff.1.gz
-usr/share/man/man1/gif2tiff.1.gz
-usr/share/man/man1/pal2rgb.1.gz
-usr/share/man/man1/ppm2tiff.1.gz
-usr/share/man/man1/ras2tiff.1.gz
-usr/share/man/man1/rgb2ycbcr.1.gz
-usr/share/man/man1/sgi2tiff.1.gz
-usr/share/man/man1/thumbnail.1.gz
-usr/share/man/man1/tiff2bw.1.gz
-usr/share/man/man1/tiff2ps.1.gz
-usr/share/man/man1/tiffcmp.1.gz
-usr/share/man/man1/tiffcp.1.gz
-usr/share/man/man1/tiffdither.1.gz
-usr/share/man/man1/tiffdump.1.gz
-usr/share/man/man1/tiffgt.1.gz
-usr/share/man/man1/tiffinfo.1.gz
-usr/share/man/man1/tiffmedian.1.gz
-usr/share/man/man1/tiffsplit.1.gz
-usr/share/man/man1/tiffsv.1.gz
-@dirrm usr/share/doc/libtiff-3.5.5
-@exec ln -sf %D/usr/lib/libtiff.so.3.5 %D/usr/lib/libtiff.so.3
-@unexec rm -f %D/usr/lib/libtiff.so.3
diff --git a/graphics/linux-f8-tiff/pkg-plist.i386 b/graphics/linux-f8-tiff/pkg-plist.i386
deleted file mode 100644
index ccb4b78f1624..000000000000
--- a/graphics/linux-f8-tiff/pkg-plist.i386
+++ /dev/null
@@ -1,45 +0,0 @@
-usr/bin/fax2ps
-usr/bin/fax2tiff
-usr/bin/gif2tiff
-usr/bin/pal2rgb
-usr/bin/ppm2tiff
-usr/bin/ras2tiff
-usr/bin/rgb2ycbcr
-usr/bin/thumbnail
-usr/bin/tiff2bw
-usr/bin/tiff2ps
-usr/bin/tiff2rgba
-usr/bin/tiffcmp
-usr/bin/tiffcp
-usr/bin/tiffdither
-usr/bin/tiffdump
-usr/bin/tiffinfo
-usr/bin/tiffmedian
-usr/bin/tiffsplit
-usr/lib/libtiff.so.3.5
-usr/share/doc/libtiff-3.5.5/COPYRIGHT
-usr/share/doc/libtiff-3.5.5/README
-usr/share/doc/libtiff-3.5.5/VERSION
-usr/share/man/man1/fax2ps.1.gz
-usr/share/man/man1/fax2tiff.1.gz
-usr/share/man/man1/gif2tiff.1.gz
-usr/share/man/man1/pal2rgb.1.gz
-usr/share/man/man1/ppm2tiff.1.gz
-usr/share/man/man1/ras2tiff.1.gz
-usr/share/man/man1/rgb2ycbcr.1.gz
-usr/share/man/man1/sgi2tiff.1.gz
-usr/share/man/man1/thumbnail.1.gz
-usr/share/man/man1/tiff2bw.1.gz
-usr/share/man/man1/tiff2ps.1.gz
-usr/share/man/man1/tiffcmp.1.gz
-usr/share/man/man1/tiffcp.1.gz
-usr/share/man/man1/tiffdither.1.gz
-usr/share/man/man1/tiffdump.1.gz
-usr/share/man/man1/tiffgt.1.gz
-usr/share/man/man1/tiffinfo.1.gz
-usr/share/man/man1/tiffmedian.1.gz
-usr/share/man/man1/tiffsplit.1.gz
-usr/share/man/man1/tiffsv.1.gz
-@dirrm usr/share/doc/libtiff-3.5.5
-@exec ln -sf %D/usr/lib/libtiff.so.3.5 %D/usr/lib/libtiff.so.3
-@unexec rm -f %D/usr/lib/libtiff.so.3