aboutsummaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorRong-En Fan <rafan@FreeBSD.org>2007-02-27 15:58:09 +0000
committerRong-En Fan <rafan@FreeBSD.org>2007-02-27 15:58:09 +0000
commit999065324a76a5364df5b8af3dd8be3a07eb7370 (patch)
tree5dcd79c3f39d407fbe7fc07f06df0f345e1c0a78 /print
parentcf3f5876b61fd26ab0ab535fadb2ee3b4a1f95bd (diff)
downloadports-999065324a76a5364df5b8af3dd8be3a07eb7370.tar.gz
ports-999065324a76a5364df5b8af3dd8be3a07eb7370.zip
- Remove conflict with print/cjk-lyx which prefixes all programs and
datadir with cjk-
Notes
Notes: svn path=/head/; revision=186138
Diffstat (limited to 'print')
-rw-r--r--print/lyx-devel/Makefile2
-rw-r--r--print/lyx/Makefile2
-rw-r--r--print/lyx14/Makefile2
-rw-r--r--print/lyx15/Makefile2
-rw-r--r--print/lyx16/Makefile2
5 files changed, 0 insertions, 10 deletions
diff --git a/print/lyx-devel/Makefile b/print/lyx-devel/Makefile
index bb1caa4d4fab..401c7a021676 100644
--- a/print/lyx-devel/Makefile
+++ b/print/lyx-devel/Makefile
@@ -24,8 +24,6 @@ BUILD_DEPENDS= latex:${PORTSDIR}/print/teTeX
RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
LIB_DEPENDS= boost_regex:${PORTSDIR}/devel/boost
-CONFLICTS= cjk-lyx-*
-
OPTIONS= QT "Use Qt (instead of XForms)" ${QT_PRESENT} \
ASPELL "Utilize ASPELL library" on \
ISPELL "Depend on ISPELL as well" off
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index bb1caa4d4fab..401c7a021676 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -24,8 +24,6 @@ BUILD_DEPENDS= latex:${PORTSDIR}/print/teTeX
RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
LIB_DEPENDS= boost_regex:${PORTSDIR}/devel/boost
-CONFLICTS= cjk-lyx-*
-
OPTIONS= QT "Use Qt (instead of XForms)" ${QT_PRESENT} \
ASPELL "Utilize ASPELL library" on \
ISPELL "Depend on ISPELL as well" off
diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile
index bb1caa4d4fab..401c7a021676 100644
--- a/print/lyx14/Makefile
+++ b/print/lyx14/Makefile
@@ -24,8 +24,6 @@ BUILD_DEPENDS= latex:${PORTSDIR}/print/teTeX
RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
LIB_DEPENDS= boost_regex:${PORTSDIR}/devel/boost
-CONFLICTS= cjk-lyx-*
-
OPTIONS= QT "Use Qt (instead of XForms)" ${QT_PRESENT} \
ASPELL "Utilize ASPELL library" on \
ISPELL "Depend on ISPELL as well" off
diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile
index bb1caa4d4fab..401c7a021676 100644
--- a/print/lyx15/Makefile
+++ b/print/lyx15/Makefile
@@ -24,8 +24,6 @@ BUILD_DEPENDS= latex:${PORTSDIR}/print/teTeX
RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
LIB_DEPENDS= boost_regex:${PORTSDIR}/devel/boost
-CONFLICTS= cjk-lyx-*
-
OPTIONS= QT "Use Qt (instead of XForms)" ${QT_PRESENT} \
ASPELL "Utilize ASPELL library" on \
ISPELL "Depend on ISPELL as well" off
diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile
index bb1caa4d4fab..401c7a021676 100644
--- a/print/lyx16/Makefile
+++ b/print/lyx16/Makefile
@@ -24,8 +24,6 @@ BUILD_DEPENDS= latex:${PORTSDIR}/print/teTeX
RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
LIB_DEPENDS= boost_regex:${PORTSDIR}/devel/boost
-CONFLICTS= cjk-lyx-*
-
OPTIONS= QT "Use Qt (instead of XForms)" ${QT_PRESENT} \
ASPELL "Utilize ASPELL library" on \
ISPELL "Depend on ISPELL as well" off