5 files changed, 20 insertions, 52 deletions

diff --git a/devel/linux-f10-sdl12/Makefile b/devel/linux-f10-sdl12/Makefile
index dcaa16d1e12e..4319e01b9f98 100644
--- a/devel/linux-f10-sdl12/Makefile
+++ b/devel/linux-f10-sdl12/Makefile
@@ -7,50 +7,22 @@
 #
 
 PORTNAME=	sdl
-PORTVERSION=	1.2.5
-PORTREVISION=	2
+PORTVERSION=	1.2.10
 CATEGORIES=	devel linux
 MASTER_SITES=	http://www.libsdl.org/release/ \
 		ftp://ftp.icm.edu.pl/vol/rzm9/linux-pld/pool/s/SDL/
-PKGNAMEPREFIX=	linux-
-DISTNAME=	${PORTNAME:U}-${PORTVERSION:S/.1$/-1/}-1.${MACHINE_ARCH}
-EXTRACT_SUFX=	.rpm
-EXTRACT_ONLY=
+DISTNAME=	${PORTNAME:U}-${PORTVERSION:S/.1$/-1/}-1
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Cross-platform multi-media development API (linux version)
 
-BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
-
-USE_LINUX=	yes
-USE_LINUX_PREFIX=	yes
+USE_LINUX_RPM=	yes
 USE_XLIB=	yes
-LDCONFIG_LINUX=	${LINUXBASE}/sbin/ldconfig
+INSTALL_SHLIB=	yes
 
-ONLY_FOR_ARCHS=	i386 alpha amd64
+ONLY_FOR_ARCHS=	i386 amd64
 DIST_SUBDIR=	rpm
-NO_BUILD=	yes
-NO_FILTER_SHLIBS=	yes
-PLIST=		${MASTERDIR}/pkg-plist.${MACHINE_ARCH}
-MD5_FILE=	${MASTERDIR}/distinfo.${MACHINE_ARCH}
-
-DBPATH=		/var/lib/rpm
-RPMFLAGS=	--ignoreos --root ${PREFIX} --dbpath ${DBPATH} \
-		--nodeps --replacepkgs
-RPMDIR=		${DISTDIR}/${DIST_SUBDIR}
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64"
-MACHINE_ARCH=	i386
-.endif
-
-.if ${ARCH} == "alpha"
-BROKEN=		"Unfetchable"
-.endif
-
-do-install:
-	@${LOCALBASE}/bin/rpm -U ${RPMFLAGS} ${RPMDIR}/${DISTFILES}
-	@${LDCONFIG_LINUX}
+PLIST=		${MASTERDIR}/pkg-plist.${LINUX_RPM_ARCH}
+PLIST_SUB+=	SDLVER=${PORTVERSION}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/linux-f10-sdl12/distinfo.alpha b/devel/linux-f10-sdl12/distinfo.alpha
deleted file mode 100644
index 03d2252e650b..000000000000
--- a/devel/linux-f10-sdl12/distinfo.alpha
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (rpm/SDL-1.2.5-1.alpha.rpm) = 32449f9682e0b34c09421859d21b5fce
diff --git a/devel/linux-f10-sdl12/distinfo.i386 b/devel/linux-f10-sdl12/distinfo.i386
index 3e6d6eeac07f..e514d1e5d652 100644
--- a/devel/linux-f10-sdl12/distinfo.i386
+++ b/devel/linux-f10-sdl12/distinfo.i386
@@ -1 +1,6 @@
-MD5 (rpm/SDL-1.2.5-1.i386.rpm) = 60fc1cc75098167f5d836b0af1ba25c8
+MD5 (rpm/SDL-1.2.10-1.i386.rpm) = 0c3fbd54bab5e9443bd113c734be54a4
+SHA256 (rpm/SDL-1.2.10-1.i386.rpm) = dd214dda420eb3240b38de0f70d2d38a1b93249215ce5dc99844d9178f74dd07
+SIZE (rpm/SDL-1.2.10-1.i386.rpm) = 202187
+MD5 (rpm/SDL-1.2.10-1.src.rpm) = 3b5bf21e881e0e2a495371ed66044150
+SHA256 (rpm/SDL-1.2.10-1.src.rpm) = 52d1b333bff6dfd8d962c71a23a21afa0594ccf2e9a0ae7048ed5eecd2553dbc
+SIZE (rpm/SDL-1.2.10-1.src.rpm) = 2797820
diff --git a/devel/linux-f10-sdl12/pkg-plist.alpha b/devel/linux-f10-sdl12/pkg-plist.alpha
deleted file mode 100644
index 4e5d3adfe310..000000000000
--- a/devel/linux-f10-sdl12/pkg-plist.alpha
+++ /dev/null
@@ -1,8 +0,0 @@
-usr/doc/SDL-1.2.5/BUGS
-usr/doc/SDL-1.2.5/COPYING
-usr/doc/SDL-1.2.5/CREDITS
-usr/doc/SDL-1.2.5/README-SDL.txt
-usr/lib/libSDL-1.1.so.0
-usr/lib/libSDL-1.2.so.0
-usr/lib/libSDL-1.2.so.0.0.5
-@dirrm usr/doc/SDL-1.2.5
diff --git a/devel/linux-f10-sdl12/pkg-plist.i386 b/devel/linux-f10-sdl12/pkg-plist.i386
index f822d036c62a..7bad4c5e788f 100644
--- a/devel/linux-f10-sdl12/pkg-plist.i386
+++ b/devel/linux-f10-sdl12/pkg-plist.i386
@@ -1,9 +1,9 @@
-usr/doc/SDL-1.2.5/BUGS
-usr/doc/SDL-1.2.5/COPYING
-usr/doc/SDL-1.2.5/CREDITS
-usr/doc/SDL-1.2.5/README-SDL.txt
+usr/share/doc/SDL-%%SDLVER%%/BUGS
+usr/share/doc/SDL-%%SDLVER%%/COPYING
+usr/share/doc/SDL-%%SDLVER%%/CREDITS
+usr/share/doc/SDL-%%SDLVER%%/README-SDL.txt
 usr/lib/libSDL-1.1.so.0
 usr/lib/libSDL-1.2.so.0
-usr/lib/libSDL-1.2.so.0.0.5
-@dirrm usr/doc/SDL-1.2.5
+usr/lib/libSDL-1.2.so.0.7.3
+@dirrm usr/share/doc/SDL-%%SDLVER%%
 @dirrmtry usr/doc