diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2017-05-29 15:26:18 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2017-05-29 15:26:18 +0000 |
| commit | 45b92a4c06e2a9ab844fcd839d72e6f17a528f6c (patch) | |
| tree | 68b9d8e2e38ba600fd45dcc91e34f55d26ed437b /archivers | |
| parent | biology/diamond: Update to version 0.9.3 (diff) | |
Update CONFLICTS_INSTALL
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/unrar/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile index c43d93fcc265..6e0bb90c8816 100644 --- a/archivers/unrar/Makefile +++ b/archivers/unrar/Makefile @@ -24,7 +24,7 @@ OPTIONS_DEFINE= OPENSSL_AES OPTIONS_DEFAULT=OPENSSL_AES OPENSSL_AES_DESC= Use OpenSSL implementation of AES -CONFLICTS_INSTALL?= zh-unrar-[0-9].* unrar-iconv-[0-9].* +CONFLICTS_INSTALL?= zh-unrar unrar-iconv LDFLAGS+= -lpthread MAKE_ARGS= CXX=${CXX} CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" STRIP=${STRIP_CMD} |