4 files changed, 23 insertions, 37 deletions

diff --git a/textproc/linux-f10-expat/Makefile b/textproc/linux-f10-expat/Makefile
index e5c55dc2ac43..d14588dad4eb 100644
--- a/textproc/linux-f10-expat/Makefile
+++ b/textproc/linux-f10-expat/Makefile
@@ -1,24 +1,30 @@
-# New ports collection makefile for:	linux-expat
-# Date created:				2003-07-05
-# Whom:					trevor
+# New ports collection makefile for:	textproc/linux-f8-expat
+# Date created:				2008-03-28
+# Whom:					bsam
 #
 # $FreeBSD$
 #
 
 PORTNAME=	expat
-PORTVERSION=	1.95.8
+PORTVERSION=	2.0.1
 CATEGORIES=	textproc linux
-DISTNAME=	${PORTNAME}-${PORTVERSION}-6
+PKGNAMEPREFIX=	linux-f8-
+DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
-COMMENT=	Linux/i386 binary port of Expat XML-parsing library
+COMMENT=	Linux/i386 binary port of Expat XML-parsing library (Linux Fedora 8)
 
-BRANDELF_DIRS=	usr/bin
-
-USE_LINUX_RPM=	yes
-LINUX_DIST_VER=	4
 ONLY_FOR_ARCHS=	i386 amd64
+USE_LINUX_RPM=	yes
+LINUX_DIST_VER=	8
+RPMVERSION=	2
+BRANDELF_FILES=	usr/bin/xmlwf
 USE_LDCONFIG=	yes
-PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
+
+PLIST_FILES=	lib/libexpat.so.1 lib/libexpat.so.1.5.2 \
+		usr/bin/xmlwf usr/share/man/man1/xmlwf.1.gz
+DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
+PORTDOCS=	COPYING README
+DESCR=		${.CURDIR}/../${PORTNAME}2/pkg-descr
 
 .include <bsd.port.mk>
diff --git a/textproc/linux-f10-expat/distinfo.i386 b/textproc/linux-f10-expat/distinfo.i386
index 105716a2a323..b4eb2d797c21 100644
--- a/textproc/linux-f10-expat/distinfo.i386
+++ b/textproc/linux-f10-expat/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/i386/fedora/4/expat-1.95.8-6.i386.rpm) = d065332edee54202eef75546727be370
-SHA256 (rpm/i386/fedora/4/expat-1.95.8-6.i386.rpm) = 0ac155ea7fa048ef65dd322a5735d1e00f7ad2e50faf4ba100500b3b7f4d11a8
-SIZE (rpm/i386/fedora/4/expat-1.95.8-6.i386.rpm) = 73083
-MD5 (rpm/i386/fedora/4/expat-1.95.8-6.src.rpm) = dc2cdb7fb6101ff887d1e9f0b3a63ddf
-SHA256 (rpm/i386/fedora/4/expat-1.95.8-6.src.rpm) = 412c4ea4c2a754dd60aaa66a8fb1a194fb7b3caf503928ead2dbb345918f9aeb
-SIZE (rpm/i386/fedora/4/expat-1.95.8-6.src.rpm) = 324444
+MD5 (rpm/i386/fedora/8/expat-2.0.1-2.i386.rpm) = 307645a3126f1f4bf997330d219327fc
+SHA256 (rpm/i386/fedora/8/expat-2.0.1-2.i386.rpm) = 6ec7d44029a432f64b14dfb6834a3a17b51119763cca44f4f4d669a0a41dba4e
+SIZE (rpm/i386/fedora/8/expat-2.0.1-2.i386.rpm) = 80204
+MD5 (rpm/i386/fedora/8/expat-2.0.1-2.src.rpm) = 955ed9cd8393869fe17ee043d55114ac
+SHA256 (rpm/i386/fedora/8/expat-2.0.1-2.src.rpm) = 15c3c195f0c4c8cd60ab68d3e8c011a28e503b4f74c1529b71ac2a74a650d5b7
+SIZE (rpm/i386/fedora/8/expat-2.0.1-2.src.rpm) = 453127
diff --git a/textproc/linux-f10-expat/pkg-descr b/textproc/linux-f10-expat/pkg-descr
deleted file mode 100644
index 74540c55ae58..000000000000
--- a/textproc/linux-f10-expat/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-This is a Linux/i386 binary port of Expat.
-
-from the README:
-
-	This is Expat, a C library for parsing XML, written by James
-	Clark.  Expat is a stream-oriented XML parser.  This means
-	that you register handlers with the parser before starting
-	the parse.  These handlers are called when the parser
-	discovers the associated structures in the document being
-	parsed.  A start tag is an example of the kind of structures
-	for which you may register handlers.
-
-WWW:  http://www.libexpat.org/
diff --git a/textproc/linux-f10-expat/pkg-plist b/textproc/linux-f10-expat/pkg-plist
deleted file mode 100644
index 5e6618a2d53a..000000000000
--- a/textproc/linux-f10-expat/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/bin/xmlwf
-usr/lib/libexpat.so.0
-usr/lib/libexpat.so.0.5.0
-usr/share/doc/expat-%%PORTVERSION%%/COPYING
-usr/share/doc/expat-%%PORTVERSION%%/README
-usr/share/man/man1/xmlwf.1.gz
-@dirrm usr/share/doc/expat-%%PORTVERSION%%