aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordougb <dougb@FreeBSD.org>2012-08-06 07:05:24 +0800
committerdougb <dougb@FreeBSD.org>2012-08-06 07:05:24 +0800
commit37b2a027341f57b44383efc005905ca41779dce6 (patch)
treeb00ca36f9787f08b1f4a9463899bf16db1e34540
parentadb4be62f94e36a288a35fbb417988f72ffb47b9 (diff)
downloadfreebsd-ports-gnome-37b2a027341f57b44383efc005905ca41779dce6.tar.gz
freebsd-ports-gnome-37b2a027341f57b44383efc005905ca41779dce6.tar.zst
freebsd-ports-gnome-37b2a027341f57b44383efc005905ca41779dce6.zip
When installing in the base, USE_RCORDER does the right thing without
all the gymnastics
-rw-r--r--security/openssh-portable/Makefile12
1 files changed, 2 insertions, 10 deletions
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile
index 8fc1231401e7..e4cc11d4df1d 100644
--- a/security/openssh-portable/Makefile
+++ b/security/openssh-portable/Makefile
@@ -161,8 +161,7 @@ CONFIGURE_ARGS+= --localstatedir=/var
EMPTYDIR= /var/empty
PREFIX= /usr
ETCSSH= /etc/ssh
-USE_RC_SUBR= yes
-SUB_FILES+= openssh
+USE_RCORDER= openssh
PLIST_SUB+= NOTBASE="@comment "
PLIST_SUB+= BASE=""
PLIST_SUB+= BASEPREFIX="${PREFIX}"
@@ -223,14 +222,7 @@ pre-su-install:
post-install:
${INSTALL_DATA} -c ${WRKSRC}/ssh_config.out ${ETCSSH}/ssh_config-dist
${INSTALL_DATA} -c ${WRKSRC}/sshd_config.out ${ETCSSH}/sshd_config-dist
-.if defined(WITH_OVERWRITE_BASE)
- @${ECHO_CMD} "===> Installing rc.d startup script(s)"
- @${ECHO_CMD} "@cwd ${LOCALBASE}" >> ${TMPPLIST}
- @${MKDIR} ${LOCALBASE}/etc/rc.d
- @${INSTALL_SCRIPT} ${WRKDIR}/openssh ${LOCALBASE}/etc/rc.d/${RC_SCRIPT_NAME}
- @${ECHO_CMD} "etc/rc.d/${RC_SCRIPT_NAME}" >> ${TMPPLIST}
- @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
-.endif
+
@${CAT} ${PKGMESSAGE}
test: build