svn commit: r478443 - in head/misc/linm: . files

[Tobias Kortkamp]

Author: tobik
Date: Thu Aug 30 12:10:49 2018
New Revision: 478443
URL: https://svnweb.freebsd.org/changeset/ports/478443

Log:
  misc/linm: Fix build with Clang 6
  
  In file included from mlsdialog.cpp:1:
  ./mlsdialog.h:30:10: error: cannot initialize return object of type 'void *' with an rvalue of type 'bool'
                  return false;
                         ^~~~~
  
  http://beefy12.nyi.freebsd.org/data/head-amd64-default/p478276_s338342/logs/errors/linm-0.8.1.1_5.log
  
  - Fix build on 12.0 too; it fails to link and seems to want iconv
    from ports for the //TRANSLIT extension
  
  /usr/bin/ld: error: undefined symbol: libiconv_open
  >>> referenced by mlslocale.cpp
  >>>               mlslocale.o:(MLSUTIL::code_convert(char const*, char const*, char const*)) in archive ../../lib/libmlscommon.a

Added:
  head/misc/linm/files/patch-lib_mlsdialog.h   (contents, props changed)
  head/misc/linm/files/patch-src_ncurses_Makefile.in   (contents, props changed)
Modified:
  head/misc/linm/Makefile

Modified: head/misc/linm/Makefile
==============================================================================
--- head/misc/linm/Makefile	Thu Aug 30 10:49:04 2018	(r478442)
+++ head/misc/linm/Makefile	Thu Aug 30 12:10:49 2018	(r478443)
@@ -3,7 +3,7 @@
 
 PORTNAME=	linm
 DISTVERSION=	0.8.1-1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	misc shells
 MASTER_SITES=	http://kldp.net/frs/download.php/4508/
 DISTNAME=	${PORTNAME}_${DISTVERSION}
@@ -14,24 +14,21 @@ COMMENT=	Clone of Mdir, mc-style terminal file manager
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gettext pkgconfig gmake libtool ncurses ssl
+USES=		gettext iconv:translit pkgconfig gmake localbase libtool ncurses ssl
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-cfgpath="${ETCDIR}"
+CONFIGURE_ARGS=	--enable-cfgpath="${ETCDIR}" ${ICONV_CONFIGURE_ARG}
 MAKE_JOBS_UNSAFE=	yes
 INSTALL_TARGET=	install-strip
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
 OPTIONS_DEFINE=	SMB DOCS
 OPTIONS_SUB=	yes
 
 SMB_CONFIGURE_ENV_OFF=	ac_cv_lib_smbclient_smbc_new_context=no
 SMB_CPPFLAGS=	-I${SAMBAINCLUDES}
 SMB_LIBS=	-L${SAMBALIBS}
-SMB_USES=	iconv samba:lib
+SMB_USES=	samba:lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|configpath|cfgpath|g' ${WRKSRC}/configure

Added: head/misc/linm/files/patch-lib_mlsdialog.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/misc/linm/files/patch-lib_mlsdialog.h	Thu Aug 30 12:10:49 2018	(r478443)
@@ -0,0 +1,16 @@
+In file included from mlsdialog.cpp:1:
+./mlsdialog.h:30:10: error: cannot initialize return object of type 'void *' with an rvalue of type 'bool'
+                return false;
+                       ^~~~~
+
+--- lib/mlsdialog.h.orig	2018-08-30 11:11:28 UTC
++++ lib/mlsdialog.h
+@@ -27,7 +27,7 @@ class MlsDialog (public)
+ 	virtual void*	MsgWaitBox(const string& sTitle, const string& sMsg)
+ 	{
+ 		cout << "MsgWaitBox :: " << sTitle << "Msg :: " << sMsg << endl;
+-		return false;
++		return NULL;
+ 	}
+ 	virtual void	MsgWaitEnd(void* ) {}
+ 	virtual int		InputBox(const string& sTitle, string& sInputStr, bool /*bPasswd*/ = false)

Added: head/misc/linm/files/patch-src_ncurses_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/misc/linm/files/patch-src_ncurses_Makefile.in	Thu Aug 30 12:10:49 2018	(r478443)
@@ -0,0 +1,11 @@
+--- src/ncurses/Makefile.in.orig	2018-08-30 11:32:53 UTC
++++ src/ncurses/Makefile.in
+@@ -279,7 +279,7 @@ linm_LDADD = $(top_builddir)/lib/libmlscommon.a \
+ 	$(top_builddir)/editor/libeditor.a \
+ 	$(top_builddir)/panel/common/libpanelcommon.a \
+ 	$(top_builddir)/panel/vfs/archive/liblinmpluginarc.la \
+-	$(top_builddir)/panel/vfs/ftp/liblinmpluginftp.la @LIBINTL@ \
++	$(top_builddir)/panel/vfs/ftp/liblinmpluginftp.la @LIBICONV@ @LIBINTL@ \
+ 	$(am__append_1) $(am__append_2)
+ all: all-recursive
+