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/openssh | |
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/openssh')
-rw-r--r-- | security/openssh/Makefile | 6 | ||||
-rw-r--r-- | security/openssh/pkg/MESSAGE | 11 |
2 files changed, 9 insertions, 8 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index 1e61af28863..2427e92f471 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2001/01/10 16:05:52 tron Exp $ +# $NetBSD: Makefile,v 1.35 2001/01/29 11:34:41 wiz Exp $ DISTNAME= openssh-2.3.0p1 CATEGORIES= security @@ -48,7 +48,6 @@ BUILD_DEFS+= SSH_CONF_DIR DEINSTALL_FILE= ${WRKDIR}/DEINSTALL INSTALL_FILE= ${WRKDIR}/INSTALL -MESSAGE_FILE= ${WRKDIR}/MESSAGE # matches what's in `Configure' (except sparc64 and alpha, see PR 10984) ONLY_FOR_PLATFORM= NetBSD-*-arm32 NetBSD-*-i386 \ @@ -60,6 +59,8 @@ ONLY_FOR_PLATFORM= NetBSD-*-arm32 NetBSD-*-i386 \ SSH_CONF_DIR?= /etc +MESSAGE_SUBST+= SSH_CONF_DIR=${SSH_CONF_DIR} + GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${SSH_CONF_DIR} CONFIGURE_ARGS+= --with-ssl-dir=${SSLBASE} @@ -87,7 +88,6 @@ post-build: ${PKGDIR}/DEINSTALL \ ${PKGDIR}/INSTALL \ ${PKGDIR}/INSTALL.SunOS \ - ${PKGDIR}/MESSAGE \ ${FILESDIR}/sshd.sh; \ do \ ${SED} -e 's#@SSH_CONF_DIR@#${SSH_CONF_DIR}#g' \ diff --git a/security/openssh/pkg/MESSAGE b/security/openssh/pkg/MESSAGE index 4ff54dcc806..1a754dc9bc5 100644 --- a/security/openssh/pkg/MESSAGE +++ b/security/openssh/pkg/MESSAGE @@ -1,13 +1,13 @@ ========================================================================== -$NetBSD: MESSAGE,v 1.2 2000/09/28 09:25:15 jlam Exp $ +$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:41 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 + ========================================================================== |