From owner-svn-ports-head@freebsd.org Tue Aug 4 16:00:44 2020 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 60A41378AC5; Tue, 4 Aug 2020 16:00:44 +0000 (UTC) (envelope-from amdmi3@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BLfcD1v5Bz4XM1; Tue, 4 Aug 2020 16:00:44 +0000 (UTC) (envelope-from amdmi3@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 0D6ED279E3; Tue, 4 Aug 2020 16:00:44 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 074G0h0W065184; Tue, 4 Aug 2020 16:00:43 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 074G0h4I065182; Tue, 4 Aug 2020 16:00:43 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <202008041600.074G0h4I065182@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 4 Aug 2020 16:00:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r544176 - head/science/v_sim X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/science/v_sim X-SVN-Commit-Revision: 544176 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.33 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, 04 Aug 2020 16:00:44 -0000 Author: amdmi3 Date: Tue Aug 4 16:00:43 2020 New Revision: 544176 URL: https://svnweb.freebsd.org/changeset/ports/544176 Log: - Fix build without NLS (missing gettext-tools dependency) and without EXAMPLES (broken patching) - Convert patching to options helpers, silence, fix whitespace and make more future proof Approved by: portmgr blanket Modified: head/science/v_sim/Makefile head/science/v_sim/pkg-plist Modified: head/science/v_sim/Makefile ============================================================================== --- head/science/v_sim/Makefile Tue Aug 4 15:47:49 2020 (r544175) +++ head/science/v_sim/Makefile Tue Aug 4 16:00:43 2020 (r544176) @@ -39,6 +39,7 @@ OPTIONS_DEFINE= DOCS NLS EXAMPLES USES+= gettext PLIST_SUB+= NLS="" .else +USES+= gettext-tools PLIST_SUB+= NLS="@comment " .endif @@ -61,26 +62,26 @@ PLIST_SUB+= BABEL="@comment " .endif pre-configure: - ${REINPLACE_CMD} -e 's|$$datadir/doc/$$PACKAGE/examples|${EXAMPLESDIR}|' \ + @${REINPLACE_CMD} -e 's|$$datadir/doc/$$PACKAGE/examples|${EXAMPLESDIR}|' \ -e 's| CFLAGS="-O2"|#CFLAGS="-O2"|;s|Werror ansi pedantic-errors||' \ -e 's| FCFLAGS="-O2"|FCFLAGS=${FFLAGS}|;s|$${docdir}/examples|${EXAMPLESDIR}|' \ ${WRKSRC}/${CONFIGURE_SCRIPT} -.if ! ${PORT_OPTIONS:MNLS} - ${REINPLACE_CMD} -e 's| po ||' \ + +pre-configure-NLS-off: + @${REINPLACE_CMD} -e '/^ po /d' \ ${WRKSRC}/Makefile.in -.endif -.if ! ${PORT_OPTIONS:MDOCS} - ${REINPLACE_CMD} -e 's|Documentation||' \ + +pre-configure-DOCS-off: + @${REINPLACE_CMD} -e '/^ Documentation/d' \ ${WRKSRC}/Makefile.in -.endif -.if ! ${PORT_OPTIONS:MEXAMPLES} - ${REINPLACE_CMD} -e 's|pixmaps \\|pixmaps|;s|examples$$||' \ + +pre-configure-EXAMPLES-off: + @${REINPLACE_CMD} -e '/^ examples/d' \ ${WRKSRC}/Makefile.in - ${FIND} ${WRKSRC}/lib/plug-ins -name Makefile.in | ${XARGS} \ - ${REINPLACE_CMD} -e \ - 's|install-v_simexamplesDATA install-v_simpixmapsDATA|install-v_simpixmapsDATA|' - ${REINPLACE_CMD} -e 's|: install-v_simexamplesDATA|:|' \ + @${FIND} ${WRKSRC}/lib/plug-ins -name Makefile.in | ${XARGS} \ + ${REINPLACE_CMD} -e \ + 's|install-v_simexamplesDATA install-v_simpixmapsDATA|install-v_simpixmapsDATA|' + @${REINPLACE_CMD} -e 's|: install-v_simexamplesDATA|:|' \ ${WRKSRC}/lib/python/Makefile.in -.endif .include Modified: head/science/v_sim/pkg-plist ============================================================================== --- head/science/v_sim/pkg-plist Tue Aug 4 15:47:49 2020 (r544175) +++ head/science/v_sim/pkg-plist Tue Aug 4 16:00:43 2020 (r544176) @@ -186,7 +186,7 @@ share/icons/hicolor/24x24/apps/v_sim.png share/icons/hicolor/32x32/apps/v_sim.png share/icons/hicolor/48x48/apps/v_sim.png share/icons/hicolor/scalable/apps/v_sim.svg -share/locale/fr/LC_MESSAGES/v_sim.mo +%%NLS%%share/locale/fr/LC_MESSAGES/v_sim.mo share/pixmaps/v_sim.xpm %%DATADIR%%/pixmaps/axes-angles.png %%DATADIR%%/pixmaps/axes-box.png