Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 2 Feb 2019 08:04:11 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r491921 - in head/textproc/s5: . files
Message-ID:  <201902020804.x1284BCi042213@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902020804.x1284BCi042213>