misc/mc{,-nox11}: slightly improve the ports' Makefiles (+)

- Do not globally pollute -I/-L with ${LOCALBASE} when handling
  the NLS option and pass it as the --with-libintl-prefix instead
- Drop no longer supported --with-slang-includes configure switch,
  correct paths are obtained via pkgconf(1) these days
- Set PKGNAMESUFFIX together with CONFLICTS_INSTALL in the master
  so they are always coherent (previously, when the main port is
  built with X11 option unset it would conflict with itself)
This commit is contained in:
Alexey Dokuchaev 2022-08-10 11:19:00 +00:00
parent 33fb6bd864
commit 20c44243c4
2 changed files with 5 additions and 7 deletions

View file

@ -1,5 +1,4 @@
MASTERDIR= ${.CURDIR}/../mc
PKGNAMESUFFIX= -nox11
OPTIONS_EXCLUDE= X11
.include "${MASTERDIR}/Makefile"

View file

@ -53,16 +53,15 @@ ICONV_CONFIGURE_ENABLE= charset
NCURSES_CONFIGURE_ON= --with-screen=ncurses
NCURSES_CFLAGS+= -DNCURSES_WIDECHAR
NLS_CONFIGURE_ENABLE= nls
NLS_CONFIGURE_ON= --with-libintl-prefix=${LOCALBASE}
NLS_CONFIGURE_OFF= --disable-nls
NLS_USES= gettext
NLS_CPPFLAGS= -I${LOCALBASE}/include
NLS_LDFLAGS= -L${LOCALBASE}/lib
SFTP_LIB_DEPENDS= libssh2.so:security/libssh2
SFTP_CONFIGURE_ENABLE= vfs-sftp
SLANG_LIB_DEPENDS= libslang.so:devel/libslang2
SLANG_CONFIGURE_ON= --with-screen=slang --with-slang-includes=${LOCALBASE}/include
SLANG_CONFIGURE_ON= --with-screen=slang
SUBSHELL_CONFIGURE_WITH=subshell
SUBSHELL_SUB_FILES= pkg-message
@ -70,8 +69,8 @@ SUBSHELL_SUB_FILES= pkg-message
X11_CONFIGURE_WITH= x
X11_USES= xorg
X11_USE= xorg=x11,xext
X11_VARS= CONFLICTS_INSTALL+="mc-nox11"
X11_VARS_OFF= CONFLICTS_INSTALL+="mc"
X11_VARS= CONFLICTS_INSTALL=mc-nox11
X11_VARS_OFF= CONFLICTS_INSTALL=mc PKGNAMESUFFIX=-nox11
post-patch:
@${REINPLACE_CMD} -e 's|clang||' ${WRKSRC}/configure