cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix CONFLICTS_INSTALL in categories cad and chinese

Browse Source 
Approved by:	portmgr (implicit)
This commit is contained in:
Stefan Eßer 2022-06-29 17:00:01 +02:00
parent b52114270f
commit 15c825be19
5 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cad/netgen/Makefile
View File

@ -32,7 +32,7 @@ LDFLAGS+= -lexecinfo
CMAKE_OFF= USE_NATIVE_ARCH
CONFLICTS_INSTALL= libvisual netgen-lvs pybind11 # bin/netgen include/pybind11/attr.h lib/libvisual.so
CONFLICTS_INSTALL= libvisual pybind11 # bin/netgen include/pybind11/attr.h lib/libvisual.so
OPTIONS_DEFINE= JPEG MPEG CGNS

2
chinese/enscript/Makefile
View File

@ -16,7 +16,7 @@ PKGMESSAGE= ${.CURDIR}/pkg-message
USES+= ghostscript:run
CONFLICTS_INSTALL= enscript-a4 enscript-letter enscript-letterdj py*-us # bin/einfo bin/xml2json
CONFLICTS_INSTALL= enscript-a4 enscript-letter enscript-letterdj # bin/einfo bin/xml2json
post-patch:
@${ECHO_CMD} "share/enscript/README.BIG5" > ${WRKDIR}/pkg-plist

2
chinese/fcitx/Makefile
View File

@ -37,7 +37,7 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils \
SUB_FILES= pkg-message
SUB_LIST+= PORTSDIR=${PORTSDIR}
CONFLICTS_INSTALL= fcitx5 zh-fcitx5-chinese-addons zh-scim-fcitx # bin/createPYMB share/icons/hicolor/128x128/apps/fcitx.png share/icons/hicolor/16x16/apps/fcitx-fullwidth-active.png
CONFLICTS_INSTALL= fcitx5 zh-fcitx5-chinese-addons # bin/createPYMB share/icons/hicolor/128x128/apps/fcitx.png share/icons/hicolor/16x16/apps/fcitx-fullwidth-active.png
USE_GNOME= pango intltool libxml2 introspection
USE_KDE= ecm

4
chinese/wordpress-zh_CN/Makefile
View File

@ -20,6 +20,10 @@ USES= cpe php:web
CPE_VERSION= ${DISTVERSION}.0
.endif
USE_PHP= curl exif fileinfo ftp gd hash json mysqli pcre tokenizer xml zip zlib
CONFLICTS_INSTALL= de-wordpress fr-wordpress ru-wordpress wordpress \
zh-wordpress-zh_TW # share/doc/wordpress/readme.html
WWWDIR= ${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX}
NO_ARCH= yes
NO_BUILD= yes

2
chinese/wordpress-zh_TW/Makefile
View File

@ -22,6 +22,8 @@ CPE_VERSION= ${DISTVERSION}.0
USE_PHP= curl exif fileinfo ftp gd hash json mysqli pcre tokenizer xml zip zlib
CONFLICTS_INSTALL= ja-wordpress wordpress # share/doc/wordpress/readme.html
CONFLICTS_INSTALL= de-wordpress fr-wordpress ru-wordpress wordpress \
zh-wordpress-zh_CN # share/doc/wordpress/readme.html
WWWDIR= ${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX}
NO_ARCH= yes