aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Samorodov <bsam@FreeBSD.org>2009-06-02 20:14:36 +0000
committerBoris Samorodov <bsam@FreeBSD.org>2009-06-02 20:14:36 +0000
commit15dfb098e6ab531f8329e5a2602bcaed9c7a10f8 (patch)
treeafe14291805f19e2653b0bb58c797670a467c29e
parent3b06da316e87632197ec2b5d65f2483212443f46 (diff)
downloadports-15dfb098e6ab531f8329e5a2602bcaed9c7a10f8.tar.gz
ports-15dfb098e6ab531f8329e5a2602bcaed9c7a10f8.zip
Notes
-rw-r--r--accessibility/linux-f8-atk/Makefile3
-rw-r--r--archivers/linux-f8-ucl/Makefile3
-rw-r--r--archivers/linux-f8-upx/Makefile3
-rw-r--r--audio/linux-f10-mikmod/Makefile3
-rw-r--r--audio/linux-f8-alsa-lib/Makefile3
-rw-r--r--audio/linux-f8-arts/Makefile3
-rw-r--r--audio/linux-f8-esound/Makefile3
-rw-r--r--audio/linux-f8-freealut/Makefile3
-rw-r--r--audio/linux-f8-libaudiofile/Makefile3
-rw-r--r--audio/linux-f8-libogg/Makefile3
-rw-r--r--audio/linux-f8-libvorbis/Makefile3
-rw-r--r--audio/linux-f8-mikmod/Makefile3
-rw-r--r--audio/linux-f8-openal/Makefile3
-rw-r--r--audio/linux-f8-sdl_mixer/Makefile3
-rw-r--r--databases/linux-f8-sqlite3/Makefile4
-rw-r--r--devel/linux-f8-allegro/Makefile3
-rw-r--r--devel/linux-f8-libglade/Makefile3
-rw-r--r--devel/linux-f8-libglade2/Makefile3
-rw-r--r--devel/linux-f8-libsigc++20/Makefile3
-rw-r--r--devel/linux-f8-nspr/Makefile3
-rw-r--r--devel/linux-f8-sdl12/Makefile3
-rw-r--r--dns/linux-f8-libidn/Makefile3
-rw-r--r--ftp/linux-f8-curl/Makefile3
-rw-r--r--graphics/linux-f10-libGLU/Makefile3
-rw-r--r--graphics/linux-f8-cairo/Makefile3
-rw-r--r--graphics/linux-f8-dri/Makefile3
-rw-r--r--graphics/linux-f8-gdk-pixbuf/Makefile3
-rw-r--r--graphics/linux-f8-imlib/Makefile3
-rw-r--r--graphics/linux-f8-jpeg/Makefile3
-rw-r--r--graphics/linux-f8-libGLU/Makefile3
-rw-r--r--graphics/linux-f8-libmng/Makefile3
-rw-r--r--graphics/linux-f8-png/Makefile3
-rw-r--r--graphics/linux-f8-png10/Makefile3
-rw-r--r--graphics/linux-f8-sdl_image/Makefile3
-rw-r--r--graphics/linux-f8-tiff/Makefile3
-rw-r--r--graphics/linux-f8-ungif/Makefile3
-rw-r--r--lang/linux-f8-libg2c/Makefile3
-rw-r--r--lang/linux-f8-tcl84/Makefile3
-rw-r--r--multimedia/linux-f8-libtheora/Makefile3
-rw-r--r--security/linux-f8-libssh2/Makefile3
-rw-r--r--security/linux-f8-nss/Makefile3
-rw-r--r--security/linux-f8-openssl/Makefile3
-rw-r--r--textproc/linux-f8-aspell/Makefile3
-rw-r--r--textproc/linux-f8-expat/Makefile3
-rw-r--r--textproc/linux-f8-libxml/Makefile3
-rw-r--r--textproc/linux-f8-libxml2/Makefile3
-rw-r--r--textproc/linux-f8-scim-gtk/Makefile3
-rw-r--r--textproc/linux-f8-scim-libs/Makefile3
-rw-r--r--x11-fonts/linux-f8-fontconfig/Makefile3
-rw-r--r--x11-themes/linux-f8-hicolor-icon-theme/Makefile3
-rw-r--r--x11-toolkits/linux-f8-gtk/Makefile3
-rw-r--r--x11-toolkits/linux-f8-gtk2/Makefile3
-rw-r--r--x11-toolkits/linux-f8-openmotif/Makefile3
-rw-r--r--x11-toolkits/linux-f8-pango/Makefile3
-rw-r--r--x11-toolkits/linux-f8-qt33/Makefile3
-rw-r--r--x11-toolkits/linux-f8-tk84/Makefile3
-rw-r--r--x11/linux-f8-xorg-libs/Makefile4
57 files changed, 167 insertions, 6 deletions
diff --git a/accessibility/linux-f8-atk/Makefile b/accessibility/linux-f8-atk/Makefile
index 0002479b80a9..7ce39b6d26fc 100644
--- a/accessibility/linux-f8-atk/Makefile
+++ b/accessibility/linux-f8-atk/Makefile
@@ -7,6 +7,7 @@
PORTNAME= atk
PORTVERSION= 1.20.0
+PORTREVISION= 1
CATEGORIES= accessibility linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Accessibility Toolkit, Linux/i386 binary (Linux Fedora 8)
+CONFLICTS= linux-atk-[0-9]* linux-f10-atk-[0-9]*
+
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_DIST_VER= 8
diff --git a/archivers/linux-f8-ucl/Makefile b/archivers/linux-f8-ucl/Makefile
index 14ef5f64bead..e7af44ddeef7 100644
--- a/archivers/linux-f8-ucl/Makefile
+++ b/archivers/linux-f8-ucl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ucl
PORTVERSION= 1.03
+PORTREVISION= 1
CATEGORIES= archivers linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= UCL, a lossless data compression library (Linux Fedora 8)
+CONFLICTS= linux-ucl-[0-9]* linux-f10-ucl-[0-9]*
+
USE_LINUX_RPM= yes
LINUX_DIST_VER= 8
RPMVERSION= 7.fc8
diff --git a/archivers/linux-f8-upx/Makefile b/archivers/linux-f8-upx/Makefile
index a681d2679b28..bfa2b01e4888 100644
--- a/archivers/linux-f8-upx/Makefile
+++ b/archivers/linux-f8-upx/Makefile
@@ -7,6 +7,7 @@
PORTNAME= upx
PORTVERSION= 3.02
+PORTREVISION= 1
CATEGORIES= archivers linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= UPX, a high-performance executable packer (Linux Fedora 8)
+CONFLICTS= linux-upx-[0-9]* linux-f10-upx-[0-9]*
+
USE_LINUX_RPM= yes
USE_LINUX_APPS= ucl
LINUX_DIST_VER= 8
diff --git a/audio/linux-f10-mikmod/Makefile b/audio/linux-f10-mikmod/Makefile
index c2264a2706b8..690403fa1331 100644
--- a/audio/linux-f10-mikmod/Makefile
+++ b/audio/linux-f10-mikmod/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mikmod
PORTVERSION= 3.2.2
+PORTREVISION= 1
CATEGORIES= audio linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= MikMod Sound Library (Linux Fedora 8)
+CONFLICTS= linux-mikmod-[0-9]* linux-f10-mikmod-[0-9]*
+
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_DIST_VER= 8
diff --git a/audio/linux-f8-alsa-lib/Makefile b/audio/linux-f8-alsa-lib/Makefile
index fba5ff03cef0..7c9d7620c6cd 100644
--- a/audio/linux-f8-alsa-lib/Makefile
+++ b/audio/linux-f8-alsa-lib/Makefile
@@ -7,6 +7,7 @@
PORTNAME= alsa-lib
PORTVERSION= 1.0.15
+PORTREVISION= 1
CATEGORIES= audio linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= The Advanced Linux Sound Architecture libraries (Linux Fedora 8)
+CONFLICTS= linux-alsa-lib-[0-9]* linux-f10-alsa-lib-[0-9]*
+
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_DIST_VER= 8
diff --git a/audio/linux-f8-arts/Makefile b/audio/linux-f8-arts/Makefile
index e1d8cd10b37b..994e7dace4eb 100644
--- a/audio/linux-f8-arts/Makefile
+++ b/audio/linux-f8-arts/Makefile
@@ -7,6 +7,7 @@
PORTNAME= arts
PORTVERSION= 1.5.10
+PORTREVISION= 1
CATEGORIES= audio kde linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Audio system for the KDE integrated X11 desktop (Linux Fedora 8)
+CONFLICTS= linux-arts-[0-9]* linux-f10-arts-[0-9]*
+
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_DIST_VER= 8
diff --git a/audio/linux-f8-esound/Makefile b/audio/linux-f8-esound/Makefile
index 75e0234b1e02..330f8957d0b0 100644
--- a/audio/linux-f8-esound/Makefile
+++ b/audio/linux-f8-esound/Makefile
@@ -7,6 +7,7 @@
PORTNAME= esound
PORTVERSION= 0.2.38
+PORTREVISION= 1
CATEGORIES= audio linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of esound (Linux Fedora 8)
+CONFLICTS= linux-esound-[0-9]* linux-f10-esound-[0-9]*
+
USE_LINUX_RPM= yes
USE_LINUX_APPS= libaudiofile
LINUX_NAME= ${PORTNAME}-libs
diff --git a/audio/linux-f8-freealut/Makefile b/audio/linux-f8-freealut/Makefile
index 2f34db720696..6ad4b2a6c164 100644
--- a/audio/linux-f8-freealut/Makefile
+++ b/audio/linux-f8-freealut/Makefile
@@ -7,6 +7,7 @@
PORTNAME= freealut
PORTVERSION= 1.1.0
+PORTREVISION= 1
CATEGORIES= audio linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= A free implementation of OpenAL's ALUT standard (Linux Fedora 8)
+CONFLICTS= linux-freealut-[0-9]* linux-f10-freealut-[0-9]*
+
USE_LINUX_RPM= yes
USE_LINUX_APPS= openal
LINUX_DIST_VER= 8
diff --git a/audio/linux-f8-libaudiofile/Makefile b/audio/linux-f8-libaudiofile/Makefile
index ec3405afa6fe..db9134f2ec0d 100644
--- a/audio/linux-f8-libaudiofile/Makefile
+++ b/audio/linux-f8-libaudiofile/Makefile
@@ -7,6 +7,7 @@
PORTNAME= lib${LINUX_NAME}
PORTVERSION= 0.2.6
+PORTREVISION= 1
CATEGORIES= audio linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= An implementation of the Audio File Library from SGI (Linux Fedora 8)
+CONFLICTS= linux-libaudiofile-[0-9]* linux-f10-libaudiofile-[0-9]*
+
USE_LINUX_RPM= yes
LINUX_NAME= audiofile
LINUX_DIST_VER= 8
diff --git a/audio/linux-f8-libogg/Makefile b/audio/linux-f8-libogg/Makefile
index e8f42ea170f8..a7f623a6dd75 100644
--- a/audio/linux-f8-libogg/Makefile
+++ b/audio/linux-f8-libogg/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libogg
PORTVERSION= 1.1.3
+PORTREVISION= 1
CATEGORIES= audio linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Ogg bitstream library (Linux Fedora 8)
+CONFLICTS= linux-libogg-[0-9]* linux-f10-libogg-[0-9]*
+
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_DIST_VER= 8
diff --git a/audio/linux-f8-libvorbis/Makefile b/audio/linux-f8-libvorbis/Makefile
index aca7ea357170..eade27848e90 100644
--- a/audio/linux-f8-libvorbis/Makefile
+++ b/audio/linux-f8-libvorbis/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libvorbis
PORTVERSION= 1.2.0
+PORTREVISION= 1
CATEGORIES= audio linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Audio compression codec library (Linux Fedora 8)
+CONFLICTS= linux-libvorbis-[0-9]* linux-f10-libvorbis-[0-9]*
+
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
USE_LINUX_APPS= libogg
diff --git a/audio/linux-f8-mikmod/Makefile b/audio/linux-f8-mikmod/Makefile
index c2264a2706b8..690403fa1331 100644
--- a/audio/linux-f8-mikmod/Makefile
+++ b/audio/linux-f8-mikmod/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mikmod
PORTVERSION= 3.2.2
+PORTREVISION= 1
CATEGORIES= audio linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= MikMod Sound Library (Linux Fedora 8)
+CONFLICTS= linux-mikmod-[0-9]* linux-f10-mikmod-[0-9]*
+
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_DIST_VER= 8
diff --git a/audio/linux-f8-openal/Makefile b/audio/linux-f8-openal/Makefile
index 42f2687f0262..51422830e085 100644
--- a/audio/linux-f8-openal/Makefile
+++ b/audio/linux-f8-openal/Makefile
@@ -7,6 +7,7 @@
PORTNAME= openal
PORTVERSION= 0.0.9
+PORTREVISION= 1
CATEGORIES= audio linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= A 3D positional spatialized sound library (Linux Fedora 8)
+CONFLICTS= linux-openal-[0-9]* linux-f10-openal-[0-9]*
+
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
USE_LINUX_APPS= alsalib arts esound libaudiofile libvorbis sdl12
diff --git a/audio/linux-f8-sdl_mixer/Makefile b/audio/linux-f8-sdl_mixer/Makefile
index 4019dc86798c..bced6cd9e832 100644
--- a/audio/linux-f8-sdl_mixer/Makefile
+++ b/audio/linux-f8-sdl_mixer/Makefile
@@ -7,6 +7,7 @@
PORTNAME= sdl_mixer
PORTVERSION= 1.2.8
+PORTREVISION= 1
CATEGORIES= audio linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= A sample multi-channel audio mixer library (Linux Fedora 8)
+CONFLICTS= linux-sdl_mixer-[0-9]* linux-f10-sdl_mixer-[0-9]*
+
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
USE_LINUX_APPS= sdl12
diff --git a/databases/linux-f8-sqlite3/Makefile b/databases/linux-f8-sqlite3/Makefile
index 0e7574f7cfa7..8421d681a128 100644
--- a/databases/linux-f8-sqlite3/Makefile
+++ b/databases/linux-f8-sqlite3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sqlite3
PORTVERSION= 3.4.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= sqlite-${PORTVERSION}-${RPMVERSION}
@@ -15,6 +15,8 @@ DISTNAME= sqlite-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= The library that implements an embeddable SQL database engine (Linux Fedora 8)
+CONFLICTS= linux-sqlite3-[0-9]* linux-f10-sqlite3-[0-9]*
+
USE_LINUX_RPM= yes
LINUX_DIST_VER= 8
RPMVERSION= 3.fc8
diff --git a/devel/linux-f8-allegro/Makefile b/devel/linux-f8-allegro/Makefile
index 64d9036ab867..945416f45b61 100644
--- a/devel/linux-f8-allegro/Makefile
+++ b/devel/linux-f8-allegro/Makefile
@@ -7,6 +7,7 @@
PORTNAME= allegro
PORTVERSION= 4.2.2
+PORTREVISION= 1
CATEGORIES= devel linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Cross-platform game programming library (Linux Fedora 8)
+CONFLICTS= linux-allegro-[0-9]* linux-f10-allegro-[0-9]*
+
USE_LINUX_RPM= yes
USE_LINUX_APPS= xorglibs
ONLY_FOR_ARCHS= i386 amd64
diff --git a/devel/linux-f8-libglade/Makefile b/devel/linux-f8-libglade/Makefile
index b071d7284aba..b5339005a031 100644
--- a/devel/linux-f8-libglade/Makefile
+++ b/devel/linux-f8-libglade/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libglade
PORTVERSION= 0.17
+PORTREVISION= 1
CATEGORIES= devel linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of libglade (Linux Fedora 8)
+CONFLICTS= linux-libglade-[0-9]* linux-f10-libglade-[0-9]*
+
USE_LINUX_RPM= yes
LINUX_DIST_VER= 8
RPMVERSION= 20.fc8
diff --git a/devel/linux-f8-libglade2/Makefile b/devel/linux-f8-libglade2/Makefile
index 82d6afa232e8..f09e5647653a 100644
--- a/devel/linux-f8-libglade2/Makefile
+++ b/devel/linux-f8-libglade2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libglade2
PORTVERSION= 2.6.2
+PORTREVISION= 1
CATEGORIES= devel linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= RPM of libglade2 (Linux Fedora 8)
+CONFLICTS= linux-libglade2-[0-9]* linux-f10-libglade2-[0-9]*
+
USE_LINUX_RPM= yes
LINUX_DIST_VER= 8
RPMVERSION= 3.fc8
diff --git a/devel/linux-f8-libsigc++20/Makefile b/devel/linux-f8-libsigc++20/Makefile
index 901a5ee91aca..e32e5b2b8ae8 100644
--- a/devel/linux-f8-libsigc++20/Makefile
+++ b/devel/linux-f8-libsigc++20/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libsigc++20
PORTVERSION= 2.0.18
+PORTREVISION= 1
CATEGORIES= devel linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Callback Framework for C++ (Linux Fedora 8)
+CONFLICTS= linux-libsigc++20-[0-9]* linux-f10-libsigc++20-[0-9]*
+
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_DIST_VER= 8
diff --git a/devel/linux-f8-nspr/Makefile b/devel/linux-f8-nspr/Makefile
index f37f52678041..d46185971db9 100644
--- a/devel/linux-f8-nspr/Makefile
+++ b/devel/linux-f8-nspr/Makefile
@@ -7,6 +7,7 @@
PORTNAME= nspr
PORTVERSION= 4.7.3
+PORTREVISION= 1
CATEGORIES= devel linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Netscape Portable Runtime (Linux Fedora 8)
+CONFLICTS= linux-nspr-[0-9]* linux-f10-nspr-[0-9]*
+
USE_LINUX_RPM= yes
LINUX_DIST_VER= 8
RPMVERSION= 1.fc8
diff --git a/devel/linux-f8-sdl12/Makefile b/devel/linux-f8-sdl12/Makefile
index 1efb89cb45c1..d6379eab899a 100644
--- a/devel/linux-f8-sdl12/Makefile
+++ b/devel/linux-f8-sdl12/Makefile
@@ -7,6 +7,7 @@
PORTNAME= sdl
PORTVERSION= 1.2.13
+PORTREVISION= 1
CATEGORIES= devel linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Cross-platform multi-media development API (Linux Fedora 8)
+CONFLICTS= linux-sdl12-[0-9]* linux-f10-sdl12-[0-9]*
+
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
USE_LINUX_APPS= xorglibs
diff --git a/dns/linux-f8-libidn/Makefile b/dns/linux-f8-libidn/Makefile
index 2c5f11cb3251..f3f2a41d07dd 100644
--- a/dns/linux-f8-libidn/Makefile
+++ b/dns/linux-f8-libidn/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libidn
PORTVERSION= 0.6.14
+PORTREVISION= 1
CATEGORIES= dns linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Internationalized Domain Name support library (Linux Fedora 8)
+CONFLICTS= linux-libidn-[0-9]* linux-f10-libidn-[0-9]*
+
USE_LINUX_RPM= yes
LINUX_DIST_VER= 8
RPMVERSION= 4
diff --git a/ftp/linux-f8-curl/Makefile b/ftp/linux-f8-curl/Makefile
index 502c4a442352..2c696408c5eb 100644
--- a/ftp/linux-f8-curl/Makefile
+++ b/ftp/linux-f8-curl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= curl
PORTVERSION= 7.18.2
+PORTREVISION= 1
CATEGORIES= ftp linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= The command line tool for transferring files with URL syntax (Linux Fedora 8)
+CONFLICTS= linux-curl-[0-9]* linux-f10-curl-[0-9]*
+
USE_LINUX_RPM= yes
LINUX_DIST_VER= 8
RPMVERSION= 7.fc8
diff --git a/graphics/linux-f10-libGLU/Makefile b/graphics/linux-f10-libGLU/Makefile
index 85a0bc02d641..dc82caec3a9f 100644
--- a/graphics/linux-f10-libGLU/Makefile
+++ b/graphics/linux-f10-libGLU/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libGLU
PORTVERSION= 7.0.2
+PORTREVISION= 1
CATEGORIES= graphics linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,7 +15,7 @@ DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Mesa libGLU runtime library (Linux Fedora 8)
-CONFLICTS= linux_dri-[0-9]* linux_dri-devel-* linux-libGLU-*
+CONFLICTS= linux_dri-[0-9]* linux_dri-devel-* linux-libGLU-* linux-dri-[0-9]*
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
diff --git a/graphics/linux-f8-cairo/Makefile b/graphics/linux-f8-cairo/Makefile
index f86b18119808..f6e446a8676e 100644
--- a/graphics/linux-f8-cairo/Makefile
+++ b/graphics/linux-f8-cairo/Makefile
@@ -7,6 +7,7 @@
PORTNAME= cairo
PORTVERSION= 1.4.14
+PORTREVISION= 1
CATEGORIES= graphics linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Vector graphics library Cairo (Linux Fedora 8)
+CONFLICTS= linux-cairo-[0-9]* linux-f10-cairo-[0-9]*
+
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
USE_LINUX_APPS= fontconfig png xorglibs
diff --git a/graphics/linux-f8-dri/Makefile b/graphics/linux-f8-dri/Makefile
index 8d4d15925710..13a28e9d3103 100644
--- a/graphics/linux-f8-dri/Makefile
+++ b/graphics/linux-f8-dri/Makefile
@@ -7,6 +7,7 @@
PORTNAME= dri
PORTVERSION= 7.0.2
+PORTREVISION= 1
CATEGORIES= graphics linux
PKGNAMEPREFIX= linux-f8-
DISTFILES= Glide3-20050815-6.fc8.${LINUX_RPM_ARCH}.rpm \
@@ -27,7 +28,7 @@ ALWAYS_KEEP_DISTFILES= YES
MAINTAINER= emulation@FreeBSD.org
COMMENT= Mesa libGL runtime libraries and DRI drivers (Linux Fedora 8)
-CONFLICTS= linux_dri-[0-9]* linux_dri-devel-[0-9]*
+CONFLICTS= linux_dri-[0-9]* linux_dri-devel-[0-9]* linux-dri-[0-9]* linux-f10-dri-[0-9]*
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
diff --git a/graphics/linux-f8-gdk-pixbuf/Makefile b/graphics/linux-f8-gdk-pixbuf/Makefile
index 6aafda7bec3e..a2814afd69df 100644
--- a/graphics/linux-f8-gdk-pixbuf/Makefile
+++ b/graphics/linux-f8-gdk-pixbuf/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gdk-pixbuf
PORTVERSION= 0.22.0
+PORTREVISION= 1
CATEGORIES= graphics linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Image loading library for GTK+ (Linux Fedora 8)
+CONFLICTS= linux-gdk-pixbuf-[0-9]* linux-f10-gdk-pixbuf-[0-9]*
+
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_DIST_VER= 8
diff --git a/graphics/linux-f8-imlib/Makefile b/graphics/linux-f8-imlib/Makefile
index a9f1b627bc49..dde4f8397efa 100644
--- a/graphics/linux-f8-imlib/Makefile
+++ b/graphics/linux-f8-imlib/Makefile
@@ -7,6 +7,7 @@
PORTNAME= imlib
PORTVERSION= 1.9.15
+PORTREVISION= 1
CATEGORIES= graphics linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of imlib (Linux Fedora 8)
+CONFLICTS= linux-imlib-[0-9]* linux-f10-imlib-[0-9]*
+
USE_LINUX_RPM= yes
LINUX_DIST_VER= 8
RPMVERSION= 6.fc8
diff --git a/graphics/linux-f8-jpeg/Makefile b/graphics/linux-f8-jpeg/Makefile
index b68fc51b6b6a..04729f68092d 100644
--- a/graphics/linux-f8-jpeg/Makefile
+++ b/graphics/linux-f8-jpeg/Makefile
@@ -7,6 +7,7 @@
PORTNAME= jpeg
PORTVERSION= 6b
+PORTREVISION= 1
CATEGORIES= graphics linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of the JPEG lib (Linux Fedora 8)
+CONFLICTS= linux-jpeg-[0-9]* linux-f10-jpeg-[0-9]*
+
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_NAME= lib${PORTNAME}
diff --git a/graphics/linux-f8-libGLU/Makefile b/graphics/linux-f8-libGLU/Makefile
index 85a0bc02d641..dc82caec3a9f 100644
--- a/graphics/linux-f8-libGLU/Makefile
+++ b/graphics/linux-f8-libGLU/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libGLU
PORTVERSION= 7.0.2
+PORTREVISION= 1
CATEGORIES= graphics linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,7 +15,7 @@ DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Mesa libGLU runtime library (Linux Fedora 8)
-CONFLICTS= linux_dri-[0-9]* linux_dri-devel-* linux-libGLU-*
+CONFLICTS= linux_dri-[0-9]* linux_dri-devel-* linux-libGLU-* linux-dri-[0-9]*
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
diff --git a/graphics/linux-f8-libmng/Makefile b/graphics/linux-f8-libmng/Makefile
index 88c1b0d09e2d..2c26f3fbeea3 100644
--- a/graphics/linux-f8-libmng/Makefile
+++ b/graphics/linux-f8-libmng/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libmng
PORTVERSION= 1.0.9
+PORTREVISION= 1
CATEGORIES= graphics linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= RPM of libmng (Linux Fedora 8)
+CONFLICTS= linux-libmng-[0-9]* linux-f10-libmng-[0-9]*
+
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
USE_LINUX_APPS= jpeg
diff --git a/graphics/linux-f8-png/Makefile b/graphics/linux-f8-png/Makefile
index fc1e07c180fe..c86c3fa47124 100644
--- a/graphics/linux-f8-png/Makefile
+++ b/graphics/linux-f8-png/Makefile
@@ -7,6 +7,7 @@
PORTNAME= png
PORTVERSION= 1.2.22
+PORTREVISION= 1
CATEGORIES= graphics linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of the PNG lib (Linux Fedora 8)
+CONFLICTS= linux-png-[0-9]* linux-f10-png-[0-9]*
+
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_NAME= libpng
diff --git a/graphics/linux-f8-png10/Makefile b/graphics/linux-f8-png10/Makefile
index e48aeaa568b8..392c86597699 100644
--- a/graphics/linux-f8-png10/Makefile
+++ b/graphics/linux-f8-png10/Makefile
@@ -7,6 +7,7 @@
PORTNAME= png10
PORTVERSION= 1.0.30
+PORTREVISION= 1
CATEGORIES= graphics linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of the PNG lib (old 1.0 version, Linux Fedora 8)
+CONFLICTS= linux-png10-[0-9]* linux-f10-png10-[0-9]*
+
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_NAME= lib${PORTNAME}
diff --git a/graphics/linux-f8-sdl_image/Makefile b/graphics/linux-f8-sdl_image/Makefile
index a7318678eb48..402c534d3de6 100644
--- a/graphics/linux-f8-sdl_image/Makefile
+++ b/graphics/linux-f8-sdl_image/Makefile
@@ -7,6 +7,7 @@
PORTNAME= sdl_image
PORTVERSION= 1.2.6
+PORTREVISION= 1
CATEGORIES= graphics linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= A simple library to load images as SDL interfaces (Linux Fedora 8)
+CONFLICTS= linux-sdl_image-[0-9]* linux-f10-sdl_image-[0-9]*
+
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
USE_LINUX_APPS= sdl12
diff --git a/graphics/linux-f8-tiff/Makefile b/graphics/linux-f8-tiff/Makefile
index 1b1fdb50c0df..6a1e3d2e6fe4 100644
--- a/graphics/linux-f8-tiff/Makefile
+++ b/graphics/linux-f8-tiff/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tiff
PORTVERSION= 3.8.2
+PORTREVISION= 1
CATEGORIES= graphics linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= The TIFF library, Linux/i386 binary (Linux Fedora 8)
+CONFLICTS= linux-tiff-[0-9]* linux-f10-tiff-[0-9]*
+
ONLY_FOR_ARCHS= amd64 i386
USE_LINUX_RPM= yes
USE_LINUX_APPS= jpeg
diff --git a/graphics/linux-f8-ungif/Makefile b/graphics/linux-f8-ungif/Makefile
index fed19f3d1c38..f1a8f209fdb4 100644
--- a/graphics/linux-f8-ungif/Makefile
+++ b/graphics/linux-f8-ungif/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ungif
PORTVERSION= 4.1.3
+PORTREVISION= 1
CATEGORIES= graphics linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= RPM of gif and ungif libs (Linux Fedora 8)
+CONFLICTS= linux-ungif-[0-9]* linux-f10-ungif-[0-9]*
+
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_NAME= giflib
diff --git a/lang/linux-f8-libg2c/Makefile b/lang/linux-f8-libg2c/Makefile
index 695b94919978..eef3c33dcad2 100644
--- a/lang/linux-f8-libg2c/Makefile
+++ b/lang/linux-f8-libg2c/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libg2c
PORTVERSION= 3.4.6
+PORTREVISION= 1
CATEGORIES= lang linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Fortran 77 shared library (Linux Fedora 8)
+CONFLICTS= linux-libg2c-[0-9]* linux-f10-libg2c-[0-9]*
+
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_NAME= compat-libf2c-34
diff --git a/lang/linux-f8-tcl84/Makefile b/lang/linux-f8-tcl84/Makefile
index 09a02f3eb309..27ba29772e78 100644
--- a/lang/linux-f8-tcl84/Makefile
+++ b/lang/linux-f8-tcl84/Makefile
@@ -6,6 +6,7 @@
PORTNAME= tcl
PORTVERSION= 8.4.17
+PORTREVISION= 1
CATEGORIES= lang linux
PKGNAMEPREFIX= linux-f8-
PKGNAMESUFFIX= 84
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= stast@bsdportal.ru
COMMENT= Tool Command Language (Linux Fedora 8)
+CONFLICTS= linux-f10-tcl85-[0-9]*
+
USE_LINUX_RPM= yes
LINUX_DIST_VER= 8
RPMVERSION= 1.fc8
diff --git a/multimedia/linux-f8-libtheora/Makefile b/multimedia/linux-f8-libtheora/Makefile
index 1605c90618f2..23c1856c6b1f 100644
--- a/multimedia/linux-f8-libtheora/Makefile
+++ b/multimedia/linux-f8-libtheora/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libtheora
PORTVERSION= 1.0beta2
+PORTREVISION= 1
CATEGORIES= multimedia linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Theora Video Compression Codec (Linux Fedora 8)
+CONFLICTS= linux-libtheora-[0-9]* linux-f10-libtheora-[0-9]*
+
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_DIST_VER= 8
diff --git a/security/linux-f8-libssh2/Makefile b/security/linux-f8-libssh2/Makefile
index 05d030df3482..6ceeef7ee6e3 100644
--- a/security/linux-f8-libssh2/Makefile
+++ b/security/linux-f8-libssh2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libssh2
PORTVERSION= 0.18
+PORTREVISION= 1
CATEGORIES= security linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= The library implementing the SSH2 protocol (Linux Fedora 8)
+CONFLICTS= linux-libssh2-[0-9]* linux-f10-libssh2-[0-9]*
+
USE_LINUX_RPM= yes
USE_LINUX_APPS= openssl
LINUX_DIST_VER= 8
diff --git a/security/linux-f8-nss/Makefile b/security/linux-f8-nss/Makefile
index 3bd026baf5cf..4f8489eba91e 100644
--- a/security/linux-f8-nss/Makefile
+++ b/security/linux-f8-nss/Makefile
@@ -7,6 +7,7 @@
PORTNAME= nss
PORTVERSION= 3.12.2.0
+PORTREVISION= 1
CATEGORIES= security linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Network Security Services (Linux Fedora 8)
+CONFLICTS= linux-nss-[0-9]* linux-f10-nss-[0-9]*
+
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
USE_LINUX_APPS= nspr sqlite3
diff --git a/security/linux-f8-openssl/Makefile b/security/linux-f8-openssl/Makefile
index c4b5d7e0f940..5e1c953c28d4 100644
--- a/security/linux-f8-openssl/Makefile
+++ b/security/linux-f8-openssl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= openssl
PORTVERSION= 0.9.8b
+PORTREVISION= 1
CATEGORIES= security linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= The OpenSSL toolkit (Linux Fedora 8)
+CONFLICTS= linux-openssl-[0-9]* linux-f10-openssl-[0-9]*
+
USE_LINUX_RPM= yes
LINUX_DIST_VER= 8
RPMVERSION= 17.fc8
diff --git a/textproc/linux-f8-aspell/Makefile b/textproc/linux-f8-aspell/Makefile
index e3364af841e2..47277f091331 100644
--- a/textproc/linux-f8-aspell/Makefile
+++ b/textproc/linux-f8-aspell/Makefile
@@ -7,6 +7,7 @@
PORTNAME= aspell
PORTVERSION= 0.60.5
+PORTREVISION= 1
CATEGORIES= textproc linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Spelling checker with better logic than ispell (Linux Fedora 8)
+CONFLICTS= linux-aspell-[0-9]* linux-f10-aspell-[0-9]*
+
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_DIST_VER= 8
diff --git a/textproc/linux-f8-expat/Makefile b/textproc/linux-f8-expat/Makefile
index d14588dad4eb..d583b62ca314 100644
--- a/textproc/linux-f8-expat/Makefile
+++ b/textproc/linux-f8-expat/Makefile
@@ -7,6 +7,7 @@
PORTNAME= expat
PORTVERSION= 2.0.1
+PORTREVISION= 1
CATEGORIES= textproc linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Linux/i386 binary port of Expat XML-parsing library (Linux Fedora 8)
+CONFLICTS= linux-expat-[0-9]* linux-f10-expat-[0-9]*
+
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_DIST_VER= 8
diff --git a/textproc/linux-f8-libxml/Makefile b/textproc/linux-f8-libxml/Makefile
index 54665f45675a..e6b01e1ed941 100644
--- a/textproc/linux-f8-libxml/Makefile
+++ b/textproc/linux-f8-libxml/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libxml
PORTVERSION= 1.8.17
+PORTREVISION= 1
CATEGORIES= textproc linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Old libXML library for Gnome-1 application compatibility (Linux Fedora 8)
+CONFLICTS= linux-libxml-[0-9]* linux-f10-libxml-[0-9]*
+
USE_LINUX_RPM= yes
LINUX_DIST_VER= 8
RPMVERSION= 18.fc8
diff --git a/textproc/linux-f8-libxml2/Makefile b/textproc/linux-f8-libxml2/Makefile
index 9ec61e39e1d7..841418c58765 100644
--- a/textproc/linux-f8-libxml2/Makefile
+++ b/textproc/linux-f8-libxml2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libxml2
PORTVERSION= 2.7.2
+PORTREVISION= 1
CATEGORIES= textproc linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Library providing XML and HTML support (Linux Fedora 8)
+CONFLICTS= linux-libxml2-[0-9]* linux-f10-libxml2-[0-9]*
+
USE_LINUX_RPM= yes
LINUX_DIST_VER= 8
RPMVERSION= 2.fc8
diff --git a/textproc/linux-f8-scim-gtk/Makefile b/textproc/linux-f8-scim-gtk/Makefile
index 11a154a9c3eb..9d4d31be6d1f 100644
--- a/textproc/linux-f8-scim-gtk/Makefile
+++ b/textproc/linux-f8-scim-gtk/Makefile
@@ -7,6 +7,7 @@
PORTNAME= scim-gtk
PORTVERSION= 1.4.7
+PORTREVISION= 1
CATEGORIES= textproc linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Smart Common Input Method platform, gtk module, (Linux Fedora 8)
+CONFLICTS= linux-scim-gtk-[0-9]* linux-f10-scim-gtk-[0-9]*
+
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
USE_LINUX_APPS= gtk2 scimlibs
diff --git a/textproc/linux-f8-scim-libs/Makefile b/textproc/linux-f8-scim-libs/Makefile
index 5bc2397693e5..e7354c5c4ea4 100644
--- a/textproc/linux-f8-scim-libs/Makefile
+++ b/textproc/linux-f8-scim-libs/Makefile
@@ -7,6 +7,7 @@
PORTNAME= scim-libs
PORTVERSION= 1.4.7
+PORTREVISION= 1
CATEGORIES= textproc linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Smart Common Input Method libraries (Linux Fedora 8)
+CONFLICTS= linux-scim-libs-[0-9]* linux-f10-scim-libs-[0-9]*
+
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
USE_LINUX_APPS= gtk2
diff --git a/x11-fonts/linux-f8-fontconfig/Makefile b/x11-fonts/linux-f8-fontconfig/Makefile
index e8f1671c439c..ced9c90b8b17 100644
--- a/x11-fonts/linux-f8-fontconfig/Makefile
+++ b/x11-fonts/linux-f8-fontconfig/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fontconfig
PORTVERSION= 2.4.2
+PORTREVISION= 1
CATEGORIES= x11-fonts linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= An XML-based font configuration API for X Windows (Linux Fedora 8)
+CONFLICTS= linux-fontconfig-[0-9]* linux-f10-fontconfig-[0-9]*
+
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
USE_LINUX_APPS= expat
diff --git a/x11-themes/linux-f8-hicolor-icon-theme/Makefile b/x11-themes/linux-f8-hicolor-icon-theme/Makefile
index 9f93dd77acc3..262c95565b89 100644
--- a/x11-themes/linux-f8-hicolor-icon-theme/Makefile
+++ b/x11-themes/linux-f8-hicolor-icon-theme/Makefile
@@ -7,6 +7,7 @@
PORTNAME= hicolor-icon-theme
PORTVERSION= 0.5
+PORTREVISION= 1
CATEGORIES= x11-themes linux
MASTER_SITES= # empty
PKGNAMEPREFIX= linux-f8-
@@ -17,6 +18,8 @@ COMMENT= A high-color icon theme shell from the FreeDesktop project
RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
+CONFLICTS= linux-hicolor-icon-theme-[0-9]* linux-f10-hicolor-icon-theme-[0-9]*
+
NO_BUILD= yes
USE_LINUX= yes
USE_LINUX_PREFIX= yes
diff --git a/x11-toolkits/linux-f8-gtk/Makefile b/x11-toolkits/linux-f8-gtk/Makefile
index 9395d3cdf40e..3c6943979f45 100644
--- a/x11-toolkits/linux-f8-gtk/Makefile
+++ b/x11-toolkits/linux-f8-gtk/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtk
PORTVERSION= 1.2.10
+PORTREVISION= 1
CATEGORIES= x11-toolkits linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Gtk library (Linux Fedora 8)
+CONFLICTS= linux-gtk-[0-9]* linux-f10-gtk-[0-9]*
+
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
USE_LINUX_APPS= xorglibs
diff --git a/x11-toolkits/linux-f8-gtk2/Makefile b/x11-toolkits/linux-f8-gtk2/Makefile
index 27fc0c82df12..fdb3490c3af8 100644
--- a/x11-toolkits/linux-f8-gtk2/Makefile
+++ b/x11-toolkits/linux-f8-gtk2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtk2
PORTVERSION= 2.12.8
+PORTREVISION= 1
CATEGORIES= x11-toolkits linux
PKGNAMEPREFIX= linux-f8-
DISTFILES= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}.${LINUX_RPM_ARCH}.rpm \
@@ -20,6 +21,8 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}.${LINUX_RPM_ARCH}.rpm \
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= GTK+ library, version 2.X (Linux Fedora 8)
+CONFLICTS= linux-gtk2-[0-9]* linux-f10-gtk2-[0-9]*
+
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
# these libraries are required by gtk-query-immodules-2.0 or
diff --git a/x11-toolkits/linux-f8-openmotif/Makefile b/x11-toolkits/linux-f8-openmotif/Makefile
index 678feb74d5a4..b940ba545c8a 100644
--- a/x11-toolkits/linux-f8-openmotif/Makefile
+++ b/x11-toolkits/linux-f8-openmotif/Makefile
@@ -6,6 +6,7 @@
PORTNAME= openmotif
PORTVERSION= 2.3.2
+PORTREVISION= 1
CATEGORIES= x11-toolkits linux
MASTER_SITES= ftp://ftp.motifzone.com/%SUBDIR%/ \
ftp://ftp.ics.com/openmotif/%SUBDIR%/
@@ -17,6 +18,8 @@ DIST_SUBDIR= rpm
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Motif toolkit Linux libraries
+CONFLICTS= linux-openmotif-[0-9]* linux-f10-openmotif-[0-9]*
+
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
USE_LINUX_APPS= xorglibs
diff --git a/x11-toolkits/linux-f8-pango/Makefile b/x11-toolkits/linux-f8-pango/Makefile
index 41725e1bc18d..eafa6e8b3251 100644
--- a/x11-toolkits/linux-f8-pango/Makefile
+++ b/x11-toolkits/linux-f8-pango/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pango
PORTVERSION= 1.18.4
+PORTREVISION= 1
CATEGORIES= x11-toolkits linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= The pango library (Linux Fedora 8)
+CONFLICTS= linux-pango-[0-9]* linux-f10-pango-[0-9]*
+
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
# these libraries are required by pango-querymodules
diff --git a/x11-toolkits/linux-f8-qt33/Makefile b/x11-toolkits/linux-f8-qt33/Makefile
index 7cf9dd80b3f5..877c2cd34d1d 100644
--- a/x11-toolkits/linux-f8-qt33/Makefile
+++ b/x11-toolkits/linux-f8-qt33/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ${LINUX_NAME}33
PORTVERSION= 3.3.8b
+PORTREVISION= 1
CATEGORIES= x11-toolkits linux
PKGNAMEPREFIX= linux-f8-
DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
@@ -14,6 +15,8 @@ DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= RPM of QT3 (Linux Fedora 8)
+CONFLICTS= linux-qt33-[0-9]* linux-f10-qt33-[0-9]*
+
USE_LINUX_RPM= yes
USE_LINUX_APPS= fontconfig libmng png
LINUX_NAME= qt
diff --git a/x11-toolkits/linux-f8-tk84/Makefile b/x11-toolkits/linux-f8-tk84/Makefile
index de81daeda88a..c209e955e7c5 100644
--- a/x11-toolkits/linux-f8-tk84/Makefile
+++ b/x11-toolkits/linux-f8-tk84/Makefile
@@ -6,6 +6,7 @@
PORTNAME= tk
PORTVERSION= 8.4.17
+PORTREVISION= 1
CATEGORIES= x11-toolkits linux
PKGNAMEPREFIX= linux-f8-
PKGNAMESUFFIX= 84
@@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= stast@bsdportal.ru
COMMENT= Graphical toolkit for TCL (Linux Fedora 8)
+CONFLICTS= linux-f10-tk85-[0-9]*
+
USE_LINUX_RPM= yes
USE_LINUX_APPS= xorglibs
LINUX_DIST_VER= 8
diff --git a/x11/linux-f8-xorg-libs/Makefile b/x11/linux-f8-xorg-libs/Makefile
index ce0cd9d6df36..c7a0489706eb 100644
--- a/x11/linux-f8-xorg-libs/Makefile
+++ b/x11/linux-f8-xorg-libs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xorg-libs
PORTVERSION= 7.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 linux
PKGNAMEPREFIX= linux-f8-
DISTFILES= libICE-1.0.4-2.fc8.${LINUX_RPM_ARCH}.rpm \
@@ -88,7 +88,7 @@ SRC_DISTFILES= libICE-1.0.4-2.fc8.src.rpm \
ALWAYS_KEEP_DISTFILES= YES
.endif
-CONFLICTS= linux-xorg-libs-[0-9]*
+CONFLICTS= linux-xorg-libs-[0-9]* linux-f10-xorg-libs-[0-9]*
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Xorg libraries (Linux Fedora 8)