diff options
| author | Stefan Eßer <se@FreeBSD.org> | 2022-06-29 15:00:01 +0000 |
|---|---|---|
| committer | Stefan Eßer <se@FreeBSD.org> | 2022-06-29 15:00:01 +0000 |
| commit | 15c825be194e0b8a9d48226441684486600978b6 (patch) | |
| tree | 86a28f4108ac867c3f6941231da2a608c0d0138f | |
| parent | b52114270fb74b73a57ab9e58cfb84f4ac0271a3 (diff) | |
| download | ports-15c825be194e0b8a9d48226441684486600978b6.tar.gz ports-15c825be194e0b8a9d48226441684486600978b6.zip | |
Fix CONFLICTS_INSTALL in categories cad and chinese
Approved by: portmgr (implicit)
| -rw-r--r-- | cad/netgen/Makefile | 2 | ||||
| -rw-r--r-- | chinese/enscript/Makefile | 2 | ||||
| -rw-r--r-- | chinese/fcitx/Makefile | 2 | ||||
| -rw-r--r-- | chinese/wordpress-zh_CN/Makefile | 4 | ||||
| -rw-r--r-- | chinese/wordpress-zh_TW/Makefile | 2 |
5 files changed, 9 insertions, 3 deletions
diff --git a/cad/netgen/Makefile b/cad/netgen/Makefile index f488b12ffceb..0347dae9f065 100644 --- a/cad/netgen/Makefile +++ b/cad/netgen/Makefile @@ -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 diff --git a/chinese/enscript/Makefile b/chinese/enscript/Makefile index 31a9f3201fdb..66e749f05002 100644 --- a/chinese/enscript/Makefile +++ b/chinese/enscript/Makefile @@ -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 diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile index 7204c62544d6..64e15fc465a1 100644 --- a/chinese/fcitx/Makefile +++ b/chinese/fcitx/Makefile @@ -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 diff --git a/chinese/wordpress-zh_CN/Makefile b/chinese/wordpress-zh_CN/Makefile index 456edaabeb3b..ca11c3eead2e 100644 --- a/chinese/wordpress-zh_CN/Makefile +++ b/chinese/wordpress-zh_CN/Makefile @@ -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 diff --git a/chinese/wordpress-zh_TW/Makefile b/chinese/wordpress-zh_TW/Makefile index 6b949d2d40f4..c52c4c7bdc07 100644 --- a/chinese/wordpress-zh_TW/Makefile +++ b/chinese/wordpress-zh_TW/Makefile @@ -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 |