From 999065324a76a5364df5b8af3dd8be3a07eb7370 Mon Sep 17 00:00:00 2001 From: Rong-En Fan Date: Tue, 27 Feb 2007 15:58:09 +0000 Subject: [PATCH] - Remove conflict with print/cjk-lyx which prefixes all programs and datadir with cjk- --- print/lyx-devel/Makefile | 2 -- print/lyx/Makefile | 2 -- print/lyx14/Makefile | 2 -- print/lyx15/Makefile | 2 -- print/lyx16/Makefile | 2 -- 5 files changed, 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