svn commit: r566407 - head/emulators/mtools

[Steven Kreuzer]

Author: skreuzer
Date: Tue Feb 23 16:09:20 2021
New Revision: 566407
URL: https://svnweb.freebsd.org/changeset/ports/566407

Log:
  Add libiconv as a dependancy
  
  * Prefer to use libiconv from ports
  * Comment out the SAMPLE FILE line in mtools.conf to avoid breakng other ports
  
  PR:		252928
  Submitted by:	John Kennedy <warlock at phouka.net>

Modified:
  head/emulators/mtools/Makefile

Modified: head/emulators/mtools/Makefile
==============================================================================
--- head/emulators/mtools/Makefile	Tue Feb 23 16:01:47 2021	(r566406)
+++ head/emulators/mtools/Makefile	Tue Feb 23 16:09:20 2021	(r566407)
@@ -3,6 +3,7 @@
 
 PORTNAME=	mtools
 PORTVERSION=	4.0.26
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	GNU
 
@@ -31,6 +32,7 @@ OPTIONS_DEFAULT=ICONV X11
 USES+=		iconv
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
+LIB_DEPENDS+=	libiconv.so:converters/libiconv
 .else
 CONFIGURE_ENV+=	ac_cv_header_iconv_h=no
 .endif
@@ -51,6 +53,8 @@ post-patch:
 		${WRKSRC}/llong.h
 	@${REINPLACE_CMD} -e 's|/etc/mtools.conf|${PREFIX}/etc/mtools.conf|g' \
 		${WRKSRC}/mformat.c
+	@${REINPLACE_CMD} -e 's|^\(SAMPLE FILE\)$$|#\1|' \
+		${WRKSRC}/mtools.conf
 .for f in mtools.5 mtools.texi
 	@${REINPLACE_CMD} -e 's|/usr/local/etc/|${PREFIX}/etc/|g' \
 		${WRKSRC}/${f}