From owner-svn-ports-all@freebsd.org Mon Dec 17 08:13:16 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 27AE81334978; Mon, 17 Dec 2018 08:13:16 +0000 (UTC) (envelope-from dinoex@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BDC6888F66; Mon, 17 Dec 2018 08:13:15 +0000 (UTC) (envelope-from dinoex@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 B14FFC431; Mon, 17 Dec 2018 08:13:15 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBH8DFEW079713; Mon, 17 Dec 2018 08:13:15 GMT (envelope-from dinoex@FreeBSD.org) Received: (from dinoex@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBH8DFMj079712; Mon, 17 Dec 2018 08:13:15 GMT (envelope-from dinoex@FreeBSD.org) Message-Id: <201812170813.wBH8DFMj079712@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dinoex set sender to dinoex@FreeBSD.org using -f From: Dirk Meyer Date: Mon, 17 Dec 2018 08:13:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r487660 - head/emulators/vice X-SVN-Group: ports-head X-SVN-Commit-Author: dinoex X-SVN-Commit-Paths: head/emulators/vice X-SVN-Commit-Revision: 487660 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: BDC6888F66 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_LONG(-1.00)[-0.996,0]; NEURAL_HAM_SHORT(-0.98)[-0.975,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Dec 2018 08:13:16 -0000 Author: dinoex Date: Mon Dec 17 08:13:15 2018 New Revision: 487660 URL: https://svnweb.freebsd.org/changeset/ports/487660 Log: - workaround USES=iconv does not support patch and lib depends at the same time. Modified: head/emulators/vice/Makefile Modified: head/emulators/vice/Makefile ============================================================================== --- head/emulators/vice/Makefile Mon Dec 17 07:59:57 2018 (r487659) +++ head/emulators/vice/Makefile Mon Dec 17 08:13:15 2018 (r487660) @@ -115,18 +115,16 @@ INFO+= vice USE_SDL= sdl2 .endif -post-patch: -.for i in da.po de.po fr.po - ${MV} "${WRKSRC}/po/${i}" "${WRKSRC}/po/${i}.latin" - ${ICONV_CMD} -f latin1 -t utf-8 < "${WRKSRC}/po/${i}.latin" > "${WRKSRC}/po/${i}" - ${REINPLACE_CMD} -e 's|ISO-8859-1|UTF-8|' ${WRKSRC}/Makefile.in -.endfor - pre-configure: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \ ${WRKSRC}/man/vice.1 ${REINPLACE_CMD} -e 's|^localedir.*|localedir = $$(DESTDIR)${LOCALBASE}/share/locale|' \ ${WRKSRC}/po/Makefile.in.in +.for i in da.po de.po fr.po + ${MV} "${WRKSRC}/po/${i}" "${WRKSRC}/po/${i}.latin" + ${ICONV_CMD} -f latin1 -t utf-8 < "${WRKSRC}/po/${i}.latin" > "${WRKSRC}/po/${i}" + ${REINPLACE_CMD} -e 's|ISO-8859-1|UTF-8|' ${WRKSRC}/Makefile.in +.endfor .if ! ${PORT_OPTIONS:MDOCS} ${REINPLACE_CMD} -e 's| doc||' ${WRKSRC}/Makefile.in .endif