11 files changed, 10 insertions, 41 deletions
diff --git a/www/linux-c6-flashplugin11/Makefile b/www/linux-c6-flashplugin11/Makefile
index afaa6fecf1e5..6f5846577e9d 100644
--- a/www/linux-c6-flashplugin11/Makefile
+++ b/www/linux-c6-flashplugin11/Makefile
@@ -18,9 +18,6 @@ USE_LINUX?=	c6
 USE_LINUX_APPS?=	curl cyrus-sasl2 gdkpixbuf2 gtk2 nspr nss # libssh2 openldap
 WANT_GNOME=	yes
 
-DISTINFO_FILE=	${MASTERDIR}/distinfo.${LINUX_RPM_ARCH}
-PLIST=		${MASTERDIR}/pkg-plist.${LINUX_RPM_ARCH}
-
 RESTRICTED=	Redistribution not allowed
 RESTRICTED_FILES=	${DISTFILES:Nlinux-f10-flashsupport*:C/:[^:]+$//}
 
diff --git a/www/linux-c6-flashplugin11/distinfo.i686 b/www/linux-c6-flashplugin11/distinfo
index ab176d1c062b..ab176d1c062b 100644
--- a/www/linux-c6-flashplugin11/distinfo.i686
+++ b/www/linux-c6-flashplugin11/distinfo
diff --git a/www/linux-c6-flashplugin11/distinfo.x86_64 b/www/linux-c6-flashplugin11/distinfo.x86_64
deleted file mode 100644
index 881f646eece0..000000000000
--- a/www/linux-c6-flashplugin11/distinfo.x86_64
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (flashplugin/11.2r202.466/install_flash_player_11_linux.x86_64.tar.gz) = a884194f5125144b63ba8137f7859ee587acfa4b211ea9d13093bd5330749cb2
-SIZE (flashplugin/11.2r202.466/install_flash_player_11_linux.x86_64.tar.gz) = 7246913
-SHA256 (flashplugin/11.2r202.466/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf
-SIZE (flashplugin/11.2r202.466/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455
diff --git a/www/linux-c6-flashplugin11/pkg-plist.i686 b/www/linux-c6-flashplugin11/pkg-plist
index 7ddfcec73079..af45ed36bdbe 100644
--- a/www/linux-c6-flashplugin11/pkg-plist.i686
+++ b/www/linux-c6-flashplugin11/pkg-plist
@@ -11,5 +11,3 @@ share/icons/hicolor/48x48/apps/flash-player-properties.png
 %%NO_ALSA%%@dir %%LINUXBASE%%/usr
 %%NO_ALSA%%@dir %%LINUXBASE%%
 %%NO_ALSA%%@dir %%COMPATDIR%%
-@dir share/applications
-@dir share
diff --git a/www/linux-c6-flashplugin11/pkg-plist.x86_64 b/www/linux-c6-flashplugin11/pkg-plist.x86_64
deleted file mode 100644
index 7ddfcec73079..000000000000
--- a/www/linux-c6-flashplugin11/pkg-plist.x86_64
+++ /dev/null
@@ -1,15 +0,0 @@
-bin/flash-player-properties
-%%WEBPLUGIN_DIR%%/libflashplayer.so
-share/applications/flash-player-properties.desktop
-share/icons/hicolor/16x16/apps/flash-player-properties.png
-share/icons/hicolor/22x22/apps/flash-player-properties.png
-share/icons/hicolor/24x24/apps/flash-player-properties.png
-share/icons/hicolor/32x32/apps/flash-player-properties.png
-share/icons/hicolor/48x48/apps/flash-player-properties.png
-%%NO_ALSA%%%%LINUXBASE%%/usr/lib/libflashsupport.so
-%%NO_ALSA%%@dir %%LINUXBASE%%/usr/lib
-%%NO_ALSA%%@dir %%LINUXBASE%%/usr
-%%NO_ALSA%%@dir %%LINUXBASE%%
-%%NO_ALSA%%@dir %%COMPATDIR%%
-@dir share/applications
-@dir share
diff --git a/www/linux-c6-qt47-webkit/Makefile b/www/linux-c6-qt47-webkit/Makefile
index 3fdbd6e92d83..5b46f71dcb77 100644
--- a/www/linux-c6-qt47-webkit/Makefile
+++ b/www/linux-c6-qt47-webkit/Makefile
@@ -5,17 +5,21 @@ PORTNAME=	qt47-webkit
 PORTVERSION=	4.7.2
 PORTREVISION=	1
 CATEGORIES=	www linux
-MASTER_SITES=	http://dl.atrpms.net/el6-${LINUX_REPO_ARCH}/atrpms/testing/ LOCAL/xmj
-DIST_SUBDIR=	rpm/${LINUX_RPM_ARCH}/atrpms/6
+MASTER_SITES=	LOCAL/xmj
+PKGNAMEPREFIX=	linux-${USE_LINUX}-
+DIST_SUBDIR=	rpm/${LINUX_RPM_ARCH}/centos/c5
 
 MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	RPM of QT4 (Linux CentOS 6)
+COMMENT=	RPM of QT4 (Linux CentOS 5)
 
 ONLY_FOR_ARCHS=	i386 amd64
-RPMVERSION=	1_18.el6
+RPMVERSION=	1_18.el5
 USE_LINUX=	c6
+LINUX_RPM_ARCH=	i386
 USE_LINUX_APPS=	fontconfig png xorglibs sqlite3 qt47 qt47-x11
+
 USE_LINUX_RPM=	yes
+LINUX_DIST_VER=	5
 USE_LDCONFIG=	yes
 DESCR=  ${.CURDIR}/../../www/webkit-gtk3/pkg-descr # contains no GTK references, reuse
 
diff --git a/www/linux-c6-qt47-webkit/distinfo.i386 b/www/linux-c6-qt47-webkit/distinfo.i386
new file mode 100644
index 000000000000..95cd9ec0bac3
--- /dev/null
+++ b/www/linux-c6-qt47-webkit/distinfo.i386
@@ -0,0 +1,2 @@
+SHA256 (rpm/i386/centos/c5/qt47-webkit-4.7.2-1_18.el5.i386.rpm) = de86590afcffa2016062bc891530f982445c44a9b599fe2c8a6310f72bcb3f54
+SIZE (rpm/i386/centos/c5/qt47-webkit-4.7.2-1_18.el5.i386.rpm) = 7233670
diff --git a/www/linux-c6-qt47-webkit/distinfo.i686 b/www/linux-c6-qt47-webkit/distinfo.i686
deleted file mode 100644
index 4cafe2dc6bf8..000000000000
--- a/www/linux-c6-qt47-webkit/distinfo.i686
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (rpm/i686/atrpms/6/qt47-webkit-4.7.2-1_18.el6.i686.rpm) = a0362422d4ea0fb87838ce1e17a2ffcc934d312cd8e8cfac02112d61a9d62bf0
-SIZE (rpm/i686/atrpms/6/qt47-webkit-4.7.2-1_18.el6.i686.rpm) = 5491340
diff --git a/www/linux-c6-qt47-webkit/distinfo.x86_64 b/www/linux-c6-qt47-webkit/distinfo.x86_64
deleted file mode 100644
index 460a3bba0db7..000000000000
--- a/www/linux-c6-qt47-webkit/distinfo.x86_64
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (rpm/x86_64/atrpms/6/qt47-webkit-4.7.2-1_18.el6.x86_64.rpm) = 49b4dd40492c920f8562764f16dcbef1e976549da715936965be088055f80f65
-SIZE (rpm/x86_64/atrpms/6/qt47-webkit-4.7.2-1_18.el6.x86_64.rpm) = 5384720
diff --git a/www/linux-c6-qt47-webkit/pkg-plist.i686 b/www/linux-c6-qt47-webkit/pkg-plist
index b7d58b1927bb..b7d58b1927bb 100644
--- a/www/linux-c6-qt47-webkit/pkg-plist.i686
+++ b/www/linux-c6-qt47-webkit/pkg-plist
diff --git a/www/linux-c6-qt47-webkit/pkg-plist.x86_64 b/www/linux-c6-qt47-webkit/pkg-plist.x86_64
deleted file mode 100644
index a4f0cf77355b..000000000000
--- a/www/linux-c6-qt47-webkit/pkg-plist.x86_64
+++ /dev/null
@@ -1,9 +0,0 @@
-usr/lib64/qt47/imports/QtWebKit/libqmlwebkitplugin.so
-usr/lib64/qt47/libQtWebKit.so.4
-usr/lib64/qt47/libQtWebKit.so.4.7
-usr/lib64/qt47/libQtWebKit.so.4.7.2
-usr/lib64/qt47/plugins/designer/libqwebview.so
-usr/lib64/qt47/imports/QtWebKit/qmldir
-@dirrm usr/lib64/qt47/imports/QtWebKit
-@dirrmtry usr/lib64/qt47/plugins/designer
-@dirrmtry usr/lib64/qt47/plugins