diff options
47 files changed, 139 insertions, 22 deletions
diff --git a/accessibility/linux-atk/Makefile b/accessibility/linux-atk/Makefile index dbc2265c7518..c4f1cbc7c81c 100644 --- a/accessibility/linux-atk/Makefile +++ b/accessibility/linux-atk/Makefile @@ -7,13 +7,15 @@ PORTNAME= atk PORTVERSION= 1.9.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= accessibility linux DISTNAME= ${PORTNAME}-${PORTVERSION}-1 MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= Accessibility Toolkit, Linux/i386 binary +CONFLICTS= linux-f8-atk-[0-9]* + ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 diff --git a/archivers/linux-ucl/Makefile b/archivers/linux-ucl/Makefile index b672de7a3ebe..97a30675626f 100644 --- a/archivers/linux-ucl/Makefile +++ b/archivers/linux-ucl/Makefile @@ -7,6 +7,7 @@ PORTNAME= ucl PORTVERSION= 1.03 +PORTREVISION= 1 CATEGORIES= archivers linux MASTER_SITE_SUBDIR= ../extras/${LINUX_DIST_VER}/${LINUX_RPM_ARCH} DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION} @@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION} MAINTAINER= emulation@FreeBSD.org COMMENT= RPM of UCL, a lossless data compression library +CONFLICTS= linux-f8-ucl-[0-9]* + USE_LINUX_RPM= yes RPMVERSION= 3 LINUX_DIST_VER= 4 diff --git a/archivers/linux-upx/Makefile b/archivers/linux-upx/Makefile index e5abf413f4db..80c4b4d3e1bd 100644 --- a/archivers/linux-upx/Makefile +++ b/archivers/linux-upx/Makefile @@ -7,6 +7,7 @@ PORTNAME= upx PORTVERSION= 1.25 +PORTREVISION= 1 CATEGORIES= archivers linux MASTER_SITE_SUBDIR= ../extras/${LINUX_DIST_VER}/${LINUX_RPM_ARCH} DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION} @@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION} MAINTAINER= emulation@FreeBSD.org COMMENT= RPM of UPX, a high-performance executable packer +CONFLICTS= linux-f8-upx-[0-9]* + USE_LINUX_RPM= yes USE_LINUX_APPS= ucl RPMVERSION= 4 diff --git a/audio/linux-alsa-lib/Makefile b/audio/linux-alsa-lib/Makefile index 800b6414793f..2968147ce766 100644 --- a/audio/linux-alsa-lib/Makefile +++ b/audio/linux-alsa-lib/Makefile @@ -7,12 +7,15 @@ PORTNAME= alsa-lib DISTVERSION= 1.0.10-3 +PORTREVISION= 1 CATEGORIES= audio linux DISTNAME= ${PORTNAME}-${DISTVERSION}.FC4 MAINTAINER= ports@FreeBSD.org COMMENT= The Advanced Linux Sound Architecture libraries +CONFLICTS= linux-f8-alsa-lib-[0-9]* + ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 diff --git a/audio/linux-arts/Makefile b/audio/linux-arts/Makefile index 8835f0917b60..a2f0ff815b1c 100644 --- a/audio/linux-arts/Makefile +++ b/audio/linux-arts/Makefile @@ -7,11 +7,14 @@ PORTNAME= arts DISTVERSION= 1.5.3-0.1.fc4 +PORTREVISION= 1 CATEGORIES= audio kde linux MAINTAINER= ports@FreeBSD.org COMMENT= Audio system for the KDE integrated X11 desktop (Linux version) +CONFLICTS= linux-f8-arts-[0-9]* + ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 diff --git a/audio/linux-esound/Makefile b/audio/linux-esound/Makefile index 9e9ab0cb8c8f..511a2a143e9e 100644 --- a/audio/linux-esound/Makefile +++ b/audio/linux-esound/Makefile @@ -6,13 +6,16 @@ # PORTNAME= esound -CATEGORIES= audio linux PORTVERSION= 0.2.36 +PORTREVISION= 1 +CATEGORIES= audio linux DISTNAME= ${PORTNAME}-${PORTVERSION}-0.fc4.1 MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= RPM of esound +CONFLICTS= linux-f8-esound-[0-9]* + USE_LINUX_RPM= yes USE_LINUX_APPS= libaudiofile LINUX_DIST_VER= 4 diff --git a/audio/linux-freealut/Makefile b/audio/linux-freealut/Makefile index 93d47290414b..5285867a2e5b 100644 --- a/audio/linux-freealut/Makefile +++ b/audio/linux-freealut/Makefile @@ -7,6 +7,7 @@ PORTNAME= freealut PORTVERSION= 1.1.0 +PORTREVISION= 1 CATEGORIES= audio linux MASTER_SITE_SUBDIR= ../extras/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/ DISTNAME= ${PORTNAME}-${PORTVERSION}-1.fc${LINUX_DIST_VER} @@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-1.fc${LINUX_DIST_VER} MAINTAINER= ports@FreeBSD.org COMMENT= A free implementation of OpenAL's ALUT standard (Linux version) +CONFLICTS= linux-f8-freealut-[0-9]* + USE_LINUX_RPM= yes USE_LINUX_APPS= openal LINUX_DIST_VER= 4 diff --git a/audio/linux-libaudiofile/Makefile b/audio/linux-libaudiofile/Makefile index afcbcbf7e445..eb0daef4e309 100644 --- a/audio/linux-libaudiofile/Makefile +++ b/audio/linux-libaudiofile/Makefile @@ -7,13 +7,15 @@ PORTNAME= libaudiofile PORTVERSION= 0.2.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio linux DISTNAME= audiofile-${PORTVERSION}-2 MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= RPM of audiofile +CONFLICTS= linux-f8-libaudiofile-[0-9]* + USE_LINUX_RPM= yes LINUX_DIST_VER= 4 USE_LDCONFIG= yes diff --git a/audio/linux-libogg/Makefile b/audio/linux-libogg/Makefile index 9f33fefbaa61..4c1596c16b2f 100644 --- a/audio/linux-libogg/Makefile +++ b/audio/linux-libogg/Makefile @@ -7,12 +7,14 @@ PORTNAME= libogg DISTVERSION= 1.1.2-2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio linux MAINTAINER= ports@FreeBSD.org COMMENT= Ogg bitstream library (Linux version) +CONFLICTS= linux-f8-libogg-[0-9]* + ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 diff --git a/audio/linux-libvorbis/Makefile b/audio/linux-libvorbis/Makefile index e21ca9b52cf8..e45d2f6cf9a0 100644 --- a/audio/linux-libvorbis/Makefile +++ b/audio/linux-libvorbis/Makefile @@ -7,11 +7,14 @@ PORTNAME= libvorbis DISTVERSION= 1.1.0-2 +PORTREVISION= 1 CATEGORIES= audio linux MAINTAINER= ports@FreeBSD.org COMMENT= Audio compression codec library (Linux version) +CONFLICTS= linux-f8-libvorbis-[0-9]* + ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes USE_LINUX_APPS= libogg diff --git a/audio/linux-mikmod/Makefile b/audio/linux-mikmod/Makefile index 230e13109c71..eaf17343d15d 100644 --- a/audio/linux-mikmod/Makefile +++ b/audio/linux-mikmod/Makefile @@ -7,12 +7,15 @@ PORTNAME= mikmod DISTVERSION= 3.1.6 +PORTREVISION= 1 CATEGORIES= audio linux DISTNAME= ${PORTNAME}-${PORTVERSION}-34 MAINTAINER= mva@FreeBSD.org COMMENT= MikMod Sound Library (Linux version) +CONFLICTS= linux-f8-mikmod-[0-9]* + ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 diff --git a/audio/linux-openal/Makefile b/audio/linux-openal/Makefile index 850736b2b4da..5c493f68c0a8 100644 --- a/audio/linux-openal/Makefile +++ b/audio/linux-openal/Makefile @@ -6,14 +6,16 @@ # PORTNAME= openal -PORTREVISION= 1 DISTVERSION= 0.0.9-0.6.20060204cvs.fc4 +PORTREVISION= 2 CATEGORIES= audio linux MASTER_SITE_SUBDIR= ../extras/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/ MAINTAINER= ports@FreeBSD.org COMMENT= A 3D positional spatialized sound library (Linux version) +CONFLICTS= linux-f8-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-sdl_mixer/Makefile b/audio/linux-sdl_mixer/Makefile index 8a21370a5e18..0999570e80c5 100644 --- a/audio/linux-sdl_mixer/Makefile +++ b/audio/linux-sdl_mixer/Makefile @@ -7,6 +7,7 @@ PORTNAME= sdl_mixer DISTVERSION= 1.2.6 +PORTREVISION= 1 CATEGORIES= audio linux MASTER_SITE_SUBDIR= ../extras/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/ DISTNAME= SDL_mixer-${PORTVERSION}-3.fc${LINUX_DIST_VER} @@ -14,6 +15,8 @@ DISTNAME= SDL_mixer-${PORTVERSION}-3.fc${LINUX_DIST_VER} MAINTAINER= mva@FreeBSD.org COMMENT= A sample multi-channel audio mixer library (Linux version) +CONFLICTS= linux-f8-sdl_mixer-[0-9]* + ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes USE_LINUX_APPS= sdl12 diff --git a/devel/linux-allegro/Makefile b/devel/linux-allegro/Makefile index b855c36a7ad4..988cbbafd5d5 100644 --- a/devel/linux-allegro/Makefile +++ b/devel/linux-allegro/Makefile @@ -7,7 +7,7 @@ PORTNAME= allegro PORTVERSION= 4.0.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel linux MASTER_SITES= http://membres.lycos.fr/ebotcazou/allegro/ DISTNAME= ${PORTNAME}-${PORTVERSION}-1 @@ -15,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-1 MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= Cross-platform game programming library (linux version) +CONFLICTS= linux-f8-allegro-[0-9]* + USE_LINUX_RPM= yes USE_LINUX_APPS= xorglibs ONLY_FOR_ARCHS= i386 amd64 diff --git a/devel/linux-libglade/Makefile b/devel/linux-libglade/Makefile index 4c057ecc2c90..0c71cd9a8d64 100644 --- a/devel/linux-libglade/Makefile +++ b/devel/linux-libglade/Makefile @@ -7,13 +7,15 @@ PORTNAME= libglade PORTVERSION= 0.17 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel linux DISTNAME= ${PORTNAME}-${PORTVERSION}-16 MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= RPM of libglade +CONFLICTS= linux-f8-libglade-[0-9]* + USE_LINUX_RPM= yes LINUX_DIST_VER= 4 USE_LDCONFIG= yes diff --git a/devel/linux-libglade2/Makefile b/devel/linux-libglade2/Makefile index 23b1d20ad914..a50b9e15296a 100644 --- a/devel/linux-libglade2/Makefile +++ b/devel/linux-libglade2/Makefile @@ -7,12 +7,15 @@ PORTNAME= libglade2 PORTVERSION= 2.5.1 +PORTREVISION= 1 CATEGORIES= devel linux DISTNAME= ${PORTNAME}-${PORTVERSION}-2 MAINTAINER= tut@nhamon.com.ua COMMENT= RPM of libglade2 +CONFLICTS= linux-f8-libglade2-[0-9]* + USE_LINUX_RPM= yes LINUX_DIST_VER= 4 USE_LDCONFIG= yes diff --git a/devel/linux-libsigc++20/Makefile b/devel/linux-libsigc++20/Makefile index f42831a19231..30d40810362d 100644 --- a/devel/linux-libsigc++20/Makefile +++ b/devel/linux-libsigc++20/Makefile @@ -7,6 +7,7 @@ PORTNAME= libsigc PORTVERSION= 2.0.17 +PORTREVISION= 1 CATEGORIES= devel linux MASTER_SITE_SUBDIR= ../extras/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/ DISTNAME= ${PORTNAME}++20-${PORTVERSION}-${RPMVERSION} @@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}++20-${PORTVERSION}-${RPMVERSION} MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= Callback Framework for C++ (linux version) +CONFLICTS= linux-f8-libsigc++20-[0-9]* + ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes RPMVERSION= 1 diff --git a/devel/linux-sdl12/Makefile b/devel/linux-sdl12/Makefile index ec312f529c75..0681c31bffdb 100644 --- a/devel/linux-sdl12/Makefile +++ b/devel/linux-sdl12/Makefile @@ -8,6 +8,7 @@ PORTNAME= sdl PORTVERSION= 1.2.10 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel linux MASTER_SITES= http://www.libsdl.org/release/ \ @@ -17,6 +18,8 @@ DISTNAME= ${PORTNAME:U}-${PORTVERSION:S/.1$/-1/}-1 MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= Cross-platform multi-media development API (linux version) +CONFLICTS= linux-f8-sdl12-[0-9]* + USE_LINUX_RPM= yes USE_LINUX_APPS= xorglibs INSTALL_SHLIB= yes diff --git a/ftp/linux-curl/Makefile b/ftp/linux-curl/Makefile index ee494bbbcfb6..63f5068428a0 100644 --- a/ftp/linux-curl/Makefile +++ b/ftp/linux-curl/Makefile @@ -7,6 +7,7 @@ PORTNAME= curl PORTVERSION= 7.13.1 +PORTREVISION= 1 CATEGORIES= ftp linux PKGNAMEPREFIX= linux- DISTNAME= ${PORTNAME}-${PORTVERSION}-5.fc4 @@ -14,6 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-5.fc4 MAINTAINER= acm@FreeBSD.org COMMENT= Curl linux version +CONFLICTS= linux-f8-curl-[0-9]* + USE_LINUX_RPM= yes LINUX_DIST_VER= 4 USE_LDCONFIG= yes diff --git a/graphics/linux-cairo/Makefile b/graphics/linux-cairo/Makefile index 580fc64bf927..e4656dbcc46e 100644 --- a/graphics/linux-cairo/Makefile +++ b/graphics/linux-cairo/Makefile @@ -8,6 +8,7 @@ PORTNAME= cairo PORTVERSION= 1.0.2 DISTVERSIONSUFFIX= -2.gst.1.4 +PORTREVISION= 1 CATEGORIES= graphics linux MASTER_SITES= http://gstreamer.freedesktop.org/pkg/%SUBDIR%/ CENKES/myports MASTER_SITE_SUBDIR= ${LINUX_DIST}/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/RPMS.deps @@ -16,6 +17,8 @@ MASTER_SITE_SRC_SUBDIR= ${LINUX_DIST}/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/SRPMS. MAINTAINER= ports@FreeBSD.org COMMENT= Linux cairo binary +CONFLICTS= linux-f8-cairo-[0-9]* + ONLY_FOR_ARCHS= i386 amd64 LINUX_DIST_VER= 4 USE_LDCONFIG= yes diff --git a/graphics/linux-gdk-pixbuf/Makefile b/graphics/linux-gdk-pixbuf/Makefile index 28ad286f678a..7f6c8e79a33e 100644 --- a/graphics/linux-gdk-pixbuf/Makefile +++ b/graphics/linux-gdk-pixbuf/Makefile @@ -7,12 +7,15 @@ PORTNAME= gdk-pixbuf PORTVERSION= 0.22.0.18.fc4.2 +PORTREVISION= 1 CATEGORIES= graphics linux DISTNAME= ${PORTNAME}-${PORTVERSION:C/^([^\.]+\.[^\.]+\.[^\.]+)\./\1-/} MAINTAINER= sethk@meowfishies.com COMMENT= Linux version of the graphic library for GTK+ +CONFLICTS= linux-f8-gdk-pixbuf-[0-9]* + USE_LINUX_RPM= yes LINUX_DIST_VER= 4 ONLY_FOR_ARCHS= i386 amd64 diff --git a/graphics/linux-imlib/Makefile b/graphics/linux-imlib/Makefile index 70552b4b75c1..18387be76a5f 100644 --- a/graphics/linux-imlib/Makefile +++ b/graphics/linux-imlib/Makefile @@ -7,13 +7,15 @@ PORTNAME= imlib PORTVERSION= 1.9.13 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics linux DISTNAME= ${PORTNAME}-${PORTVERSION}-24 MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= RPM of imlib +CONFLICTS= linux-f8-imlib-[0-9]* + USE_LINUX_RPM= yes LINUX_DIST_VER= 4 USE_LDCONFIG= yes diff --git a/graphics/linux-jpeg/Makefile b/graphics/linux-jpeg/Makefile index abd359ef7b1a..b0a20482428d 100644 --- a/graphics/linux-jpeg/Makefile +++ b/graphics/linux-jpeg/Makefile @@ -7,12 +7,15 @@ PORTNAME= jpeg PORTVERSION= 6b.34 +PORTREVISION= 1 CATEGORIES= graphics linux DISTNAME= libjpeg-6b-34 MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= RPM of the JPEG lib +CONFLICTS= linux-f8-jpeg-[0-9]* + USE_LINUX_RPM= yes LINUX_DIST_VER= 4 USE_LDCONFIG= yes diff --git a/graphics/linux-libGLU/Makefile b/graphics/linux-libGLU/Makefile index e3e972565ee9..ca950b16f568 100644 --- a/graphics/linux-libGLU/Makefile +++ b/graphics/linux-libGLU/Makefile @@ -7,6 +7,7 @@ PORTNAME= libGLU PORTVERSION= 6.8.2 +PORTREVISION= 1 CATEGORIES= graphics linux DISTNAME= xorg-x11-Mesa-libGLU-${PORTVERSION}-${RPMVERSION} SRC_DISTFILES= xorg-x11-${PORTVERSION}-${RPMVERSION}${SRC_SUFX} @@ -14,7 +15,7 @@ SRC_DISTFILES= xorg-x11-${PORTVERSION}-${RPMVERSION}${SRC_SUFX} MAINTAINER= ports@FreeBSD.org COMMENT= OpenGL utility library (Linux version) -CONFLICTS= linux_dri-[0-9]* +CONFLICTS= linux_dri-[0-9]* linux-f8-libGLU-[0-9]* RPMVERSION= 37.FC4.49.2.1 ONLY_FOR_ARCHS= i386 amd64 diff --git a/graphics/linux-libmng/Makefile b/graphics/linux-libmng/Makefile index 1ed7a820da68..6e7e97ca820b 100644 --- a/graphics/linux-libmng/Makefile +++ b/graphics/linux-libmng/Makefile @@ -7,12 +7,15 @@ PORTNAME= libmng PORTVERSION= 1.0.9 +PORTREVISION= 1 CATEGORIES= graphics linux DISTNAME= ${PORTNAME}-${PORTVERSION}-1 MAINTAINER= michael@ranner.eu COMMENT= RPM of libmng +CONFLICTS= linux-f8-libmng-[0-9]* + USE_LINUX_RPM= yes USE_LINUX_APPS= jpeg LINUX_DIST_VER= 4 diff --git a/graphics/linux-png/Makefile b/graphics/linux-png/Makefile index 10c3d3261f22..1b18f7dd1a79 100644 --- a/graphics/linux-png/Makefile +++ b/graphics/linux-png/Makefile @@ -7,13 +7,15 @@ PORTNAME= png PORTVERSION= 1.2.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics linux DISTNAME= libpng-${PORTVERSION}-2 MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= RPM of the PNG lib +CONFLICTS= linux-f8-png-[0-9]* + # no alpha rpm is available ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes diff --git a/graphics/linux-png10/Makefile b/graphics/linux-png10/Makefile index d23671783b57..17ece16f0588 100644 --- a/graphics/linux-png10/Makefile +++ b/graphics/linux-png10/Makefile @@ -7,12 +7,14 @@ PORTNAME= png PORTVERSION= 1.0.18 +PORTREVISION= 1 CATEGORIES= graphics linux DISTNAME= libpng10-${PORTVERSION}-2 MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= RPM of the PNG lib (old 1.0 version) +CONFLICTS= linux-f8-png10-[0-9]* LATEST_LINK= linux-png10 ONLY_FOR_ARCHS= i386 amd64 diff --git a/graphics/linux-sdl_image/Makefile b/graphics/linux-sdl_image/Makefile index a80e82a4136f..6aa0688b28fb 100644 --- a/graphics/linux-sdl_image/Makefile +++ b/graphics/linux-sdl_image/Makefile @@ -8,6 +8,7 @@ PORTNAME= sdl_image PORTVERSION= 1.2.5 +PORTREVISION= 1 CATEGORIES= graphics linux MASTER_SITES= http://www.libsdl.org/projects/SDL_image/release/ DISTNAME= SDL_image-${PORTVERSION}-1 @@ -15,6 +16,8 @@ DISTNAME= SDL_image-${PORTVERSION}-1 MAINTAINER= nivit@FreeBSD.org COMMENT= A simple library to load images as SDL interfaces (linux version) +CONFLICTS= linux-f8-sdl_image-[0-9]* + USE_LINUX_RPM= yes USE_LINUX_APPS= sdl12 INSTALL_SHLIB= yes diff --git a/graphics/linux-tiff/Makefile b/graphics/linux-tiff/Makefile index 7c52ea33277f..9e791da3a55f 100644 --- a/graphics/linux-tiff/Makefile +++ b/graphics/linux-tiff/Makefile @@ -7,12 +7,15 @@ PORTNAME= tiff PORTVERSION= 3.7.1 +PORTREVISION= 1 CATEGORIES= graphics linux DISTNAME= libtiff-${PORTVERSION}-6.fc4.2 MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= TIFF library, Linux/i386 binary +CONFLICTS= linux-f8-tiff-[0-9]* + ONLY_FOR_ARCHS= amd64 i386 USE_LINUX_RPM= yes USE_LINUX_APPS= jpeg diff --git a/graphics/linux-ungif/Makefile b/graphics/linux-ungif/Makefile index 33f945001b80..35743e62486c 100644 --- a/graphics/linux-ungif/Makefile +++ b/graphics/linux-ungif/Makefile @@ -6,13 +6,15 @@ PORTNAME= ungif PORTVERSION= 4.1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics linux DISTNAME= libungif-${PORTVERSION}-3.fc4.2 MAINTAINER= maho@FreeBSD.org COMMENT= RPM of the ungif lib +CONFLICTS= linux-f8-ungif-[0-9]* + ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes diff --git a/lang/linux-libg2c/Makefile b/lang/linux-libg2c/Makefile index f1034d8870df..2b64d81899f8 100644 --- a/lang/linux-libg2c/Makefile +++ b/lang/linux-libg2c/Makefile @@ -6,12 +6,15 @@ PORTNAME= libg2c PORTVERSION= 3.2.3 +PORTREVISION= 1 CATEGORIES= lang linux DISTNAME= compat-libf2c-32-${PORTVERSION}-47.fc4 MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= Fortran 77 compatibility runtime +CONFLICTS= linux-f8-libg2c-[0-9]* + ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 diff --git a/multimedia/linux-libtheora/Makefile b/multimedia/linux-libtheora/Makefile index 27f27e41e0d4..3d95509067a8 100644 --- a/multimedia/linux-libtheora/Makefile +++ b/multimedia/linux-libtheora/Makefile @@ -7,11 +7,14 @@ PORTNAME= libtheora DISTVERSION= 1.0alpha4-2 +PORTREVISION= 1 CATEGORIES= multimedia linux MAINTAINER= ports@FreeBSD.org COMMENT= Video codec +CONFLICTS= linux-f8-libtheora-[0-9]* + ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 diff --git a/security/linux-openssl/Makefile b/security/linux-openssl/Makefile index a5be6edca011..68250bedf0dc 100644 --- a/security/linux-openssl/Makefile +++ b/security/linux-openssl/Makefile @@ -7,12 +7,15 @@ PORTNAME= openssl PORTVERSION= 0.9.7f +PORTREVISION= 1 CATEGORIES= security linux DISTNAME= ${PORTNAME}-${PORTVERSION}-7.10 MAINTAINER= acm@FreeBSD.org COMMENT= SSL and crypto library (Linux Version) +CONFLICTS= linux-f8-openssl-[0-9]* + USE_LINUX_RPM= yes LINUX_DIST_VER= 4 USE_LDCONFIG= yes diff --git a/textproc/linux-aspell/Makefile b/textproc/linux-aspell/Makefile index d63a5ce3f480..82c3daa1da8a 100644 --- a/textproc/linux-aspell/Makefile +++ b/textproc/linux-aspell/Makefile @@ -7,7 +7,7 @@ PORTNAME= aspell PORTVERSION= 0.50.4.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc linux MASTER_SITES= ftp://ftp.pbone.net/mirror/ftp.ximian.com/pub/ximian-evolution/redhat-80-i386/ \ ftp://ftp.pbone.net/mirror/ftp.ximian.com/pub/ximian-evolution/redhat-80-i386/source/ \ @@ -21,6 +21,8 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org COMMENT= Spelling checker with better logic than ispell (linux version) +CONFLICTS= linux-f8-aspell-[0-9]* + USE_LINUX_RPM= yes ONLY_FOR_ARCHS= i386 amd64 USE_GMAKE= yes diff --git a/textproc/linux-expat/Makefile b/textproc/linux-expat/Makefile index e5c55dc2ac43..2aa2e4617ab6 100644 --- a/textproc/linux-expat/Makefile +++ b/textproc/linux-expat/Makefile @@ -7,12 +7,15 @@ PORTNAME= expat PORTVERSION= 1.95.8 +PORTREVISION= 1 CATEGORIES= textproc linux DISTNAME= ${PORTNAME}-${PORTVERSION}-6 MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= Linux/i386 binary port of Expat XML-parsing library +CONFLICTS= linux-f8-expat-[0-9]* + BRANDELF_DIRS= usr/bin USE_LINUX_RPM= yes diff --git a/textproc/linux-libxml/Makefile b/textproc/linux-libxml/Makefile index d826d1a9e74c..17b3f338f3bd 100644 --- a/textproc/linux-libxml/Makefile +++ b/textproc/linux-libxml/Makefile @@ -7,13 +7,15 @@ PORTNAME= libxml PORTVERSION= 1.8.17 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc linux DISTNAME= ${PORTNAME}-${PORTVERSION}-13 MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= RPM of libxml +CONFLICTS= linux-f8-libxml-[0-9]* + USE_LINUX_RPM= yes LINUX_DIST_VER= 4 USE_LDCONFIG= yes diff --git a/textproc/linux-libxml2/Makefile b/textproc/linux-libxml2/Makefile index 6fa129db58df..5640acf4e903 100644 --- a/textproc/linux-libxml2/Makefile +++ b/textproc/linux-libxml2/Makefile @@ -7,12 +7,15 @@ PORTNAME= libxml2 PORTVERSION= 2.6.19 +PORTREVISION= 1 CATEGORIES= textproc linux DISTNAME= ${PORTNAME}-${PORTVERSION}-1 MAINTAINER= tut@nhamon.com.ua COMMENT= RPM of libxml2 +CONFLICTS= linux-f8-libxml2-[0-9]* + USE_LINUX_RPM= yes LINUX_DIST_VER= 4 USE_LDCONFIG= yes diff --git a/textproc/linux-scim-gtk/Makefile b/textproc/linux-scim-gtk/Makefile index bc097f2150e7..e0e54a104d0d 100644 --- a/textproc/linux-scim-gtk/Makefile +++ b/textproc/linux-scim-gtk/Makefile @@ -7,6 +7,7 @@ PORTNAME= scim-gtk PORTVERSION= # defined below +PORTREVISION= 1 CATEGORIES= textproc linux MASTER_SITE_SUBDIR= # defined below PKGNAMESUFFIX= -fc${LINUX_DIST_VER} @@ -15,6 +16,8 @@ DISTNAME= # defined below MAINTAINER= hrs@FreeBSD.org COMMENT= Smart Common Input Method platform, gtk module, Linux binary +CONFLICTS= linux-f8-scim-gtk-[0-9]* + MASTER_SITE_SRC_SUBDIR= # defined below SRC_DISTFILES= scim-${PORTVERSION}-${PORTSUBVERSION}.fc${LINUX_DIST_VER}${SRC_SUFX} diff --git a/textproc/linux-scim-libs/Makefile b/textproc/linux-scim-libs/Makefile index d180ded8f0d2..156b8ce9dfef 100644 --- a/textproc/linux-scim-libs/Makefile +++ b/textproc/linux-scim-libs/Makefile @@ -7,7 +7,7 @@ PORTNAME= scim-libs PORTVERSION= # defined below -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc linux MASTER_SITE_SUBDIR= # defined below PKGNAMESUFFIX= -fc${LINUX_DIST_VER} @@ -16,6 +16,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${PORTSUBVERSION}.fc${LINUX_DIST_VER} MAINTAINER= hrs@FreeBSD.org COMMENT= Smart Common Input Method platform, library part, Linux binary +CONFLICTS= linux-f8-scim-libs-[0-9]* + MASTER_SITE_SRC_SUBDIR= # defined below SRC_DISTFILES= scim-${PORTVERSION}-${PORTSUBVERSION}.fc${LINUX_DIST_VER}${SRC_SUFX} diff --git a/x11-fonts/linux-fontconfig/Makefile b/x11-fonts/linux-fontconfig/Makefile index 3516be49859f..7caa46f288c5 100644 --- a/x11-fonts/linux-fontconfig/Makefile +++ b/x11-fonts/linux-fontconfig/Makefile @@ -7,13 +7,15 @@ PORTNAME= fontconfig PORTVERSION= 2.2.3 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11-fonts linux DISTNAME= ${PORTNAME}-${PORTVERSION}-13 MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= Linux/i386 binary of Fontconfig +CONFLICTS= linux-f8-fontconfig-[0-9]* + ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes USE_LINUX_APPS= expat diff --git a/x11-themes/linux-hicolor-icon-theme/Makefile b/x11-themes/linux-hicolor-icon-theme/Makefile index e8de31fb6335..4e472a9d48ba 100644 --- a/x11-themes/linux-hicolor-icon-theme/Makefile +++ b/x11-themes/linux-hicolor-icon-theme/Makefile @@ -7,7 +7,7 @@ PORTNAME= hicolor-icon-theme PORTVERSION= 0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-themes linux MASTER_SITES= # empty PKGNAMEPREFIX= linux- @@ -18,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-f8-hicolor-icon-theme-[0-9]* + NO_BUILD= yes USE_LINUX= yes USE_LINUX_PREFIX= yes diff --git a/x11-toolkits/linux-gtk/Makefile b/x11-toolkits/linux-gtk/Makefile index 715acd969687..28770096b17c 100644 --- a/x11-toolkits/linux-gtk/Makefile +++ b/x11-toolkits/linux-gtk/Makefile @@ -9,13 +9,15 @@ PORTNAME= gtk PORTVERSION= 1.2.10 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits linux DISTNAME= gtk+-${PORTVERSION}-39 MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= RPM of the Gtk lib +CONFLICTS= linux-f8-gtk-[0-9]* + ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes diff --git a/x11-toolkits/linux-gtk2/Makefile b/x11-toolkits/linux-gtk2/Makefile index a183e803d042..4f0ee8f96e07 100644 --- a/x11-toolkits/linux-gtk2/Makefile +++ b/x11-toolkits/linux-gtk2/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtk2 PORTVERSION= 2.6.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits linux DISTFILES= ${PORTNAME}-${PORTVERSION}-2.fc4.4.${LINUX_RPM_ARCH}.rpm \ ${PORTNAME}-engines-2.6.3-2.${LINUX_RPM_ARCH}.rpm @@ -15,6 +15,8 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}-2.fc4.4.${LINUX_RPM_ARCH}.rpm \ MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= GTK+ library, version 2.X, Linux binary +CONFLICTS= linux-f8-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-openmotif/Makefile b/x11-toolkits/linux-openmotif/Makefile index 0284d92b4b44..a745feb859cf 100644 --- a/x11-toolkits/linux-openmotif/Makefile +++ b/x11-toolkits/linux-openmotif/Makefile @@ -6,7 +6,7 @@ PORTNAME= openmotif PORTVERSION= 2.2.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits linux MASTER_SITES= ftp://ftp.motifzone.com/%SUBDIR%/ \ ftp://ftp.ics.com/pub/Products/Motif/%SUBDIR%/ @@ -21,6 +21,8 @@ COMMENT= Motif toolkit Linux libraries BUILD_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm +CONFLICTS= linux-f8-openmotif-[0-9]* + ONLY_FOR_ARCHS= i386 amd64 USE_LINUX= yes USE_LINUX_APPS= xorglibs diff --git a/x11-toolkits/linux-pango/Makefile b/x11-toolkits/linux-pango/Makefile index 11c9512817ba..997f74dd626b 100644 --- a/x11-toolkits/linux-pango/Makefile +++ b/x11-toolkits/linux-pango/Makefile @@ -7,8 +7,8 @@ PORTNAME= pango PORTVERSION= 1.10.2 -PORTREVISION= 1 DISTVERSIONSUFFIX= -1.gst.1.4 +PORTREVISION= 2 CATEGORIES= x11-toolkits linux MASTER_SITES= http://gstreamer.freedesktop.org/pkg/%SUBDIR%/ CENKES/myports MASTER_SITE_SUBDIR= ${LINUX_DIST}/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/RPMS.gst010 @@ -17,6 +17,8 @@ MASTER_SITE_SRC_SUBDIR= ${LINUX_DIST}/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/SRPMS. MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= Linux pango binary +CONFLICTS= linux-f8-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-qt33/Makefile b/x11-toolkits/linux-qt33/Makefile index 64f5d884540b..b719131ffd4e 100644 --- a/x11-toolkits/linux-qt33/Makefile +++ b/x11-toolkits/linux-qt33/Makefile @@ -7,12 +7,15 @@ PORTNAME= qt33 PORTVERSION= 3.3.4 +PORTREVISION= 1 CATEGORIES= x11-toolkits linux DISTNAME= qt-${PORTVERSION}-${RPMVERSION} MAINTAINER= bsam@FreeBSD.org COMMENT= RPM of QT3 +CONFLICTS= linux-f8-qt33-[0-9]* + USE_LINUX_RPM= yes USE_LINUX_APPS= fontconfig libmng png RPMVERSION= 15.5 diff --git a/x11/linux-xorg-libs/Makefile b/x11/linux-xorg-libs/Makefile index d2b2f59d1a19..dba37be30ee1 100644 --- a/x11/linux-xorg-libs/Makefile +++ b/x11/linux-xorg-libs/Makefile @@ -7,7 +7,7 @@ PORTNAME= xorg-libs PORTVERSION= 6.8.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11 linux DISTFILES= xorg-x11-libs-${PORTVERSION}-37.FC4.49.2.1.${LINUX_RPM_ARCH}.rpm \ xorg-x11-deprecated-libs-6.8.2-31.${LINUX_RPM_ARCH}.rpm @@ -15,7 +15,7 @@ DISTFILES= xorg-x11-libs-${PORTVERSION}-37.FC4.49.2.1.${LINUX_RPM_ARCH}.rpm \ MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= Xorg libraries, linux binaries -CONFLICTS= linux-XFree86-libs +CONFLICTS= linux-XFree86-libs-[0-9]* linux-f8-xorg-libs-[0-9]* USE_LINUX_RPM= yes USE_LINUX_APPS= fontconfig |