diff options
| author | jlam <jlam@pkgsrc.org> | 2005-08-19 18:12:36 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-08-19 18:12:36 +0000 |
| commit | bd2788d930980fb7fff304fa568751d0f69d819b (patch) | |
| tree | 41d5fc337098f380e5f2c0106fb2d4d88fd977eb /security/openssh | |
| parent | e956158a4eb6d5a4d218d8ed22d012b1f05a74c6 (diff) | |
| download | pkgsrc-bd2788d930980fb7fff304fa568751d0f69d819b.tar.gz | |
Merge CONF_FILES/SUPPORT_FILES and CONF_FILES_PERMS/SUPPORT_FILES_PERMS
as the INSTALL and DEINSTALL scripts no longer distinguish between
the two types of files. Drop SUPPORT_FILES{,_PERMS} and modify the
packages in pkgsrc accordingly.
Diffstat (limited to 'security/openssh')
| -rw-r--r-- | security/openssh/Makefile | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index ed724627608..ca81dbcd71d 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.154 2005/07/28 17:54:57 reed Exp $ +# $NetBSD: Makefile,v 1.155 2005/08/19 18:12:38 jlam Exp $ DISTNAME= openssh-3.9p1 PKGNAME= openssh-3.9.1 @@ -116,8 +116,7 @@ CONFIGURE_ARGS+= --with-xauth=${X11BASE}/bin/xauth CONFIGURE_ARGS+= --with-xauth=${X11PREFIX}/bin/xauth .endif -CONFS= ssh_config sshd_config -SUPPS= moduli +CONFS= ssh_config sshd_config moduli .if exists(/dev/urandom) . if ${OPSYS} == "NetBSD" @@ -134,10 +133,6 @@ CONF_FILES= # empty .for FILE in ${CONFS} CONF_FILES+= ${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE} .endfor -SUPPORT_FILES= # empty -.for FILE in ${SUPPS} -SUPPORT_FILES+= ${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE} -.endfor OWN_DIRS= ${OPENSSH_CHROOT} RCD_SCRIPTS= sshd @@ -152,7 +147,7 @@ INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL post-install: ${INSTALL_DATA_DIR} ${EGDIR} - cd ${WRKSRC}; for file in ${CONFS} ${SUPPS}; do \ + cd ${WRKSRC}; for file in ${CONFS}; do \ ${INSTALL_DATA} $${file}.out ${EGDIR}/$${file}; \ done .if !empty(PKG_OPTIONS:MPAM) && ${OPSYS} == "Linux" |