D13318.id36194.diff
No OneTemporary
Actions

Size

780 B

Referenced Files

None

Subscribers

None

D13318.id36194.diff
View Options

	Index: head/comms/mlan3/Makefile
	===================================================================
	--- head/comms/mlan3/Makefile
	+++ head/comms/mlan3/Makefile
	@@ -17,6 +17,8 @@
	USES= dos2unix uidfix zip
	DOS2UNIX_GLOB= .c .h

	+CONFLICTS_INSTALL= shells/fish
	+
	post-patch:
	@${REINPLACE_CMD} -e '/int main/s/short argc/int argc/' \
	${WRKSRC}/apps/gethumd/gethumd.c ${WRKSRC}/apps/shaapp/shaapp.c
	Index: head/shells/fish/Makefile
	===================================================================
	--- head/shells/fish/Makefile
	+++ head/shells/fish/Makefile
	@@ -17,6 +17,8 @@
	localbase compiler:c++11-lang shebangfix
	SHEBANG_FILES= share/tools/*.py share/tools/web_config/webconfig.py

	+CONFLICTS_INSTALL= comms/mlan3
	+
	GNU_CONFIGURE= yes

	CPE_VENDOR= fishshell