6 files changed, 30 insertions, 27 deletions

diff --git a/textproc/linux-expat/Makefile b/textproc/linux-expat/Makefile
index d0998ecab7cc..796bd0f432f9 100644
--- a/textproc/linux-expat/Makefile
+++ b/textproc/linux-expat/Makefile
@@ -6,9 +6,11 @@
 #
 
 PORTNAME=	expat
-PORTVERSION=	1.95.5
-PORTREVISION=	3
+PORTVERSION=	1.95.7
+PORTREVISION=	0
 CATEGORIES=	textproc linux
+MASTER_SITES=	${MASTER_SITE_FEDORA_LINUX}
+MASTER_SITE_SUBDIR=	3/i386/os/Fedora/RPMS
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Linux/i386 binary port of Expat XML-parsing library
@@ -16,17 +18,16 @@ COMMENT=	Linux/i386 binary port of Expat XML-parsing library
 RUN_DEPENDS=
 
 USE_LINUX=	yes
-BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386 amd64
 PLIST=		${WRKDIR}/plist
-RPM_SET=	expat-1.95.5-2.i386.rpm
+RPM_SET=	expat-${PORTVERSION}-4.i386.rpm
 
 pre-install:
 	${RM} -rf ${WRKSRC}/tmp
 	${MKDIR} ${WRKSRC}/tmp
 	cd ${WRKSRC}/tmp; \
-		rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -div; \
+		rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | ${CPIO} -div; \
 		${FIND} * -type f -o -type l > ${PLIST}
-	${ECHO_CMD} @dirrm usr/share/doc/expat-1.95.5 >> ${PLIST}
+	${ECHO_CMD} @dirrm usr/share/doc/expat-${PORTVERSION} >> ${PLIST}
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/textproc/linux-expat/distinfo.i386 b/textproc/linux-expat/distinfo.i386
index 5fb06c450ba6..ce74e5c67c36 100644
--- a/textproc/linux-expat/distinfo.i386
+++ b/textproc/linux-expat/distinfo.i386
@@ -1,3 +1,3 @@
-$FreeBSD$
-MD5 (rpm/expat-1.95.5-2.i386.rpm) = 76aa046090620b8c51107a94a3e80d7c
-SIZE (rpm/expat-1.95.5-2.i386.rpm) = 67026
+MD5 (rpm/expat-1.95.7-4.i386.rpm) = 2df48545d73e0a20c56d8c727fa606a8
+SHA256 (rpm/expat-1.95.7-4.i386.rpm) = 4813f1e179b6f32e9f9dfd9b5f457691cdbea5760836b0632f72590d1542a765
+SIZE (rpm/expat-1.95.7-4.i386.rpm) = 72430
diff --git a/textproc/linux-f10-expat/Makefile b/textproc/linux-f10-expat/Makefile
index d0998ecab7cc..796bd0f432f9 100644
--- a/textproc/linux-f10-expat/Makefile
+++ b/textproc/linux-f10-expat/Makefile
@@ -6,9 +6,11 @@
 #
 
 PORTNAME=	expat
-PORTVERSION=	1.95.5
-PORTREVISION=	3
+PORTVERSION=	1.95.7
+PORTREVISION=	0
 CATEGORIES=	textproc linux
+MASTER_SITES=	${MASTER_SITE_FEDORA_LINUX}
+MASTER_SITE_SUBDIR=	3/i386/os/Fedora/RPMS
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Linux/i386 binary port of Expat XML-parsing library
@@ -16,17 +18,16 @@ COMMENT=	Linux/i386 binary port of Expat XML-parsing library
 RUN_DEPENDS=
 
 USE_LINUX=	yes
-BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386 amd64
 PLIST=		${WRKDIR}/plist
-RPM_SET=	expat-1.95.5-2.i386.rpm
+RPM_SET=	expat-${PORTVERSION}-4.i386.rpm
 
 pre-install:
 	${RM} -rf ${WRKSRC}/tmp
 	${MKDIR} ${WRKSRC}/tmp
 	cd ${WRKSRC}/tmp; \
-		rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -div; \
+		rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | ${CPIO} -div; \
 		${FIND} * -type f -o -type l > ${PLIST}
-	${ECHO_CMD} @dirrm usr/share/doc/expat-1.95.5 >> ${PLIST}
+	${ECHO_CMD} @dirrm usr/share/doc/expat-${PORTVERSION} >> ${PLIST}
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/textproc/linux-f10-expat/distinfo.i386 b/textproc/linux-f10-expat/distinfo.i386
index 5fb06c450ba6..ce74e5c67c36 100644
--- a/textproc/linux-f10-expat/distinfo.i386
+++ b/textproc/linux-f10-expat/distinfo.i386
@@ -1,3 +1,3 @@
-$FreeBSD$
-MD5 (rpm/expat-1.95.5-2.i386.rpm) = 76aa046090620b8c51107a94a3e80d7c
-SIZE (rpm/expat-1.95.5-2.i386.rpm) = 67026
+MD5 (rpm/expat-1.95.7-4.i386.rpm) = 2df48545d73e0a20c56d8c727fa606a8
+SHA256 (rpm/expat-1.95.7-4.i386.rpm) = 4813f1e179b6f32e9f9dfd9b5f457691cdbea5760836b0632f72590d1542a765
+SIZE (rpm/expat-1.95.7-4.i386.rpm) = 72430
diff --git a/textproc/linux-f8-expat/Makefile b/textproc/linux-f8-expat/Makefile
index d0998ecab7cc..796bd0f432f9 100644
--- a/textproc/linux-f8-expat/Makefile
+++ b/textproc/linux-f8-expat/Makefile
@@ -6,9 +6,11 @@
 #
 
 PORTNAME=	expat
-PORTVERSION=	1.95.5
-PORTREVISION=	3
+PORTVERSION=	1.95.7
+PORTREVISION=	0
 CATEGORIES=	textproc linux
+MASTER_SITES=	${MASTER_SITE_FEDORA_LINUX}
+MASTER_SITE_SUBDIR=	3/i386/os/Fedora/RPMS
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Linux/i386 binary port of Expat XML-parsing library
@@ -16,17 +18,16 @@ COMMENT=	Linux/i386 binary port of Expat XML-parsing library
 RUN_DEPENDS=
 
 USE_LINUX=	yes
-BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386 amd64
 PLIST=		${WRKDIR}/plist
-RPM_SET=	expat-1.95.5-2.i386.rpm
+RPM_SET=	expat-${PORTVERSION}-4.i386.rpm
 
 pre-install:
 	${RM} -rf ${WRKSRC}/tmp
 	${MKDIR} ${WRKSRC}/tmp
 	cd ${WRKSRC}/tmp; \
-		rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -div; \
+		rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | ${CPIO} -div; \
 		${FIND} * -type f -o -type l > ${PLIST}
-	${ECHO_CMD} @dirrm usr/share/doc/expat-1.95.5 >> ${PLIST}
+	${ECHO_CMD} @dirrm usr/share/doc/expat-${PORTVERSION} >> ${PLIST}
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/textproc/linux-f8-expat/distinfo.i386 b/textproc/linux-f8-expat/distinfo.i386
index 5fb06c450ba6..ce74e5c67c36 100644
--- a/textproc/linux-f8-expat/distinfo.i386
+++ b/textproc/linux-f8-expat/distinfo.i386
@@ -1,3 +1,3 @@
-$FreeBSD$
-MD5 (rpm/expat-1.95.5-2.i386.rpm) = 76aa046090620b8c51107a94a3e80d7c
-SIZE (rpm/expat-1.95.5-2.i386.rpm) = 67026
+MD5 (rpm/expat-1.95.7-4.i386.rpm) = 2df48545d73e0a20c56d8c727fa606a8
+SHA256 (rpm/expat-1.95.7-4.i386.rpm) = 4813f1e179b6f32e9f9dfd9b5f457691cdbea5760836b0632f72590d1542a765
+SIZE (rpm/expat-1.95.7-4.i386.rpm) = 72430