From owner-svn-ports-all@freebsd.org Sat Feb 2 08:04:13 2019 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 CBB8214AF402; Sat, 2 Feb 2019 08:04:12 +0000 (UTC) (envelope-from tobik@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 6852074342; Sat, 2 Feb 2019 08:04:12 +0000 (UTC) (envelope-from tobik@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 329403E78; Sat, 2 Feb 2019 08:04:12 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1284C9e042216; Sat, 2 Feb 2019 08:04:12 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1284BCi042213; Sat, 2 Feb 2019 08:04:11 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201902020804.x1284BCi042213@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sat, 2 Feb 2019 08:04:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r491921 - in head/textproc/s5: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/textproc/s5: . files X-SVN-Commit-Revision: 491921 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6852074342 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.95)[-0.952,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0] 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: Sat, 02 Feb 2019 08:04:13 -0000 Author: tobik Date: Sat Feb 2 08:04:11 2019 New Revision: 491921 URL: https://svnweb.freebsd.org/changeset/ports/491921 Log: textproc/s5: Use SUB_FILES too Added: head/textproc/s5/files/s5.1.in - copied, changed from r491920, head/textproc/s5/files/s5.1 head/textproc/s5/files/s5.in - copied, changed from r491920, head/textproc/s5/files/s5.sh Deleted: head/textproc/s5/files/s5.1 head/textproc/s5/files/s5.sh Modified: head/textproc/s5/Makefile Modified: head/textproc/s5/Makefile ============================================================================== --- head/textproc/s5/Makefile Sat Feb 2 08:02:48 2019 (r491920) +++ head/textproc/s5/Makefile Sat Feb 2 08:04:11 2019 (r491921) @@ -21,13 +21,13 @@ NO_ARCH= yes NO_BUILD= yes NO_WRKSUBDIR= yes +SUB_FILES= s5 s5.1 + S5_DIR= ${PREFIX}/share/${PORTNAME} S5_SUBDIRS= pix primer s5-blank ui post-extract: @cd ${WRKSRC} && ${TAR} -xf s5-blank.zip - @${SED} -e "s,/usr/local,${PREFIX}," ${FILESDIR}/s5.sh > ${WRKDIR}/s5 - @${SED} -e "s,/usr/local,${PREFIX}," ${FILESDIR}/s5.1 > ${WRKDIR}/s5.1 @${FIND} ${WRKSRC} -type f -name .DS_Store -delete do-install: Copied and modified: head/textproc/s5/files/s5.1.in (from r491920, head/textproc/s5/files/s5.1) ============================================================================== --- head/textproc/s5/files/s5.1 Sat Feb 2 08:02:48 2019 (r491920, copy source) +++ head/textproc/s5/files/s5.1.in Sat Feb 2 08:04:11 2019 (r491921) @@ -72,7 +72,7 @@ Display a short help text and exit. No-operation mode; just display the commands without executing them. .It Fl T Ar template Specify the template directory instead of the default -.Pa /usr/local/share/s5/s5-blank +.Pa %%PREFIX%%/share/s5/s5-blank .It Fl v Verbose operation; display diagnostic information. .El Copied and modified: head/textproc/s5/files/s5.in (from r491920, head/textproc/s5/files/s5.sh) ============================================================================== --- head/textproc/s5/files/s5.sh Sat Feb 2 08:02:48 2019 (r491920, copy source) +++ head/textproc/s5/files/s5.in Sat Feb 2 08:04:11 2019 (r491921) @@ -26,7 +26,7 @@ set -e -LOCALBASE='/usr/local' +LOCALBASE='%%PREFIX%%' S5_DIR="${LOCALBASE}/share/s5" S5_TEMPLATE="${S5_DIR}/s5-blank" NOOP='' @@ -217,7 +217,7 @@ Usage: s5 [-hNv] [-T template] command [args...] The available command-line options are: -h display this help message and exit -N no-op mode, just display the commands without executing them - -T template directory, default /usr/local/share/s5/s5-blank + -T template directory, default %%PREFIX%%/share/s5/s5-blank -v verbose operation, display diagnostic information The available commands are: