Update CentOS base to 6.5, add userland ports

The Fedora 10 infrastructure ports have been in use since June 2009 and, while
having served a great deed, have become unsupported upstream and hence affected
by unfixed security vulnerabilities. In addition to that, many recent Linux
binaries need newer libc / stdlibc++ versions.

This commit adds the linux-c6- userland as drop-in replacement for the -f10
infrastructure, as well as upgrading the linux_base-c6 port to CentOS 6.5.

If you want to switch to linux-c6 ports, please define at /etc/make.conf:

    OVERRIDE_LINUX_BASE_PORT=c6
    OVERRIDE_LINUX_NONBASE_PORTS=c6

Additionally, please add the following line to /etc/sysctl.conf:

    compat.linux.osrelease=2.6.18

Upgrading procedures are shown in /usr/ports/UPDATING.

This work has been inspired by Artyom Mirgorodskiy's post to emulation@ in
November 2013, using and extending mav@'s work. It has been tested extensively
and most reported issues were already fixed. Please report any additional bug
or "features" to the emulation mailing list.

Many thanks to: mav@, rene@, allanjude@, netchild@, antoine@, everyone who's
filed Issues and Pull requests on GitHub,

PR:		186820
Differential Revision:	https://reviews.freebsd.org/D793
Reviewed by:	allanjude, antoine, bapt, rene
Approved by:	portmgr (antoine, bapt)
Approved by:	koobs (mentor)
Sponsored by:	Perceivon Hosting Inc.

42 files changed, 558 insertions, 48 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index bdb005f71388..f60724779f07 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -548,6 +548,13 @@
     SUBDIR += linplasma
     SUBDIR += linux-XnViewMP
     SUBDIR += linux-adobesvg
+    SUBDIR += linux-c6-sdl_image
+    SUBDIR += linux-c6-sdl_ttf
+    SUBDIR += linux-c6-dri
+    SUBDIR += linux-c6-jpeg
+    SUBDIR += linux-c6-tiff
+    SUBDIR += linux-c6-cairo
+    SUBDIR += linux-c6-png
     SUBDIR += linux-f10-cairo
     SUBDIR += linux-f10-dri
     SUBDIR += linux-f10-gdk-pixbuf
@@ -558,9 +565,9 @@
     SUBDIR += linux-f10-libmng
     SUBDIR += linux-f10-png
     SUBDIR += linux-f10-sdl_image
+    SUBDIR += linux-f10-sdl_ttf
     SUBDIR += linux-f10-tiff
     SUBDIR += linux-f10-ungif
-    SUBDIR += linux-sdl_ttf
     SUBDIR += lprof-devel
     SUBDIR += lua-gd
     SUBDIR += luminance
diff --git a/graphics/linux-c6-cairo/Makefile b/graphics/linux-c6-cairo/Makefile
new file mode 100644
index 000000000000..e0fc76f497f1
--- /dev/null
+++ b/graphics/linux-c6-cairo/Makefile
@@ -0,0 +1,27 @@
+# Created by: Artyom Mirgorodskiy <artyom.mirgorodsky@gmail.com>
+# $FreeBSD$
+
+PORTNAME=	cairo
+PORTVERSION=	1.8.8
+CATEGORIES=	graphics linux
+
+MAINTAINER=	emulation@FreeBSD.org
+COMMENT=	Vector graphics library Cairo (Linux CentOS ${LINUX_DIST_VER})
+
+CONFLICTS=	linux-cairo-[0-9]* linux-f10-cairo-[0-9]*
+
+ONLY_FOR_ARCHS=	i386 amd64
+USE_LINUX=	c6
+USE_LINUX_RPM=	yes
+USE_LINUX_APPS=	fontconfig png xorglibs
+
+RPMVERSION=	3.1.el6
+USE_LDCONFIG=	yes
+
+PLIST_FILES=	usr/lib/libcairo.so.2 \
+		usr/lib/libcairo.so.2.10800.8
+DOCSDIR=	${PREFIX}/usr/share/doc/cairo-${PORTVERSION}
+PORTDOCS=	AUTHORS BIBLIOGRAPHY BUGS COPYING COPYING-LGPL-2.1 \
+		COPYING-MPL-1.1 NEWS README
+
+.include <bsd.port.mk>
diff --git a/graphics/linux-c6-cairo/distinfo.i686 b/graphics/linux-c6-cairo/distinfo.i686
new file mode 100644
index 000000000000..05423197bb6b
--- /dev/null
+++ b/graphics/linux-c6-cairo/distinfo.i686
@@ -0,0 +1,4 @@
+SHA256 (rpm/i686/centos/6.5/cairo-1.8.8-3.1.el6.i686.rpm) = 09b2b2b38115e74d1aab2253682cde59970c6a0286a151b438a7e7ec3fefa1f4
+SIZE (rpm/i686/centos/6.5/cairo-1.8.8-3.1.el6.i686.rpm) = 326400
+SHA256 (rpm/i686/centos/6.5/cairo-1.8.8-3.1.el6.src.rpm) = 0878b1cc9dcb05138fee6d32dc8148fe19cb6de6bf788c68526b9059d35be87e
+SIZE (rpm/i686/centos/6.5/cairo-1.8.8-3.1.el6.src.rpm) = 6660677
diff --git a/graphics/linux-c6-cairo/pkg-descr b/graphics/linux-c6-cairo/pkg-descr
new file mode 100644
index 000000000000..d18f9422d684
--- /dev/null
+++ b/graphics/linux-c6-cairo/pkg-descr
@@ -0,0 +1,15 @@
+This is a Linux/i386 binary port of Cairo.
+
+Cairo is a vector graphics library with cross-device output
+support. Currently supported output targets include the X Window
+System and in-memory image buffers. PostScript and PDF file output is
+planned. Cairo is designed to produce identical output on all output
+media while taking advantage of display hardware acceleration when
+available (eg. through the X Render Extension).
+
+Cairo provides a stateful user-level API with capabilities similar to
+the PDF 1.4 imaging model. Cairo provides operations including stroking 
+and filling Bezier cubic splines, transforming and compositing translucent
+images, and antialiased text rendering.
+
+WWW: http://www.cairographics.org/
diff --git a/graphics/linux-c6-dri-compat/Makefile b/graphics/linux-c6-dri-compat/Makefile
new file mode 100644
index 000000000000..eb500f225494
--- /dev/null
+++ b/graphics/linux-c6-dri-compat/Makefile
@@ -0,0 +1,35 @@
+# Created by: Artyom Mirgorodskiy <artyom.mirgorodsky@gmail.com>
+# $FreeBSD$
+
+PORTNAME=	dri
+PORTVERSION=	9.0
+CATEGORIES=	graphics linux
+MASTER_SITES=	http://vault.centos.org/6.4/os/i386/Packages/
+PKGNAMESUFFIX=	-compat
+DISTFILES=		mesa-libGL-9.0-0.7.el6.i686.rpm \
+		mesa-libGLU-9.0-0.7.el6.i686.rpm \
+		mesa-dri-drivers-9.0-0.7.el6.i686.rpm \
+		libdrm-2.4.39-1.el6.i686.rpm \
+		freeglut-2.6.0-1.el6.i686.rpm
+
+MAINTAINER=	emulation@FreeBSD.org
+COMMENT=	Mesa libGL runtime libraries (Linux CentOS 6.4)
+
+ALWAYS_KEEP_DISTFILES=	YES
+
+CONFLICTS=	linux_dri-[0-9]* linux_dri-devel-[0-9]* linux-f10-dri-[0-9]* linux-dri-[0-9]*
+
+ONLY_FOR_ARCHS=	i386 amd64
+.if defined(PACKAGE_BUILDING)
+MASTER_SITES+=	http://vault.centos.org/6.4/os/Source/SPackages/
+SRC_DISTFILES=	mesa-9.0-0.7.el6.src.rpm \
+		libdrm-2.4.39-1.el6.src.rpm \
+		freeglut-2.6.0-1.el6.src.rpm
+.endif
+
+USE_LINUX=	c6
+USE_LINUX_APPS=	xorglibs
+USE_LINUX_RPM=	yes
+USE_LDCONFIG=	yes
+
+.include <bsd.port.mk>
diff --git a/graphics/linux-c6-dri-compat/distinfo.i686 b/graphics/linux-c6-dri-compat/distinfo.i686
new file mode 100644
index 000000000000..58e14d9e9bb2
--- /dev/null
+++ b/graphics/linux-c6-dri-compat/distinfo.i686
@@ -0,0 +1,16 @@
+SHA256 (rpm/i686/centos/6.5/mesa-libGL-9.0-0.7.el6.i686.rpm) = d6118a637f7fd22307c6b781ab8571a4f08cb86d701a48c0b573f38efa123729
+SIZE (rpm/i686/centos/6.5/mesa-libGL-9.0-0.7.el6.i686.rpm) = 165176
+SHA256 (rpm/i686/centos/6.5/mesa-libGLU-9.0-0.7.el6.i686.rpm) = fafa5a79261ac4835dc6101857d86b095d13931937275ee662daf1777c9d4256
+SIZE (rpm/i686/centos/6.5/mesa-libGLU-9.0-0.7.el6.i686.rpm) = 226992
+SHA256 (rpm/i686/centos/6.5/mesa-dri-drivers-9.0-0.7.el6.i686.rpm) = f442e88fb435bce9111aeabdde9b7d0013cc4303e2ea97e2fc8e740c884bca01
+SIZE (rpm/i686/centos/6.5/mesa-dri-drivers-9.0-0.7.el6.i686.rpm) = 4271416
+SHA256 (rpm/i686/centos/6.5/libdrm-2.4.39-1.el6.i686.rpm) = 33c05516d07ca236394004b9c3fc62834d7057892fbe341f5ecee7258d49ef9b
+SIZE (rpm/i686/centos/6.5/libdrm-2.4.39-1.el6.i686.rpm) = 121244
+SHA256 (rpm/i686/centos/6.5/freeglut-2.6.0-1.el6.i686.rpm) = fa6cb446baf0b4e02a68c7260e3a2186fc2bb208293d39ccb48dd8ed9c61b606
+SIZE (rpm/i686/centos/6.5/freeglut-2.6.0-1.el6.i686.rpm) = 170044
+SHA256 (rpm/i686/centos/6.5/mesa-9.0-0.7.el6.src.rpm) = 83d0dde99dfc12eba3522e2edb7fde31d507c085cef9cd003b636a7c55a103f5
+SIZE (rpm/i686/centos/6.5/mesa-9.0-0.7.el6.src.rpm) = 22910741
+SHA256 (rpm/i686/centos/6.5/libdrm-2.4.39-1.el6.src.rpm) = ba866f47135cf1bbae8030bcc9325569a0d5d25e86ba818444a3f412ba12fc9f
+SIZE (rpm/i686/centos/6.5/libdrm-2.4.39-1.el6.src.rpm) = 533038
+SHA256 (rpm/i686/centos/6.5/freeglut-2.6.0-1.el6.src.rpm) = 04ca4b3c4917110e7878df3d82f52639a76274ed3c0611ff72b86ea5e242d037
+SIZE (rpm/i686/centos/6.5/freeglut-2.6.0-1.el6.src.rpm) = 2185780
diff --git a/graphics/linux-c6-dri-compat/pkg-descr b/graphics/linux-c6-dri-compat/pkg-descr
new file mode 100644
index 000000000000..a606f11321a7
--- /dev/null
+++ b/graphics/linux-c6-dri-compat/pkg-descr
@@ -0,0 +1,2 @@
+The port installs Linux Fedora 10 Mesa libGL runtime libraries
+and DRI drivers.
diff --git a/graphics/linux-c6-dri-compat/pkg-plist b/graphics/linux-c6-dri-compat/pkg-plist
new file mode 100644
index 000000000000..f8d7aa3ec616
--- /dev/null
+++ b/graphics/linux-c6-dri-compat/pkg-plist
@@ -0,0 +1,52 @@
+lib/udev/rules.d/91-drm-modeset.rules
+usr/lib/dri/i915_dri.so
+usr/lib/dri/i965_dri.so
+usr/lib/dri/r200_dri.so
+usr/lib/dri/r300_dri.so
+usr/lib/dri/r600_dri.so
+usr/lib/dri/radeon_dri.so
+usr/lib/dri/swrast_dri.so
+usr/lib/libGL.so.1
+usr/lib/libGL.so.1.2.0
+usr/lib/libGLU.so.1
+usr/lib/libGLU.so.1.3.1
+usr/lib/libdricore9.0.0.so
+usr/lib/libdricore9.0.0.so.1
+usr/lib/libdricore9.0.0.so.1.0.0
+usr/lib/libdrm.so.2
+usr/lib/libdrm.so.2.4.0
+usr/lib/libdrm_intel.so.1
+usr/lib/libdrm_intel.so.1.0.0
+usr/lib/libdrm_nouveau.so.1
+usr/lib/libdrm_nouveau.so.1.0.0
+usr/lib/libdrm_nouveau2.so.2
+usr/lib/libdrm_nouveau2.so.2.0.0
+usr/lib/libdrm_radeon.so.1
+usr/lib/libdrm_radeon.so.1.0.1
+usr/lib/libglapi.so
+usr/lib/libglapi.so.0
+usr/lib/libglapi.so.0.0.0
+usr/lib/libglut.so.3
+usr/lib/libglut.so.3.9.0
+usr/share/doc/freeglut-2.6.0/AUTHORS
+usr/share/doc/freeglut-2.6.0/COPYING
+usr/share/doc/freeglut-2.6.0/ChangeLog
+usr/share/doc/freeglut-2.6.0/INSTALL
+usr/share/doc/freeglut-2.6.0/NEWS
+usr/share/doc/freeglut-2.6.0/README
+usr/share/doc/freeglut-2.6.0/TODO
+usr/share/doc/freeglut-2.6.0/download.html
+usr/share/doc/freeglut-2.6.0/freeglut.html
+usr/share/doc/freeglut-2.6.0/freeglut_logo.png
+usr/share/doc/freeglut-2.6.0/freeglut_user_interface.html
+usr/share/doc/freeglut-2.6.0/index.html
+usr/share/doc/freeglut-2.6.0/ogl_sm.png
+usr/share/doc/freeglut-2.6.0/progress.html
+usr/share/doc/freeglut-2.6.0/structure.html
+usr/share/doc/libdrm-2.4.39/README
+%%ETCDIR%%rc
+@dirrmtry usr/share/doc/libdrm-2.4.39
+@dirrmtry usr/share/doc/freeglut-2.6.0
+@dirrmtry usr/lib/dri
+@dirrmtry lib/udev/rules.d
+@dirrmtry lib/udev
diff --git a/graphics/linux-c6-dri/Makefile b/graphics/linux-c6-dri/Makefile
new file mode 100644
index 000000000000..5c8012365382
--- /dev/null
+++ b/graphics/linux-c6-dri/Makefile
@@ -0,0 +1,32 @@
+# Created by: Artyom Mirgorodskiy <artyom.mirgorodsky@gmail.com>
+# $FreeBSD$
+
+PORTNAME=	dri
+PORTVERSION=	9.2
+CATEGORIES=	graphics linux
+DISTFILES=		mesa-libGL-9.2-0.5.el6.i686.rpm \
+		mesa-libGLU-9.2-0.5.el6.i686.rpm \
+		mesa-dri-drivers-9.2-0.5.el6.i686.rpm \
+		libdrm-2.4.45-2.el6.i686.rpm \
+		freeglut-2.6.0-1.el6.i686.rpm
+
+MAINTAINER=	emulation@FreeBSD.org
+COMMENT=	Mesa libGL runtime libraries (Linux CentOS ${LINUX_DIST_VER})
+
+ALWAYS_KEEP_DISTFILES=	YES
+
+CONFLICTS=	linux_dri-[0-9]* linux_dri-devel-[0-9]* linux-f10-dri-[0-9]* linux-dri-[0-9]*
+
+ONLY_FOR_ARCHS=	i386 amd64
+.if defined(PACKAGE_BUILDING)
+SRC_DISTFILES=	mesa-9.2-0.5.el6.src.rpm \
+				libdrm-2.4.45-2.el6.src.rpm \
+				freeglut-2.6.0-1.el6.src.rpm
+.endif
+
+USE_LINUX=	c6
+USE_LINUX_APPS=	xorglibs
+USE_LINUX_RPM=	yes
+USE_LDCONFIG=	yes
+
+.include <bsd.port.mk>
diff --git a/graphics/linux-c6-dri/distinfo.i686 b/graphics/linux-c6-dri/distinfo.i686
new file mode 100644
index 000000000000..c5bb8cb91a41
--- /dev/null
+++ b/graphics/linux-c6-dri/distinfo.i686
@@ -0,0 +1,16 @@
+SHA256 (rpm/i686/centos/6.5/mesa-libGL-9.2-0.5.el6.i686.rpm) = 0bcc2435f7e0e97a480543c54bfbba2563848209cbd249088f460f3650a40fc2
+SIZE (rpm/i686/centos/6.5/mesa-libGL-9.2-0.5.el6.i686.rpm) = 125140
+SHA256 (rpm/i686/centos/6.5/mesa-libGLU-9.2-0.5.el6.i686.rpm) = ded5d3f58c8fbe89e9c710d90d578f3fc76cc7b44090ff9c3c87276004f23175
+SIZE (rpm/i686/centos/6.5/mesa-libGLU-9.2-0.5.el6.i686.rpm) = 197372
+SHA256 (rpm/i686/centos/6.5/mesa-dri-drivers-9.2-0.5.el6.i686.rpm) = 35911f50ece5ce4765430bb5339ebfe93bf934b9b7f2ab6019952ae995f38f33
+SIZE (rpm/i686/centos/6.5/mesa-dri-drivers-9.2-0.5.el6.i686.rpm) = 6465704
+SHA256 (rpm/i686/centos/6.5/libdrm-2.4.45-2.el6.i686.rpm) = 93b0b7e9645989e646eba713ef754ac92fe5d835c0e87baaaf654274d1e199ac
+SIZE (rpm/i686/centos/6.5/libdrm-2.4.45-2.el6.i686.rpm) = 125804
+SHA256 (rpm/i686/centos/6.5/freeglut-2.6.0-1.el6.i686.rpm) = fa6cb446baf0b4e02a68c7260e3a2186fc2bb208293d39ccb48dd8ed9c61b606
+SIZE (rpm/i686/centos/6.5/freeglut-2.6.0-1.el6.i686.rpm) = 170044
+SHA256 (rpm/i686/centos/6.5/mesa-9.2-0.5.el6.src.rpm) = 235ebab32077e6658c8785b310c40907bfc0e9bcfec4affabdfd00e28b67f54c
+SIZE (rpm/i686/centos/6.5/mesa-9.2-0.5.el6.src.rpm) = 23336483
+SHA256 (rpm/i686/centos/6.5/libdrm-2.4.45-2.el6.src.rpm) = 3a220027585dc2acc791fb82508d985c95fda8dabc4fcf521012fa17af73dfdb
+SIZE (rpm/i686/centos/6.5/libdrm-2.4.45-2.el6.src.rpm) = 595076
+SHA256 (rpm/i686/centos/6.5/freeglut-2.6.0-1.el6.src.rpm) = 04ca4b3c4917110e7878df3d82f52639a76274ed3c0611ff72b86ea5e242d037
+SIZE (rpm/i686/centos/6.5/freeglut-2.6.0-1.el6.src.rpm) = 2185780
diff --git a/graphics/linux-c6-dri/pkg-descr b/graphics/linux-c6-dri/pkg-descr
new file mode 100644
index 000000000000..a606f11321a7
--- /dev/null
+++ b/graphics/linux-c6-dri/pkg-descr
@@ -0,0 +1,2 @@
+The port installs Linux Fedora 10 Mesa libGL runtime libraries
+and DRI drivers.
diff --git a/graphics/linux-c6-dri/pkg-plist b/graphics/linux-c6-dri/pkg-plist
new file mode 100644
index 000000000000..59b53f959e22
--- /dev/null
+++ b/graphics/linux-c6-dri/pkg-plist
@@ -0,0 +1,53 @@
+lib/udev/rules.d/91-drm-modeset.rules
+usr/lib/dri/i915_dri.so
+usr/lib/dri/i965_dri.so
+usr/lib/dri/r200_dri.so
+usr/lib/dri/r300_dri.so
+usr/lib/dri/r600_dri.so
+usr/lib/dri/radeon_dri.so
+usr/lib/dri/radeonsi_dri.so
+usr/lib/dri/swrast_dri.so
+usr/lib/libGL.so.1
+usr/lib/libGL.so.1.2.0
+usr/lib/libGLU.so.1
+usr/lib/libGLU.so.1.3.1
+usr/lib/libdricore9.2.0-devel.so
+usr/lib/libdricore9.2.0-devel.so.1
+usr/lib/libdricore9.2.0-devel.so.1.0.0
+usr/lib/libdrm.so.2
+usr/lib/libdrm.so.2.4.0
+usr/lib/libdrm_intel.so.1
+usr/lib/libdrm_intel.so.1.0.0
+usr/lib/libdrm_nouveau.so.1
+usr/lib/libdrm_nouveau.so.1.0.0
+usr/lib/libdrm_nouveau2.so.2
+usr/lib/libdrm_nouveau2.so.2.0.0
+usr/lib/libdrm_radeon.so.1
+usr/lib/libdrm_radeon.so.1.0.1
+usr/lib/libglapi.so
+usr/lib/libglapi.so.0
+usr/lib/libglapi.so.0.0.0
+usr/lib/libglut.so.3
+usr/lib/libglut.so.3.9.0
+usr/share/doc/freeglut-2.6.0/AUTHORS
+usr/share/doc/freeglut-2.6.0/COPYING
+usr/share/doc/freeglut-2.6.0/ChangeLog
+usr/share/doc/freeglut-2.6.0/INSTALL
+usr/share/doc/freeglut-2.6.0/NEWS
+usr/share/doc/freeglut-2.6.0/README
+usr/share/doc/freeglut-2.6.0/TODO
+usr/share/doc/freeglut-2.6.0/download.html
+usr/share/doc/freeglut-2.6.0/freeglut.html
+usr/share/doc/freeglut-2.6.0/freeglut_logo.png
+usr/share/doc/freeglut-2.6.0/freeglut_user_interface.html
+usr/share/doc/freeglut-2.6.0/index.html
+usr/share/doc/freeglut-2.6.0/ogl_sm.png
+usr/share/doc/freeglut-2.6.0/progress.html
+usr/share/doc/freeglut-2.6.0/structure.html
+usr/share/doc/libdrm-2.4.45/README
+%%ETCDIR%%rc
+@dirrmtry usr/share/doc/libdrm-2.4.45
+@dirrmtry usr/share/doc/freeglut-2.6.0
+@dirrmtry usr/lib/dri
+@dirrmtry lib/udev/rules.d
+@dirrmtry lib/udev
diff --git a/graphics/linux-c6-jpeg/Makefile b/graphics/linux-c6-jpeg/Makefile
new file mode 100644
index 000000000000..e349b6137890
--- /dev/null
+++ b/graphics/linux-c6-jpeg/Makefile
@@ -0,0 +1,26 @@
+# Created by: Artyom Mirgorodskiy <artyom.mirgorodsky@gmail.com>
+# $FreeBSD$
+
+PORTNAME=	jpeg
+PORTVERSION=	1.2.1
+CATEGORIES=	graphics linux
+DISTNAME=	lib${PORTNAME}-turbo-${PORTVERSION}-${RPMVERSION}
+
+MAINTAINER=	emulation@FreeBSD.org
+COMMENT=	RPM of the JPEG lib (Linux CentOS ${LINUX_DIST_VER})
+
+DIST_SUBDIR=	rpm/${LINUX_RPM_ARCH}/centos/${LINUX_DIST_VER}
+
+CONFLICTS=	linux-jpeg-[0-9]* linux-f10-jpeg-[0-9]*
+
+ONLY_FOR_ARCHS=	i386 amd64
+USE_LINUX=	c6
+USE_LINUX_RPM=	yes
+RPMVERSION=	1.el6
+LINUX_NAME=	lib${PORTNAME}
+BRANDELF_DIRS=	usr/bin
+USE_LDCONFIG=	yes
+
+DESCR=		${.CURDIR}/../jpeg/pkg-descr
+
+.include <bsd.port.mk>
diff --git a/graphics/linux-c6-jpeg/distinfo.i686 b/graphics/linux-c6-jpeg/distinfo.i686
new file mode 100644
index 000000000000..39dab49ff4c2
--- /dev/null
+++ b/graphics/linux-c6-jpeg/distinfo.i686
@@ -0,0 +1,4 @@
+SHA256 (rpm/i686/centos/6.5/libjpeg-turbo-1.2.1-1.el6.i686.rpm) = 656c094c4c5a4137095e8864d40919b50232f9a4928ec353daf3f62e9051c282
+SIZE (rpm/i686/centos/6.5/libjpeg-turbo-1.2.1-1.el6.i686.rpm) = 180548
+SHA256 (rpm/i686/centos/6.5/libjpeg-turbo-1.2.1-1.el6.src.rpm) = 7424121cce6fa6fd63cf12ec333207aafcc4a498425ba1adbca499523b2c63a4
+SIZE (rpm/i686/centos/6.5/libjpeg-turbo-1.2.1-1.el6.src.rpm) = 1757836
diff --git a/graphics/linux-c6-jpeg/pkg-plist b/graphics/linux-c6-jpeg/pkg-plist
new file mode 100644
index 000000000000..15e1d182fe8f
--- /dev/null
+++ b/graphics/linux-c6-jpeg/pkg-plist
@@ -0,0 +1,21 @@
+@comment file listing
+usr/bin/cjpeg
+usr/bin/djpeg
+usr/bin/jpegtran
+usr/bin/rdjpgcom
+usr/bin/wrjpgcom
+usr/lib/libjpeg.so.62
+usr/lib/libjpeg.so.62.0.0
+usr/share/doc/libjpeg-turbo-1.2.1/ChangeLog.txt
+usr/share/doc/libjpeg-turbo-1.2.1/README
+usr/share/doc/libjpeg-turbo-1.2.1/README-turbo.txt
+usr/share/doc/libjpeg-turbo-1.2.1/change.log
+usr/share/doc/libjpeg-turbo-1.2.1/usage.txt
+usr/share/doc/libjpeg-turbo-1.2.1/wizard.txt
+usr/share/man/man1/cjpeg.1.gz
+usr/share/man/man1/djpeg.1.gz
+usr/share/man/man1/jpegtran.1.gz
+usr/share/man/man1/rdjpgcom.1.gz
+usr/share/man/man1/wrjpgcom.1.gz
+@comment non-empty directory listing in revers order
+@dirrm usr/share/doc/libjpeg-turbo-1.2.1
diff --git a/graphics/linux-c6-png/Makefile b/graphics/linux-c6-png/Makefile
new file mode 100644
index 000000000000..c683b41f7b18
--- /dev/null
+++ b/graphics/linux-c6-png/Makefile
@@ -0,0 +1,30 @@
+# Created by: Artyom Mirgorodskiy <artyom.mirgorodsky@gmail.com>
+# $FreeBSD$
+
+PORTNAME=	png
+PORTVERSION=	1.2.49
+CATEGORIES=	graphics linux
+DISTNAME=	lib${PORTNAME}-${PORTVERSION}-${RPMVERSION}
+
+MAINTAINER=	emulation@FreeBSD.org
+COMMENT=	RPM of the PNG lib (Linux CentOS ${LINUX_DIST_VER})
+
+CONFLICTS=	linux-png-[0-9]* linux-f8-png-[0-9]* linux-f10-png-[0-9]*
+
+LINUX_NAME=	libpng
+ONLY_FOR_ARCHS=	i386 amd64
+RPMVERSION=	1.el6_2
+USE_LINUX=	c6
+USE_LINUX_RPM=	yes
+USE_LDCONFIG=	yes
+
+PLIST_FILES=	usr/lib/libpng.so.3 \
+		usr/lib/libpng.so.3.49.0 \
+		usr/lib/libpng12.so.0 \
+		usr/lib/libpng12.so.0.49.0 \
+		usr/share/man/man5/png.5.gz
+DOCSDIR=	${PREFIX}/usr/share/doc/libpng-${PORTVERSION}
+PORTDOCS=	CHANGES LICENSE README TODO example.c libpng-1.2.49.txt CMakeLists.txt
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+
+.include <bsd.port.mk>
diff --git a/graphics/linux-c6-png/distinfo.i686 b/graphics/linux-c6-png/distinfo.i686
new file mode 100644
index 000000000000..a21efc70f4ad
--- /dev/null
+++ b/graphics/linux-c6-png/distinfo.i686
@@ -0,0 +1,4 @@
+SHA256 (rpm/i686/centos/6.5/libpng-1.2.49-1.el6_2.i686.rpm) = 88400ce6450fa3b320266d5896714a41a3eee2632c620e9375046d4bcdb452cc
+SIZE (rpm/i686/centos/6.5/libpng-1.2.49-1.el6_2.i686.rpm) = 188124
+SHA256 (rpm/i686/centos/6.5/libpng-1.2.49-1.el6_2.src.rpm) = 156fd77c25efa50bd7623011b14d0fae1a022442453d6bd2a0c69df13587dc65
+SIZE (rpm/i686/centos/6.5/libpng-1.2.49-1.el6_2.src.rpm) = 688305
diff --git a/graphics/linux-c6-sdl_image/Makefile b/graphics/linux-c6-sdl_image/Makefile
new file mode 100644
index 000000000000..49126a397277
--- /dev/null
+++ b/graphics/linux-c6-sdl_image/Makefile
@@ -0,0 +1,32 @@
+# Created by: Johannes Meixner <xmj@chaot.net>
+# $FreeBSD$
+
+PORTNAME=	sdl_image
+PORTVERSION=	1.2.10
+CATEGORIES=	graphics linux
+MASTER_SITES=	EPEL
+DISTNAME=	SDL_image-${PORTVERSION}-${RPMVERSION}
+
+MAINTAINER=	emulation@FreeBSD.org
+COMMENT=	Simple library to load images as SDL interfaces (Linux CentOS ${LINUX_DIST_VER})
+
+CONFLICTS=	linux-sdl_image-[0-9]* linux-f8-sdl_image-[0-9]*
+
+ONLY_FOR_ARCHS=	i386 amd64
+USE_LINUX=	c6
+USE_LINUX_RPM=	yes
+USE_LINUX_APPS=	jpeg png sdl12 tiff
+LINUX_NAME=	SDL_image
+
+RPMVERSION=	1.el6
+BRANDELF_FILES=	usr/bin/showimage
+USE_LDCONFIG=	yes
+
+DOCSDIR=	${PREFIX}/usr/share/doc/${LINUX_NAME}-${PORTVERSION}
+PORTDOCS=	CHANGES COPYING README
+
+PLIST_FILES=	usr/bin/showimage usr/lib/libSDL_image-1.2.so.0 \
+		usr/lib/libSDL_image-1.2.so.0.8.2
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+
+.include <bsd.port.mk>
diff --git a/graphics/linux-c6-sdl_image/distinfo.i386 b/graphics/linux-c6-sdl_image/distinfo.i386
new file mode 100644
index 000000000000..a1563343a877
--- /dev/null
+++ b/graphics/linux-c6-sdl_image/distinfo.i386
@@ -0,0 +1,4 @@
+SHA256 (rpm/i386/fedora/10/SDL_image-1.2.6-6.fc9.i386.rpm) = 8da4e1aebeefcd68b6d5684fac9cf361e56818691c8e73c39d5e1bcf090971de
+SIZE (rpm/i386/fedora/10/SDL_image-1.2.6-6.fc9.i386.rpm) = 45268
+SHA256 (rpm/i386/fedora/10/SDL_image-1.2.6-6.fc9.src.rpm) = dedfd510d6b8b314db97a8e0406e0481fa564f508dff177c65ae6fa3335a848a
+SIZE (rpm/i386/fedora/10/SDL_image-1.2.6-6.fc9.src.rpm) = 1317840
diff --git a/graphics/linux-c6-sdl_image/distinfo.i686 b/graphics/linux-c6-sdl_image/distinfo.i686
new file mode 100644
index 000000000000..e26eb1b18080
--- /dev/null
+++ b/graphics/linux-c6-sdl_image/distinfo.i686
@@ -0,0 +1,4 @@
+SHA256 (rpm/i686/centos/6.5/SDL_image-1.2.10-1.el6.i686.rpm) = 81233adfe8f95e2aa362a7d7ab568ad2ad32624a37ced1dc37d64bef9ba9109b
+SIZE (rpm/i686/centos/6.5/SDL_image-1.2.10-1.el6.i686.rpm) = 45732
+SHA256 (rpm/i686/centos/6.5/SDL_image-1.2.10-1.el6.src.rpm) = 39c291625747a8ba168465af16ec0c5bc1e5746ffb4e5cfe5efd597e8c2b1c52
+SIZE (rpm/i686/centos/6.5/SDL_image-1.2.10-1.el6.src.rpm) = 1342983
diff --git a/graphics/linux-c6-sdl_ttf/Makefile b/graphics/linux-c6-sdl_ttf/Makefile
new file mode 100644
index 000000000000..7fd710aec65a
--- /dev/null
+++ b/graphics/linux-c6-sdl_ttf/Makefile
@@ -0,0 +1,31 @@
+# Created by: Johannes Meixner <xmj@chaot.net>
+# $FreeBSD$
+
+PORTNAME=	sdl_ttf
+PORTVERSION=	2.0.9
+CATEGORIES=	graphics linux
+MASTER_SITES=	EPEL
+DISTNAME=	SDL_ttf-${PORTVERSION}-${RPMVERSION}
+
+MAINTAINER=	emulation@FreeBSD.org
+COMMENT=	Simple library to load True Type Fonts as SDL interfaces (Linux CentOS ${LINUX_DIST_VER})
+
+CONFLICTS=	linux-sdl_ttf-[0-9]*
+
+ONLY_FOR_ARCHS=	i386 amd64
+USE_LINUX=	c6
+USE_LINUX_RPM=	yes
+USE_LINUX_APPS=	jpeg png sdl12 tiff
+LINUX_NAME=	SDL_ttf
+
+RPMVERSION=	6.el6
+USE_LDCONFIG=	yes
+
+DOCSDIR=	${PREFIX}/usr/share/doc/${LINUX_NAME}-${PORTVERSION}
+PORTDOCS=	CHANGES COPYING README
+
+PLIST_FILES=	usr/lib/libSDL_ttf-2.0.so.0 \
+	usr/lib/libSDL_ttf-2.0.so.0.6.3
+DESCR=		${.CURDIR}/../linux-f10-sdl_ttf/pkg-descr
+
+.include <bsd.port.mk>
diff --git a/graphics/linux-c6-sdl_ttf/distinfo.i386 b/graphics/linux-c6-sdl_ttf/distinfo.i386
new file mode 100644
index 000000000000..a1563343a877
--- /dev/null
+++ b/graphics/linux-c6-sdl_ttf/distinfo.i386
@@ -0,0 +1,4 @@
+SHA256 (rpm/i386/fedora/10/SDL_image-1.2.6-6.fc9.i386.rpm) = 8da4e1aebeefcd68b6d5684fac9cf361e56818691c8e73c39d5e1bcf090971de
+SIZE (rpm/i386/fedora/10/SDL_image-1.2.6-6.fc9.i386.rpm) = 45268
+SHA256 (rpm/i386/fedora/10/SDL_image-1.2.6-6.fc9.src.rpm) = dedfd510d6b8b314db97a8e0406e0481fa564f508dff177c65ae6fa3335a848a
+SIZE (rpm/i386/fedora/10/SDL_image-1.2.6-6.fc9.src.rpm) = 1317840
diff --git a/graphics/linux-c6-sdl_ttf/distinfo.i686 b/graphics/linux-c6-sdl_ttf/distinfo.i686
new file mode 100644
index 000000000000..d1c4aeb0b117
--- /dev/null
+++ b/graphics/linux-c6-sdl_ttf/distinfo.i686
@@ -0,0 +1,4 @@
+SHA256 (rpm/i686/centos/6.5/SDL_ttf-2.0.9-6.el6.i686.rpm) = 22b0f9c7516899af396ac10c6cfb6902296c535629a09173e4eeeb17a275e37c
+SIZE (rpm/i686/centos/6.5/SDL_ttf-2.0.9-6.el6.i686.rpm) = 26672
+SHA256 (rpm/i686/centos/6.5/SDL_ttf-2.0.9-6.el6.src.rpm) = a3d613dc29139227be9ef4d86ed5ae15494c58a9c51f5d02443a74939c6d5079
+SIZE (rpm/i686/centos/6.5/SDL_ttf-2.0.9-6.el6.src.rpm) = 3150704
diff --git a/graphics/linux-c6-tiff/Makefile b/graphics/linux-c6-tiff/Makefile
new file mode 100644
index 000000000000..7587b73076b5
--- /dev/null
+++ b/graphics/linux-c6-tiff/Makefile
@@ -0,0 +1,25 @@
+# Created by: Artyom Mirgorodskiy <artyom.mirgorodsky@gmail.com>
+# $FreeBSD$
+
+PORTNAME=	tiff
+PORTVERSION=	3.9.4
+CATEGORIES=	graphics linux
+DISTNAME=	lib${PORTNAME}-${PORTVERSION}-${RPMVERSION}
+
+MAINTAINER=	emulation@FreeBSD.org
+COMMENT=	TIFF library (Linux CentOS ${LINUX_DIST_VER})
+
+CONFLICTS=	linux-tiff-[0-9]* linux-f10-tiff-[0-9]*
+
+ONLY_FOR_ARCHS=	amd64 i386
+USE_LINUX=	c6
+USE_LINUX_APPS=	jpeg
+USE_LINUX_RPM=	yes
+RPMVERSION=	9.el6_3
+LINUX_NAME=	lib${PORTNAME}
+BRANDELF_DIRS=	usr/bin
+USE_LDCONFIG=	yes
+
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+
+.include <bsd.port.mk>
diff --git a/graphics/linux-c6-tiff/distinfo.i686 b/graphics/linux-c6-tiff/distinfo.i686
new file mode 100644
index 000000000000..193805308bd9
--- /dev/null
+++ b/graphics/linux-c6-tiff/distinfo.i686
@@ -0,0 +1,4 @@
+SHA256 (rpm/i686/centos/6.5/libtiff-3.9.4-9.el6_3.i686.rpm) = 0b3f107d56ce0573d470ff613f3fe15419493fe940021ff2aa57a61fd755af21
+SIZE (rpm/i686/centos/6.5/libtiff-3.9.4-9.el6_3.i686.rpm) = 346840
+SHA256 (rpm/i686/centos/6.5/libtiff-3.9.4-9.el6_3.src.rpm) = 73bd79bac805f90a43cfe048bf71eb28c9e10758a47d97b0a8ef478e210dbbd5
+SIZE (rpm/i686/centos/6.5/libtiff-3.9.4-9.el6_3.src.rpm) = 1472377
diff --git a/graphics/linux-c6-tiff/pkg-plist b/graphics/linux-c6-tiff/pkg-plist
new file mode 100644
index 000000000000..9f1776548027
--- /dev/null
+++ b/graphics/linux-c6-tiff/pkg-plist
@@ -0,0 +1,57 @@
+@comment file listing
+usr/bin/bmp2tiff
+usr/bin/fax2ps
+usr/bin/fax2tiff
+usr/bin/gif2tiff
+usr/bin/pal2rgb
+usr/bin/ppm2tiff
+usr/bin/ras2tiff
+usr/bin/raw2tiff
+usr/bin/rgb2ycbcr
+usr/bin/thumbnail
+usr/bin/tiff2bw
+usr/bin/tiff2pdf
+usr/bin/tiff2ps
+usr/bin/tiff2rgba
+usr/bin/tiffcmp
+usr/bin/tiffcp
+usr/bin/tiffcrop
+usr/bin/tiffdither
+usr/bin/tiffdump
+usr/bin/tiffinfo
+usr/bin/tiffmedian
+usr/bin/tiffset
+usr/bin/tiffsplit
+usr/lib/libtiff.so.3
+usr/lib/libtiff.so.3.9.4
+usr/lib/libtiffxx.so.3
+usr/lib/libtiffxx.so.3.9.4
+usr/share/doc/libtiff-3.9.4/COPYRIGHT
+usr/share/doc/libtiff-3.9.4/README
+usr/share/doc/libtiff-3.9.4/RELEASE-DATE
+usr/share/doc/libtiff-3.9.4/VERSION
+usr/share/man/man1/bmp2tiff.1.gz
+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/raw2tiff.1.gz
+usr/share/man/man1/rgb2ycbcr.1.gz
+usr/share/man/man1/thumbnail.1.gz
+usr/share/man/man1/tiff2bw.1.gz
+usr/share/man/man1/tiffcrop.1.gz
+usr/share/man/man1/tiff2pdf.1.gz
+usr/share/man/man1/tiff2ps.1.gz
+usr/share/man/man1/tiff2rgba.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/tiffinfo.1.gz
+usr/share/man/man1/tiffmedian.1.gz
+usr/share/man/man1/tiffset.1.gz
+usr/share/man/man1/tiffsplit.1.gz
+@comment non-empty directory listing in revers order
+@dirrm usr/share/doc/libtiff-3.9.4
diff --git a/graphics/linux-f10-cairo/Makefile b/graphics/linux-f10-cairo/Makefile
index 32a5fca93c79..c2e7290b229f 100644
--- a/graphics/linux-f10-cairo/Makefile
+++ b/graphics/linux-f10-cairo/Makefile
@@ -3,11 +3,9 @@
 
 PORTNAME=	cairo
 PORTVERSION=	1.8.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics linux
 MASTER_SITES=	CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
-PKGNAMEPREFIX=	linux-f10-
-DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Vector graphics library Cairo (Linux Fedora 10)
@@ -15,9 +13,10 @@ COMMENT=	Vector graphics library Cairo (Linux Fedora 10)
 CONFLICTS=	linux-cairo-[0-9]* linux-f8-cairo-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
+USE_LINUX=	f10
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	fontconfig png xorglibs
-LINUX_DIST_VER=	10
+
 RPMVERSION=	1.fc10
 USE_LDCONFIG=	yes
 
diff --git a/graphics/linux-f10-dri/Makefile b/graphics/linux-f10-dri/Makefile
index 33d8c8c759eb..45cbc0dc3693 100644
--- a/graphics/linux-f10-dri/Makefile
+++ b/graphics/linux-f10-dri/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	7.2
 PORTREVISION=	1
 CATEGORIES=	graphics linux
 MASTER_SITES=	CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
-PKGNAMEPREFIX=	linux-f10-
 DISTFILES=	Glide3-20050815-7.fc9.${LINUX_RPM_ARCH}.rpm \
 		freeglut-2.4.0-14.fc9.${LINUX_RPM_ARCH}.rpm \
 		libdrm-2.4.0-0.21.fc10.${LINUX_RPM_ARCH}.rpm \
@@ -14,24 +13,25 @@ DISTFILES=	Glide3-20050815-7.fc9.${LINUX_RPM_ARCH}.rpm \
 		mesa-libGL-7.2-0.15.fc10.${LINUX_RPM_ARCH}.rpm \
 		mesa-libGLU-7.2-0.15.fc10.${LINUX_RPM_ARCH}.rpm
 
-.if defined(PACKAGE_BUILDING)
-SRC_DISTFILES=	Glide3-20050815-7.fc9.src.rpm \
-		freeglut-2.4.0-14.fc9.src.rpm \
-		libdrm-2.4.0-0.21.fc10.src.rpm \
-		mesa-7.2-0.15.fc10.src.rpm
-
-ALWAYS_KEEP_DISTFILES=  YES
-.endif
-
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Mesa libGL runtime libraries and DRI drivers (Linux Fedora 10)
 
 CONFLICTS=	linux_dri-[0-9]* linux_dri-devel-[0-9]* linux-f8-dri-[0-9]* linux-dri-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
+USE_LINUX=	f10
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	xorglibs
-LINUX_DIST_VER=	10
+
 USE_LDCONFIG=	yes
 
+.if defined(PACKAGE_BUILDING)
+SRC_DISTFILES=	Glide3-20050815-7.fc9.src.rpm \
+		freeglut-2.4.0-14.fc9.src.rpm \
+		libdrm-2.4.0-0.21.fc10.src.rpm \
+		mesa-7.2-0.15.fc10.src.rpm
+
+ALWAYS_KEEP_DISTFILES=	YES
+.endif
+
 .include <bsd.port.mk>
diff --git a/graphics/linux-f10-gdk-pixbuf/Makefile b/graphics/linux-f10-gdk-pixbuf/Makefile
index bdfda18891f1..ba88ca3bfcde 100644
--- a/graphics/linux-f10-gdk-pixbuf/Makefile
+++ b/graphics/linux-f10-gdk-pixbuf/Makefile
@@ -3,10 +3,9 @@
 
 PORTNAME=	gdk-pixbuf
 PORTVERSION=	0.22.0
+PORTREVISION=	1
 CATEGORIES=	graphics linux
 MASTER_SITES=	CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
-PKGNAMEPREFIX=	linux-f10-
-DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Image loading library for GTK+ (Linux Fedora 10)
@@ -14,8 +13,9 @@ COMMENT=	Image loading library for GTK+ (Linux Fedora 10)
 CONFLICTS=	linux-gdk-pixbuf-[0-9]* linux-f8-gdk-pixbuf-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
+USE_LINUX=	f10
 USE_LINUX_RPM=	yes
-LINUX_DIST_VER=	10
+
 RPMVERSION=	36.fc9
 USE_LDCONFIG=	yes
 
diff --git a/graphics/linux-f10-glew/Makefile b/graphics/linux-f10-glew/Makefile
index 95ec0c625bc6..cef553fce9eb 100644
--- a/graphics/linux-f10-glew/Makefile
+++ b/graphics/linux-f10-glew/Makefile
@@ -2,18 +2,17 @@
 
 PORTNAME=	glew
 PORTVERSION=	1.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics linux
-PKGNAMEPREFIX=	linux-f10-
-DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	eadler@FreeBSD.org
 COMMENT=	OpenGL Extension Wrangler Library (Linux Fedora 10)
 
 ONLY_FOR_ARCHS=	i386 amd64
+USE_LINUX=	f10
 USE_LINUX_RPM=	yes
 LINUX_NAME=	glew
-LINUX_DIST_VER=	10
+
 RPMVERSION=	1.fc10
 USE_LDCONFIG=	yes
 BRANDELF_DIRS=	usr/bin
diff --git a/graphics/linux-f10-imlib/Makefile b/graphics/linux-f10-imlib/Makefile
index 5aa60729cb0c..af4df74d74e9 100644
--- a/graphics/linux-f10-imlib/Makefile
+++ b/graphics/linux-f10-imlib/Makefile
@@ -3,18 +3,18 @@
 
 PORTNAME=	imlib
 PORTVERSION=	1.9.15
+PORTREVISION=	1
 CATEGORIES=	graphics linux
 MASTER_SITES=	CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
-PKGNAMEPREFIX=	linux-f10-
-DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	RPM of imlib (Linux Fedora 10)
 
 CONFLICTS=	linux-imlib-[0-9]* linux-f8-imlib-[0-9]*
 
+USE_LINUX=	f10
 USE_LINUX_RPM=	yes
-LINUX_DIST_VER=	10
+
 RPMVERSION=	9.fc10
 BRANDELF_FILES=	usr/bin/imlib_config
 USE_LDCONFIG=	yes
diff --git a/graphics/linux-f10-jpeg/Makefile b/graphics/linux-f10-jpeg/Makefile
index 37b5e8f7682b..966ad752c120 100644
--- a/graphics/linux-f10-jpeg/Makefile
+++ b/graphics/linux-f10-jpeg/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	jpeg
 PORTVERSION=	6b
 CATEGORIES=	graphics linux
 MASTER_SITES=	CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
-PKGNAMEPREFIX=	linux-f10-
-DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
+DISTNAME=	lib${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	RPM of the JPEG lib (Linux Fedora 10)
@@ -14,9 +13,10 @@ COMMENT=	RPM of the JPEG lib (Linux Fedora 10)
 CONFLICTS=	linux-jpeg-[0-9]* linux-f8-jpeg-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
+USE_LINUX=	f10
 USE_LINUX_RPM=	yes
 LINUX_NAME=	lib${PORTNAME}
-LINUX_DIST_VER=	10
+
 RPMVERSION=	43.fc10
 BRANDELF_DIRS=	usr/bin
 USE_LDCONFIG=	yes
diff --git a/graphics/linux-f10-libGLU/Makefile b/graphics/linux-f10-libGLU/Makefile
index d7e092ca2211..2f28bf7ccf83 100644
--- a/graphics/linux-f10-libGLU/Makefile
+++ b/graphics/linux-f10-libGLU/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	libGLU
 PORTVERSION=	7.2
 CATEGORIES=	graphics linux
 MASTER_SITES=	CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
-PKGNAMEPREFIX=	linux-f10-
-DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
+DISTNAME=	mesa-${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Mesa libGLU runtime library (Linux Fedora 10)
@@ -15,9 +14,10 @@ CONFLICTS=	linux_dri-[0-9]* linux_dri-devel-* linux-libGLU-[0-9]* \
 		linux-f8-libGLU-[0-9]* linux-dri-[0-9]* linux-dri74-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
+USE_LINUX=	f10
 USE_LINUX_RPM=	yes
 LINUX_NAME=	mesa-libGLU
-LINUX_DIST_VER=	10
+
 RPMVERSION=	0.15.fc10
 USE_LDCONFIG=	yes
 SRC_DISTFILES=	mesa-${PORTVERSION}-${RPMVERSION}.src.rpm
@@ -25,4 +25,6 @@ SRC_DISTFILES=	mesa-${PORTVERSION}-${RPMVERSION}.src.rpm
 PLIST_FILES=	usr/lib/libGLU.so.1 usr/lib/libGLU.so.1.3.070300
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
+SRC_DISTFILE=	mesa-${PORTVERSION}-${RPMVERSION}.src.rpm
+
 .include <bsd.port.mk>
diff --git a/graphics/linux-f10-libmng/Makefile b/graphics/linux-f10-libmng/Makefile
index 5b26d127f68f..1a709abdc3f7 100644
--- a/graphics/linux-f10-libmng/Makefile
+++ b/graphics/linux-f10-libmng/Makefile
@@ -3,10 +3,9 @@
 
 PORTNAME=		libmng
 PORTVERSION=		1.0.9
+PORTREVISION=	1
 CATEGORIES=		graphics linux
 MASTER_SITES=		CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
-PKGNAMEPREFIX=		linux-f10-
-DISTNAME=		${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=		emulation@FreeBSD.org
 COMMENT=		RPM of libmng (Linux Fedora 10)
@@ -14,9 +13,10 @@ COMMENT=		RPM of libmng (Linux Fedora 10)
 CONFLICTS=		linux-libmng-[0-9]* linux-f8-libmng-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
+USE_LINUX=	f10
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	jpeg
-LINUX_DIST_VER=	10
+
 RPMVERSION=	7
 USE_LDCONFIG=	yes
 
diff --git a/graphics/linux-f10-png/Makefile b/graphics/linux-f10-png/Makefile
index 60b137c017da..eeea214ba7db 100644
--- a/graphics/linux-f10-png/Makefile
+++ b/graphics/linux-f10-png/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	1.2.37
 PORTREVISION=	2
 CATEGORIES=	graphics linux
 MASTER_SITES=	CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
-PKGNAMEPREFIX=	linux-f10-
-DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
+DISTNAME=	lib${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	RPM of the PNG lib (Linux Fedora 10)
@@ -15,9 +14,10 @@ COMMENT=	RPM of the PNG lib (Linux Fedora 10)
 CONFLICTS=	linux-png-[0-9]* linux-f8-png-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
+USE_LINUX=	f10
 USE_LINUX_RPM=	yes
 LINUX_NAME=	libpng
-LINUX_DIST_VER=	10
+
 RPMVERSION=	1.fc10
 USE_LDCONFIG=	yes
 
diff --git a/graphics/linux-f10-sdl_image/Makefile b/graphics/linux-f10-sdl_image/Makefile
index e5f8b9318452..01667f0679c5 100644
--- a/graphics/linux-f10-sdl_image/Makefile
+++ b/graphics/linux-f10-sdl_image/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	1.2.6
 PORTREVISION=	3
 CATEGORIES=	graphics linux
 MASTER_SITES=	CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
-PKGNAMEPREFIX=	linux-f10-
-DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
+DISTNAME=	SDL_image-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Simple library to load images as SDL interfaces (Linux Fedora 10)
@@ -15,10 +14,11 @@ COMMENT=	Simple library to load images as SDL interfaces (Linux Fedora 10)
 CONFLICTS=	linux-sdl_image-[0-9]* linux-f8-sdl_image-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
+USE_LINUX=	f10
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	jpeg png sdl12 tiff
 LINUX_NAME=	SDL_image
-LINUX_DIST_VER=	10
+
 RPMVERSION=	6.fc9
 BRANDELF_FILES=	usr/bin/showimage
 USE_LDCONFIG=	yes
diff --git a/graphics/linux-sdl_ttf/Makefile b/graphics/linux-f10-sdl_ttf/Makefile
index c65e9e37c6af..c03f4512aa5b 100644
--- a/graphics/linux-sdl_ttf/Makefile
+++ b/graphics/linux-f10-sdl_ttf/Makefile
@@ -10,6 +10,7 @@ DISTNAME=	SDL_ttf-${PORTVERSION}-1
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library to use TrueType fonts in SDL applications (Linux version)
 
+USE_LINUX=	f10
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	sdl12
 USE_LDCONFIG=	yes
diff --git a/graphics/linux-sdl_ttf/distinfo.i386 b/graphics/linux-f10-sdl_ttf/distinfo.i386
index d54a968ab86f..d54a968ab86f 100644
--- a/graphics/linux-sdl_ttf/distinfo.i386
+++ b/graphics/linux-f10-sdl_ttf/distinfo.i386
diff --git a/graphics/linux-sdl_ttf/pkg-descr b/graphics/linux-f10-sdl_ttf/pkg-descr
index 77770e39e7d6..77770e39e7d6 100644
--- a/graphics/linux-sdl_ttf/pkg-descr
+++ b/graphics/linux-f10-sdl_ttf/pkg-descr
diff --git a/graphics/linux-sdl_ttf/pkg-plist b/graphics/linux-f10-sdl_ttf/pkg-plist
index 0f62dd0f5d05..0f62dd0f5d05 100644
--- a/graphics/linux-sdl_ttf/pkg-plist
+++ b/graphics/linux-f10-sdl_ttf/pkg-plist
diff --git a/graphics/linux-f10-tiff/Makefile b/graphics/linux-f10-tiff/Makefile
index b205a5f5d90c..87740f168b52 100644
--- a/graphics/linux-f10-tiff/Makefile
+++ b/graphics/linux-f10-tiff/Makefile
@@ -5,19 +5,17 @@ PORTNAME=	tiff
 PORTVERSION=	3.8.2
 CATEGORIES=	graphics linux
 MASTER_SITES=	CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
-PKGNAMEPREFIX=	linux-f10-
-DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
+DISTNAME=	lib${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	TIFF library, Linux/i386 binary (Linux Fedora 10)
 
-CONFLICTS=	linux-tiff-[0-9]* linux-f8-tiff-[0-9]*
-
 ONLY_FOR_ARCHS=	amd64 i386
+USE_LINUX=	f10
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	jpeg
 LINUX_NAME=	lib${PORTNAME}
-LINUX_DIST_VER=	10
+
 RPMVERSION=	11.fc10
 BRANDELF_DIRS=	usr/bin
 PLIST=		${PKGDIR}/pkg-plist.${LINUX_RPM_ARCH}
diff --git a/graphics/linux-f10-ungif/Makefile b/graphics/linux-f10-ungif/Makefile
index 0770f9e81385..886e9508a5ba 100644
--- a/graphics/linux-f10-ungif/Makefile
+++ b/graphics/linux-f10-ungif/Makefile
@@ -5,7 +5,6 @@ PORTNAME=	ungif
 PORTVERSION=	4.1.3
 CATEGORIES=	graphics linux
 MASTER_SITES=	CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
-PKGNAMEPREFIX=	linux-f10-
 DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -14,9 +13,10 @@ COMMENT=	RPM of gif and ungif libs (Linux Fedora 10)
 CONFLICTS=	linux-ungif-[0-9]* linux-f8-ungif-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
+USE_LINUX=	f10
 USE_LINUX_RPM=	yes
 LINUX_NAME=	giflib
-LINUX_DIST_VER=	10
+
 RPMVERSION=	9
 USE_LDCONFIG=	yes