Use SUB_FILES for pkg-message

9 files changed, 13 insertions, 19 deletions

diff --git a/irc/slirc/Makefile b/irc/slirc/Makefile
index a3ade59f62bb..2a81c8fb4367 100644
--- a/irc/slirc/Makefile
+++ b/irc/slirc/Makefile
@@ -19,6 +19,8 @@ COMMENT=	A SLang-based IRC client
 LIB_DEPENDS=	${LIB_DEPENDS_LIBSLANG}
 
 USE_GMAKE=	yes
+SUB_FILES=	pkg-message
+PKGMESSAGE=	${WRKDIR}/pkg-message
 
 SLANG_INCDIR?=	${PREFIX}/include
 SLANG_LIBDIR?=	${PREFIX}/lib
diff --git a/irc/slirc/pkg-message b/irc/slirc/files/pkg-message.in
index 175236ed3db5..4662c285c3f1 100644
--- a/irc/slirc/pkg-message
+++ b/irc/slirc/files/pkg-message.in
@@ -4,8 +4,8 @@ Quickstart:
 - Copy config.sl and colours.sl to ~/.slirc/scripts
 
   mkdir -p ~/.slirc/scripts
-  cp ${PREFIX}/lib/slirc/scripts/config.sl  ~/.slirc/scripts
-  cp ${PREFIX}/lib/slirc/scripts/colours.sl ~/.slirc/scripts
+  cp %%PREFIX%%/lib/slirc/scripts/config.sl  ~/.slirc/scripts
+  cp %%PREFIX%%/lib/slirc/scripts/colours.sl ~/.slirc/scripts
 
 - Edit ~/.slirc/scripts/config.sl
 
diff --git a/misc/sword/Makefile b/misc/sword/Makefile
index 5b7620eb9b59..5eea102cc9ef 100644
--- a/misc/sword/Makefile
+++ b/misc/sword/Makefile
@@ -26,6 +26,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--without-conf
 INSTALLS_SHLIB=	yes
+SUB_FILES=	pkg-message
+PKGMESSAGE=	${WRKDIR}/pkg-message
 
 .if defined(WITHOUT_CURL)
 CONFIGURE_ARGS+=	--without-curl
diff --git a/misc/sword/pkg-message b/misc/sword/files/pkg-message.in
index 541b0da7b4d2..fa3a2c01a95b 100644
--- a/misc/sword/pkg-message
+++ b/misc/sword/files/pkg-message.in
@@ -9,7 +9,7 @@ try this.
      See `installmgr --help` for details.
   2. Download raw zip-archives from
        http://www.crosswire.org/sword/modules/
-     and unpack them in PREFIX/share/sword.
+     and unpack them in %%PREFIX%%/share/sword.
 
 You probabely want to install a bible-application that uses sword, like
 cheatah, bibletime or gnomesword.
diff --git a/misc/sword15/Makefile b/misc/sword15/Makefile
index 5b7620eb9b59..5eea102cc9ef 100644
--- a/misc/sword15/Makefile
+++ b/misc/sword15/Makefile
@@ -26,6 +26,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--without-conf
 INSTALLS_SHLIB=	yes
+SUB_FILES=	pkg-message
+PKGMESSAGE=	${WRKDIR}/pkg-message
 
 .if defined(WITHOUT_CURL)
 CONFIGURE_ARGS+=	--without-curl
diff --git a/misc/sword15/pkg-message b/misc/sword15/files/pkg-message.in
index 541b0da7b4d2..fa3a2c01a95b 100644
--- a/misc/sword15/pkg-message
+++ b/misc/sword15/files/pkg-message.in
@@ -9,7 +9,7 @@ try this.
      See `installmgr --help` for details.
   2. Download raw zip-archives from
        http://www.crosswire.org/sword/modules/
-     and unpack them in PREFIX/share/sword.
+     and unpack them in %%PREFIX%%/share/sword.
 
 You probabely want to install a bible-application that uses sword, like
 cheatah, bibletime or gnomesword.
diff --git a/misc/upclient/Makefile b/misc/upclient/Makefile
index 541ebeb011a8..94672d3a4f29 100644
--- a/misc/upclient/Makefile
+++ b/misc/upclient/Makefile
@@ -26,8 +26,8 @@ USE_RC_SUBR=	yes
 ALL_TARGET=	bsd
 BUILD_WRKSRC=	${WRKSRC}/src
 
-MSG_FILE=	${PKGDIR}/pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
+SUB_FILES=	pkg-message 
+PKGMESSAGE=	${WRKDIR}/pkg-message upclient.sh
 
 MAN8=		upclient.8
 
@@ -35,8 +35,6 @@ MAN8=		upclient.8
 #
 
 REINPLACE_SUB=	PREFIX=${PREFIX} LOCALBASE=${LOCALBASE}
-RCSCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
-PKGMESSAGE_SUB=	PREFIX=${PREFIX}
 
 DOC_FILES=	AUTHORS COPYING FAQ HISTORY INSTALL README TODO
 DOC_FILES+=	doc/UptimesProtocol5
@@ -55,21 +53,11 @@ rename-doc:
 # Post-patch
 #
 
-post-patch: patch-inplace patch-startup patch-pkgmessage
-
-patch-inplace:
+post-patch:
 	@${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${WRKSRC}/scripts/upchk ${WRKSRC}/scripts/clientchk \
 		${WRKSRC}/src/Makefile
 
-patch-startup:
-	@${SED} ${RCSCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/upclient.sh > ${WRKDIR}/upclient.sh
-
-patch-pkgmessage:
-	@${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${MSG_FILE} > ${PKGMESSAGE}
-
 # Install
 #
 
diff --git a/misc/upclient/pkg-message b/misc/upclient/files/pkg-message.in
index f833be75f615..f833be75f615 100644
--- a/misc/upclient/pkg-message
+++ b/misc/upclient/files/pkg-message.in
diff --git a/misc/upclient/files/upclient.sh b/misc/upclient/files/upclient.sh.in
index 07de990f6193..07de990f6193 100644
--- a/misc/upclient/files/upclient.sh
+++ b/misc/upclient/files/upclient.sh.in