From owner-svn-ports-head@freebsd.org Tue Feb 23 16:09:20 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D5F60548CED; Tue, 23 Feb 2021 16:09:20 +0000 (UTC) (envelope-from skreuzer@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DlPBS5mMlz3krF; Tue, 23 Feb 2021 16:09:20 +0000 (UTC) (envelope-from skreuzer@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B897E1C414; Tue, 23 Feb 2021 16:09:20 +0000 (UTC) (envelope-from skreuzer@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11NG9Kih028990; Tue, 23 Feb 2021 16:09:20 GMT (envelope-from skreuzer@FreeBSD.org) Received: (from skreuzer@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11NG9Ki1028989; Tue, 23 Feb 2021 16:09:20 GMT (envelope-from skreuzer@FreeBSD.org) Message-Id: <202102231609.11NG9Ki1028989@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: skreuzer set sender to skreuzer@FreeBSD.org using -f From: Steven Kreuzer Date: Tue, 23 Feb 2021 16:09:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r566407 - head/emulators/mtools X-SVN-Group: ports-head X-SVN-Commit-Author: skreuzer X-SVN-Commit-Paths: head/emulators/mtools X-SVN-Commit-Revision: 566407 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Feb 2021 16:09:20 -0000 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 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}