aboutsummaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
Diffstat (limited to 'textproc')
-rw-r--r--textproc/linux-aspell/Makefile4
-rw-r--r--textproc/linux-expat/Makefile4
-rw-r--r--textproc/linux-libxml/Makefile4
-rw-r--r--textproc/linux-libxml2/Makefile4
-rw-r--r--textproc/linux-scim-gtk/Makefile4
-rw-r--r--textproc/linux-scim-libs/Makefile4
6 files changed, 12 insertions, 12 deletions
diff --git a/textproc/linux-aspell/Makefile b/textproc/linux-aspell/Makefile
index 82c3daa1da8a..e7057629fb0a 100644
--- a/textproc/linux-aspell/Makefile
+++ b/textproc/linux-aspell/Makefile
@@ -7,7 +7,7 @@
PORTNAME= aspell
PORTVERSION= 0.50.4.1
-PORTREVISION= 3
+PORTREVISION= 4
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,7 +21,7 @@ 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]*
+CONFLICTS= linux-f8-aspell-[0-9]* linux-f10-aspell-[0-9]*
USE_LINUX_RPM= yes
ONLY_FOR_ARCHS= i386 amd64
diff --git a/textproc/linux-expat/Makefile b/textproc/linux-expat/Makefile
index 2aa2e4617ab6..47faef0dbeeb 100644
--- a/textproc/linux-expat/Makefile
+++ b/textproc/linux-expat/Makefile
@@ -7,14 +7,14 @@
PORTNAME= expat
PORTVERSION= 1.95.8
-PORTREVISION= 1
+PORTREVISION= 2
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]*
+CONFLICTS= linux-f8-expat-[0-9]* linux-f10-expat-[0-9]*
BRANDELF_DIRS= usr/bin
diff --git a/textproc/linux-libxml/Makefile b/textproc/linux-libxml/Makefile
index 17b3f338f3bd..e02e889261bc 100644
--- a/textproc/linux-libxml/Makefile
+++ b/textproc/linux-libxml/Makefile
@@ -7,14 +7,14 @@
PORTNAME= libxml
PORTVERSION= 1.8.17
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc linux
DISTNAME= ${PORTNAME}-${PORTVERSION}-13
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of libxml
-CONFLICTS= linux-f8-libxml-[0-9]*
+CONFLICTS= linux-f8-libxml-[0-9]* linux-f10-libxml-[0-9]*
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
diff --git a/textproc/linux-libxml2/Makefile b/textproc/linux-libxml2/Makefile
index 5640acf4e903..e769e1853e2c 100644
--- a/textproc/linux-libxml2/Makefile
+++ b/textproc/linux-libxml2/Makefile
@@ -7,14 +7,14 @@
PORTNAME= libxml2
PORTVERSION= 2.6.19
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc linux
DISTNAME= ${PORTNAME}-${PORTVERSION}-1
MAINTAINER= tut@nhamon.com.ua
COMMENT= RPM of libxml2
-CONFLICTS= linux-f8-libxml2-[0-9]*
+CONFLICTS= linux-f8-libxml2-[0-9]* linux-f10-libxml2-[0-9]*
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
diff --git a/textproc/linux-scim-gtk/Makefile b/textproc/linux-scim-gtk/Makefile
index e0e54a104d0d..7b38466f5d51 100644
--- a/textproc/linux-scim-gtk/Makefile
+++ b/textproc/linux-scim-gtk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim-gtk
PORTVERSION= # defined below
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc linux
MASTER_SITE_SUBDIR= # defined below
PKGNAMESUFFIX= -fc${LINUX_DIST_VER}
@@ -16,7 +16,7 @@ DISTNAME= # defined below
MAINTAINER= hrs@FreeBSD.org
COMMENT= Smart Common Input Method platform, gtk module, Linux binary
-CONFLICTS= linux-f8-scim-gtk-[0-9]*
+CONFLICTS= linux-f8-scim-gtk-[0-9]* linux-f10-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 156b8ce9dfef..1fb7b3042c45 100644
--- a/textproc/linux-scim-libs/Makefile
+++ b/textproc/linux-scim-libs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scim-libs
PORTVERSION= # defined below
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc linux
MASTER_SITE_SUBDIR= # defined below
PKGNAMESUFFIX= -fc${LINUX_DIST_VER}
@@ -16,7 +16,7 @@ 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]*
+CONFLICTS= linux-f8-scim-libs-[0-9]* linux-f10-scim-libs-[0-9]*
MASTER_SITE_SRC_SUBDIR= # defined below
SRC_DISTFILES= scim-${PORTVERSION}-${PORTSUBVERSION}.fc${LINUX_DIST_VER}${SRC_SUFX}