diff options
| author | wiz <wiz@pkgsrc.org> | 2001-01-29 11:34:21 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2001-01-29 11:34:21 +0000 |
| commit | b979f7222ad9bade13f010cd27e5bc6afab1681c (patch) | |
| tree | 86f14acd24842161759a420487862022044c2b4b /security/ssh | |
| parent | 6a13219ca89e5dae86f27159ff86006058c06859 (diff) | |
| download | pkgsrc-b979f7222ad9bade13f010cd27e5bc6afab1681c.tar.gz | |
Add automatic ${VARIABLE} handling for MESSAGE files.
Convert most MESSAGE files to new syntax (${VARIABLE} gets replaced,
not @VARIABLE@, nor @@VARIABLE@@).
By default, substitutions are done for LOCALBASE, PKGNAME, PREFIX,
X11BASE, X11PREFIX; additional patterns can be added via MESSAGE_SUBST.
Clean up some packages while I'm there; add RCS tags to most MESSAGEs.
Remove some uninteresting MESSAGEs.
Diffstat (limited to 'security/ssh')
| -rw-r--r-- | security/ssh/Makefile | 9 | ||||
| -rw-r--r-- | security/ssh/pkg/MESSAGE | 11 |
2 files changed, 11 insertions, 9 deletions
diff --git a/security/ssh/Makefile b/security/ssh/Makefile index 9002f76f2a2..023613925a5 100644 --- a/security/ssh/Makefile +++ b/security/ssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.84 2000/09/26 19:59:54 fredb Exp $ +# $NetBSD: Makefile,v 1.85 2001/01/29 11:34:42 wiz Exp $ # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp # @@ -147,9 +147,10 @@ ROOT_GROUP?= wheel .endif DEINSTALL_FILE= ${WRKDIR}/DEINSTALL -MESSAGE_FILE= ${WRKDIR}/MESSAGE PLIST_SRC= ${WRKDIR}/PLIST -PLIST_SUBST+= INSTALL="${INSTALL}" ROOT_GROUP="${ROOT_GROUP}" +PLIST_SUBST+= INSTALL="${INSTALL}" \ + ROOT_GROUP="${ROOT_GROUP}" +MESSAGE_SUBST+= SSH_CONF_DIR="${SSH_CONF_DIR}" pre-patch: @${MV} -f ${WRKSRC}/make-ssh-known-hosts.pl \ @@ -178,7 +179,7 @@ post-patch: post-build: @cd ${PKGDIR}; \ - for FILE in DEINSTALL MESSAGE PLIST ${FILESDIR}/sshd.sh; do \ + for FILE in DEINSTALL PLIST ${FILESDIR}/sshd.sh; do \ ${SED} -e 's#@SSH_CONF_DIR@#${SSH_CONF_DIR}#g' \ -e 's#@PREFIX@#${PREFIX}#g' \ <$${FILE} >${WRKDIR}/`basename $${FILE}`; \ diff --git a/security/ssh/pkg/MESSAGE b/security/ssh/pkg/MESSAGE index b99e81a15ee..f4c7d464fca 100644 --- a/security/ssh/pkg/MESSAGE +++ b/security/ssh/pkg/MESSAGE @@ -1,13 +1,13 @@ ========================================================================== -$NetBSD: MESSAGE,v 1.4 2000/09/28 09:25:16 jlam Exp $ +$NetBSD: MESSAGE,v 1.5 2001/01/29 11:34:42 wiz Exp $ -If "starter" configuration files were installed (in @SSH_CONF_DIR@) +If "starter" configuration files were installed (in ${SSH_CONF_DIR}) when the package was installed, be sure to examine them (and the man pages for ssh and sshd) to determine whether you want to make any changes. Copies of the example configuration files are installed in -@PREFIX@/share/examples/ssh, so those can still be used for reference -after you have made changes to those installed in @SSH_CONF_DIR@, or if +${PREFIX}/share/examples/ssh, so those can still be used for reference +after you have made changes to those installed in ${SSH_CONF_DIR}, or if you had existing configuration files, which would not be overwritten in the installation process. @@ -15,5 +15,6 @@ In general, you will want to set up /etc/rc.local to start sshd at boot time. Something like the following should do the job: # Run sshd if installed and configured -@PREFIX@/etc/rc.d/sshd +${PREFIX}/etc/rc.d/sshd + ========================================================================== |