use more specific version of SUBST_* where appropriate

2014-08-10 09:58:04 +00:00 · 2014-08-10 09:58:04 +00:00 · 92816cd8fc
commit 92816cd8fc
parent 40715699cf
59 changed files with 132 additions and 180 deletions
--- a/audio/umurmur/Makefile
+++ b/audio/umurmur/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2014/07/25 22:03:30 naddy Exp $
+# $OpenBSD: Makefile,v 1.13 2014/08/10 09:58:04 espie Exp $

 COMMENT =		minimalistic Mumble server

@ -31,13 +31,11 @@ post-configure:

 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/umurmur
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} \
-		-c ${WRKBUILD}/umurmur.conf.example \
+	${SUBST_DATA} ${WRKBUILD}/umurmur.conf.example \
 		${PREFIX}/share/examples/umurmur/umurmur.conf
 	${INSTALL_MAN} ${FILESDIR}/umurmurd.1 \
 		${PREFIX}/man/man1/
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} \
-		-c ${FILESDIR}/umurmur.conf.1 \
+	${SUBST_MAN} ${FILESDIR}/umurmur.conf.1 \
 			${PREFIX}/man/man1/umurmur.conf.1

 .include <bsd.port.mk>
--- a/cad/fritzing/Makefile
+++ b/cad/fritzing/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2014/03/26 16:00:31 jasper Exp $
+# $OpenBSD: Makefile,v 1.19 2014/08/10 09:58:04 espie Exp $

 COMMENT=	interactive electronics designing software

@ -36,14 +36,13 @@ do-configure:
 		${LOCALBASE}/bin/qmake4 -o Makefile phoenix.pro

 do-install:
-	${SUBST_CMD} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} -c \
-		${FILESDIR}/fritzing.sh ${PREFIX}/bin/fritzing
+	${SUBST_PROGRAM} ${FILESDIR}/fritzing.sh ${PREFIX}/bin/fritzing
 	${INSTALL_PROGRAM} ${WRKSRC}/Fritzing ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/fritzing/
 	cd ${WRKSRC}; tar cf - bins help parts pdb resources sketches tools translations | \
 		tar xf - -C ${PREFIX}/share/fritzing/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/applications/
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${FILESDIR}/fritzing.desktop \
+	${SUBST_DATA} ${FILESDIR}/fritzing.desktop \
 		${PREFIX}/share/applications/fritzing.desktop

 .include <bsd.port.mk>
--- a/comms/smstools/Makefile
+++ b/comms/smstools/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2014/03/09 20:52:25 sthen Exp $
+# $OpenBSD: Makefile,v 1.32 2014/08/10 09:58:04 espie Exp $

 COMMENT =	gateway to send and receive SMS through GSM mobile phones

@ -44,8 +44,7 @@ do-install:
 	${INSTALL_DATA} ${WRKDIST}/scripts/* \
 		${PREFIX}/share/examples/smstools/scripts
 	rm ${PREFIX}/share/examples/smstools/scripts/*.orig
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} \
-		-c ${FILESDIR}/smsd.conf.openbsd \
+	${SUBST_DATA} ${FILESDIR}/smsd.conf.openbsd \
 		${PREFIX}/share/examples/smstools/smsd.conf.openbsd
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/smstools
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/smstools/slideshow
--- a/databases/iodbc/Makefile
+++ b/databases/iodbc/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.34 2014/03/26 14:12:27 sthen Exp $
+# $OpenBSD: Makefile,v 1.35 2014/08/10 09:58:04 espie Exp $

 COMMENT-main=		ODBC 3.x driver manager
 COMMENT-admin=		ODBC 3.x driver manager admin application
@ -54,7 +54,7 @@ WANTLIB-admin += xcb xcb-render xcb-shm z
 EXDIR=${PREFIX}/share/examples/iodbc/
 post-install:
 	${INSTALL_DATA_DIR} ${EXDIR}
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c \
+	${SUBST_DATA} \
 	    ${WRKSRC}/etc/odbc.ini.sample ${EXDIR}/odbc.ini.sample \
 	    ${WRKSRC}/etc/odbcinst.ini.sample ${EXDIR}/odbcinst.ini.sample
 	rm -f ${PREFIX}/man/man1/iodbctestw.1
--- a/databases/pkglocatedb/Makefile
+++ b/databases/pkglocatedb/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2014/07/13 16:52:37 espie Exp $
+# $OpenBSD: Makefile,v 1.28 2014/08/10 09:58:04 espie Exp $

 # NOTE for FLAVOR=src
 # - you can have up-to-date ${BSDSRCDIR}/distrib/sets/lists 
@ -36,8 +36,7 @@ do-build:
 do-install:
 	${INSTALL_DATA} ${WRKBUILD}/pkglocatedb ${PREFIX}/share
 	${INSTALL_MAN} ${FILESDIR}/pkg_locate.1 ${PREFIX}/man/man1
-	${SUBST_CMD} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} -c \
-		${FILESDIR}/pkglocate ${PREFIX}/bin/pkg_locate
+	${SUBST_PROGRAM} ${FILESDIR}/pkglocate ${PREFIX}/bin/pkg_locate
 	ln -s ${TRUEPREFIX}/bin/pkg_locate ${PREFIX}/bin/pkglocate

 NO_TEST =		Yes
--- a/databases/ports-readmes-dancer/Makefile
+++ b/databases/ports-readmes-dancer/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2013/05/12 18:49:49 rpe Exp $
+# $OpenBSD: Makefile,v 1.6 2014/08/10 09:58:04 espie Exp $

 COMMENT =		ports-readmes dancer web app
 PKG_ARCH = *
@ -20,8 +20,7 @@ do-install:
 	${SUBST_CMD} -c ${FILESDIR}/config.yml.sample ${INSTALL_DIR}/config.yml.sample
 	chown -R ${SHAREOWN}:${SHAREGRP} ${INSTALL_DIR}
 	chmod ${BINMODE} ${INSTALL_DIR}/bin/ports-readmes
-	${SUBST_CMD} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} -c \
-		${FILESDIR}/ports-readmes ${PREFIX}/bin/ports-readmes
+	${SUBST_PROGRAM} ${FILESDIR}/ports-readmes ${PREFIX}/bin/ports-readmes

 RUN_DEPENDS = 	www/p5-Dancer \
 		databases/p5-DBI \
--- a/databases/py-couchdb/Makefile
+++ b/databases/py-couchdb/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2013/08/07 21:31:23 naddy Exp $
+# $OpenBSD: Makefile,v 1.16 2014/08/10 09:58:04 espie Exp $

 COMMENT =	Python library for working with CouchDB

@ -38,8 +38,7 @@ post-install:
 	    pax -rw * ${PREFIX}/share/doc/py-couchdb
 	rm -rf ${PREFIX}/share/doc/py-couchdb/_sources
 	$(INSTALL_DATA_DIR) ${PREFIX}/share/examples/py-couchdb
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} \
-	    -c ${FILESDIR}/python.ini \
+	${SUBST_DATA} ${FILESDIR}/python.ini \
 	    ${PREFIX}/share/examples/py-couchdb/python.ini

 do-test:
--- a/databases/redis/Makefile
+++ b/databases/redis/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.67 2014/07/12 09:53:56 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.68 2014/08/10 09:58:04 espie Exp $

 COMMENT =		persistent key-value database
 DISTNAME =		redis-2.8.12
@ -43,11 +43,9 @@ pre-configure:
 post-install:
 	${INSTALL_PROGRAM} ${WRKBUILD}/src/redis-sentinel ${PREFIX}/bin/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/redis
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c \
-		${WRKSRC}/redis.conf \
+	${SUBST_DATA} ${WRKSRC}/redis.conf \
 			${PREFIX}/share/examples/redis/redis.conf
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c \
-		${WRKSRC}/sentinel.conf \
+	${SUBST_DATA} ${WRKSRC}/sentinel.conf \
 			${PREFIX}/share/examples/redis/sentinel.conf

 .include <bsd.port.mk>
--- a/devel/boris/Makefile
+++ b/devel/boris/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2014/07/11 08:26:53 jasper Exp $
+# $OpenBSD: Makefile,v 1.6 2014/08/10 09:58:05 espie Exp $

 COMMENT =		read-eval-print loop for PHP

@ -32,7 +32,6 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/boris ${PREFIX}/lib/boris
 	${INSTALL_DATA} ${WRKSRC}/{LICENSE,README.md} ${PREFIX}/share/doc/boris
 	cp -r ${WRKSRC}/lib/* ${PREFIX}/lib/boris
-	${SUBST_CMD} -c -m ${BINMODE} -o ${BINOWN} -g ${BINGRP} \
-	    ${WRKSRC}/bin/boris ${PREFIX}/bin/boris
+	${SUBST_PROGRAM} ${WRKSRC}/bin/boris ${PREFIX}/bin/boris

 .include <bsd.port.mk>
--- a/devel/intellij/Makefile
+++ b/devel/intellij/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2014/05/07 15:42:15 kurt Exp $
+# $OpenBSD: Makefile,v 1.19 2014/08/10 09:58:05 espie Exp $

 SHARED_ONLY=		Yes

@ -40,19 +40,14 @@ do-build:
 do-install:
 	${INSTALL_DATA_DIR} ${IJ}
 	@tar -czf - -C ${WRKDIST} . | tar xzf - -C ${IJ}
-	@${SUBST_CMD} -o ${BINOWN} -g ${BINGRP} -c \
-		${FILESDIR}/idea \
-		${PREFIX}/bin/idea
+	@${SUBST_PROGRAM} ${FILESDIR}/idea ${PREFIX}/bin/idea
 	@chmod ${BINMODE} ${PREFIX}/bin/idea
 	@ln -s ${TRUEPREFIX}/bin/idea ${PREFIX}/bin/intellij
 	${INSTALL_MAN} ${FILESDIR}/idea.1 ${PREFIX}/man/man1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/applications
 	cd ${WRKDIST}/lib && ${JAVA_HOME}/bin/jar xf icons.jar
 	${INSTALL_DATA} ${WRKDIST}/lib/icon.png ${IJ}/idea.png
-	@${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c \
-		${FILESDIR}/intellij.desktop \
-		${PREFIX}/share/applications/intellij.desktop
-	@chmod ${SHAREMODE} \
+	@${SUBST_DATA} ${FILESDIR}/intellij.desktop \
 		${PREFIX}/share/applications/intellij.desktop

 .include <bsd.port.mk>
--- a/devel/libJudy/Makefile
+++ b/devel/libJudy/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2014/04/12 21:17:13 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2014/08/10 09:58:05 espie Exp $

 COMMENT=		general purpose dynamic array

@ -25,7 +25,6 @@ EXAMPLESDIR=		${PREFIX}/share/examples/libJudy
 post-install:
 	${INSTALL_DATA_DIR} ${EXAMPLESDIR}
 	@cd ${WRKSRC}/src/apps/demo; tar cf - * | tar xf - -C ${EXAMPLESDIR}
-	@${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} \
-	    -c ${WRKSRC}/src/apps/demo/run_demo ${EXAMPLESDIR}/run_demo
+	@${SUBST_DATA} ${WRKSRC}/src/apps/demo/run_demo ${EXAMPLESDIR}/run_demo

 .include <bsd.port.mk>
--- a/devel/libaudiofile/Makefile
+++ b/devel/libaudiofile/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.47 2013/05/10 20:30:31 rpe Exp $
+# $OpenBSD: Makefile,v 1.48 2014/08/10 09:58:05 espie Exp $

 COMMENT=	SGI audiofile library clone

@ -32,8 +32,7 @@ CONFIGURE_ARGS=	${CONFIGURE_SHARED}

 # audiofile-config is still needed by audio/normalize and devel/libspectrum
 post-install:
-	${SUBST_CMD} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} -c \
-		${FILESDIR}/audiofile-config \
+	${SUBST_PROGRAM} ${FILESDIR}/audiofile-config \
 		${PREFIX}/bin/audiofile-config

 .include <bsd.port.mk>
--- a/devel/lualdoc/Makefile
+++ b/devel/lualdoc/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2014/07/10 16:54:37 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2014/08/10 09:58:05 espie Exp $

 COMMENT =	LuaDoc-compatible documentation generation system

@ -36,7 +36,7 @@ do-install:
 		${MODLUA_DATADIR}/ldoc/html/
 	${INSTALL_DATA} ${WRKSRC}/doc/*.md ${MODLUA_DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/readme.md ${MODLUA_DOCDIR}
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -m ${BINMODE} \
-		-c ${WRKSRC}/ldoc.lua ${PREFIX}/bin/ldoc${MODLUA_DEP_VERSION}
+	${SUBST_PROGRAM} \
+		${WRKSRC}/ldoc.lua ${PREFIX}/bin/ldoc${MODLUA_DEP_VERSION}

 .include <bsd.port.mk>
--- a/devel/ocaml-mlgmp/Makefile
+++ b/devel/ocaml-mlgmp/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2014/01/23 23:37:32 edd Exp $
+# $OpenBSD: Makefile,v 1.8 2014/08/10 09:58:05 espie Exp $

 COMMENT =		GMP bindings for OCaml

@ -50,8 +50,7 @@ pre-build:
 	cd ${WRKBUILD} && ${MAKE_PROGRAM} clean

 post-install:
-	${SUBST_CMD} -o ${BINOWN} -g ${BINGRP} -c \
-		${FILESDIR}/META ${PREFIX}/lib/ocaml/gmp/META
+	${SUBST_PROGRAM} ${FILESDIR}/META ${PREFIX}/lib/ocaml/gmp/META
 	chmod 644 ${PREFIX}/lib/ocaml/gmp/gmp.mli

 .include <bsd.port.mk>
--- a/devel/vtcl/Makefile
+++ b/devel/vtcl/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2013/05/04 10:00:52 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2014/08/10 09:58:05 espie Exp $

 COMMENT=		Visual Tcl development environment

@ -30,8 +30,7 @@ do-install:
 	     ${WRKSRC}/demo ${PREFIX}/lib/vtcl
 	cp -R ${WRKSRC}/sample ${PREFIX}/share/examples/vtcl
 	cp -R ${WRKSRC}/doc ${PREFIX}/share/doc/vtcl
-	${SUBST_CMD} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} -c \
-	    ${FILESDIR}/vtcl ${PREFIX}/bin/vtcl
+	${SUBST_PROGRAM} ${FILESDIR}/vtcl ${PREFIX}/bin/vtcl

 NO_TEST=		Yes

--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.137 2014/07/10 23:54:15 jturner Exp $
+# $OpenBSD: Makefile,v 1.138 2014/08/10 09:58:05 espie Exp $

 COMMENT-main=	vi clone, many additional features
 COMMENT-lang=	vi clone, NLS subpackage
@ -163,8 +163,7 @@ post-install:

 .if ! ${FLAVOR:Mno_x11}
 	${INSTALL_DATA_DIR} ${PREFIX}/share/applications
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} -c \
-		${FILESDIR}/gvim.desktop \
+	${SUBST_DATA} ${FILESDIR}/gvim.desktop \
 		${PREFIX}/share/applications/gvim.desktop
 	${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKDIST}/runtime/vim48x48.png ${PREFIX}/share/pixmaps/vim.png
--- a/emulators/sdlmame/Makefile
+++ b/emulators/sdlmame/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.39 2014/05/14 23:32:50 bcallah Exp $
+# $OpenBSD: Makefile,v 1.40 2014/08/10 09:58:05 espie Exp $

 # Other archs have not been tested
 ONLY_FOR_ARCHS =	amd64 i386
@ -90,7 +90,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/${f} ${PREFIX}/share/doc/sdlmame
 .endfor
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sdlmame
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${FILESDIR}/mame.ini \
+	${SUBST_DATA} ${FILESDIR}/mame.ini \
 	    ${PREFIX}/share/examples/sdlmame/mame.ini
 	${INSTALL_DATA} ${WRKDIR}/history.dat ${PREFIX}/share/sdlmame

--- a/emulators/sdlmess/Makefile
+++ b/emulators/sdlmess/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2014/05/14 23:11:41 bcallah Exp $
+# $OpenBSD: Makefile,v 1.34 2014/08/10 09:58:05 espie Exp $

 # Other archs have not been tested
 ONLY_FOR_ARCHS =	amd64 i386
@ -86,7 +86,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/${f} ${PREFIX}/share/doc/sdlmess
 .endfor
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sdlmess
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${FILESDIR}/mess.ini \
+	${SUBST_DATA} ${FILESDIR}/mess.ini \
 	    ${PREFIX}/share/examples/sdlmess/mess.ini
 	${INSTALL_DATA} ${WRKDIR}/history.dat ${PREFIX}/share/sdlmess

--- a/games/clonekeen/Makefile
+++ b/games/clonekeen/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2013/03/11 11:07:38 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2014/08/10 09:58:05 espie Exp $

 COMMENT =		commander keen clone
 DISTNAME =		clonekeen-src-84
@ -33,7 +33,6 @@ do-install:
 	cp -r ${WRKSRC}/bin ${PREFIX}/share/clonekeen
 	chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/clonekeen
 	${INSTALL_PROGRAM} ${WRKBUILD}/keen ${PREFIX}/share/clonekeen
-	${SUBST_CMD} -c -o root -g bin ${FILESDIR}/keen ${PREFIX}/bin/keen
-	chmod 755 ${PREFIX}/bin/keen
+	${SUBST_PROGRAM} ${FILESDIR}/keen ${PREFIX}/bin/keen

 .include <bsd.port.mk>
--- a/games/freecol/Makefile
+++ b/games/freecol/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2014/05/23 18:16:25 bcallah Exp $
+# $OpenBSD: Makefile,v 1.2 2014/08/10 09:58:05 espie Exp $

 COMMENT =	free Colonization clone
 DISTNAME =	freecol-0.10.7
@ -24,8 +24,7 @@ NO_TEST =	Yes
 WRKDIST =	${WRKDIR}/freecol

 do-install:
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -m 555 \
-		-c ${FILESDIR}/freecol ${PREFIX}/bin/freecol
+	${SUBST_PROGRAM} ${FILESDIR}/freecol ${PREFIX}/bin/freecol
 	${INSTALL_DATA_DIR} ${PREFIX}/share/freecol
 	${INSTALL_DATA} ${WRKSRC}/{FreeCol.jar,freecol.xpm} ${PREFIX}/share/freecol
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/freecol
--- a/games/opentyrian/Makefile
+++ b/games/opentyrian/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2014/03/24 09:08:55 juanfra Exp $
+# $OpenBSD: Makefile,v 1.2 2014/08/10 09:58:05 espie Exp $

 V =			2.1.20130907
 COMMENT =		port of the DOS shoot-em-up Tyrian
@ -25,8 +25,7 @@ MAKE_FLAGS =		CC="${CC}" \
 WRKDIST =		${WRKDIR}/opentyrian-${V}

 do-install:
-	${SUBST_CMD} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-		${FILESDIR}/opentyrian ${PREFIX}/bin/opentyrian
+	${SUBST_PROGRAM} ${FILESDIR}/opentyrian ${PREFIX}/bin/opentyrian
 	${INSTALL_DATA_DIR} ${PREFIX}/share/opentyrian
 	${INSTALL_PROGRAM} ${WRKSRC}/opentyrian ${PREFIX}/share/opentyrian/opentyrian

--- a/games/renpy/Makefile
+++ b/games/renpy/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2014/01/01 06:43:05 bentley Exp $
+# $OpenBSD: Makefile,v 1.8 2014/08/10 09:58:05 espie Exp $

 COMMENT =		visual novel engine

@ -42,7 +42,6 @@ pre-install:
 	cp -r launcher renpy templates the_question tutorial LICENSE.txt \
 		${PREFIX}/share/renpy
 	${INSTALL_SCRIPT} ${WRKDIST}/renpy.py ${PREFIX}/share/renpy
-	${SUBST_CMD} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} -c \
-		${FILESDIR}/renpy ${PREFIX}/bin/renpy
+	${SUBST_PROGRAM} ${FILESDIR}/renpy ${PREFIX}/bin/renpy

 .include <bsd.port.mk>
--- a/games/singularity/Makefile
+++ b/games/singularity/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2014/07/10 11:17:31 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.15 2014/08/10 09:58:05 espie Exp $

 COMMENT=	simulation of a true AI

@ -43,7 +43,7 @@ do-install:
 	cp -R ${WRKDIR}/endgame-singularity-music-${MUSIC_V}/* \
 		${PREFIX}/share/singularity/music
 	${INSTALL_DATA} ${WRKSRC}/singularity.py ${PREFIX}/share/singularity/
-	${SUBST_CMD} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} -c \
+	${SUBST_PROGRAM} \
 		${FILESDIR}/singularity ${PREFIX}/bin/singularity
 	chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/singularity

--- a/geo/qgis/Makefile
+++ b/geo/qgis/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2013/11/08 22:40:38 sthen Exp $
+# $OpenBSD: Makefile,v 1.31 2014/08/10 09:58:05 espie Exp $

 BROKEN-powerpc=	doesn't build, assembler error: operand out of range

@ -67,8 +67,7 @@ pre-configure:
 post-install:
 		${INSTALL_DATA_DIR} ${PREFIX}/share/{pixmaps,applications}
 		ln ${PREFIX}/share/{qgis/images/icons,pixmaps}/qgis-icon.png
-		${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c \
-			${WRKSRC}/debian/qgis.desktop \
+		${SUBST_DATA} ${WRKSRC}/debian/qgis.desktop \
 			${PREFIX}/share/applications/qgis.desktop

 .include <bsd.port.mk>
--- a/lang/abcl/Makefile
+++ b/lang/abcl/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2014/05/07 15:42:16 kurt Exp $
+# $OpenBSD: Makefile,v 1.5 2014/08/10 09:58:05 espie Exp $

 COMMENT =		Common Lisp dialect for the Java Virtual Machine

@ -37,8 +37,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${ABCL_HOME}
 	${INSTALL_DATA} ${WRKSRC}/dist/abcl.jar ${ABCL_HOME}
 	${INSTALL_DATA} ${WRKSRC}/dist/abcl-contrib.jar ${ABCL_HOME}
-	${SUBST_CMD} -o ${BINOWN} -g ${BINGRP} -c -m 0755 \
-		${FILESDIR}/abcl ${PREFIX}/bin/abcl
+	${SUBST_PROGRAM} ${FILESDIR}/abcl ${PREFIX}/bin/abcl
 	cd ${WRKDIST} && tar -cf - src | tar -C ${ABCL_HOME} -xf -
 	chown -R ${SHAREOWN}:${SHAREGRP} ${ABCL_HOME}/src
 	${INSTALL_DATA} ${FILESDIR}/abcl_completions ${ABCL_HOME}
--- a/lang/clojure/Makefile
+++ b/lang/clojure/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2014/07/10 11:06:15 rpe Exp $
+# $OpenBSD: Makefile,v 1.24 2014/08/10 09:58:05 espie Exp $

 COMMENT =		Lisp-1 dialect for the Java Virtual Machine

@ -43,8 +43,7 @@ completions: install
 do-install:
 	${INSTALL_DATA_DIR} ${CLOJURE_HOME}
 	${INSTALL_DATA} ${WRKSRC}/clojure.jar ${CLOJURE_HOME}
-	@${SUBST_CMD} -o ${BINOWN} -g ${BINGRP} -c \
-		${FILESDIR}/clojure \
+	@${SUBST_PROGRAM} ${FILESDIR}/clojure \
 		${PREFIX}/bin/clojure
 	cd ${WRKDIST} && tar -cf - src | tar -C ${CLOJURE_HOME} -xf -
 	chown -R ${SHAREOWN}:${SHAREGRP} ${CLOJURE_HOME}/src
--- a/lang/icon/interp/Makefile
+++ b/lang/icon/interp/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2013/11/03 14:32:21 espie Exp $
+# $OpenBSD: Makefile,v 1.30 2014/08/10 09:58:05 espie Exp $

 COMMENT-main =		programming language with generators, X11 and more
 COMMENT-main-no_x11 =	programming language with generators
@ -61,8 +61,7 @@ post-build:
 # with the package. Ludicrous to get through a ftp connexion for such
 # a small file...
 do-install:
-	${SUBST_CMD} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} -c \
-		${FILESDIR}/icont.template ${PREFIX}/bin/icont
+	${SUBST_PROGRAM} ${FILESDIR}/icont.template ${PREFIX}/bin/icont
 	${INSTALL_DATA_DIR} ${WRKINST}${LIBDIR}
 	${INSTALL_PROGRAM} ${WRKBUILD}/bin/icont ${WRKINST}${LIBDIR}
 	${INSTALL_PROGRAM} ${WRKBUILD}/bin/iconx ${PREFIX}/bin
--- a/lang/lua/5.2/Makefile
+++ b/lang/lua/5.2/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2013/12/09 07:43:08 jasper Exp $
+# $OpenBSD: Makefile,v 1.5 2014/08/10 09:58:05 espie Exp $

 VERSION=	5.2.3
 PKGSPEC=	lua->=5.2,<5.3
@ -13,7 +13,7 @@ MAKE_FLAGS+=	LIBlua5.2_VERSION="${LIBlua5.2_VERSION}"

 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/pkgconfig
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${FILESDIR}/lua52.pc \
+	${SUBST_DATA} -c ${FILESDIR}/lua52.pc \
 		${PREFIX}/lib/pkgconfig/lua52.pc


--- a/lang/spidermonkey/Makefile
+++ b/lang/spidermonkey/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2013/12/09 16:31:59 landry Exp $
+# $OpenBSD: Makefile,v 1.26 2014/08/10 09:58:05 espie Exp $

 SHARED_ONLY=	Yes

@ -66,7 +66,7 @@ post-install:
 	# There is a mozilla-js.pc in the tarball, but it's not initialized
 	# as part of the build. This file is based on that.
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/pkgconfig/
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${FILESDIR}/mozilla-js.pc \
+	${SUBST_DATA} ${FILESDIR}/mozilla-js.pc \
 		${PREFIX}/lib/pkgconfig/mozilla-js.pc

 .include <bsd.port.mk>
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.98 2014/07/23 10:36:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.99 2014/08/10 09:58:05 espie Exp $

 CATEGORIES =		mail
 COMMENT-main =		flexible mail transfer agent
@ -106,8 +106,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/spec.txt ${PREFIX}/share/doc/exim
 	${INSTALL_DATA} ${WRKSRC}/doc/README.SIEVE ${PREFIX}/share/doc/exim
 	${INSTALL_DATA} ${WRKSRC}/doc/filter.txt ${PREFIX}/share/doc/exim
-	${SUBST_CMD} -c -o ${SHAREOWN} -g ${SHAREGRP} \
-	    ${FILESDIR}/mailer.conf.exim \
+	${SUBST_DATA} ${FILESDIR}/mailer.conf.exim \
 	    ${PREFIX}/share/doc/exim/mailer.conf.exim
 	${INSTALL_SCRIPT} ${FILESDIR}/exim-enable ${FILESDIR}/exim-disable \
 	    ${PREFIX}/sbin
--- a/mail/mozilla-thunderbird/Makefile
+++ b/mail/mozilla-thunderbird/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.193 2014/07/25 17:26:18 landry Exp $
+# $OpenBSD: Makefile,v 1.194 2014/08/10 09:58:06 espie Exp $

 COMMENT-main =		Mozilla e-mail, rss and usenet client
 COMMENT-lightning =	Mozilla Thunderbird calendar extension
@ -95,11 +95,11 @@ post-install:
 	${UNZIP} -oq ${WRKBUILD}/mozilla/dist/xpi-stage/${xpi}*.xpi -d ${EXTDIR}/${guid}
 .endfor
 	# install prefs
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${FILESDIR}/all-openbsd.js \
+	${SUBST_DATA} ${FILESDIR}/all-openbsd.js \
 		${PREFIX}/lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/defaults/pref/all-openbsd.js
 	# install desktop file
 	${INSTALL_DATA_DIR} ${PREFIX}/share/applications/ ; \
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${FILESDIR}/${MOZILLA_PROJECT}.desktop \
+	${SUBST_DATA} ${FILESDIR}/${MOZILLA_PROJECT}.desktop \
 		${PREFIX}/share/applications/${MOZILLA_PROJECT}.desktop ; \
 	# install icon for desktop file
 	${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps/
--- a/mail/rss2email/Makefile
+++ b/mail/rss2email/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2013/06/26 16:23:10 sthen Exp $
+# $OpenBSD: Makefile,v 1.2 2014/08/10 09:58:06 espie Exp $

 COMMENT=	get news from RSS feeds in email

@ -33,7 +33,6 @@ do-install:
 	    ${PREFIX}/share/examples/rss2email/
 	${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
 	    ${WRKINST}/${MODPY_SITEPKG}/rss2email.py
-	${SUBST_CMD} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${FILESDIR}/r2e ${PREFIX}/bin/r2e
+	${SUBST_PROGRAM} ${FILESDIR}/r2e ${PREFIX}/bin/r2e

 .include <bsd.port.mk>
--- a/misc/rocrail/Makefile
+++ b/misc/rocrail/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2013/03/11 11:23:58 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2014/08/10 09:58:06 espie Exp $

 SHARED_ONLY =		Yes

@ -82,8 +82,6 @@ do-install:
 	${INSTALL_DATA} ${WRKBUILD}/rocrail/symbols/control/* ${PREFIX}/share/rocrail/symbols/control
 	${INSTALL_DATA} ${WRKBUILD}/stylesheets/* ${PREFIX}/share/rocrail/stylesheets
 	${INSTALL_DATA} ${WRKBUILD}/rocrail/package/images/* ${PREFIX}/share/rocrail/images
-	${SUBST_CMD} -c -g ${BINGRP} -o ${BINOWN} \
-		${FILESDIR}/rocview.sh ${PREFIX}/bin/rocview.sh
-	chmod 755 ${PREFIX}/bin/rocview.sh
+	${SUBST_PROGRAM} ${FILESDIR}/rocview.sh ${PREFIX}/bin/rocview.sh

 .include <bsd.port.mk>
--- a/multimedia/get_iplayer/Makefile
+++ b/multimedia/get_iplayer/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.74 2014/04/06 17:03:03 sthen Exp $
+# $OpenBSD: Makefile,v 1.75 2014/08/10 09:58:06 espie Exp $

 COMMENT=		download/stream programmes from BBC iPlayer

@ -36,7 +36,7 @@ do-build:

 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/get_iplayer/plugins
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -m 644 -c \
+	${SUBST_DATA} -m 644 \
 	   ${FILESDIR}/options.sample ${PREFIX}/share/get_iplayer/options.sample
 	${INSTALL_SCRIPT} ${WRKSRC}/get_iplayer ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/plugins/* \
--- a/multimedia/mediatomb/Makefile
+++ b/multimedia/mediatomb/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2013/03/11 11:35:44 espie Exp $
+# $OpenBSD: Makefile,v 1.19 2014/08/10 09:58:06 espie Exp $

 COMMENT =	UPnP media server

@ -42,7 +42,7 @@ CONFIGURE_ENV =		CPPFLAGS="-I${WRKSRC}/src -I${LOCALBASE}/include" \

 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mediatomb/
-	${SUBST_CMD} -c -o ${SHAREOWN} -g ${SHAREGRP} ${FILESDIR}/config.xml \
+	${SUBST_DATA} ${FILESDIR}/config.xml \
 		${PREFIX}/share/examples/mediatomb/config.xml

 .include <bsd.port.mk>
--- a/net/coccinella/Makefile
+++ b/net/coccinella/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2013/11/09 18:22:02 zhuk Exp $
+# $OpenBSD: Makefile,v 1.18 2014/08/10 09:58:06 espie Exp $

 SHARED_ONLY =		Yes

@ -52,9 +52,8 @@ do-install:
 	rm ${PREFIX}/lib/coccinella/lib/Init.tcl.* \
 		${PREFIX}/lib/coccinella/show_own_jid.patch
 	${INSTALL_SCRIPT} ${WRKSRC}/Coccinella.tcl ${PREFIX}/lib/coccinella
-	${SUBST_CMD} -c -o ${BINOWN} -g ${BINGRP} ${FILESDIR}/coccinella \
+	${SUBST_PROGRAM} ${FILESDIR}/coccinella \
 				${PREFIX}/bin/coccinella
-	chmod 755 ${PREFIX}/bin/coccinella
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/coccinella
 	cd ${WRKSRC} && ${INSTALL_DATA} README.txt READMEs/README-xmpp \
 		READMEs/README-sounds \
--- a/net/jnettop/Makefile
+++ b/net/jnettop/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2013/03/11 11:35:48 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2014/08/10 09:58:06 espie Exp $

 COMMENT=	capture network traffic, display streams sorted by bandwidth

@ -30,7 +30,7 @@ post-install:
 	${SUBST_CMD} ${PREFIX}/man/man8/jnettop.8
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jnettop
 	${INSTALL_DATA} ${WRKSRC}/README* ${PREFIX}/share/doc/jnettop/
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${WRKSRC}/.jnettop \
+	${SUBST_DATA} ${WRKSRC}/.jnettop \
 	    ${PREFIX}/share/doc/jnettop/dot.jnettop

 .include <bsd.port.mk>
--- a/net/miniupnp/miniupnpd/Makefile
+++ b/net/miniupnp/miniupnpd/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2013/10/31 21:12:13 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2014/08/10 09:58:06 espie Exp $

 COMMENT=	UPnP IGD client lightweight library

@ -14,8 +14,7 @@ FAKE_FLAGS=	PREFIX=${TRUEPREFIX}

 post-install:
 	${INSTALL_MAN_DIR} ${PREFIX}/man/man8
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -m ${MANMODE} \
-		-c ${WRKBUILD}/miniupnpd.8 \
+	${SUBST_DATA} ${WRKBUILD}/miniupnpd.8 \
 			${PREFIX}/man/man8/miniupnpd.8

 .include <bsd.port.mk>
--- a/net/rrdtool/Makefile
+++ b/net/rrdtool/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.82 2014/06/14 10:34:45 sthen Exp $
+# $OpenBSD: Makefile,v 1.83 2014/08/10 09:58:06 espie Exp $

 SHARED_ONLY=	Yes

@ -111,8 +111,7 @@ post-install:
 	cd ${WRKSRC}; ${INSTALL_DATA} CHANGES CONTRIBUTORS COPYRIGHT \
 	    NEWS README ${PREFIX}/share/doc/rrdtool
 	rm -r ${PREFIX}/share/doc/rrdtool/txt
-	${SUBST_CMD} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${FILESDIR}/rrdtool-chroot.sh \
+	${SUBST_PROGRAM} ${FILESDIR}/rrdtool-chroot.sh \
 	    ${PREFIX}/share/examples/rrdtool/rrdtool-chroot
 	rm -rf ${PREFIX}/share/doc/rrdtool/html

--- a/net/zabbix/Makefile
+++ b/net/zabbix/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.100 2014/07/24 09:03:58 robert Exp $
+# $OpenBSD: Makefile,v 1.101 2014/08/10 09:58:06 espie Exp $

 COMMENT-main =		network and application monitoring - agent
 COMMENT-server =	network and application monitoring - server
@ -110,12 +110,10 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/zabbix
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX-web}/conf/
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX-web}/conf/modules.sample
-	${SUBST_CMD} -c -o ${SHAREOWN} -g ${SHAREGRP} \
-		${FILESDIR}/zabbix.conf \
+	${SUBST_DATA} ${FILESDIR}/zabbix.conf \
 		${DESTDIR}${PREFIX-web}/conf/modules.sample/zabbix.conf
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/php-${MODPHP_VERSION}
-	${SUBST_CMD} -c -o ${SHAREOWN} -g ${SHAREGRP} \
-		${FILESDIR}/zabbix.ini \
+	${SUBST_DATA} ${FILESDIR}/zabbix.ini \
 		${PREFIX}/share/examples/php-${MODPHP_VERSION}/zabbix.ini
 	${INSTALL_DATA_DIR} ${PREFIX}/share/zabbix/schema
 	${INSTALL_DATA_DIR} ${PREFIX}/share/zabbix/data
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.115 2014/06/17 08:51:18 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.116 2014/08/10 09:58:06 espie Exp $

 SHARED_ONLY=		Yes

@ -183,7 +183,7 @@ pre-configure:
 		${WRKSRC}/logcapture.py

 post-install:
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${FILESDIR}/hplip.state \
+	${SUBST_DATA} ${FILESDIR}/hplip.state \
 		${PREFIX}/share/examples/hplip/db/hplip.state
 	${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
 		${PREFIX}/share/hplip
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.68 2014/02/03 17:56:54 bcallah Exp $
+# $OpenBSD: Makefile,v 1.69 2014/08/10 09:58:06 espie Exp $

 COMMENT=	graphical frontend for LaTeX (nearly WYSIWYG)

@ -58,7 +58,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/lib/images/lyx.png ${PREFIX}/share/pixmaps
 	${INSTALL_DATA_DIR} ${PREFIX}/share/applications
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${FILESDIR}/lyx.desktop \
+	${SUBST_DATA} ${FILESDIR}/lyx.desktop \
 		${PREFIX}/share/applications/lyx.desktop

 .include <bsd.port.mk>
--- a/productivity/projectlibre/Makefile
+++ b/productivity/projectlibre/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2014/05/07 15:42:16 kurt Exp $
+# $OpenBSD: Makefile,v 1.5 2014/08/10 09:58:06 espie Exp $

 COMMENT=		open source alternative to Microsoft Project

@ -27,10 +27,8 @@ NO_TEST=	Yes
 PKG_ARCH=       *

 do-install:
-	@${SUBST_CMD} -o ${BINOWN} -g ${BINGRP} -c \
-		${FILESDIR}/projectlibre \
+	@${SUBST_PROGRAM} ${FILESDIR}/projectlibre \
 		${PREFIX}/bin/projectlibre
-	chmod +x ${PREFIX}/bin/projectlibre
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/projectlibre/lib/
 	${INSTALL_DATA} ${WRKSRC}/projectlibre.jar ${PREFIX}/lib/projectlibre/
 	${INSTALL_DATA} ${WRKSRC}/lib/* ${PREFIX}/lib/projectlibre/lib/
--- a/productivity/radicale/Makefile
+++ b/productivity/radicale/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2014/03/26 10:17:02 sthen Exp $
+# $OpenBSD: Makefile,v 1.22 2014/08/10 09:58:06 espie Exp $

 COMMENT =	simple CalDAV calendar server

@ -31,7 +31,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/radicale
 	cd ${WRKSRC}; ${INSTALL_DATA} COPYING NEWS.rst README \
 	    ${PREFIX}/share/doc/radicale/
-	${SUBST_CMD} -g ${SHAREGRP} -o ${SHAREOWN} -c ${WRKSRC}/config \
+	${SUBST_DATA} ${WRKSRC}/config \
 	    ${PREFIX}/share/examples/radicale/config
 	${INSTALL_DATA} ${WRKSRC}/logging \
 	    ${PREFIX}/share/examples/radicale/logging
--- a/productivity/taskd/Makefile
+++ b/productivity/taskd/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2014/07/12 22:08:35 landry Exp $
+# $OpenBSD: Makefile,v 1.2 2014/08/10 09:58:06 espie Exp $

 COMMENT =	lightweight server providing access to task data

@ -34,7 +34,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/taskd/pki/
 	${INSTALL_SCRIPT} ${WRKSRC}/pki/!(*.orig) \
 		${PREFIX}/share/examples/taskd/pki/
-	${SUBST_CMD} -c -o root -g bin -m 444 ${FILESDIR}/config \
+	${SUBST_DATA} ${FILESDIR}/config \
 		${PREFIX}/share/examples/taskd/config
 	${INSTALL_DATA} ${FILESDIR}/vars.dist ${PREFIX}/share/examples/taskd/pki/

--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.82 2014/04/21 12:12:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.83 2014/08/10 09:58:06 espie Exp $

 COMMENT=	RFC 2222 SASL (Simple Authentication and Security Layer)

@ -120,7 +120,7 @@ post-install:
 .if ${FLAVOR:Mldap}
 	${INSTALL_DATA} ${WRKSRC}/saslauthd/LDAP_SASLAUTHD \
 		${PREFIX}/share/doc/cyrus-sasl
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${FILESDIR}/saslauthd.conf \
+	${SUBST_DATA} ${FILESDIR}/saslauthd.conf \
 		${PREFIX}/share/examples/cyrus-sasl/saslauthd.conf
 .endif

--- a/sysutils/logtail/Makefile
+++ b/sysutils/logtail/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2013/03/11 11:41:31 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2014/08/10 09:58:06 espie Exp $

 COMMENT=	mail anomalies in the system logfiles to the administrator

@ -21,7 +21,7 @@ DTR=		10-savelog 20-logrotate 30-logrotate-dateext

 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/src/logtail ${PREFIX}/bin/logtail
-	${SUBST_CMD} -c -o root -g wheel ${WRKSRC}/src/logtail2 ${PREFIX}/bin/logtail2
+	${SUBST_PROGRAM} ${WRKSRC}/src/logtail2 ${PREFIX}/bin/logtail2
 	${INSTALL_DATA_DIR} ${PREFIX}/share/logtail/detectrotate
 .for i in ${DTR}
 	${INSTALL_SCRIPT} ${WRKSRC}/src/detectrotate/${i}.dtr \
--- a/textproc/dblatex/Makefile
+++ b/textproc/dblatex/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2014/01/11 18:53:34 edd Exp $
+# $OpenBSD: Makefile,v 1.14 2014/08/10 09:58:06 espie Exp $

 COMMENT =		convert DocBook to LaTeX, DVI, PostScript, and PDF
 DISTNAME =		dblatex-0.3
@ -32,7 +32,6 @@ post-extract:

 post-install:
 	@rm -r ${PREFIX}/lib/python${MODPY_VERSION}/site-packages/contrib
-	${SUBST_CMD} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    -c ${FILESDIR}/dblatex ${PREFIX}/bin/dblatex
+	${SUBST_PROGRAM} ${FILESDIR}/dblatex ${PREFIX}/bin/dblatex

 .include <bsd.port.mk>
--- a/textproc/xml2rfc/Makefile
+++ b/textproc/xml2rfc/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.37 2013/05/04 09:41:38 sthen Exp $
+# $OpenBSD: Makefile,v 1.38 2014/08/10 09:58:06 espie Exp $

 COMMENT=	convert memos written in XML to the RFC format

@ -21,8 +21,7 @@ NO_TEST=	Yes
 PKG_ARCH=	*

 do-install:
-	@${SUBST_CMD} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} -c \
-	    ${FILESDIR}/xml2rfc ${PREFIX}/bin/xml2rfc
+	@${SUBST_PROGRAM} ${FILESDIR}/xml2rfc ${PREFIX}/bin/xml2rfc
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/xml2rfc
 	@${INSTALL_DATA} ${WRKSRC}/xml2rfc.tcl ${PREFIX}/share/xml2rfc
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xml2rfc
--- a/www/chive/Makefile
+++ b/www/chive/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2014/05/30 13:20:13 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2014/08/10 09:58:06 espie Exp $

 COMMENT=	web-based MySQL management

@ -34,7 +34,7 @@ WRKDIST=	${WRKDIR}/chive
 do-install:
 	${INSTALL_DATA_DIR} ${WRKINST}${INSTDIR}
 	cd ${WRKSRC} && pax -rw * ${WRKINST}${INSTDIR}
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} \
-	    -c ${FILESDIR}/chive.conf ${WRKINST}${INSTDIR}/chive.conf.default
+	${SUBST_DATA} \
+	    ${FILESDIR}/chive.conf ${WRKINST}${INSTDIR}/chive.conf.default

 .include <bsd.port.mk>
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.179 2014/07/28 12:33:47 espie Exp $
+# $OpenBSD: Makefile,v 1.180 2014/08/10 09:58:06 espie Exp $

 ONLY_FOR_ARCHS=		i386 amd64
 DPB_PROPERTIES=		parallel
@ -164,9 +164,7 @@ do-build:
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/chrome
 	${INSTALL_PROGRAM} ${BUILDDIR}/chrome ${PREFIX}/chrome
-	${SUBST_CMD} -o ${BINOWN} -g ${BINGRP} -c \
-		${FILESDIR}/chrome ${PREFIX}/bin/chrome
-	chmod ${BINMODE} ${PREFIX}/bin/chrome
+	${SUBST_PROGRAM} ${FILESDIR}/chrome ${PREFIX}/bin/chrome
 	${INSTALL_MAN} ${BUILDDIR}/chrome.1 ${PREFIX}/man/man1

 .for p in chrome_100_percent content_resources keyboard_resources resources
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.47 2014/04/11 17:44:08 bcallah Exp $
+# $OpenBSD: Makefile,v 1.48 2014/08/10 09:58:06 espie Exp $

 COMMENT =		fast and light graphical web browser

@ -45,7 +45,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${FILESDIR}/dillo.xpm ${PREFIX}/share/pixmaps
 	${INSTALL_DATA_DIR} ${PREFIX}/share/applications
-	@${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${FILESDIR}/dillo.desktop \
+	@${SUBST_DATA} ${FILESDIR}/dillo.desktop \
 		${PREFIX}/share/applications/dillo.desktop

 .include <bsd.port.mk>
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2014/07/24 18:09:57 landry Exp $
+# $OpenBSD: Makefile,v 1.11 2014/08/10 09:58:06 espie Exp $

 COMMENT =	Firefox web browser, Extended Support Release

@ -70,11 +70,11 @@ MOZILLA_AUTOCONF_DIRS +=	js/src
 post-install:
 	# install prefs
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/${MOZILLA_PROJECT}-esr-${MOZILLA_VER}/browser/defaults/preferences
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${FILESDIR}/all-openbsd.js \
+	${SUBST_DATA} ${FILESDIR}/all-openbsd.js \
 		${PREFIX}/lib/${MOZILLA_PROJECT}-esr-${MOZILLA_VER}/browser/defaults/preferences/all-openbsd.js
 	# install desktop file
 	${INSTALL_DATA_DIR} ${PREFIX}/share/applications/
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${FILESDIR}/${MOZILLA_PROJECT}.desktop \
+	${SUBST_DATA} ${FILESDIR}/${MOZILLA_PROJECT}.desktop \
 		${PREFIX}/share/applications/${MOZILLA_PROJECT}-esr.desktop
 	# install icon for desktop file
 	${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps/
--- a/www/mozilla-firefox/Makefile
+++ b/www/mozilla-firefox/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.256 2014/07/24 18:31:03 landry Exp $
+# $OpenBSD: Makefile,v 1.257 2014/08/10 09:58:07 espie Exp $

 COMMENT =	Mozilla web browser

@ -63,17 +63,17 @@ RUN_DEPENDS +=	multimedia/gstreamer1/plugins-good
 MOZILLA_AUTOCONF_DIRS +=	js/src

 post-install:
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${FILESDIR}/mozilla-firefox.1 \
+	${SUBST_MAN} ${FILESDIR}/mozilla-firefox.1 \
 		${PREFIX}/man/man1/mozilla-firefox.1
 	cd ${PREFIX}/man/man1/ && ln -sf mozilla-firefox.1 firefox.1
 	cd ${PREFIX}/bin/ && ln -sf firefox mozilla-firefox
 	# install prefs
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/defaults/preferences
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${FILESDIR}/all-openbsd.js \
+	${SUBST_DATA} ${FILESDIR}/all-openbsd.js \
 		${PREFIX}/lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/defaults/preferences/all-openbsd.js
 	# install desktop file
 	${INSTALL_DATA_DIR} ${PREFIX}/share/applications/
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${FILESDIR}/${MOZILLA_PROJECT}.desktop \
+	${SUBST_DATA} ${FILESDIR}/${MOZILLA_PROJECT}.desktop \
 		${PREFIX}/share/applications/${MOZILLA_PROJECT}.desktop
 	# install icon for desktop file
 	${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps/
--- a/www/opengroupware/Makefile
+++ b/www/opengroupware/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2014/05/22 09:50:22 sebastia Exp $
+# $OpenBSD: Makefile,v 1.4 2014/08/10 09:58:07 espie Exp $

 COMMENT = 	web based groupware server

@ -93,7 +93,7 @@ post-build:
 post-install:
 	mkdir -p ${PREFIX}/share/examples/opengroupware
 .for F in ${EXAMPLE_FILES}
-	${SUBST_CMD} -g ${SHAREGRP} -o ${SHAREOWN} -c \
+	${SUBST_DATA} \
 		${FILESDIR}/${F} ${PREFIX}/share/examples/opengroupware/${F}
 .endfor
 	${MODAPACHE_INSTALL}
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.160 2014/07/24 18:04:21 landry Exp $
+# $OpenBSD: Makefile,v 1.161 2014/08/10 09:58:07 espie Exp $

 COMMENT-main =		Mozilla application suite
 COMMENT-lightning =	Mozilla Seamonkey calendar extension
@ -87,11 +87,11 @@ post-install:
 	${UNZIP} -oq ${WRKBUILD}/mozilla/dist/xpi-stage/${xpi}*.xpi -d ${EXTDIR}/${guid}
 .endfor
 	# install prefs
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${FILESDIR}/all-openbsd.js \
+	${SUBST_DATA} ${FILESDIR}/all-openbsd.js \
 		${PREFIX}/lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/defaults/pref/all-openbsd.js
 	# install desktop file
 	${INSTALL_DATA_DIR} ${PREFIX}/share/applications/ ; \
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${FILESDIR}/${MOZILLA_PROJECT}.desktop \
+	${SUBST_DATA} ${FILESDIR}/${MOZILLA_PROJECT}.desktop \
 		${PREFIX}/share/applications/${MOZILLA_PROJECT}.desktop ; \
 	# install icon for desktop file
 	${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps/
--- a/www/xombrero/Makefile
+++ b/www/xombrero/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2013/07/14 19:06:02 gonzalo Exp $
+# $OpenBSD: Makefile,v 1.13 2014/08/10 09:58:07 espie Exp $

 COMMENT=		vi-like minimalists web browser
 DISTNAME=		xombrero-1.6.3
@ -44,8 +44,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/xombrero.conf ${EXAMPLEDIR}
 	${INSTALL_DATA} ${WRKSRC}/favorites ${EXAMPLEDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/playflash.sh ${EXAMPLEDIR}
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} \
-		-c ${WRKSRC}/xombrero.desktop \
+	${SUBST_DATA} ${WRKSRC}/xombrero.desktop \
 		${PREFIX}/share/applications/xombrero.desktop

 .include <bsd.port.mk>
--- a/x11/i3/Makefile
+++ b/x11/i3/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.86 2014/07/11 15:49:58 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.87 2014/08/10 09:58:07 espie Exp $

 COMMENT =	improved dynamic tiling window manager

@ -61,14 +61,11 @@ post-configure:

 post-install:
 	${INSTALL_MAN} ${WRKBUILD}/man/*.1 ${PREFIX}/man/man1/
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -m ${MANMODE} \
-		-c ${WRKBUILD}/man/i3-config-wizard.1 \
+	${SUBST_MAN} ${WRKBUILD}/man/i3-config-wizard.1 \
 			${PREFIX}/man/man1/i3-config-wizard.1
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -m ${MANMODE} \
-		-c ${WRKBUILD}/man/i3-dmenu-desktop.1 \
+	${SUBST_MAN} ${WRKBUILD}/man/i3-dmenu-desktop.1 \
 			${PREFIX}/man/man1/i3-dmenu-desktop.1
-	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -m ${MANMODE} \
-		-c ${WRKBUILD}/man/i3.1 ${PREFIX}/man/man1/i3.1
+	${SUBST_MAN} ${WRKBUILD}/man/i3.1 ${PREFIX}/man/man1/i3.1
 	@rm ${PREFIX}/man/man1/i3-sensible*.1

 .include <bsd.port.mk>
--- a/x11/qwt/Makefile
+++ b/x11/qwt/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2013/03/19 13:07:14 nigel Exp $
+# $OpenBSD: Makefile,v 1.14 2014/08/10 09:58:07 espie Exp $

 SHARED_ONLY =		Yes

@ -42,8 +42,7 @@ do-configure:
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/man/man3/* ${PREFIX}/man/man3/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/qwt
-	${SUBST_CMD} -c -o ${SHAREOWN} -g ${SHAREGRP} \
-		${FILESDIR}/Makefile.examples \
+	${SUBST_DATA} ${FILESDIR}/Makefile.examples \
 		${PREFIX}/share/examples/qwt/Makefile
 	${INSTALL_DATA} ${WRKSRC}/examples/examples.pri \
 		${PREFIX}/share/examples/qwt/